+NEW in 2.91.4.3 (24/12/2010)
+===============
+
+The "Hopefully the good one..." release.
+
+This new 2.91.4 release fixes build with latest gnome-keyring.
+
+Dependencies:
+ • libgcr (provided by gnome-keyring) ≥ 2.91.4
+
+Bugs fixed:
+ - Fixed #609568, Add a popup menu to quickly enable/disable accounts
+
+Translations:
+ - Updated ug Translation (Gheyret T.Kenji)
+
+NEW in 2.91.4.2 (23/12/2010)
+===============
+
+This releases fixes some build warnings which could lead to crashes.
+
+NEW in 2.91.4.1 (23/12/2010)
+===============
+
+The main goal of this release is to be able to build with GTK+ 2.91.7 (and
+make Vincent happy :).
+
+Bugs fixed:
+ - Fixed #637799, Empty Contact menu on chatrooms (Guillaume Desmottes)
+ - Fixed #637854, Empathy depends upon removed gdk_spawn_on_screen() (Guillaume Desmottes)
+ - Fixed #637855, Empathy depends upon removed gdk_xid_table_lookup() (Guillaume Desmottes)
+
+NEW in 2.91.4 (20/12/2010)
+=============
+
+Empathy is now able to prompt you for your password when it's needed, rather
+than requiring you to save it when you create the account. This needs the very
+latest versions of connection managers (in some cases, unreleased versions).
+Older connection managers will continue to work but you'll still have to save
+passwords when creating accounts.
+
+Dependencies:
+ • telepathy-glib ≥ 0.13.9
+ • GTK+ ≥ 2.91.6
+
+Bugs fixed:
+ - Fixed #602450, Cannot clear password from created accounts (Jonny Lamb)
+ - Fixed #637135, Add nice UI for password-less accounts (Jonny Lamb)
+ - Fixed #637307, Accounts dialog doesn't select the right accounts when opened from the info bar (Guillaume Desmottes)
+
+Translations:
+ - Updated eo Translation (Kristjan SCHMIDT)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated nb Translation (Kjartan Maraas)
+
+NEW in 2.91.3.1 (14/12/2010)
+===============
+
+This release fixes a lot of nasty bugs, including crashes and infinite
+loops.
+
+Dependencies:
+ • telepathy-glib ≥ 0.13.7
+ • folks ≥ 0.3.3
+
+Bugs fixed:
+ - Fixed #608806, empathy doesn't let me see or get to contact details during subscription request (Guillaume Desmottes)
+ - Fixed #626507, Connection error message is not shown completely (Robert Sajdok)
+ - Fixed #630146, Add Ovi account profile (Guillaume Desmottes)
+ - Fixed #631096, Should not mention "meta contacts" in UI (Philip Withnall)
+ - Fixed #635513, Message displayed TWICE (in chat msg overlay) when opening a chat window for unread msg (Guillaume Desmottes)
+ - Fixed #636067, Add an EmpathySoundManager (Guillaume Desmottes)
+ - Fixed #636123, gtk_menu_detach(): menu is not attached when right closing contact context menu (Guillaume Desmottes)
+ - Fixed #636202, "Invite to chatroom" menu broken (Guillaume Desmottes)
+ - Fixed #636203, Crash when trying to create an IRC account (Guillaume Desmottes)
+ - Fixed #636207, Avatar not always displayed in a MUC (Guillaume Desmottes)
+ - Fixed #636360, Favorite chatrooms list is not updated (Guillaume Desmottes)
+ - Fixed #636613, Become a server SASL handler (Jonny Lamb)
+ - Fixed #636700, Add an extra warning when deleting a metacontact (Philip Withnall)
+ - Fixed #636802, Doesn't compile with --without-ca-file (Will Thompson)
+ - Fixed #637097, Port to latest folks API changes (Philip Withnall)
+
+Translations:
+ - Updated en_GB Translation (Philip Withnall)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
+Documentation translations:
+ - Updated hu Documentation translation (Gabor Kelemen)
+
NEW in 2.91.3 (29/11/2010)
=============
See http://live.gnome.org/Empathy/Roadmap
If you want to contribute you can ask for information at
- - #telepathy on freenode
+ - #empathy on irc.gimp.org
- Telepathy's mailing list: telepathy@lists.freedesktop.org
dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
m4_define([empathy_major_version], [2])
m4_define([empathy_minor_version], [91])
-m4_define([empathy_micro_version], [3])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_micro_version], [4])
+m4_define([empathy_nano_version], [3])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],
# Minimal version required
# Hardp deps
-FOLKS_REQUIRED=0.3.2
+FOLKS_REQUIRED=0.3.3
GLIB_REQUIRED=2.27.2
GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=2.91.3
+GTK_REQUIRED=2.91.6
KEYRING_REQUIRED=2.26.0
+GCR_REQUIRED=2.91.4
LIBCANBERRA_GTK_REQUIRED=0.25
LIBNOTIFY_REQUIRED=0.7.0
TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.13.1.1
+TELEPATHY_GLIB_REQUIRED=0.13.9
TELEPATHY_LOGGER=0.1.5
# Optional deps
# Use --enable-maintainer-mode to disable deprecated symbols,
# disable single include and enable GSEAL. If this is not a released empathy,
# maintainer mode is forced
-ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
-GNOME_MAINTAINER_MODE_DEFINES
+# FIXME: don't disable deprecated symbols until bgo #636654 has been fixed
+#ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
+#GNOME_MAINTAINER_MODE_DEFINES
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
gtk+-3.0 >= $GTK_REQUIRED
libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
libnotify >= $LIBNOTIFY_REQUIRED
- gcr-3 >= $KEYRING_REQUIRED
+ gcr-3 >= $GCR_REQUIRED
])
# -----------------------------------------------------------
AM_GLIB_GNU_GETTEXT
-# -----------------------------------------------------------
-# Make CA certificates path configurable
-# Stolen from GIO's TLS
-# -----------------------------------------------------------
-AC_MSG_CHECKING([location of system Certificate Authority list])
-AC_ARG_WITH(ca-file,
- [AC_HELP_STRING([--with-ca-file=@<:@path@:>@],
- [path to system Certificate Authority list])])
-if test "$with_ca_file" = "no"; then
- AC_MSG_RESULT([disabled])
-else
- if test -z "$with_ca_file"; then
- for f in /etc/pki/tls/certs/ca-bundle.crt \
- /etc/ssl/certs/ca-certificates.crt; do
- if test -f "$f"; then
- with_ca_file="$f"
- fi
- done
- if test -z "$with_ca_file"; then
- AC_MSG_ERROR([could not find. Use --with-ca-file=path to set, or --without-ca-file to disable])
- fi
- fi
-
- AC_MSG_RESULT($with_ca_file)
- if ! test -f "$with_ca_file"; then
- AC_MSG_ERROR([No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable])
- fi
- GTLS_SYSTEM_CA_FILE="$with_ca_file"
-
- AC_DEFINE_UNQUOTED([GTLS_SYSTEM_CA_FILE], ["$GTLS_SYSTEM_CA_FILE"], [path to system Certificate Authority list])
-fi
-
# -----------------------------------------------------------
# Connectivity integration
# -----------------------------------------------------------
Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS}
Prefix......................: ${prefix}
Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS}
- CA Cert Path................: ${GTLS_SYSTEM_CA_FILE}
Features:
Spell checking (enchant)....: ${have_enchant}
[org.freedesktop.Telepathy.Client]
-Interfaces=org.freedesktop.Telepathy.Client.Handler
+Interfaces=org.freedesktop.Telepathy.Client.Handler;org.freedesktop.Telepathy.Client.Observer
[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection
org.freedesktop.Telepathy.Channel.TargetHandleType u=0
+
+[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 1]
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerAuthentication
+org.freedesktop.Telepathy.Channel.Type.ServerAuthentication s=org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication
+
+[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 0]
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerAuthentication
+org.freedesktop.Telepathy.Channel.Type.ServerAuthentication s=org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication
tune=0x4
profile=1
speed-preset=3
+sliced-threads=false
+aud=false
[ffenc_h263]
rtp-payload-size=1
empathy-new-message-dialog.c \
empathy-new-call-dialog.c \
empathy-notify-manager.c \
+ empathy-password-dialog.c \
empathy-persona-store.c \
empathy-persona-view.c \
empathy-presence-chooser.c \
empathy-new-message-dialog.h \
empathy-new-call-dialog.h \
empathy-notify-manager.h \
+ empathy-password-dialog.h \
empathy-persona-store.h \
empathy-persona-view.h \
empathy-presence-chooser.h \
libempathy_gtk_la_SOURCES = \
$(libempathy_gtk_handwritten_source) \
$(libempathy_gtk_headers) \
- gcr-simple-certificate.c gcr-simple-certificate.h \
totem-subtitle-encoding.c totem-subtitle-encoding.h
# do not distribute generated files
<child>
<object class="GtkTable" id="table_common_settings">
<property name="visible">True</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<placeholder/>
</child>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password_simple">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
</interface>
<child>
<object class="GtkTable" id="table_common_groupwise_settings">
<property name="visible">True</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<property name="bottom_attach">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
<child>
<object class="GtkEntry" id="entry_password">
<property name="visible">True</property>
<property name="bottom_attach">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password_simple">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
</interface>
<child>
<object class="GtkTable" id="table_common_settings">
<property name="visible">True</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<placeholder/>
</child>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password_simple">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
</interface>
<child>
<object class="GtkTable" id="table_common_settings">
<property name="visible">True</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
</packing>
</child>
<child>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
</packing>
</child>
<child>
<property name="mnemonic_widget">entry_password</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label_username_example">
- <property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">3</property>
<property name="label" translatable="yes"><b>Example:</b> user@jabber.org</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<placeholder/>
</child>
<property name="position">5</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password_simple">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">6</property>
+ </packing>
+ </child>
</object>
<object class="GtkVBox" id="vbox_gtalk_simple">
<property name="visible">True</property>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password_g_simple">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
<object class="GtkVBox" id="vbox_fb_simple">
<property name="visible">True</property>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password_fb_simple">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
</interface>
<child>
<object class="GtkTable" id="table_common_msn_settings">
<property name="visible">True</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<property name="bottom_attach">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
<child>
<object class="GtkEntry" id="entry_password">
<property name="visible">True</property>
<property name="bottom_attach">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password_simple">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
</interface>
<child>
<object class="GtkTable" id="table_common_settings">
<property name="visible">True</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<property name="bottom_attach">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
<child>
<object class="GtkEntry" id="entry_password">
<property name="visible">True</property>
<property name="bottom_attach">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password_simple">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">65535</property>
<child>
<object class="GtkTable" id="table_common_settings">
<property name="visible">True</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password">
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<placeholder/>
</child>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="remember_password_simple">
+ <property name="label" translatable="yes">Remember password</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
</interface>
G_DEFINE_TYPE (EmpathyAccountWidget, empathy_account_widget, G_TYPE_OBJECT)
+typedef enum
+{
+ NO_SERVICE = 0,
+ GTALK_SERVICE,
+ FACEBOOK_SERVICE,
+ N_SERVICES
+} Service;
+
+typedef struct
+{
+ const gchar *label_username_example;
+ gboolean show_advanced;
+} ServiceInfo;
+
+static ServiceInfo services_infos[N_SERVICES] = {
+ { "label_username_example", TRUE },
+ { "label_username_g_example", TRUE },
+ { "label_username_f_example", FALSE },
+};
+
typedef struct {
EmpathyAccountSettings *settings;
GtkWidget *param_account_widget;
GtkWidget *param_password_widget;
+ gboolean automatic_change;
+ GtkWidget *remember_password_widget;
+
/* Used only for IRC accounts */
EmpathyIrcNetworkChooser *irc_network_chooser;
+ /* Used for 'special' XMPP account having a service associated ensuring that
+ * JIDs have a specific suffix; such as Facebook for example */
+ gchar *jid_suffix;
+
gboolean dispose_run;
} EmpathyAccountWidgetPriv;
}
static void
-account_widget_set_entry_highlighting (GtkEntry *entry, gboolean highlight)
+account_widget_set_entry_highlighting (GtkEntry *entry,
+ gboolean highlight)
{
- GdkColor color;
- GtkStyle *style;
-
g_return_if_fail (GTK_IS_ENTRY (entry));
- style = gtk_widget_get_style (GTK_WIDGET (entry));
-
if (highlight)
{
- color = style->bg[GTK_STATE_SELECTED];
+ GtkStyleContext *style;
+ GdkRGBA color;
+
+ style = gtk_widget_get_style_context (GTK_WIDGET (entry));
+ gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED,
+ &color);
/* Here we take the current theme colour and add it to
* the colour for white and average the two. This
* gives a colour which is inline with the theme but
* slightly whiter.
*/
- color.red = (color.red + (style->white).red) / 2;
- color.green = (color.green + (style->white).green) / 2;
- color.blue = (color.blue + (style->white).blue) / 2;
+ empathy_make_color_whiter (&color);
- gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, &color);
+ gtk_widget_override_background_color (GTK_WIDGET (entry), 0, &color);
}
else
- gtk_widget_modify_base (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
+ {
+ gtk_widget_override_background_color (GTK_WIDGET (entry), 0, NULL);
+ }
}
static void
account_widget_entry_changed_cb (GtkEditable *entry,
EmpathyAccountWidget *self)
{
+ EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+ if (priv->automatic_change)
+ return;
+
account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE);
empathy_account_widget_changed (self);
}
"com.meego.libsocialweb"))
{
/* we know how to handle this external provider */
- GDesktopAppInfo *app_info;
- const gchar *args[3] = { NULL, };
+ GDesktopAppInfo *desktop_info;
GError *error = NULL;
+ GdkAppLaunchContext *context = NULL;
+ gchar *cmd;
+ GAppInfo *app_info;
- app_info = g_desktop_app_info_new ("gnome-control-center.desktop");
-
- if (app_info == NULL)
+ desktop_info = g_desktop_app_info_new ("gnome-control-center.desktop");
+ if (desktop_info == NULL)
{
g_critical ("Could not locate 'gnome-control-center.desktop'");
return;
}
- args[0] = g_app_info_get_commandline (G_APP_INFO (app_info));
- args[1] = "bisho.desktop";
- args[2] = NULL;
+ /* glib doesn't have API to start a desktop file with args... (#637875) */
+ cmd = g_strdup_printf ("%s bisho.desktop", g_app_info_get_commandline (
+ (GAppInfo *) desktop_info));
+
+ app_info = g_app_info_create_from_commandline (cmd, NULL, 0, &error);
+ g_free (cmd);
+
+ if (app_info == NULL)
+ {
+ DEBUG ("Failed to create app info: %s", error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ context = gdk_app_launch_context_new ();
+ gdk_app_launch_context_set_screen (context,
+ gtk_widget_get_screen (button));
- gdk_spawn_on_screen (gtk_widget_get_screen (button),
- NULL, (gchar **) args, NULL,
- G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error);
- if (error != NULL)
+ if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
+ &error))
{
- g_critical ("Failed to launch editor: %s", error->message);
+ g_critical ("Failed to bisho: %s", error->message);
g_clear_error (&error);
}
- g_object_unref (app_info);
+out:
+ g_object_unref (desktop_info);
+ tp_clear_object (&app_info);
+ tp_clear_object (&context);
}
}
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
empathy_account_widget_sip_build (self, filename,
&priv->table_common_settings);
+
+ if (priv->simple)
+ {
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password_simple"));
+ }
+ else
+ {
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password"));
+ }
}
static void
NULL);
self->ui_details->default_focus = g_strdup ("entry_id_simple");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password_simple"));
}
else
{
NULL);
self->ui_details->default_focus = g_strdup ("entry_id");
- }
-}
-
-static gboolean
-account_widget_is_gtalk (EmpathyAccountWidget *self)
-{
- EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
-
- return !tp_strdiff (empathy_account_settings_get_icon_name (priv->settings),
- "im-google-talk");
-}
-
-static gboolean
-account_widget_is_facebook (EmpathyAccountWidget *self)
-{
- EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
- return !tp_strdiff (empathy_account_settings_get_icon_name (priv->settings),
- "im-facebook");
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password"));
+ }
}
-#define FACEBOOK_SUFFIX "@chat.facebook.com"
-
static void
-facebook_id_widget_changed_cb (GtkWidget *entry,
+suffix_id_widget_changed_cb (GtkWidget *entry,
EmpathyAccountWidget *self)
{
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
const gchar *account;
+ g_assert (priv->jid_suffix != NULL);
+
account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE);
account = empathy_account_settings_get_string (priv->settings, "account");
if (!EMP_STR_EMPTY (account) &&
- !g_str_has_suffix (account, FACEBOOK_SUFFIX))
+ !g_str_has_suffix (account, priv->jid_suffix))
{
gchar *tmp;
- tmp = g_strdup_printf ("%s%s", account, FACEBOOK_SUFFIX);
+ tmp = g_strdup_printf ("%s%s", account, priv->jid_suffix);
DEBUG ("Change account from '%s' to '%s'", account, tmp);
}
static gchar *
-remove_facebook_suffix (const gchar *str)
+remove_jid_suffix (EmpathyAccountWidget *self,
+ const gchar *str)
{
- if (!g_str_has_suffix (str, FACEBOOK_SUFFIX))
+ EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+ g_assert (priv->jid_suffix != NULL);
+
+ if (!g_str_has_suffix (str, priv->jid_suffix))
return g_strdup (str);
- return g_strndup (str, strlen (str) - strlen (FACEBOOK_SUFFIX));
+ return g_strndup (str, strlen (str) - strlen (priv->jid_suffix));
}
static void
-setup_facebook_id_widget (EmpathyAccountWidget *self,
- GtkWidget *widget)
+setup_id_widget_with_suffix (EmpathyAccountWidget *self,
+ GtkWidget *widget,
+ const gchar *suffix)
{
EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
const gchar *str = NULL;
g_object_set_data_full (G_OBJECT (widget), "param_name",
g_strdup ("account"), g_free);
+ g_assert (priv->jid_suffix == NULL);
+ priv->jid_suffix = g_strdup (suffix);
+
str = empathy_account_settings_get_string (priv->settings, "account");
if (str != NULL)
{
gchar *tmp;
- tmp = remove_facebook_suffix (str);
+ tmp = remove_jid_suffix (self, str);
gtk_entry_set_text (GTK_ENTRY (widget), tmp);
g_free (tmp);
}
priv->param_account_widget = widget;
g_signal_connect (widget, "changed",
- G_CALLBACK (facebook_id_widget_changed_cb), self);
+ G_CALLBACK (suffix_id_widget_changed_cb), self);
+}
+
+static Service
+account_widget_get_service (EmpathyAccountWidget *self)
+{
+ EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+ const gchar *icon_name, *service;
+
+ icon_name = empathy_account_settings_get_icon_name (priv->settings);
+ service = empathy_account_settings_get_service (priv->settings);
+
+ /* Previous versions of Empathy didn't set the Service property on Facebook
+ * and gtalk accounts, so we check using the icon name as well. */
+ if (!tp_strdiff (icon_name, "im-google-talk") ||
+ !tp_strdiff (service, "google-talk"))
+ return GTALK_SERVICE;
+
+ if (!tp_strdiff (icon_name, "im-facebook") ||
+ !tp_strdiff (service, "facebook"))
+ return FACEBOOK_SERVICE;
+
+ return NO_SERVICE;
}
static void
GtkWidget *checkbutton_ssl;
GtkWidget *label_id, *label_password;
GtkWidget *label_id_create, *label_password_create;
- GtkWidget *label_example_gtalk, *label_example_jabber, *label_example_fb;
- gboolean is_gtalk, is_facebook;
+ GtkWidget *label_example_fb;
+ GtkWidget *label_example;
GtkWidget *expander_advanced;
GtkWidget *entry_id;
+ Service service;
- is_gtalk = account_widget_is_gtalk (self);
- is_facebook = account_widget_is_facebook (self);
+ service = account_widget_get_service (self);
empathy_account_settings_set_regex (priv->settings, "account",
ACCOUNT_REGEX_JABBER);
- if (priv->simple && !is_gtalk && !is_facebook)
+ if (priv->simple && service == NO_SERVICE)
{
/* Simple widget for XMPP */
self->ui_details->gui = empathy_builder_get_file (filename,
NULL);
self->ui_details->default_focus = g_strdup ("entry_id_simple");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password_simple"));
}
- else if (priv->simple && is_gtalk)
+ else if (priv->simple && service == GTALK_SERVICE)
{
/* Simple widget for Google Talk */
self->ui_details->gui = empathy_builder_get_file (filename,
NULL);
self->ui_details->default_focus = g_strdup ("entry_id_g_simple");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password_g_simple"));
}
- else if (priv->simple && is_facebook)
+ else if (priv->simple && service == FACEBOOK_SERVICE)
{
/* Simple widget for Facebook */
self->ui_details->gui = empathy_builder_get_file (filename,
"entry_password_fb_simple", "password",
NULL);
- setup_facebook_id_widget (self, entry_id);
+ setup_id_widget_with_suffix (self, entry_id, "@chat.facebook.com");
self->ui_details->default_focus = g_strdup ("entry_id_fb_simple");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password_fb_simple"));
}
else
{
+ ServiceInfo info = services_infos[service];
+
/* Full widget for XMPP, Google Talk and Facebook*/
self->ui_details->gui = empathy_builder_get_file (filename,
"table_common_settings", &priv->table_common_settings,
"vbox_jabber_settings", &self->ui_details->widget,
"spinbutton_port", &spinbutton_port,
"checkbutton_ssl", &checkbutton_ssl,
- "label_username_example", &label_example_jabber,
- "label_username_g_example", &label_example_gtalk,
"label_username_f_example", &label_example_fb,
+ info.label_username_example, &label_example,
"expander_advanced", &expander_advanced,
"entry_id", &entry_id,
"label_id", &label_id,
"checkbutton_encryption", "require-encryption",
NULL);
- if (is_facebook)
+ if (service == FACEBOOK_SERVICE)
{
gtk_label_set_label (GTK_LABEL (label_id), _("Username:"));
/* Facebook special case the entry ID widget to hide the
* "@chat.facebook.com" part */
- setup_facebook_id_widget (self, entry_id);
+ setup_id_widget_with_suffix (self, entry_id, "@chat.facebook.com");
}
else
{
self->ui_details->default_focus = g_strdup ("entry_id");
priv->spinbutton_port = spinbutton_port;
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password"));
+
g_signal_connect (checkbutton_ssl, "toggled",
G_CALLBACK (account_widget_jabber_ssl_toggled_cb),
self);
- if (is_gtalk)
- {
- gtk_widget_hide (label_example_jabber);
- gtk_widget_show (label_example_gtalk);
- }
- else if (is_facebook)
+ if (service == FACEBOOK_SERVICE)
{
GtkContainer *parent;
GList *children;
- gtk_widget_hide (label_example_jabber);
-
/* Removing the label from list of focusable widgets */
parent = GTK_CONTAINER (gtk_widget_get_parent (label_example_fb));
children = gtk_container_get_children (parent);
children = g_list_remove (children, label_example_fb);
gtk_container_set_focus_chain (parent, children);
g_list_free (children);
-
- gtk_widget_show (label_example_fb);
- gtk_widget_hide (expander_advanced);
}
+
+ gtk_widget_show (label_example);
+
+ if (!info.show_advanced)
+ gtk_widget_hide (expander_advanced);
}
}
NULL);
self->ui_details->default_focus = g_strdup ("entry_uin_simple");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password_simple"));
}
else
{
NULL);
self->ui_details->default_focus = g_strdup ("entry_uin");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password"));
}
}
NULL);
self->ui_details->default_focus = g_strdup ("entry_screenname_simple");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password_simple"));
}
else
{
NULL);
self->ui_details->default_focus = g_strdup ("entry_screenname");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password"));
}
}
NULL);
self->ui_details->default_focus = g_strdup ("entry_id_simple");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password_simple"));
}
else
{
NULL);
self->ui_details->default_focus = g_strdup ("entry_id");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password"));
}
}
NULL);
self->ui_details->default_focus = g_strdup ("entry_id_simple");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password_simple"));
}
else
{
NULL);
self->ui_details->default_focus = g_strdup ("entry_id");
+
+ priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object (
+ self->ui_details->gui, "remember_password"));
}
}
if (!tp_connection_manager_protocol_can_register (protocol))
return;
- if (account_widget_is_gtalk (self) || account_widget_is_facebook (self))
+ if (account_widget_get_service (self) != NO_SERVICE)
return;
if (priv->simple)
}
#endif /* HAVE_MEEGO */
+static void
+remember_password_toggled_cb (GtkToggleButton *button,
+ EmpathyAccountWidget *self)
+{
+ EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+ if (gtk_toggle_button_get_active (button))
+ {
+ gtk_widget_set_sensitive (priv->param_password_widget, TRUE);
+ }
+ else
+ {
+ gtk_widget_set_sensitive (priv->param_password_widget, FALSE);
+ gtk_entry_set_text (GTK_ENTRY (priv->param_password_widget), "");
+ empathy_account_settings_unset (priv->settings, "password");
+ }
+}
+
+static void
+account_settings_password_retrieved_cb (GObject *object,
+ gpointer user_data)
+{
+ EmpathyAccountWidget *self = user_data;
+ EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+ const gchar *password = empathy_account_settings_get_string (
+ priv->settings, "password");
+
+ if (password != NULL)
+ {
+ /* We have to do this so that when we call gtk_entry_set_text,
+ * the ::changed callback doesn't think the user made the
+ * change. */
+ priv->automatic_change = TRUE;
+ gtk_entry_set_text (GTK_ENTRY (priv->param_password_widget), password);
+ priv->automatic_change = FALSE;
+ }
+
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (priv->remember_password_widget),
+ !EMP_STR_EMPTY (password));
+}
+
static void
do_constructed (GObject *obj)
{
NULL);
}
+ /* remember password */
+ if (priv->param_password_widget != NULL
+ && priv->remember_password_widget != NULL
+ && empathy_account_settings_supports_sasl (priv->settings))
+ {
+ if (priv->simple)
+ {
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (priv->remember_password_widget), TRUE);
+ }
+ else
+ {
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (priv->remember_password_widget),
+ !EMP_STR_EMPTY (empathy_account_settings_get_string (
+ priv->settings, "password")));
+
+ /* The password might not have been retrieved from the
+ * keyring yet. We should update the remember password
+ * toggle button and the password entry when/if it is. */
+ g_signal_connect (priv->settings, "password-retrieved",
+ G_CALLBACK (account_settings_password_retrieved_cb), self);
+ }
+
+ g_signal_connect (priv->remember_password_widget, "toggled",
+ G_CALLBACK (remember_password_toggled_cb), self);
+
+ remember_password_toggled_cb (
+ GTK_TOGGLE_BUTTON (priv->remember_password_widget), self);
+ }
+ else if (priv->remember_password_widget != NULL
+ && !empathy_account_settings_supports_sasl (priv->settings))
+ {
+ gtk_widget_set_visible (priv->remember_password_widget, FALSE);
+ }
+
/* dup and init the account-manager */
priv->account_manager = tp_account_manager_dup ();
do_finalize (GObject *obj)
{
EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj);
+ EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
g_free (self->ui_details->default_focus);
g_slice_free (EmpathyAccountWidgetUIDetails, self->ui_details);
+ g_free (priv->jid_suffix);
+
if (G_OBJECT_CLASS (empathy_account_widget_parent_class)->finalize != NULL)
G_OBJECT_CLASS (empathy_account_widget_parent_class)->finalize (obj);
}
const gchar *login_id;
const gchar *protocol, *p;
gchar *default_display_name;
+ Service service;
login_id = empathy_account_settings_get_string (priv->settings, "account");
protocol = empathy_account_settings_get_protocol (priv->settings);
+ service = account_widget_get_service (self);
if (login_id != NULL)
{
default_display_name = g_strdup_printf (_("%1$s on %2$s"),
login_id, empathy_irc_network_get_name (network));
}
- else if (account_widget_is_facebook (self))
+ else if (service == FACEBOOK_SERVICE)
{
gchar *tmp;
- tmp = remove_facebook_suffix (login_id);
+ tmp = remove_jid_suffix (self, login_id);
default_display_name = g_strdup_printf ("Facebook (%s)", tmp);
g_free (tmp);
}
static void
avatar_image_add_filter (EmpathyAvatarImage *avatar_image)
{
+ Display *display;
Window window;
- GdkWindow *gdkwindow;
gint mask;
+ XWindowAttributes attrs;
mask = PropertyChangeMask;
- window = GDK_ROOT_WINDOW ();
- gdkwindow = gdk_xid_table_lookup (window);
+ window = gdk_x11_get_default_root_xwindow ();
+ display = gdk_x11_get_default_xdisplay ();
gdk_error_trap_push ();
- if (gdkwindow) {
- XWindowAttributes attrs;
- XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, &attrs);
- mask |= attrs.your_event_mask;
- }
- XSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, mask);
+ XGetWindowAttributes (display, window, &attrs);
+ mask |= attrs.your_event_mask;
+
+ XSelectInput (display, window, mask);
gdk_error_trap_pop_ignored ();
font_description = NULL;
}
- gtk_widget_modify_font (GTK_WIDGET (view), font_description);
+ gtk_widget_override_font (GTK_WIDGET (view), font_description);
if (font_description) {
pango_font_description_free (font_description);
EMPATHY_CONTACT_FEATURE_LOG |
EMPATHY_CONTACT_FEATURE_INFO);
}
- else if (priv->contact_list_view) {
- EmpathyContactListView *view;
-
- view = EMPATHY_CONTACT_LIST_VIEW (priv->contact_list_view);
- menu = empathy_contact_list_view_get_contact_menu (view);
- }
return menu;
}
}
priv->unread_messages = 0;
}
+
+/* Return TRUE if on of the contacts in this chat is composing */
+gboolean
+empathy_chat_is_composing (EmpathyChat *chat)
+{
+ return chat->priv->compositors != NULL;
+}
guint empathy_chat_get_nb_unread_messages (EmpathyChat *chat);
void empathy_chat_messages_read (EmpathyChat *self);
+
+gboolean empathy_chat_is_composing (EmpathyChat *chat);
G_END_DECLS
#endif /* __EMPATHY_CHAT_H__ */
contact_widget = empathy_contact_widget_new (contact,
EMPATHY_CONTACT_WIDGET_NO_SET_ALIAS |
EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |
- EMPATHY_CONTACT_WIDGET_EDIT_GROUPS);
+ EMPATHY_CONTACT_WIDGET_EDIT_GROUPS |
+ EMPATHY_CONTACT_WIDGET_SHOW_DETAILS);
gtk_box_pack_start (GTK_BOX (vbox),
contact_widget,
TRUE, TRUE,
{
EmpathyContactListViewPriv *priv;
TpAccountManager *account_manager;
- TpConnection *connection;
- TpAccount *account;
+ TpConnection *connection = NULL;
+ TpAccount *account = NULL;
DndGetContactData *data;
GtkTreePath *source_path;
const gchar *sel_data;
gboolean is_group,
gboolean is_active)
{
- GdkColor color;
- GtkStyle *style;
+ if (!is_group && is_active) {
+ GdkRGBA color;
+ GtkStyleContext *style;
- style = gtk_widget_get_style (GTK_WIDGET (view));
+ style = gtk_widget_get_style_context (GTK_WIDGET (view));
- if (!is_group && is_active) {
- color = style->bg[GTK_STATE_SELECTED];
+ gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED,
+ &color);
/* Here we take the current theme colour and add it to
* the colour for white and average the two. This
* gives a colour which is inline with the theme but
* slightly whiter.
*/
- color.red = (color.red + (style->white).red) / 2;
- color.green = (color.green + (style->white).green) / 2;
- color.blue = (color.blue + (style->white).blue) / 2;
+ empathy_make_color_whiter (&color);
g_object_set (cell,
- "cell-background-gdk", &color,
+ "cell-background-rgba", &color,
NULL);
} else {
g_object_set (cell,
- "cell-background-gdk", NULL,
+ "cell-background-rgba", NULL,
NULL);
}
}
FolksPersona *persona = empathy_contact_get_persona (
information->contact);
- if (persona != NULL && FOLKS_IS_FAVOURITE (persona))
+ if (persona != NULL && FOLKS_IS_FAVOURITABLE (persona))
{
- gboolean is_favourite = folks_favourite_get_is_favourite (
- FOLKS_FAVOURITE (persona));
+ gboolean is_favourite = folks_favouritable_get_is_favourite (
+ FOLKS_FAVOURITABLE (persona));
contact_widget_favourites_changed_cb (information->manager,
information->contact, is_favourite, information);
}
{
FolksPersona *persona = empathy_contact_get_persona (information->contact);
- if (persona != NULL && FOLKS_IS_FAVOURITE (persona))
+ if (persona != NULL && FOLKS_IS_FAVOURITABLE (persona))
{
gboolean active = gtk_toggle_button_get_active (button);
- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (persona), active);
+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (persona), active);
}
}
favourite_menu_item_toggled_cb (GtkCheckMenuItem *item,
FolksIndividual *individual)
{
- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (individual),
+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual),
gtk_check_menu_item_get_active (item));
}
item = gtk_check_menu_item_new_with_label (_("Favorite"));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
- folks_favourite_get_is_favourite (FOLKS_FAVOURITE (individual)));
+ folks_favouritable_get_is_favourite (FOLKS_FAVOURITABLE (individual)));
g_signal_connect (item, "toggled",
G_CALLBACK (favourite_menu_item_toggled_cb), individual);
personas = folks_individual_get_personas (individual);
for (l = personas; l != NULL; l = l->next)
{
- FolksPresence *presence;
+ FolksHasPresence *presence;
- /* We only want personas which implement FolksPresence */
- if (!FOLKS_IS_PRESENCE (l->data))
+ /* We only want personas which implement FolksHasPresence */
+ if (!FOLKS_IS_HAS_PRESENCE (l->data))
continue;
- presence = FOLKS_PRESENCE (l->data);
+ presence = FOLKS_HAS_PRESENCE (l->data);
- if (folks_presence_typecmp (folks_presence_get_presence_type (presence),
+ if (folks_has_presence_typecmp (
+ folks_has_presence_get_presence_type (presence),
presence_type) > 0)
{
TpContact *tp_contact;
- presence_type = folks_presence_get_presence_type (presence);
+ presence_type = folks_has_presence_get_presence_type (presence);
tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data));
types = tp_contact_get_client_types (tp_contact);
g_list_free (groups);
if (priv->show_groups &&
- folks_favourite_get_is_favourite (FOLKS_FAVOURITE (individual)))
+ folks_favouritable_get_is_favourite (FOLKS_FAVOURITABLE (individual)))
{
/* Add contact to the fake 'Favorites' group */
GtkTreeIter iter_group;
}
/* Get online state now. */
- now_online = folks_presence_is_online (FOLKS_PRESENCE (individual));
+ now_online = folks_has_presence_is_online (FOLKS_HAS_PRESENCE (individual));
if (!in_list)
{
EMPATHY_INDIVIDUAL_STORE_COL_NAME,
folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)),
EMPATHY_INDIVIDUAL_STORE_COL_PRESENCE_TYPE,
- folks_presence_get_presence_type (FOLKS_PRESENCE (individual)),
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (individual)),
EMPATHY_INDIVIDUAL_STORE_COL_STATUS,
- folks_presence_get_presence_message (FOLKS_PRESENCE (individual)),
+ folks_has_presence_get_presence_message (
+ FOLKS_HAS_PRESENCE (individual)),
EMPATHY_INDIVIDUAL_STORE_COL_COMPACT, priv->is_compact,
EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE,
EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, now_online,
* the presences.
*/
folks_presence_type_a =
- folks_presence_get_presence_type (FOLKS_PRESENCE (individual_a));
+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual_a));
folks_presence_type_b =
- folks_presence_get_presence_type (FOLKS_PRESENCE (individual_b));
+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual_b));
tp_presence_a = empathy_folks_presence_type_to_tp (folks_presence_type_a);
tp_presence_b = empathy_folks_presence_type_to_tp (folks_presence_type_b);
if (!tp_strdiff (new_group, EMPATHY_INDIVIDUAL_STORE_FAVORITE))
{
/* Mark contact as favourite */
- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (individual), TRUE);
+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual), TRUE);
return;
}
if (!tp_strdiff (old_group, EMPATHY_INDIVIDUAL_STORE_FAVORITE))
{
/* Remove contact as favourite */
- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (individual), FALSE);
+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual), FALSE);
/* Don't try to remove it */
old_group = NULL;
}
if (individual != NULL &&
- folks_presence_is_online (FOLKS_PRESENCE (individual)) &&
+ folks_has_presence_is_online (FOLKS_HAS_PRESENCE (individual)) &&
(caps & EMPATHY_CAPABILITIES_FT))
{
gdk_drag_status (context, GDK_ACTION_COPY, time_);
gboolean is_group,
gboolean is_active)
{
- GdkColor color;
- GtkStyle *style;
-
- style = gtk_widget_get_style (GTK_WIDGET (view));
-
if (!is_group && is_active)
{
- color = style->bg[GTK_STATE_SELECTED];
+ GtkStyleContext *style;
+ GdkRGBA color;
+
+ style = gtk_widget_get_style_context (GTK_WIDGET (view));
+
+ gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED,
+ &color);
/* Here we take the current theme colour and add it to
* the colour for white and average the two. This
* gives a colour which is inline with the theme but
* slightly whiter.
*/
- color.red = (color.red + (style->white).red) / 2;
- color.green = (color.green + (style->white).green) / 2;
- color.blue = (color.blue + (style->white).blue) / 2;
+ empathy_make_color_whiter (&color);
- g_object_set (cell, "cell-background-gdk", &color, NULL);
+ g_object_set (cell, "cell-background-rgba", &color, NULL);
}
else
- g_object_set (cell, "cell-background-gdk", NULL, NULL);
+ g_object_set (cell, "cell-background-rgba", NULL, NULL);
}
static void
{
gchar *text;
GtkWindow *parent;
+ GList *l, *personas;
+ guint persona_count = 0;
+
+ personas = folks_individual_get_personas (individual);
+
+ /* If we have more than one TpfPersona, display a different message
+ * ensuring the user knows that *all* of the meta-contacts' personas will
+ * be removed. */
+ for (l = personas; l != NULL; l = l->next)
+ {
+ if (!TPF_IS_PERSONA (l->data))
+ continue;
+
+ persona_count++;
+ if (persona_count >= 2)
+ break;
+ }
+
+ if (persona_count < 2)
+ {
+ /* Not a meta-contact */
+ text =
+ g_strdup_printf (
+ _("Do you really want to remove the contact '%s'?"),
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
+ }
+ else
+ {
+ /* Meta-contact */
+ text =
+ g_strdup_printf (
+ _("Do you really want to remove the linked contact '%s'? "
+ "Note that this will remove all the contacts which make up "
+ "this linked contact."),
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
+ }
parent = empathy_get_toplevel_window (GTK_WIDGET (view));
- text =
- g_strdup_printf (_
- ("Do you really want to remove the contact '%s'?"),
- folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
+
if (individual_view_remove_dialog_show (parent, _("Removing contact"),
text))
{
personas = folks_individual_get_personas (priv->individual);
for (l = personas; l != NULL; l = l->next)
{
- FolksPresence *presence;
+ FolksHasPresence *presence;
/* We only want personas which implement FolksPresence */
- if (!FOLKS_IS_PRESENCE (l->data))
+ if (!FOLKS_IS_HAS_PRESENCE (l->data))
continue;
- presence = FOLKS_PRESENCE (l->data);
+ presence = FOLKS_HAS_PRESENCE (l->data);
- if (folks_presence_typecmp (folks_presence_get_presence_type (presence),
+ if (folks_has_presence_typecmp (
+ folks_has_presence_get_presence_type (presence),
presence_type) > 0
&& TPF_IS_PERSONA (presence))
{
- presence_type = folks_presence_get_presence_type (presence);
+ presence_type = folks_has_presence_get_presence_type (presence);
tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data));
}
}
/* FIXME: We just choose the first Persona which has an avatar, and save that.
* The avatar handling in EmpathyContact needs to be moved into libfolks as
- * much as possible, and this code rewritten to use FolksAvatar.
+ * much as possible, and this code rewritten to use FolksHasAvatar.
* (bgo#627401) */
personas = folks_individual_get_personas (individual);
for (l = personas; l != NULL; l = l->next)
EmpathyIndividualWidget *self)
{
gboolean active = gtk_toggle_button_get_active (button);
- folks_favourite_set_is_favourite (
- FOLKS_FAVOURITE (GET_PRIV (self)->individual), active);
+ folks_favouritable_set_is_favourite (
+ FOLKS_FAVOURITABLE (GET_PRIV (self)->individual), active);
}
static void
state_image = g_object_get_data (table, "state-image");
/* FIXME: Default messages should be moved into libfolks (bgo#627403) */
- message = folks_presence_get_presence_message (FOLKS_PRESENCE (folks_object));
+ message = folks_has_presence_get_presence_message (
+ FOLKS_HAS_PRESENCE (folks_object));
if (EMP_STR_EMPTY (message))
{
message = empathy_presence_get_default_message (
- folks_presence_get_presence_type (FOLKS_PRESENCE (folks_object)));
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (folks_object)));
}
if (message != NULL)
gtk_image_set_from_icon_name (GTK_IMAGE (state_image),
empathy_icon_name_for_presence (
- folks_presence_get_presence_type (FOLKS_PRESENCE (folks_object))),
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (folks_object))),
GTK_ICON_SIZE_BUTTON);
gtk_widget_show (state_image);
}
if (GTK_IS_TOGGLE_BUTTON (favourite_widget))
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (favourite_widget),
- folks_favourite_get_is_favourite (FOLKS_FAVOURITE (folks_object)));
+ folks_favouritable_get_is_favourite (
+ FOLKS_FAVOURITABLE (folks_object)));
}
}
num_personas++;
}
- message = g_strdup_printf (ngettext ("Meta-contact containing %u contact",
- "Meta-contact containing %u contacts", num_personas), num_personas);
+ /* Translators: the plurality applies to both instances of the word
+ * "contact" */
+ message = g_strdup_printf (
+ ngettext ("Linked contact containing %u contact",
+ "Linked contacts containing %u contacts", num_personas),
+ num_personas);
label = gtk_label_new (message);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
g_free (message);
button = gtk_button_new_with_mnemonic (
C_("Unlink individual (button)", "_Unlink…"));
gtk_widget_set_tooltip_text (button, _("Completely split the displayed "
- "meta-contact into the contacts it contains."));
+ "linked contacts into the separate contacts."));
gtk_dialog_add_action_widget (dialog, button, RESPONSE_UNLINK);
gtk_widget_show (button);
/* Show a confirmation dialogue first */
dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_MODAL,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("Unlink meta-contact '%s'?"),
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ _("Unlink linked contacts '%s'?"),
folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- _("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 these linked contacts? This will "
+ "completely split the linked contacts into separate contacts."));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
C_("Unlink individual (button)", "_Unlink"), GTK_RESPONSE_OK,
--- /dev/null
+/*
+ * empathy-password-dialog.c - Source for EmpathyPasswordDialog
+ * Copyright (C) 2010 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
+ */
+
+#include <config.h>
+
+#include "empathy-password-dialog.h"
+
+#include <glib/gi18n-lib.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_SASL
+#include <libempathy/empathy-debug.h>
+#include <libempathy/empathy-utils.h>
+
+G_DEFINE_TYPE (EmpathyPasswordDialog, empathy_password_dialog,
+ GTK_TYPE_MESSAGE_DIALOG)
+
+enum {
+ PROP_HANDLER = 1,
+
+ LAST_PROPERTY,
+};
+
+typedef struct {
+ EmpathyServerSASLHandler *handler;
+
+ GtkWidget *entry;
+ GtkWidget *ticky;
+ GtkWidget *ok_button;
+
+ gboolean grabbing;
+
+ gboolean dispose_run;
+} EmpathyPasswordDialogPriv;
+
+static void
+empathy_password_dialog_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (object)->priv;
+
+ switch (property_id)
+ {
+ case PROP_HANDLER:
+ g_value_set_object (value, priv->handler);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+empathy_password_dialog_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (object)->priv;
+
+ switch (property_id)
+ {
+ case PROP_HANDLER:
+ g_assert (priv->handler == NULL); /* construct only */
+ priv->handler = g_value_dup_object (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+empathy_password_dialog_dispose (GObject *object)
+{
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (object)->priv;
+
+ if (priv->dispose_run)
+ return;
+
+ priv->dispose_run = TRUE;
+
+ tp_clear_object (&priv->handler);
+
+ G_OBJECT_CLASS (empathy_password_dialog_parent_class)->dispose (object);
+}
+
+static void
+password_dialog_response_cb (GtkDialog *dialog,
+ gint response,
+ gpointer user_data)
+{
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (user_data)->priv;
+
+ if (response == GTK_RESPONSE_OK)
+ {
+ empathy_server_sasl_handler_provide_password (priv->handler,
+ gtk_entry_get_text (GTK_ENTRY (priv->entry)),
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->ticky)));
+ }
+ else
+ {
+ empathy_server_sasl_handler_cancel (priv->handler);
+ }
+
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+clear_icon_released_cb (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ GdkEvent *event,
+ gpointer user_data)
+{
+ gtk_entry_set_text (entry, "");
+}
+
+static void
+password_entry_changed_cb (GtkEditable *entry,
+ gpointer user_data)
+{
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (user_data)->priv;
+ const gchar *str;
+
+ str = gtk_entry_get_text (GTK_ENTRY (entry));
+
+ gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
+ GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
+
+ gtk_widget_set_sensitive (priv->ok_button,
+ !EMP_STR_EMPTY (str));
+}
+
+static gboolean
+password_dialog_grab_keyboard (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data)
+{
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (user_data)->priv;
+
+ if (!priv->grabbing)
+ {
+ GdkGrabStatus status = gdk_keyboard_grab (gtk_widget_get_window (widget),
+ FALSE, gdk_event_get_time (event));
+
+ if (status != GDK_GRAB_SUCCESS)
+ DEBUG ("Could not grab keyboard; grab status was %u", status);
+ else
+ priv->grabbing = TRUE;
+ }
+
+ return FALSE;
+}
+
+static gboolean
+password_dialog_ungrab_keyboard (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data)
+{
+ EmpathyPasswordDialogPriv *priv = EMPATHY_PASSWORD_DIALOG (user_data)->priv;
+
+ if (priv->grabbing)
+ {
+ gdk_keyboard_ungrab (gdk_event_get_time (event));
+ priv->grabbing = FALSE;
+ }
+
+ return FALSE;
+}
+
+static gboolean
+password_dialog_window_state_changed (GtkWidget *widget,
+ GdkEventWindowState *event,
+ gpointer data)
+{
+ GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (widget));
+
+ if (state & GDK_WINDOW_STATE_WITHDRAWN
+ || state & GDK_WINDOW_STATE_ICONIFIED
+ || state & GDK_WINDOW_STATE_FULLSCREEN
+ || state & GDK_WINDOW_STATE_MAXIMIZED)
+ {
+ password_dialog_ungrab_keyboard (widget, (GdkEvent *) event, data);
+ }
+ else
+ {
+ password_dialog_grab_keyboard (widget, (GdkEvent *) event, data);
+ }
+
+ return FALSE;
+}
+
+static void
+password_dialog_handler_invalidated_cb (EmpathyServerSASLHandler *handler,
+ EmpathyPasswordDialog *dialog)
+{
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+empathy_password_dialog_constructed (GObject *object)
+{
+ EmpathyPasswordDialog *dialog;
+ EmpathyPasswordDialogPriv *priv;
+ TpAccount *account;
+ GtkWidget *icon;
+ GtkBox *box;
+ gchar *text;
+
+ dialog = EMPATHY_PASSWORD_DIALOG (object);
+ priv = dialog->priv;
+
+ g_assert (priv->handler != NULL);
+
+ priv->grabbing = FALSE;
+
+ account = empathy_server_sasl_handler_get_account (priv->handler);
+
+ tp_g_signal_connect_object (priv->handler, "invalidated",
+ G_CALLBACK (password_dialog_handler_invalidated_cb),
+ object, 0);
+
+ /* dialog */
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
+ priv->ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
+ GTK_STOCK_OK, GTK_RESPONSE_OK);
+ gtk_widget_set_sensitive (priv->ok_button, FALSE);
+
+ text = g_strdup_printf (_("Enter your password for account\n<b>%s</b>"),
+ tp_account_get_display_name (account));
+ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog), text);
+ g_free (text);
+
+ gtk_window_set_icon_name (GTK_WINDOW (dialog),
+ GTK_STOCK_DIALOG_AUTHENTICATION);
+
+ box = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
+
+ /* dialog icon */
+ icon = gtk_image_new_from_icon_name (tp_account_get_icon_name (account),
+ GTK_ICON_SIZE_DIALOG);
+ gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), icon);
+ gtk_widget_show (icon);
+
+ /* entry */
+ priv->entry = gtk_entry_new ();
+ gtk_entry_set_visibility (GTK_ENTRY (priv->entry), FALSE);
+
+ /* entry clear icon */
+ gtk_entry_set_icon_from_stock (GTK_ENTRY (priv->entry),
+ GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+ gtk_entry_set_icon_sensitive (GTK_ENTRY (priv->entry),
+ GTK_ENTRY_ICON_SECONDARY, FALSE);
+
+ g_signal_connect (priv->entry, "icon-release",
+ G_CALLBACK (clear_icon_released_cb), NULL);
+ g_signal_connect (priv->entry, "changed",
+ G_CALLBACK (password_entry_changed_cb), dialog);
+
+ gtk_box_pack_start (box, priv->entry, FALSE, FALSE, 0);
+ gtk_widget_show (priv->entry);
+
+ /* remember password ticky box */
+ priv->ticky = gtk_check_button_new_with_label (_("Remember password"));
+
+ gtk_box_pack_start (box, priv->ticky, FALSE, FALSE, 0);
+ gtk_widget_show (priv->ticky);
+
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (password_dialog_response_cb), dialog);
+ g_signal_connect (dialog, "window-state-event",
+ G_CALLBACK (password_dialog_window_state_changed), dialog);
+ g_signal_connect (dialog, "map-event",
+ G_CALLBACK (password_dialog_grab_keyboard), dialog);
+ g_signal_connect (dialog, "unmap-event",
+ G_CALLBACK (password_dialog_ungrab_keyboard), dialog);
+
+ gtk_widget_grab_focus (priv->entry);
+
+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
+}
+
+static void
+empathy_password_dialog_init (EmpathyPasswordDialog *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+ EMPATHY_TYPE_PASSWORD_DIALOG, EmpathyPasswordDialogPriv);
+}
+
+static void
+empathy_password_dialog_class_init (EmpathyPasswordDialogClass *klass)
+{
+ GParamSpec *pspec;
+ GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (EmpathyPasswordDialogPriv));
+
+ oclass->set_property = empathy_password_dialog_set_property;
+ oclass->get_property = empathy_password_dialog_get_property;
+ oclass->dispose = empathy_password_dialog_dispose;
+ oclass->constructed = empathy_password_dialog_constructed;
+
+ pspec = g_param_spec_object ("handler", "The EmpathyServerSASLHandler",
+ "The EmpathyServerSASLHandler to be used.",
+ EMPATHY_TYPE_SERVER_SASL_HANDLER,
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (oclass, PROP_HANDLER, pspec);
+}
+
+GtkWidget *
+empathy_password_dialog_new (EmpathyServerSASLHandler *handler)
+{
+ g_assert (EMPATHY_IS_SERVER_SASL_HANDLER (handler));
+
+ return g_object_new (EMPATHY_TYPE_PASSWORD_DIALOG,
+ "handler", handler, NULL);
+}
--- /dev/null
+/*
+ * empathy-password-dialog.h - Header for EmpathyPasswordDialog
+ * Copyright (C) 2010 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
+ */
+
+#ifndef __EMPATHY_PASSWORD_DIALOG_H__
+#define __EMPATHY_PASSWORD_DIALOG_H__
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include <libempathy/empathy-server-sasl-handler.h>
+
+#include <extensions/extensions.h>
+
+G_BEGIN_DECLS
+
+typedef struct _EmpathyPasswordDialog EmpathyPasswordDialog;
+typedef struct _EmpathyPasswordDialogClass EmpathyPasswordDialogClass;
+
+struct _EmpathyPasswordDialogClass {
+ GtkMessageDialogClass parent_class;
+};
+
+struct _EmpathyPasswordDialog {
+ GtkMessageDialog parent;
+ gpointer priv;
+};
+
+GType empathy_password_dialog_get_type (void);
+
+#define EMPATHY_TYPE_PASSWORD_DIALOG \
+ (empathy_password_dialog_get_type ())
+#define EMPATHY_PASSWORD_DIALOG(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_PASSWORD_DIALOG, \
+ EmpathyPasswordDialog))
+#define EMPATHY_PASSWORD_DIALOG_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_PASSWORD_DIALOG, \
+ EmpathyPasswordDialogClass))
+#define EMPATHY_IS_PASSWORD_DIALOG(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_PASSWORD_DIALOG))
+#define EMPATHY_IS_PASSWORD_DIALOG_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_PASSWORD_DIALOG))
+#define EMPATHY_PASSWORD_DIALOG_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_PASSWORD_DIALOG, \
+ EmpathyPasswordDialogClass))
+
+GtkWidget * empathy_password_dialog_new (EmpathyServerSASLHandler *handler);
+
+G_END_DECLS
+
+#endif /* #ifndef __EMPATHY_PASSWORD_DIALOG_H__*/
gtk_tree_path_free (path);
/* Get online state now. */
- now_online = folks_presence_is_online (FOLKS_PRESENCE (persona));
+ now_online = folks_has_presence_is_online (FOLKS_HAS_PRESENCE (persona));
/* Get online state before. */
gtk_tree_model_get (GTK_TREE_MODEL (self), &iter,
EMPATHY_PERSONA_STORE_COL_DISPLAY_ID,
folks_persona_get_display_id (persona),
EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE,
- folks_presence_get_presence_type (FOLKS_PRESENCE (persona)),
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (persona)),
EMPATHY_PERSONA_STORE_COL_STATUS,
- folks_presence_get_presence_message (FOLKS_PRESENCE (persona)),
+ folks_has_presence_get_presence_message (
+ FOLKS_HAS_PRESENCE (persona)),
EMPATHY_PERSONA_STORE_COL_IS_ONLINE, now_online,
EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL,
empathy_contact_get_capabilities (contact) &
{
GList *l;
+ /* One of the personas' row references might hold the last reference to the
+ * PersonaStore, so we need to keep a reference ourselves so we don't get
+ * finalised. */
+ g_object_ref (self);
+
/* Remove the old personas. */
for (l = removed; l != NULL; l = l->next)
remove_persona_and_disconnect (self, FOLKS_PERSONA (l->data));
/* Add each of the new personas to the tree model */
for (l = added; l != NULL; l = l->next)
add_persona_and_connect (self, FOLKS_PERSONA (l->data));
+
+ g_object_unref (self);
}
static gint
* the presences.
*/
ret_val = -tp_connection_presence_type_cmp_availability (
- folks_presence_get_presence_type (FOLKS_PRESENCE (persona_a)),
- folks_presence_get_presence_type (FOLKS_PRESENCE (persona_b)));
+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (persona_a)),
+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (persona_b)));
if (ret_val == 0) {
/* Fallback: compare by name et al. */
#include "empathy-cell-renderer-activatable.h"
#include "empathy-gtk-enum-types.h"
#include "empathy-gtk-marshal.h"
+#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include <libempathy/empathy-debug.h>
GtkCellRenderer *cell,
gboolean is_active)
{
- GdkColor color;
- GtkStyle *style;
-
- style = gtk_widget_get_style (GTK_WIDGET (self));
-
if (is_active)
{
- color = style->bg[GTK_STATE_SELECTED];
+ GdkRGBA color;
+ GtkStyleContext *style;
+
+ style = gtk_widget_get_style_context (GTK_WIDGET (self));
+
+ gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED,
+ &color);
/* Here we take the current theme colour and add it to
* the colour for white and average the two. This
* gives a colour which is inline with the theme but
* slightly whiter.
*/
- color.red = (color.red + (style->white).red) / 2;
- color.green = (color.green + (style->white).green) / 2;
- color.blue = (color.blue + (style->white).blue) / 2;
+ empathy_make_color_whiter (&color);
- g_object_set (cell, "cell-background-gdk", &color, NULL);
+ g_object_set (cell, "cell-background-rgba", &color, NULL);
}
else
{
- g_object_set (cell, "cell-background-gdk", NULL, NULL);
+ g_object_set (cell, "cell-background-rgba", NULL, NULL);
}
}
gtk_widget_set_sensitive (priv->add_button, state);
if (state) {
- gtk_widget_modify_text (entry, GTK_STATE_NORMAL, NULL);
+ gtk_widget_override_color (entry, 0, NULL);
} else {
- GdkColor colour;
+ GdkRGBA color;
- gdk_color_parse ("Gray", &colour); /* FIXME - theme */
- gtk_widget_modify_text (entry, GTK_STATE_NORMAL, &colour);
+ if (gdk_rgba_parse (&color, "Gray")) /* FIXME - theme */
+ gtk_widget_override_color (entry, 0, &color);
if (reset_text) {
priv->block_add_combo_changed++;
#include <gcr/gcr.h>
#include <telepathy-glib/util.h>
-#include "gcr-simple-certificate.h"
+#include <gcr/gcr.h>
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
#include <libempathy/empathy-debug.h>
TpConnectionPresenceType presence;
folks_presence =
- folks_presence_get_presence_type (FOLKS_PRESENCE (individual));
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (individual));
presence = empathy_folks_presence_type_to_tp (folks_presence);
return empathy_icon_name_for_presence (presence);
callback, user_data,
empathy_pixbuf_avatar_from_individual_scaled_async);
- avatar_file = folks_avatar_get_avatar (FOLKS_AVATAR (individual));
+ avatar_file =
+ folks_has_avatar_get_avatar (FOLKS_HAS_AVATAR (individual));
if (avatar_file == NULL)
goto out;
gtk_widget_show (widget);
g_free (title);
}
+
+void
+empathy_make_color_whiter (GdkRGBA *color)
+{
+ const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 };
+
+ color->red = (color->red + white.red) / 2;
+ color->green = (color->green + white.green) / 2;
+ color->blue = (color->blue + white.blue) / 2;
+}
void empathy_send_file_with_file_chooser (EmpathyContact *contact);
void empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler);
+/* Misc */
+void empathy_make_color_whiter (GdkRGBA *color);
+
G_END_DECLS
#endif /* __EMPATHY_UI_UTILS_H__ */
empathy_video_widget_init (EmpathyVideoWidget *obj)
{
EmpathyVideoWidgetPriv *priv = GET_PRIV (obj);
- GdkColor black;
+ GdkRGBA black;
priv->lock = g_mutex_new ();
G_CALLBACK (empathy_video_widget_element_added_cb),
obj);
- if (gdk_color_parse ("Black", &black))
- gtk_widget_modify_bg (GTK_WIDGET (obj), GTK_STATE_NORMAL,
- &black);
+ if (gdk_rgba_parse (&black, "Black"))
+ gtk_widget_override_background_color (GTK_WIDGET (obj), 0, &black);
gtk_widget_set_double_buffered (GTK_WIDGET (obj), FALSE);
}
{
gtk_widget_get_allocation (widget, &allocation);
- gtk_paint_flat_box (gtk_widget_get_style (widget), cr,
- GTK_STATE_NORMAL, GTK_SHADOW_NONE, widget, NULL,
+ gtk_render_frame (gtk_widget_get_style_context (widget), cr,
0, 0,
gtk_widget_get_allocated_width (widget),
gtk_widget_get_allocated_height (widget));
+++ /dev/null
-/*
- * gnome-keyring
- *
- * Copyright (C) 2008 Stefan Walter
- *
- * This file is copied from the gnome-keyring gcr library, which can be
- * found at git://git.gnome.org/gnome-keyring
- *
- * This program 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 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gcr/gcr.h>
-#include "gcr-simple-certificate.h"
-
-#include <string.h>
-
-struct _GcrSimpleCertificatePrivate {
- guchar *owned_data;
- gsize n_owned_data;
-};
-
-static void gcr_certificate_iface (GcrCertificateIface *iface);
-G_DEFINE_TYPE_WITH_CODE (GcrSimpleCertificate, gcr_simple_certificate, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (GCR_TYPE_CERTIFICATE, gcr_certificate_iface));
-
-/* -----------------------------------------------------------------------------
- * OBJECT
- */
-
-static void
-gcr_simple_certificate_init (GcrSimpleCertificate *self)
-{
- self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_SIMPLE_CERTIFICATE, GcrSimpleCertificatePrivate);
-}
-
-static void
-gcr_simple_certificate_finalize (GObject *obj)
-{
- GcrSimpleCertificate *self = GCR_SIMPLE_CERTIFICATE (obj);
-
- g_free (self->pv->owned_data);
- self->pv->owned_data = NULL;
- self->pv->n_owned_data = 0;
-
- G_OBJECT_CLASS (gcr_simple_certificate_parent_class)->finalize (obj);
-}
-
-static void
-gcr_simple_certificate_set_property (GObject *obj, guint prop_id, const GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
- break;
- }
-}
-
-static void
-gcr_simple_certificate_get_property (GObject *obj, guint prop_id, GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
- break;
- }
-}
-
-static void
-gcr_simple_certificate_class_init (GcrSimpleCertificateClass *klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
- gobject_class->finalize = gcr_simple_certificate_finalize;
- gobject_class->set_property = gcr_simple_certificate_set_property;
- gobject_class->get_property = gcr_simple_certificate_get_property;
-
- g_type_class_add_private (gobject_class, sizeof (GcrSimpleCertificatePrivate));
-}
-
-static const guchar*
-gcr_simple_certificate_real_get_der_data (GcrCertificate *base, gsize *n_data)
-{
- GcrSimpleCertificate *self = GCR_SIMPLE_CERTIFICATE (base);
-
- g_return_val_if_fail (GCR_IS_CERTIFICATE (self), NULL);
- g_return_val_if_fail (n_data, NULL);
- g_return_val_if_fail (self->pv->owned_data, NULL);
-
- /* This is called when we're not a base class */
- *n_data = self->pv->n_owned_data;
- return self->pv->owned_data;
-}
-
-static void
-gcr_certificate_iface (GcrCertificateIface *iface)
-{
- iface->get_der_data = (gpointer)gcr_simple_certificate_real_get_der_data;
-}
-
-/* -----------------------------------------------------------------------------
- * PUBLIC
- */
-
-GcrCertificate*
-gcr_simple_certificate_new (const guchar *data, gsize n_data)
-{
- GcrSimpleCertificate *cert;
-
- g_return_val_if_fail (data, NULL);
- g_return_val_if_fail (n_data, NULL);
-
- cert = g_object_new (GCR_TYPE_SIMPLE_CERTIFICATE, NULL);
-
- cert->pv->owned_data = g_memdup (data, n_data);
- cert->pv->n_owned_data = n_data;
- return GCR_CERTIFICATE (cert);
-}
+++ /dev/null
-/*
- * gnome-keyring
- *
- * Copyright (C) 2008 Stefan Walter
- *
- * This file is copied from the gnome-keyring gcr library, which can be
- * found at git://git.gnome.org/gnome-keyring
- *
- * This program 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 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef __GCR_SIMPLE_CERTIFICATE_H__
-#define __GCR_SIMPLE_CERTIFICATE_H__
-
-#include <gcr/gcr.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GCR_TYPE_SIMPLE_CERTIFICATE (gcr_simple_certificate_get_type ())
-#define GCR_SIMPLE_CERTIFICATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCR_TYPE_CERTIFICATE, GcrSimpleCertificate))
-#define GCR_SIMPLE_CERTIFICATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GCR_TYPE_CERTIFICATE, GcrSimpleCertificateClass))
-#define GCR_IS_SIMPLE_CERTIFICATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GCR_TYPE_CERTIFICATE))
-#define GCR_IS_SIMPLE_CERTIFICATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GCR_TYPE_CERTIFICATE))
-#define GCR_SIMPLE_CERTIFICATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GCR_TYPE_CERTIFICATE, GcrSimpleCertificateClass))
-
-typedef struct _GcrSimpleCertificate GcrSimpleCertificate;
-typedef struct _GcrSimpleCertificateClass GcrSimpleCertificateClass;
-typedef struct _GcrSimpleCertificatePrivate GcrSimpleCertificatePrivate;
-
-struct _GcrSimpleCertificate {
- GObject parent;
- GcrSimpleCertificatePrivate *pv;
-};
-
-struct _GcrSimpleCertificateClass {
- GObjectClass parent_class;
-};
-
-GType gcr_simple_certificate_get_type (void);
-
-GcrCertificate* gcr_simple_certificate_new (const guchar *data,
- gsize n_data);
-
-G_END_DECLS
-
-#endif /* __GCR_SIMPLE_CERTIFICATE_H__ */
-DDATADIR=\""$(datadir)"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"empathy\" \
+ -DGCR_API_SUBJECT_TO_CHANGE \
$(EMPATHY_CFLAGS) \
$(GEOCLUE_CFLAGS) \
$(NETWORK_MANAGER_CFLAGS) \
empathy-irc-network-manager.h \
empathy-irc-network.h \
empathy-irc-server.h \
+ empathy-keyring.h \
empathy-location.h \
empathy-message.h \
+ empathy-server-sasl-handler.h \
empathy-server-tls-handler.h \
empathy-status-presets.h \
empathy-time.h \
empathy-irc-network-manager.c \
empathy-irc-network.c \
empathy-irc-server.c \
+ empathy-keyring.c \
empathy-message.c \
+ empathy-server-sasl-handler.c \
empathy-server-tls-handler.c \
empathy-status-presets.c \
empathy-time.c \
libempathy_la_LIBADD = \
$(top_builddir)/extensions/libemp-extensions.la \
+ $(GCR_LIBS) \
$(EMPATHY_LIBS) \
$(GEOCLUE_LIBS) \
$(NETWORK_MANAGER_LIBS) \
#include "empathy-account-settings.h"
#include "empathy-connection-managers.h"
+#include "empathy-keyring.h"
#include "empathy-utils.h"
#include "empathy-idle.h"
PROP_READY
};
+enum {
+ PASSWORD_RETRIEVED = 1,
+ LAST_SIGNAL
+};
+
+static gulong signals[LAST_SIGNAL] = { 0, };
+
/* private structure */
typedef struct _EmpathyAccountSettingsPriv EmpathyAccountSettingsPriv;
TpAccountManager *account_manager;
TpConnectionManager *manager;
+ TpProtocol *protocol_obj;
TpAccount *account;
gchar *cm_name;
gboolean display_name_overridden;
gboolean ready;
+ gboolean supports_sasl;
+ gboolean password_changed;
+
+ gchar *password;
+ gchar *password_original;
+
+ gboolean password_retrieved;
+ gboolean password_requested;
+
/* Parameter name (gchar *) -> parameter value (GValue) */
GHashTable *parameters;
/* Keys are parameter names from the hash above (gchar *).
GList *required_params;
gulong managers_ready_id;
+ gboolean preparing_protocol;
GSimpleAsyncResult *apply_result;
};
TP_ACCOUNT_FEATURE_STORAGE,
0 };
- tp_proxy_prepare_async (priv->account, features,
- empathy_account_settings_account_ready_cb, self);
+ if (priv->account != NULL)
+ {
+ tp_proxy_prepare_async (priv->account, features,
+ empathy_account_settings_account_ready_cb, self);
+ }
+
tp_g_signal_connect_object (priv->managers, "notify::ready",
G_CALLBACK (empathy_account_settings_managers_ready_cb), object, 0);
}
"Whether this account is ready to be used",
FALSE,
G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
+
+ signals[PASSWORD_RETRIEVED] =
+ g_signal_new ("password-retrieved",
+ G_TYPE_FROM_CLASS (empathy_account_settings_class),
+ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
static void
g_signal_handler_disconnect (priv->managers, priv->managers_ready_id);
priv->managers_ready_id = 0;
- if (priv->managers != NULL)
- g_object_unref (priv->managers);
- priv->managers = NULL;
-
- if (priv->manager != NULL)
- g_object_unref (priv->manager);
- priv->manager = NULL;
-
- if (priv->account_manager != NULL)
- g_object_unref (priv->account_manager);
- priv->account_manager = NULL;
-
- if (priv->account != NULL)
- g_object_unref (priv->account);
- priv->account = NULL;
+ tp_clear_object (&priv->managers);
+ tp_clear_object (&priv->manager);
+ tp_clear_object (&priv->account_manager);
+ tp_clear_object (&priv->account);
+ tp_clear_object (&priv->protocol_obj);
/* release any references held by the object here */
if (G_OBJECT_CLASS (empathy_account_settings_parent_class)->dispose)
g_free (priv->service);
g_free (priv->display_name);
g_free (priv->icon_name);
+ g_free (priv->password);
+ g_free (priv->password_original);
if (priv->required_params != NULL)
{
G_OBJECT_CLASS (empathy_account_settings_parent_class)->finalize (object);
}
+static void
+empathy_account_settings_protocol_obj_prepared_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ EmpathyAccountSettings *self = user_data;
+ GError *error = NULL;
+
+ if (!tp_proxy_prepare_finish (source, result, &error))
+ {
+ DEBUG ("Failed to prepare protocol object: %s", error->message);
+ g_clear_error (&error);
+ return;
+ }
+
+ empathy_account_settings_check_readyness (self);
+}
+
+static void
+empathy_account_settings_get_password_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ EmpathyAccountSettings *self = user_data;
+ EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
+ const gchar *password;
+ GError *error = NULL;
+
+ password = empathy_keyring_get_password_finish (TP_ACCOUNT (source),
+ result, &error);
+
+ if (error != NULL)
+ {
+ DEBUG ("Failed to get password: %s", error->message);
+ g_clear_error (&error);
+ }
+
+ /* It doesn't really matter if getting the password failed; that
+ * just means that it's not there, or let's act like that at
+ * least. */
+
+ g_assert (priv->password == NULL);
+
+ priv->password = g_strdup (password);
+ priv->password_original = g_strdup (password);
+
+ g_signal_emit (self, signals[PASSWORD_RETRIEVED], 0);
+}
+
+static void
+empathy_account_settings_migrate_password_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ TpAccount *account = TP_ACCOUNT (source);
+ GError *error = NULL;
+ EmpathyAccountSettings *self = user_data;
+ EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
+ GHashTable *empty;
+ const gchar *unset[] = { "password", NULL };
+
+ if (!empathy_keyring_set_password_finish (account, result, &error))
+ {
+ DEBUG ("Failed to set password: %s", error->message);
+ g_clear_error (&error);
+ return;
+ }
+
+ /* Now clear the password MC has stored. */
+ empty = tp_asv_new (NULL, NULL);
+ tp_account_update_parameters_async (priv->account,
+ empty, unset, NULL, NULL);
+
+ g_hash_table_remove (priv->parameters, "password");
+
+ g_hash_table_unref (empty);
+}
+
+static void
+empathy_account_settings_try_migrating_password (EmpathyAccountSettings *self)
+{
+ EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
+ const GValue *v;
+ const gchar *password;
+
+ if (!priv->supports_sasl || empathy_account_settings_get (
+ self, "password") == NULL)
+ return;
+
+ /* mission-control still has our password, although the CM
+ * supports SASL. Let's try migrating it. */
+
+ DEBUG ("Trying to migrate password parameter from MC to the "
+ "keyring ourselves for account %s",
+ tp_account_get_path_suffix (priv->account));
+
+ v = empathy_account_settings_get (self, "password");
+
+ /* I can't imagine why this would fail. */
+ if (!G_VALUE_HOLDS_STRING (v))
+ return;
+
+ password = g_value_get_string (v);
+
+ if (EMP_STR_EMPTY (password))
+ return;
+
+ empathy_keyring_set_password_async (priv->account, password,
+ empathy_account_settings_migrate_password_cb, self);
+
+ /* We don't want to request the password again, we
+ * already know it. */
+ priv->password_requested = TRUE;
+
+ priv->password = g_strdup (password);
+ priv->password_original = g_strdup (password);
+}
+
static void
empathy_account_settings_check_readyness (EmpathyAccountSettings *self)
{
EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
const TpConnectionManagerProtocol *tp_protocol;
+ GQuark features[] = { TP_PROTOCOL_FEATURE_CORE, 0 };
if (priv->ready)
return;
if (!empathy_connection_managers_is_ready (priv->managers))
return;
- priv->manager = empathy_connection_managers_get_cm (
- priv->managers, priv->cm_name);
+ if (priv->manager == NULL)
+ {
+ priv->manager = empathy_connection_managers_get_cm (
+ priv->managers, priv->cm_name);
+ }
if (priv->manager == NULL)
return;
+ g_object_ref (priv->manager);
+
if (priv->account != NULL)
{
g_free (priv->display_name);
}
}
- g_object_ref (priv->manager);
+ if (priv->protocol_obj == NULL)
+ {
+ priv->protocol_obj = g_object_ref (
+ tp_connection_manager_get_protocol_object (priv->manager,
+ priv->protocol));
+ }
+
+ if (!tp_proxy_is_prepared (priv->protocol_obj, TP_PROTOCOL_FEATURE_CORE)
+ && !priv->preparing_protocol)
+ {
+ priv->preparing_protocol = TRUE;
+ tp_proxy_prepare_async (priv->protocol_obj, features,
+ empathy_account_settings_protocol_obj_prepared_cb, self);
+ return;
+ }
+ else
+ {
+ if (tp_strv_contains (tp_protocol_get_authentication_types (
+ priv->protocol_obj),
+ TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION))
+ {
+ priv->supports_sasl = TRUE;
+ }
+ }
+
+ /* NOTE: When removing MC migration code, remove this call, and the
+ * function it's calling. That's it. */
+ empathy_account_settings_try_migrating_password (self);
+
+ /* priv->account won't be a proper account if it's the account
+ * assistant showing this widget. */
+ if (priv->supports_sasl && !priv->password_requested
+ && priv->account != NULL)
+ {
+ priv->password_requested = TRUE;
+
+ /* Make this call but don't block on its readiness. We'll signal
+ * if it's updated later with ::password-retrieved. */
+ empathy_keyring_get_password_async (priv->account,
+ empathy_account_settings_get_password_cb, self);
+ }
priv->ready = TRUE;
g_object_notify (G_OBJECT (self), "ready");
if (empathy_account_settings_is_unset (settings, param))
return;
+ if (priv->supports_sasl && !tp_strdiff (param, "password"))
+ {
+ g_free (priv->password);
+ priv->password = NULL;
+ priv->password_changed = TRUE;
+ return;
+ }
+
v = g_strdup (param);
g_array_append_val (priv->unset_parameters, v);
g_hash_table_remove_all (priv->parameters);
empathy_account_settings_free_unset_parameters (settings);
+
+ priv->password_changed = FALSE;
+ g_free (priv->password);
+ priv->password = g_strdup (priv->password_original);
}
const gchar *
empathy_account_settings_get_string (EmpathyAccountSettings *settings,
const gchar *param)
{
+ EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
const GValue *v;
+ if (!tp_strdiff (param, "password") && priv->supports_sasl)
+ {
+ return priv->password;
+ }
+
v = empathy_account_settings_get (settings, param);
if (v == NULL || !G_VALUE_HOLDS_STRING (v))
g_return_if_fail (param != NULL);
g_return_if_fail (value != NULL);
- tp_asv_set_string (priv->parameters, g_strdup (param), value);
+ if (!tp_strdiff (param, "password") && priv->supports_sasl)
+ {
+ g_free (priv->password);
+ priv->password = g_strdup (value);
+ priv->password_changed = TRUE;
+ }
+ else
+ {
+ tp_asv_set_string (priv->parameters, g_strdup (param), value);
+ }
account_settings_remove_from_unset (settings, param);
}
return TRUE;
}
+static void
+empathy_account_settings_processed_password (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data,
+ gpointer finish_func)
+{
+ EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data);
+ EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
+ GSimpleAsyncResult *r;
+ GError *error = NULL;
+ gboolean (*func) (TpAccount *source, GAsyncResult *result, GError **error) =
+ finish_func;
+
+ g_free (priv->password_original);
+ priv->password_original = g_strdup (priv->password);
+
+ if (!func (TP_ACCOUNT (source), result, &error))
+ {
+ g_simple_async_result_set_from_error (priv->apply_result, error);
+ g_error_free (error);
+ }
+
+ empathy_account_settings_discard_changes (settings);
+
+ r = priv->apply_result;
+ priv->apply_result = NULL;
+
+ g_simple_async_result_complete (r);
+ g_object_unref (r);
+}
+
+static void
+empathy_account_settings_set_password_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ empathy_account_settings_processed_password (source, result, user_data,
+ empathy_keyring_set_password_finish);
+}
+
+static void
+empathy_account_settings_delete_password_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ empathy_account_settings_processed_password (source, result, user_data,
+ empathy_keyring_delete_password_finish);
+}
+
static void
empathy_account_settings_account_updated (GObject *source,
GAsyncResult *result,
{
g_simple_async_result_set_from_error (priv->apply_result, error);
g_error_free (error);
+ goto out;
}
- else
+
+ /* Only set the password in the keyring if the CM supports SASL and
+ * it's changed. */
+ if (priv->supports_sasl && priv->password_changed)
{
- empathy_account_settings_discard_changes (settings);
+ if (priv->password != NULL)
+ {
+ empathy_keyring_set_password_async (priv->account, priv->password,
+ empathy_account_settings_set_password_cb, settings);
+ }
+ else
+ {
+ empathy_keyring_delete_password_async (priv->account,
+ empathy_account_settings_delete_password_cb, settings);
+ }
+
+ return;
}
+out:
+ empathy_account_settings_discard_changes (settings);
+
r = priv->apply_result;
priv->apply_result = NULL;
return tp_connection_manager_get_protocol (priv->manager, priv->protocol);
}
+
+gboolean
+empathy_account_settings_supports_sasl (EmpathyAccountSettings *self)
+{
+ EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
+
+ return priv->supports_sasl;
+}
const TpConnectionManagerProtocol * empathy_account_settings_get_tp_protocol (
EmpathyAccountSettings *settings);
+gboolean empathy_account_settings_supports_sasl (EmpathyAccountSettings *self);
+
G_END_DECLS
#endif /* #ifndef __EMPATHY_ACCOUNT_SETTINGS_H__*/
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
#include "empathy-debug.h"
+#include "empathy-keyring.h"
+#include "empathy-server-sasl-handler.h"
#include "empathy-server-tls-handler.h"
#include "empathy-utils.h"
#include "extensions/extensions.h"
-G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT);
typedef struct {
- TpBaseClient *handler;
+ /* Keep a ref here so the auth client doesn't have to mess with
+ * refs. It will be cleared when the channel (and so the handler)
+ * gets invalidated. */
+ EmpathyServerSASLHandler *sasl_handler;
gboolean dispose_run;
} EmpathyAuthFactoryPriv;
enum {
NEW_SERVER_TLS_HANDLER,
+ NEW_SERVER_SASL_HANDLER,
LAST_SIGNAL,
};
data = g_slice_new0 (HandlerContextData);
data->self = g_object_ref (self);
- data->context = g_object_ref (context);
+
+ if (context != NULL)
+ data->context = g_object_ref (context);
return data;
}
}
static void
-handle_channels_cb (TpSimpleHandler *handler,
- TpAccount *account,
- TpConnection *connection,
- GList *channels,
- GList *requests_satisfied,
- gint64 user_action_time,
- TpHandleChannelsContext *context,
+sasl_handler_invalidated_cb (EmpathyServerSASLHandler *handler,
gpointer user_data)
{
- TpChannel *channel;
- const GError *dbus_error;
- GError *error = NULL;
EmpathyAuthFactory *self = user_data;
- HandlerContextData *data;
+ EmpathyAuthFactoryPriv *priv = GET_PRIV (self);
+
+ DEBUG ("SASL handler is invalidated, unref it");
+
+ tp_clear_object (&priv->sasl_handler);
+}
+
+static void
+server_sasl_handler_ready_cb (GObject *source,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ EmpathyAuthFactoryPriv *priv;
+ GError *error = NULL;
+ HandlerContextData *data = user_data;
+
+ priv = GET_PRIV (data->self);
+ priv->sasl_handler = empathy_server_sasl_handler_new_finish (res, &error);
+
+ if (error != NULL)
+ {
+ DEBUG ("Failed to create a server SASL handler; error %s",
+ error->message);
+
+ if (data->context != NULL)
+ tp_handle_channels_context_fail (data->context, error);
+
+ g_error_free (error);
+ }
+ else
+ {
+ if (data->context != NULL)
+ tp_handle_channels_context_accept (data->context);
+
+ g_signal_connect (priv->sasl_handler, "invalidated",
+ G_CALLBACK (sasl_handler_invalidated_cb), data->self);
+
+ g_signal_emit (data->self, signals[NEW_SERVER_SASL_HANDLER], 0,
+ priv->sasl_handler);
+ }
+
+ handler_context_data_free (data);
+}
- DEBUG ("Handle TLS carrier channels.");
+static gboolean
+common_checks (EmpathyAuthFactory *self,
+ GList *channels,
+ gboolean must_be_sasl,
+ GError **error)
+{
+ EmpathyAuthFactoryPriv *priv = GET_PRIV (self);
+ TpChannel *channel;
+ GHashTable *props;
+ const gchar * const *available_mechanisms;
+ const GError *dbus_error;
- /* there can't be more than one ServerTLSConnection channels
- * at the same time, for the same connection/account.
+ /* there can't be more than one ServerTLSConnection or
+ * ServerAuthentication channels at the same time, for the same
+ * connection/account.
*/
if (g_list_length (channels) != 1)
{
- g_set_error_literal (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
- "Can't handle more than one ServerTLSConnection channel "
- "for the same connection.");
+ g_set_error_literal (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
+ "Can't handle more than one ServerTLSConnection or ServerAuthentication "
+ "channel for the same connection.");
- goto error;
+ return FALSE;
}
channel = channels->data;
if (tp_channel_get_channel_type_id (channel) !=
- EMP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION)
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
{
- g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
- "Can only handle ServerTLSConnection channels, this was a %s "
- "channel", tp_channel_get_channel_type (channel));
+ if (must_be_sasl
+ || tp_channel_get_channel_type_id (channel) !=
+ EMP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION)
+ {
+ g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
+ "Can only handle ServerTLSConnection or ServerAuthentication channels, "
+ "this was a %s channel", tp_channel_get_channel_type (channel));
+
+ return FALSE;
+ }
+ }
- goto error;
+ if (tp_channel_get_channel_type_id (channel) ==
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION
+ && priv->sasl_handler != NULL)
+ {
+ g_set_error_literal (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
+ "Can't handle more than one ServerAuthentication channel at one time");
+
+ return FALSE;
+ }
+
+ props = tp_channel_borrow_immutable_properties (channel);
+ available_mechanisms = tp_asv_get_boxed (props,
+ TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AVAILABLE_MECHANISMS,
+ G_TYPE_STRV);
+
+ if (tp_channel_get_channel_type_id (channel) ==
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION
+ && !tp_strv_contains (available_mechanisms, "X-TELEPATHY-PASSWORD"))
+ {
+ g_set_error_literal (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
+ "Only the X-TELEPATHY-PASSWORD SASL mechanism is supported");
+
+ return FALSE;
}
dbus_error = tp_proxy_get_invalidated (channel);
if (dbus_error != NULL)
{
- error = g_error_copy (dbus_error);
- goto error;
+ *error = g_error_copy (dbus_error);
+ return FALSE;
}
- /* create a handler */
+ return TRUE;
+}
+
+static void
+handle_channels (TpBaseClient *handler,
+ TpAccount *account,
+ TpConnection *connection,
+ GList *channels,
+ GList *requests_satisfied,
+ gint64 user_action_time,
+ TpHandleChannelsContext *context)
+{
+ TpChannel *channel;
+ GError *error = NULL;
+ EmpathyAuthFactory *self = EMPATHY_AUTH_FACTORY (handler);
+ HandlerContextData *data;
+
+ DEBUG ("Handle TLS or SASL carrier channels.");
+
+ if (!common_checks (self, channels, FALSE, &error))
+ {
+ DEBUG ("Failed checks: %s", error->message);
+ tp_handle_channels_context_fail (context, error);
+ g_clear_error (&error);
+ return;
+ }
+
+ /* The common checks above have checked this is fine. */
+ channel = channels->data;
+
data = handler_context_data_new (self, context);
tp_handle_channels_context_delay (context);
- empathy_server_tls_handler_new_async (channel, server_tls_handler_ready_cb,
- data);
- return;
+ /* create a handler */
+ if (tp_channel_get_channel_type_id (channel) ==
+ EMP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION)
+ {
+ empathy_server_tls_handler_new_async (channel, server_tls_handler_ready_cb,
+ data);
+ }
+ else if (tp_channel_get_channel_type_id (channel) ==
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
+ {
+ empathy_server_sasl_handler_new_async (account, channel,
+ server_sasl_handler_ready_cb, data);
+ }
+}
+
+typedef struct
+{
+ EmpathyAuthFactory *self;
+ TpObserveChannelsContext *context;
+ TpChannelDispatchOperation *dispatch_operation;
+ TpAccount *account;
+ TpChannel *channel;
+} ObserveChannelsData;
+
+static void
+observe_channels_data_free (ObserveChannelsData *data)
+{
+ g_object_unref (data->context);
+ g_object_unref (data->account);
+ g_object_unref (data->channel);
+ g_object_unref (data->dispatch_operation);
+ g_slice_free (ObserveChannelsData, data);
+}
+
+static void
+claim_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ ObserveChannelsData *data = user_data;
+ GError *error = NULL;
+
+ if (!tp_channel_dispatch_operation_claim_finish (
+ TP_CHANNEL_DISPATCH_OPERATION (source), result, &error))
+ {
+ DEBUG ("Failed to call Claim: %s", error->message);
+ g_clear_error (&error);
+ }
+ else
+ {
+ HandlerContextData *h_data;
+
+ DEBUG ("Claim called successfully");
+
+ h_data = handler_context_data_new (data->self, NULL);
+
+ empathy_server_sasl_handler_new_async (TP_ACCOUNT (data->account),
+ data->channel, server_sasl_handler_ready_cb, h_data);
+ }
+
+ observe_channels_data_free (data);
+}
+
+static void
+get_password_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ ObserveChannelsData *data = user_data;
+
+ if (empathy_keyring_get_password_finish (TP_ACCOUNT (source), result, NULL) == NULL)
+ {
+ /* We don't actually mind if this fails, just let the approver
+ * go ahead and take the channel. */
+
+ DEBUG ("We don't have a password for account %s, letting the event "
+ "manager approver take it", tp_proxy_get_object_path (source));
+
+ tp_observe_channels_context_accept (data->context);
+ observe_channels_data_free (data);
+ }
+ else
+ {
+ DEBUG ("We have a password for account %s, calling Claim",
+ tp_proxy_get_object_path (source));
+
+ tp_channel_dispatch_operation_claim_async (data->dispatch_operation,
+ claim_cb, data);
+
+ tp_observe_channels_context_accept (data->context);
+ }
+}
+
+static void
+observe_channels (TpBaseClient *client,
+ TpAccount *account,
+ TpConnection *connection,
+ GList *channels,
+ TpChannelDispatchOperation *dispatch_operation,
+ GList *requests,
+ TpObserveChannelsContext *context)
+{
+ EmpathyAuthFactory *self = EMPATHY_AUTH_FACTORY (client);
+ TpChannel *channel;
+ GError *error = NULL;
+ ObserveChannelsData *data;
- error:
- tp_handle_channels_context_fail (context, error);
- g_clear_error (&error);
+ DEBUG ("New auth channel to observe");
+
+ if (!common_checks (self, channels, TRUE, &error))
+ {
+ DEBUG ("Failed checks: %s", error->message);
+ tp_observe_channels_context_fail (context, error);
+ g_clear_error (&error);
+ return;
+ }
+
+ /* We're now sure this is a server auth channel using the SASL auth
+ * type and X-TELEPATHY-PASSWORD is available. Great. */
+
+ channel = channels->data;
+
+ data = g_slice_new0 (ObserveChannelsData);
+ data->self = self;
+ data->context = g_object_ref (context);
+ data->dispatch_operation = g_object_ref (dispatch_operation);
+ data->account = g_object_ref (account);
+ data->channel = g_object_ref (channel);
+
+ empathy_keyring_get_password_async (account, get_password_cb, data);
+
+ tp_observe_channels_context_delay (context);
}
static GObject *
static void
empathy_auth_factory_init (EmpathyAuthFactory *self)
{
- EmpathyAuthFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_AUTH_FACTORY, EmpathyAuthFactoryPriv);
- TpDBusDaemon *bus;
+}
+
+static void
+empathy_auth_factory_constructed (GObject *obj)
+{
+ EmpathyAuthFactory *self = EMPATHY_AUTH_FACTORY (obj);
+ TpBaseClient *client = TP_BASE_CLIENT (self);
GError *error = NULL;
- self->priv = priv;
+ /* chain up to TpBaseClient first */
+ G_OBJECT_CLASS (empathy_auth_factory_parent_class)->constructed (obj);
- bus = tp_dbus_daemon_dup (&error);
if (error != NULL)
{
g_critical ("Failed to get TpDBusDaemon: %s", error->message);
return;
}
- priv->handler = tp_simple_handler_new (bus, FALSE, FALSE, "Empathy.Auth",
- FALSE, handle_channels_cb, self, NULL);
+ tp_base_client_set_handler_bypass_approval (client, FALSE);
- tp_base_client_take_handler_filter (priv->handler, tp_asv_new (
+ tp_base_client_take_handler_filter (client, tp_asv_new (
+ /* ChannelType */
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
EMP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION,
+ /* AuthenticationMethod */
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_NONE, NULL));
- g_object_unref (bus);
+ tp_base_client_take_handler_filter (client, tp_asv_new (
+ /* ChannelType */
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+ TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
+ /* AuthenticationMethod */
+ TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION_AUTHENTICATION_METHOD,
+ G_TYPE_STRING, TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
+ NULL));
+
+ /* We are also an observer so that we can see new auth channels
+ * popping up and if we have the password already saved to one
+ * account where an auth channel has just appeared we can call
+ * Claim() on the CDO so the approver won't get it, which makes
+ * sense. */
+
+ tp_base_client_take_observer_filter (client, tp_asv_new (
+ /* ChannelType */
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+ TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
+ /* AuthenticationMethod */
+ TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION_AUTHENTICATION_METHOD,
+ G_TYPE_STRING, TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
+ NULL));
}
static void
priv->dispose_run = TRUE;
- tp_clear_object (&priv->handler);
+ tp_clear_object (&priv->sasl_handler);
G_OBJECT_CLASS (empathy_auth_factory_parent_class)->dispose (object);
}
empathy_auth_factory_class_init (EmpathyAuthFactoryClass *klass)
{
GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ TpBaseClientClass *base_client_cls = TP_BASE_CLIENT_CLASS (klass);
oclass->constructor = empathy_auth_factory_constructor;
+ oclass->constructed = empathy_auth_factory_constructed;
oclass->dispose = empathy_auth_factory_dispose;
+ base_client_cls->handle_channels = handle_channels;
+ base_client_cls->observe_channels = observe_channels;
+
g_type_class_add_private (klass, sizeof (EmpathyAuthFactoryPriv));
signals[NEW_SERVER_TLS_HANDLER] =
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1, EMPATHY_TYPE_SERVER_TLS_HANDLER);
+
+ signals[NEW_SERVER_SASL_HANDLER] =
+ g_signal_new ("new-server-sasl-handler",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST, 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE,
+ 1, EMPATHY_TYPE_SERVER_SASL_HANDLER);
}
EmpathyAuthFactory *
empathy_auth_factory_dup_singleton (void)
{
- return g_object_new (EMPATHY_TYPE_AUTH_FACTORY, NULL);
+ EmpathyAuthFactory *out = NULL;
+ TpDBusDaemon *bus;
+
+ bus = tp_dbus_daemon_dup (NULL);
+ out = g_object_new (EMPATHY_TYPE_AUTH_FACTORY,
+ "dbus-daemon", bus,
+ "name", "Empathy.Auth",
+ NULL);
+ g_object_unref (bus);
+
+ return out;
}
gboolean
empathy_auth_factory_register (EmpathyAuthFactory *self,
GError **error)
{
- EmpathyAuthFactoryPriv *priv = GET_PRIV (self);
-
- return tp_base_client_register (priv->handler, error);
+ return tp_base_client_register (TP_BASE_CLIENT (self), error);
}
#include <glib-object.h>
+#include <telepathy-glib/base-client.h>
+
G_BEGIN_DECLS
typedef struct _EmpathyAuthFactory EmpathyAuthFactory;
typedef struct _EmpathyAuthFactoryClass EmpathyAuthFactoryClass;
struct _EmpathyAuthFactoryClass {
- GObjectClass parent_class;
+ TpBaseClientClass parent_class;
};
struct _EmpathyAuthFactory {
- GObject parent;
+ TpBaseClient parent;
gpointer priv;
};
if (priv->persona != NULL)
{
- folks_presence_set_presence_message (FOLKS_PRESENCE (priv->persona),
- message);
+ folks_has_presence_set_presence_message (
+ FOLKS_HAS_PRESENCE (priv->persona), message);
}
}
priv = GET_PRIV (contact);
if (priv->persona != NULL)
- return folks_presence_get_presence_message (FOLKS_PRESENCE (priv->persona));
+ {
+ return folks_has_presence_get_presence_message (
+ FOLKS_HAS_PRESENCE (priv->persona));
+ }
return NULL;
}
presence_cmp_func (EmpathyContact *a,
EmpathyContact *b)
{
- FolksPresence *presence_a, *presence_b;
+ FolksHasPresence *presence_a, *presence_b;
- presence_a = FOLKS_PRESENCE (empathy_contact_get_persona (a));
- presence_b = FOLKS_PRESENCE (empathy_contact_get_persona (b));
+ presence_a = FOLKS_HAS_PRESENCE (empathy_contact_get_persona (a));
+ presence_b = FOLKS_HAS_PRESENCE (empathy_contact_get_persona (b));
/* We negate the result because we're sorting in reverse order (i.e. such that
* the Personas with the highest presence are at the beginning of the list. */
- return -folks_presence_typecmp (folks_presence_get_presence_type (presence_a),
- folks_presence_get_presence_type (presence_b));
+ return -folks_has_presence_typecmp (
+ folks_has_presence_get_presence_type (presence_a),
+ folks_has_presence_get_presence_type (presence_b));
}
static gint
{ "Tests", EMPATHY_DEBUG_TESTS },
{ "Voip", EMPATHY_DEBUG_VOIP },
{ "Tls", EMPATHY_DEBUG_TLS },
+ { "Sasl", EMPATHY_DEBUG_SASL },
{ 0, }
};
EMPATHY_DEBUG_TESTS = 1 << 12,
EMPATHY_DEBUG_VOIP = 1 << 13,
EMPATHY_DEBUG_TLS = 1 << 14,
+ EMPATHY_DEBUG_SASL = 1 << 15,
} EmpathyDebugFlags;
gboolean empathy_debug_flag_is_set (EmpathyDebugFlags flag);
GParamSpec *pspec,
EmpathyIndividualManager *self)
{
- gboolean is_favourite = folks_favourite_get_is_favourite (
- FOLKS_FAVOURITE (individual));
+ gboolean is_favourite = folks_favouritable_get_is_favourite (
+ FOLKS_FAVOURITABLE (individual));
g_signal_emit (self, signals[FAVOURITES_CHANGED], 0, individual,
is_favourite);
}
--- /dev/null
+/*
+ * Copyright (C) 2010 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
+ */
+
+#include "config.h"
+
+#include "empathy-keyring.h"
+
+#include <string.h>
+
+#include <gnome-keyring.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
+
+static GnomeKeyringPasswordSchema keyring_schema =
+ { GNOME_KEYRING_ITEM_GENERIC_SECRET,
+ { { "account-id", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
+ { "param-name", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING },
+ { NULL } } };
+
+static void
+find_items_cb (GnomeKeyringResult result,
+ GList *list,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
+
+ if (result != GNOME_KEYRING_RESULT_OK)
+ {
+ GError *error = g_error_new_literal (TP_ERROR,
+ TP_ERROR_DOES_NOT_EXIST,
+ gnome_keyring_result_to_message (result));
+ g_simple_async_result_set_from_error (simple, error);
+ g_clear_error (&error);
+ }
+
+ if (g_list_length (list) == 1)
+ {
+ GnomeKeyringFound *found = list->data;
+
+ DEBUG ("Got secret");
+
+ g_simple_async_result_set_op_res_gpointer (simple, found->secret, NULL);
+ }
+
+ g_simple_async_result_complete (simple);
+ g_object_unref (simple);
+}
+
+void
+empathy_keyring_get_password_async (TpAccount *account,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple;
+ GnomeKeyringAttributeList *match;
+ const gchar *account_id;
+
+ g_return_if_fail (TP_IS_ACCOUNT (account));
+ g_return_if_fail (callback != NULL);
+
+ simple = g_simple_async_result_new (G_OBJECT (account), callback,
+ user_data, empathy_keyring_get_password_async);
+
+ account_id = tp_proxy_get_object_path (account) +
+ strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
+
+ DEBUG ("Trying to get password for: %s", account_id);
+
+ match = gnome_keyring_attribute_list_new ();
+ gnome_keyring_attribute_list_append_string (match, "account-id",
+ account_id);
+ gnome_keyring_attribute_list_append_string (match, "param-name", "password");
+
+ gnome_keyring_find_items (GNOME_KEYRING_ITEM_GENERIC_SECRET,
+ match, find_items_cb, simple, NULL);
+
+ gnome_keyring_attribute_list_free (match);
+}
+
+const gchar *
+empathy_keyring_get_password_finish (TpAccount *account,
+ GAsyncResult *result,
+ GError **error)
+{
+ GSimpleAsyncResult *simple;
+
+ g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
+ g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), NULL);
+
+ simple = G_SIMPLE_ASYNC_RESULT (result);
+
+ if (g_simple_async_result_propagate_error (simple, error))
+ return NULL;
+
+ g_return_val_if_fail (g_simple_async_result_is_valid (result,
+ G_OBJECT (account), empathy_keyring_get_password_async), NULL);
+
+ return g_simple_async_result_get_op_res_gpointer (simple);
+}
+
+static void
+store_password_cb (GnomeKeyringResult result,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
+
+ if (result != GNOME_KEYRING_RESULT_OK)
+ {
+ GError *error = g_error_new_literal (TP_ERROR,
+ TP_ERROR_DOES_NOT_EXIST,
+ gnome_keyring_result_to_message (result));
+ g_simple_async_result_set_from_error (simple, error);
+ g_clear_error (&error);
+ }
+
+ g_simple_async_result_complete (simple);
+ g_object_unref (simple);
+}
+
+void
+empathy_keyring_set_password_async (TpAccount *account,
+ const gchar *password,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple;
+ const gchar *account_id;
+ gchar *name;
+
+ g_return_if_fail (TP_IS_ACCOUNT (account));
+ g_return_if_fail (password != NULL);
+
+ simple = g_simple_async_result_new (G_OBJECT (account), callback,
+ user_data, empathy_keyring_set_password_async);
+
+ account_id = tp_proxy_get_object_path (account) +
+ strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
+
+ DEBUG ("Remembering password for %s", account_id);
+
+ name = g_strdup_printf ("IM account password for %s (%s)",
+ tp_account_get_display_name (account), account_id);
+
+ gnome_keyring_store_password (&keyring_schema, NULL, name, password,
+ store_password_cb, simple, NULL,
+ "account-id", account_id,
+ "param-name", "password",
+ NULL);
+
+ g_free (name);
+}
+
+gboolean
+empathy_keyring_set_password_finish (TpAccount *account,
+ GAsyncResult *result,
+ GError **error)
+{
+ GSimpleAsyncResult *simple;
+
+ g_return_val_if_fail (TP_IS_ACCOUNT (account), FALSE);
+ g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), FALSE);
+
+ simple = G_SIMPLE_ASYNC_RESULT (result);
+
+ if (g_simple_async_result_propagate_error (simple, error))
+ return FALSE;
+
+ g_return_val_if_fail (g_simple_async_result_is_valid (result,
+ G_OBJECT (account), empathy_keyring_set_password_async), FALSE);
+
+ return TRUE;
+}
+
+static void
+item_delete_cb (GnomeKeyringResult result,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
+
+ if (result != GNOME_KEYRING_RESULT_OK)
+ {
+ GError *error = g_error_new_literal (TP_ERROR,
+ TP_ERROR_DOES_NOT_EXIST,
+ gnome_keyring_result_to_message (result));
+ g_simple_async_result_set_from_error (simple, error);
+ g_clear_error (&error);
+ }
+
+ g_simple_async_result_complete (simple);
+ g_object_unref (simple);
+}
+
+static void
+find_item_to_delete_cb (GnomeKeyringResult result,
+ GList *list,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
+ GnomeKeyringFound *found;
+
+ if (result != GNOME_KEYRING_RESULT_OK || g_list_length (list) != 1)
+ {
+ GError *error = g_error_new_literal (TP_ERROR,
+ TP_ERROR_DOES_NOT_EXIST,
+ gnome_keyring_result_to_message (result));
+ g_simple_async_result_set_from_error (simple, error);
+ g_clear_error (&error);
+
+ g_simple_async_result_complete (simple);
+ g_object_unref (simple);
+ return;
+ }
+
+ found = list->data;
+
+ gnome_keyring_item_delete (NULL, found->item_id, item_delete_cb,
+ simple, NULL);
+}
+
+void
+empathy_keyring_delete_password_async (TpAccount *account,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple;
+ GnomeKeyringAttributeList *match;
+ const gchar *account_id;
+
+ g_return_if_fail (TP_IS_ACCOUNT (account));
+
+ simple = g_simple_async_result_new (G_OBJECT (account), callback,
+ user_data, empathy_keyring_delete_password_async);
+
+ account_id = tp_proxy_get_object_path (account) +
+ strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
+
+ match = gnome_keyring_attribute_list_new ();
+ gnome_keyring_attribute_list_append_string (match, "account-id",
+ account_id);
+ gnome_keyring_attribute_list_append_string (match, "param-name", "password");
+
+ gnome_keyring_find_items (GNOME_KEYRING_ITEM_GENERIC_SECRET,
+ match, find_item_to_delete_cb, simple, NULL);
+
+ gnome_keyring_attribute_list_free (match);
+}
+
+gboolean
+empathy_keyring_delete_password_finish (TpAccount *account,
+ GAsyncResult *result,
+ GError **error)
+{
+ GSimpleAsyncResult *simple;
+
+ g_return_val_if_fail (TP_IS_ACCOUNT (account), FALSE);
+ g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), FALSE);
+
+ simple = G_SIMPLE_ASYNC_RESULT (result);
+
+ if (g_simple_async_result_propagate_error (simple, error))
+ return FALSE;
+
+ g_return_val_if_fail (g_simple_async_result_is_valid (result,
+ G_OBJECT (account), empathy_keyring_delete_password_async), FALSE);
+
+ return TRUE;
+}
+
--- /dev/null
+/*
+ * Copyright (C) 2010 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
+ */
+
+#ifndef __EMPATHY_KEYRING_H__
+#define __EMPATHY_KEYRING_H__
+
+#include <gio/gio.h>
+
+#include <telepathy-glib/account.h>
+
+G_BEGIN_DECLS
+
+void empathy_keyring_get_password_async (TpAccount *account,
+ GAsyncReadyCallback callback, gpointer user_data);
+
+const gchar * empathy_keyring_get_password_finish (TpAccount *account,
+ GAsyncResult *result, GError **error);
+
+void empathy_keyring_set_password_async (TpAccount *account,
+ const gchar *password, GAsyncReadyCallback callback,
+ gpointer user_data);
+
+gboolean empathy_keyring_set_password_finish (TpAccount *account,
+ GAsyncResult *result, GError **error);
+
+void empathy_keyring_delete_password_async (TpAccount *account,
+ GAsyncReadyCallback callback, gpointer user_data);
+
+gboolean empathy_keyring_delete_password_finish (TpAccount *account,
+ GAsyncResult *result, GError **error);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_KEYRING_H__ */
+
--- /dev/null
+/*
+ * empathy-server-sasl-handler.c - Source for EmpathyServerSASLHandler
+ * Copyright (C) 2010 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
+ */
+
+#include "empathy-server-sasl-handler.h"
+
+#include <telepathy-glib/util.h>
+
+#include <string.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_SASL
+#include "empathy-debug.h"
+#include "empathy-keyring.h"
+
+enum {
+ PROP_CHANNEL = 1,
+ PROP_ACCOUNT,
+ LAST_PROPERTY,
+};
+
+/* signal enum */
+enum {
+ INVALIDATED,
+ LAST_SIGNAL,
+};
+
+static guint signals[LAST_SIGNAL] = {0};
+
+typedef struct {
+ TpChannel *channel;
+ TpAccount *account;
+
+ GSimpleAsyncResult *result;
+
+ gchar *password;
+
+ GSimpleAsyncResult *async_init_res;
+} EmpathyServerSASLHandlerPriv;
+
+static void async_initable_iface_init (GAsyncInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (EmpathyServerSASLHandler, empathy_server_sasl_handler,
+ G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init));
+
+static const gchar *sasl_statuses[] = {
+ "not started",
+ "in progress",
+ "server succeeded",
+ "client accepted",
+ "succeeded",
+ "server failed",
+ "client failed",
+};
+
+static void
+sasl_status_changed_cb (TpChannel *channel,
+ TpSASLStatus status,
+ const gchar *error,
+ GHashTable *details,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (weak_object)->priv;
+
+ /* buh boh */
+ if (status >= G_N_ELEMENTS (sasl_statuses))
+ {
+ DEBUG ("SASL status changed to unknown status");
+ return;
+ }
+
+ DEBUG ("SASL status changed to '%s'", sasl_statuses[status]);
+
+ if (status == TP_SASL_STATUS_SERVER_SUCCEEDED)
+ {
+ DEBUG ("Calling AcceptSASL");
+ tp_cli_channel_interface_sasl_authentication_call_accept_sasl (
+ priv->channel, -1, NULL, NULL, NULL, NULL);
+ }
+ else if (status == TP_SASL_STATUS_SUCCEEDED)
+ {
+ DEBUG ("SASL succeeded, calling Close");
+ tp_cli_channel_call_close (priv->channel, -1,
+ NULL, NULL, NULL, NULL);
+ }
+}
+
+static gboolean
+empathy_server_sasl_handler_give_password (gpointer data)
+{
+ EmpathyServerSASLHandler *self = data;
+ EmpathyServerSASLHandlerPriv *priv = self->priv;
+
+ empathy_server_sasl_handler_provide_password (self,
+ priv->password, FALSE);
+
+ return FALSE;
+}
+
+static void
+empathy_server_sasl_handler_get_password_async_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ EmpathyServerSASLHandlerPriv *priv;
+ const gchar *password;
+ GError *error = NULL;
+
+ priv = EMPATHY_SERVER_SASL_HANDLER (user_data)->priv;
+
+ password = empathy_keyring_get_password_finish (TP_ACCOUNT (source),
+ result, &error);
+
+ if (password != NULL)
+ {
+ priv->password = g_strdup (password);
+
+ /* Do this in an idle so the async result will get there
+ * first. */
+ g_idle_add (empathy_server_sasl_handler_give_password, user_data);
+ }
+
+ g_simple_async_result_complete (priv->async_init_res);
+ tp_clear_object (&priv->async_init_res);
+}
+
+static void
+empathy_server_sasl_handler_init_async (GAsyncInitable *initable,
+ gint io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ EmpathyServerSASLHandler *self = EMPATHY_SERVER_SASL_HANDLER (initable);
+ EmpathyServerSASLHandlerPriv *priv = self->priv;
+
+ g_assert (priv->account != NULL);
+
+ priv->async_init_res = g_simple_async_result_new (G_OBJECT (self),
+ callback, user_data, empathy_server_sasl_handler_new_async);
+
+ empathy_keyring_get_password_async (priv->account,
+ empathy_server_sasl_handler_get_password_async_cb, self);
+}
+
+static gboolean
+empathy_server_sasl_handler_init_finish (GAsyncInitable *initable,
+ GAsyncResult *res,
+ GError **error)
+{
+ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res),
+ error))
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+async_initable_iface_init (GAsyncInitableIface *iface)
+{
+ iface->init_async = empathy_server_sasl_handler_init_async;
+ iface->init_finish = empathy_server_sasl_handler_init_finish;
+}
+
+static void
+channel_invalidated_cb (TpProxy *proxy,
+ guint domain,
+ gint code,
+ gchar *message,
+ EmpathyServerSASLHandler *self)
+{
+ g_signal_emit (self, signals[INVALIDATED], 0);
+}
+
+static void
+empathy_server_sasl_handler_constructed (GObject *object)
+{
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (object)->priv;
+ GError *error = NULL;
+
+ tp_cli_channel_interface_sasl_authentication_connect_to_sasl_status_changed (
+ priv->channel, sasl_status_changed_cb, NULL, NULL, object, &error);
+
+ if (error != NULL)
+ {
+ DEBUG ("Failed to connect to SASLStatusChanged: %s", error->message);
+ g_clear_error (&error);
+ }
+
+ tp_g_signal_connect_object (priv->channel, "invalidated",
+ G_CALLBACK (channel_invalidated_cb), object, 0);
+}
+
+static void
+empathy_server_sasl_handler_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (object)->priv;
+
+ switch (property_id)
+ {
+ case PROP_CHANNEL:
+ g_value_set_object (value, priv->channel);
+ break;
+ case PROP_ACCOUNT:
+ g_value_set_object (value, priv->account);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+empathy_server_sasl_handler_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (object)->priv;
+
+ switch (property_id)
+ {
+ case PROP_CHANNEL:
+ priv->channel = g_value_dup_object (value);
+ break;
+ case PROP_ACCOUNT:
+ priv->account = g_value_dup_object (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+empathy_server_sasl_handler_dispose (GObject *object)
+{
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (object)->priv;
+
+ DEBUG ("%p", object);
+
+ tp_clear_object (&priv->channel);
+ tp_clear_object (&priv->account);
+
+ G_OBJECT_CLASS (empathy_server_sasl_handler_parent_class)->dispose (object);
+}
+
+static void
+empathy_server_sasl_handler_finalize (GObject *object)
+{
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (object)->priv;
+
+ DEBUG ("%p", object);
+
+ tp_clear_pointer (&priv->password, g_free);
+
+ G_OBJECT_CLASS (empathy_server_sasl_handler_parent_class)->finalize (object);
+}
+
+static void
+empathy_server_sasl_handler_class_init (EmpathyServerSASLHandlerClass *klass)
+{
+ GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ GParamSpec *pspec;
+
+ oclass->constructed = empathy_server_sasl_handler_constructed;
+ oclass->get_property = empathy_server_sasl_handler_get_property;
+ oclass->set_property = empathy_server_sasl_handler_set_property;
+ oclass->dispose = empathy_server_sasl_handler_dispose;
+ oclass->dispose = empathy_server_sasl_handler_finalize;
+
+ g_type_class_add_private (klass, sizeof (EmpathyServerSASLHandlerPriv));
+
+ pspec = g_param_spec_object ("channel", "The TpChannel",
+ "The TpChannel this handler is supposed to handle.",
+ TP_TYPE_CHANNEL,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (oclass, PROP_CHANNEL, pspec);
+
+ pspec = g_param_spec_object ("account", "The TpAccount",
+ "The TpAccount this channel belongs to.",
+ TP_TYPE_ACCOUNT,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (oclass, PROP_ACCOUNT, pspec);
+
+ signals[INVALIDATED] = g_signal_new ("invalidated",
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST, 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+}
+
+static void
+empathy_server_sasl_handler_init (EmpathyServerSASLHandler *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+ EMPATHY_TYPE_SERVER_SASL_HANDLER, EmpathyServerSASLHandlerPriv);
+}
+
+EmpathyServerSASLHandler *
+empathy_server_sasl_handler_new_finish (GAsyncResult *result,
+ GError **error)
+{
+ GObject *object, *source_object;
+
+ source_object = g_async_result_get_source_object (result);
+
+ object = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object),
+ result, error);
+ g_object_unref (source_object);
+
+ if (object != NULL)
+ return EMPATHY_SERVER_SASL_HANDLER (object);
+ else
+ return NULL;
+}
+
+void
+empathy_server_sasl_handler_new_async (TpAccount *account,
+ TpChannel *channel,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ g_return_if_fail (TP_IS_ACCOUNT (account));
+ g_return_if_fail (TP_IS_CHANNEL (channel));
+ g_return_if_fail (callback != NULL);
+
+ g_async_initable_new_async (EMPATHY_TYPE_SERVER_SASL_HANDLER,
+ G_PRIORITY_DEFAULT, NULL, callback, user_data,
+ "account", account,
+ "channel", channel,
+ NULL);
+}
+
+static void
+start_mechanism_with_data_cb (TpChannel *proxy,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ if (error != NULL)
+ {
+ DEBUG ("Failed to start mechanism: %s", error->message);
+ return;
+ }
+
+ DEBUG ("Started mechanism successfully");
+}
+
+static void
+empathy_server_sasl_handler_set_password_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ GError *error = NULL;
+
+ if (!empathy_keyring_set_password_finish (TP_ACCOUNT (source), result,
+ &error))
+ {
+ DEBUG ("Failed to set password: %s", error->message);
+ g_clear_error (&error);
+ }
+ else
+ {
+ DEBUG ("Password set successfully.");
+ }
+}
+
+void
+empathy_server_sasl_handler_provide_password (
+ EmpathyServerSASLHandler *handler,
+ const gchar *password,
+ gboolean remember)
+{
+ EmpathyServerSASLHandlerPriv *priv;
+ GArray *array;
+
+ g_return_if_fail (EMPATHY_IS_SERVER_SASL_HANDLER (handler));
+
+ priv = handler->priv;
+
+ array = g_array_sized_new (TRUE, FALSE,
+ sizeof (gchar), strlen (password));
+
+ g_array_append_vals (array, password, strlen (password));
+
+ DEBUG ("Calling StartMechanismWithData with our password");
+
+ tp_cli_channel_interface_sasl_authentication_call_start_mechanism_with_data (
+ priv->channel, -1, "X-TELEPATHY-PASSWORD", array,
+ start_mechanism_with_data_cb, NULL, NULL, G_OBJECT (handler));
+
+ g_array_unref (array);
+
+ DEBUG ("%sremembering the password", remember ? "" : "not ");
+
+ if (remember)
+ {
+ empathy_keyring_set_password_async (priv->account, password,
+ empathy_server_sasl_handler_set_password_cb, NULL);
+ }
+}
+
+void
+empathy_server_sasl_handler_cancel (EmpathyServerSASLHandler *handler)
+{
+ EmpathyServerSASLHandlerPriv *priv;
+
+ g_return_if_fail (EMPATHY_IS_SERVER_SASL_HANDLER (handler));
+
+ priv = handler->priv;
+
+ DEBUG ("Cancelling SASL mechanism...");
+
+ tp_cli_channel_interface_sasl_authentication_call_abort_sasl (
+ priv->channel, -1, TP_SASL_ABORT_REASON_USER_ABORT,
+ "User cancelled the authentication",
+ NULL, NULL, NULL, NULL);
+}
+
+TpAccount *
+empathy_server_sasl_handler_get_account (EmpathyServerSASLHandler *handler)
+{
+ EmpathyServerSASLHandlerPriv *priv;
+
+ g_return_val_if_fail (EMPATHY_IS_SERVER_SASL_HANDLER (handler), NULL);
+
+ priv = handler->priv;
+
+ return priv->account;
+}
+
+gboolean
+empathy_server_sasl_handler_has_password (EmpathyServerSASLHandler *handler)
+{
+ EmpathyServerSASLHandlerPriv *priv;
+
+ g_return_val_if_fail (EMPATHY_IS_SERVER_SASL_HANDLER (handler), FALSE);
+
+ priv = handler->priv;
+
+ return (priv->password != NULL);
+}
--- /dev/null
+/*
+ * empathy-server-sasl-handler.h - Header for EmpathyServerSASLHandler
+ * Copyright (C) 2010 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
+ */
+
+#ifndef __EMPATHY_SERVER_SASL_HANDLER_H__
+#define __EMPATHY_SERVER_SASL_HANDLER_H__
+
+#include <glib-object.h>
+#include <gio/gio.h>
+
+#include <telepathy-glib/account.h>
+#include <telepathy-glib/channel.h>
+
+G_BEGIN_DECLS
+
+typedef struct _EmpathyServerSASLHandler EmpathyServerSASLHandler;
+typedef struct _EmpathyServerSASLHandlerClass EmpathyServerSASLHandlerClass;
+
+struct _EmpathyServerSASLHandlerClass {
+ GObjectClass parent_class;
+};
+
+struct _EmpathyServerSASLHandler {
+ GObject parent;
+ gpointer priv;
+};
+
+GType empathy_server_sasl_handler_get_type (void);
+
+#define EMPATHY_TYPE_SERVER_SASL_HANDLER \
+ (empathy_server_sasl_handler_get_type ())
+#define EMPATHY_SERVER_SASL_HANDLER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_SERVER_SASL_HANDLER, \
+ EmpathyServerSASLHandler))
+#define EMPATHY_SERVER_SASL_HANDLER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_SERVER_SASL_HANDLER, \
+ EmpathyServerSASLHandlerClass))
+#define EMPATHY_IS_SERVER_SASL_HANDLER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_SERVER_SASL_HANDLER))
+#define EMPATHY_IS_SERVER_SASL_HANDLER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_SERVER_SASL_HANDLER))
+#define EMPATHY_SERVER_SASL_HANDLER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_SERVER_SASL_HANDLER, \
+ EmpathyServerSASLHandlerClass))
+
+void empathy_server_sasl_handler_new_async (
+ TpAccount *account, TpChannel *channel,
+ GAsyncReadyCallback callback, gpointer user_data);
+
+EmpathyServerSASLHandler * empathy_server_sasl_handler_new_finish (
+ GAsyncResult *result, GError **error);
+
+void empathy_server_sasl_handler_provide_password (
+ EmpathyServerSASLHandler *handler, const gchar *password,
+ gboolean remember);
+
+void empathy_server_sasl_handler_cancel (EmpathyServerSASLHandler *handler);
+
+TpAccount * empathy_server_sasl_handler_get_account (
+ EmpathyServerSASLHandler *handler);
+
+gboolean empathy_server_sasl_handler_has_password (
+ EmpathyServerSASLHandler *handler);
+
+G_END_DECLS
+
+#endif /* #ifndef __EMPATHY_SERVER_SASL_HANDLER_H__*/
return TRUE;
}
-
-static gsize
-get_exported_size (gnutls_x509_crt_t cert)
-{
- gsize retval = 2;
- guchar fake[2] = { 0, 0 };
-
- /* fake an export so we get the size to allocate */
- gnutls_x509_crt_export (cert, GNUTLS_X509_FMT_PEM,
- fake, &retval);
-
- DEBUG ("Should allocate %lu bytes", (gulong) retval);
-
- return retval + 1;
-}
-
-void
-empathy_tls_certificate_store_ca (EmpathyTLSCertificate *self)
-{
- GArray *last_cert;
- gnutls_x509_crt_t cert;
- gnutls_datum_t datum = { NULL, 0 };
- gsize exported_len;
- guchar *exported_cert = NULL;
- gint res, offset;
- gchar *user_certs_dir = NULL, *filename = NULL, *path = NULL;
- gchar *hostname = NULL;
- GError *error = NULL;
- EmpathyTLSCertificatePriv *priv = GET_PRIV (self);
-
- last_cert = g_ptr_array_index (priv->cert_data, priv->cert_data->len - 1);
- datum.data = (guchar *) last_cert->data;
- datum.size = last_cert->len;
-
- gnutls_x509_crt_init (&cert);
- gnutls_x509_crt_import (cert, &datum, GNUTLS_X509_FMT_DER);
-
- /* make sure it's self-signed, otherwise it's not a CA */
- if (gnutls_x509_crt_check_issuer (cert, cert) <= 0)
- {
- DEBUG ("Can't import the CA, as it's not self-signed");
- gnutls_x509_crt_deinit (cert);
-
- return;
- }
-
- if (gnutls_x509_crt_get_ca_status (cert, NULL) <= 0)
- {
- DEBUG ("Can't import the CA, it's not a valid CA certificate");
- gnutls_x509_crt_deinit (cert);
-
- goto out;
- }
-
- exported_len = get_exported_size (cert);
- exported_cert = g_malloc (sizeof (guchar) * exported_len);
-
- res = gnutls_x509_crt_export (cert, GNUTLS_X509_FMT_PEM,
- exported_cert, &exported_len);
-
- if (res < 0)
- {
- DEBUG ("Failed to export the CA certificate; GnuTLS returned %d,"
- "and should be %lu bytes long", res, (gulong) exported_len);
- gnutls_x509_crt_deinit (cert);
-
- goto out;
- }
-
- hostname = empathy_get_x509_certificate_hostname (cert);
-
- if (hostname == NULL)
- hostname = g_strdup ("ca");
-
- gnutls_x509_crt_deinit (cert);
-
- /* write the file */
- user_certs_dir = g_build_filename (g_get_user_config_dir (),
- "telepathy", "certs", NULL);
-
- res = g_mkdir_with_parents (user_certs_dir, S_IRWXU | S_IRWXG);
-
- if (res < 0)
- {
- DEBUG ("Failed to create the user certificate directory: %s",
- g_strerror (errno));
-
- goto out;
- }
-
- offset = 0;
-
- do
- {
- g_free (path);
-
- if (offset == 0)
- filename = g_strdup_printf ("cert-%s", hostname);
- else
- filename = g_strdup_printf ("cert-%s-%d", hostname, offset);
-
- path = g_build_filename (user_certs_dir, filename, NULL);
-
- offset++;
- g_free (filename);
- }
- while (g_file_test (path, G_FILE_TEST_EXISTS));
-
- DEBUG ("Will save to %s", path);
-
- g_file_set_contents (path, (const gchar *) exported_cert, exported_len,
- &error);
-
- if (error != NULL)
- {
- DEBUG ("Can't save the CA certificate to %s: %s",
- path, error->message);
-
- g_error_free (error);
- }
-
- out:
- g_free (path);
- g_free (exported_cert);
- g_free (user_certs_dir);
- g_free (hostname);
-}
GAsyncResult *result,
GError **error);
-void empathy_tls_certificate_store_ca (EmpathyTLSCertificate *self);
-
G_END_DECLS
#endif /* #ifndef __EMPATHY_TLS_CERTIFICATE_H__*/
* empathy-tls-verifier.c - Source for EmpathyTLSVerifier
* Copyright (C) 2010 Collabora Ltd.
* @author Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
+ * @author Stef Walter <stefw@collabora.co.uk>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
#include "empathy-tls-verifier.h"
+#include <gcr/gcr.h>
+
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
#include "empathy-debug.h"
#include "empathy-utils.h"
LAST_PROPERTY,
};
-static const gchar* system_ca_paths[] = {
- GTLS_SYSTEM_CA_FILE,
- NULL,
-};
-
typedef struct {
- GPtrArray *cert_chain;
-
- GPtrArray *trusted_ca_list;
- GPtrArray *trusted_crl_list;
-
EmpathyTLSCertificate *certificate;
gchar *hostname;
gboolean dispose_run;
} EmpathyTLSVerifierPriv;
-static gnutls_x509_crt_t *
-ptr_array_to_x509_crt_list (GPtrArray *chain)
-{
- gnutls_x509_crt_t *retval;
- gint idx;
-
- retval = g_malloc0 (sizeof (gnutls_x509_crt_t) * chain->len);
-
- for (idx = 0; idx < (gint) chain->len; idx++)
- retval[idx] = g_ptr_array_index (chain, idx);
-
- return retval;
-}
-
static gboolean
verification_output_to_reason (gint res,
guint verify_output,
return retval;
}
-static gboolean
-verify_last_certificate (EmpathyTLSVerifier *self,
- gnutls_x509_crt_t cert,
- EmpTLSCertificateRejectReason *reason)
+static void
+build_certificate_list_for_gnutls (GcrCertificateChain *chain,
+ gnutls_x509_crt_t **list,
+ guint *n_list,
+ gnutls_x509_crt_t **anchors,
+ guint *n_anchors)
{
- guint verify_output;
- gint res;
- gnutls_x509_crt_t *trusted_ca_list;
- EmpathyTLSVerifierPriv *priv = GET_PRIV (self);
+ GcrCertificate *cert;
+ guint idx, length;
+ gnutls_x509_crt_t *retval;
+ gnutls_x509_crt_t gcert;
+ gnutls_datum_t datum;
+ gsize n_data;
+
+ g_assert (list);
+ g_assert (n_list);
+ g_assert (anchors);
+ g_assert (n_anchors);
+
+ *list = *anchors = NULL;
+ *n_list = *n_anchors = 0;
- if (priv->trusted_ca_list->len > 0)
+ length = gcr_certificate_chain_get_length (chain);
+ retval = g_malloc0 (sizeof (gnutls_x509_crt_t) * length);
+
+ /* Convert the main body of the chain to gnutls */
+ for (idx = 0; idx < length; ++idx)
{
- trusted_ca_list = ptr_array_to_x509_crt_list (priv->trusted_ca_list);
- res = gnutls_x509_crt_verify (cert, trusted_ca_list,
- priv->trusted_ca_list->len, 0, &verify_output);
+ cert = gcr_certificate_chain_get_certificate (chain, idx);
+ datum.data = (gpointer)gcr_certificate_get_der_data (cert, &n_data);
+ datum.size = n_data;
- DEBUG ("Checking last certificate %p against trusted CAs, output %u",
- cert, verify_output);
+ gnutls_x509_crt_init (&gcert);
+ if (gnutls_x509_crt_import (gcert, &datum, GNUTLS_X509_FMT_DER) < 0)
+ g_return_if_reached ();
- g_free (trusted_ca_list);
+ retval[idx] = gcert;
}
- else
+
+ *list = retval;
+ *n_list = length;
+
+ /* See if we have an anchor */
+ if (gcr_certificate_chain_get_status (chain) ==
+ GCR_CERTIFICATE_CHAIN_ANCHORED)
{
- /* check it against itself to see if it's structurally valid */
- res = gnutls_x509_crt_verify (cert, &cert, 1, 0, &verify_output);
+ cert = gcr_certificate_chain_get_anchor (chain);
+ g_return_if_fail (cert);
- DEBUG ("Checking last certificate %p against itself, output %u", cert,
- verify_output);
+ datum.data = (gpointer)gcr_certificate_get_der_data (cert, &n_data);
+ datum.size = n_data;
- /* if it's valid, return the SelfSigned error, so that we can add it
- * later to our trusted CAs whitelist.
- */
- if (res == GNUTLS_E_SUCCESS)
- {
- *reason = EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED;
- return FALSE;
- }
- }
+ gnutls_x509_crt_init (&gcert);
+ if (gnutls_x509_crt_import (gcert, &datum, GNUTLS_X509_FMT_DER) < 0)
+ g_return_if_reached ();
- return verification_output_to_reason (res, verify_output, reason);
+ retval = g_malloc0 (sizeof (gnutls_x509_crt_t) * 1);
+ retval[0] = gcert;
+ *anchors = retval;
+ *n_anchors = 1;
+ }
}
-static gboolean
-verify_certificate (EmpathyTLSVerifier *self,
- gnutls_x509_crt_t cert,
- gnutls_x509_crt_t issuer,
- EmpTLSCertificateRejectReason *reason)
+static void
+free_certificate_list_for_gnutls (gnutls_x509_crt_t *list,
+ guint n_list)
{
- guint verify_output;
- gint res;
-
- res = gnutls_x509_crt_verify (cert, &issuer, 1, 0, &verify_output);
-
- DEBUG ("Verifying %p against %p, output %u", cert, issuer, verify_output);
+ guint idx;
- return verification_output_to_reason (res, verify_output, reason);
+ for (idx = 0; idx < n_list; idx++)
+ gnutls_x509_crt_deinit (list[idx]);
+ g_free (list);
}
static void
}
static void
-real_start_verification (EmpathyTLSVerifier *self)
+debug_certificate (GcrCertificate *cert)
+{
+ gchar *subject = gcr_certificate_get_subject_dn (cert);
+ DEBUG ("Certificate: %s", subject);
+ g_free (subject);
+}
+
+static void
+debug_certificate_chain (GcrCertificateChain *chain)
{
- gnutls_x509_crt_t first_cert, last_cert;
- gint idx;
- gboolean res = FALSE;
- gint num_certs;
+ GEnumClass *enum_class;
+ GEnumValue *enum_value;
+ gint idx, length;
+ GcrCertificate *cert;
+
+ enum_class = G_ENUM_CLASS
+ (g_type_class_peek (GCR_TYPE_CERTIFICATE_CHAIN_STATUS));
+ enum_value = g_enum_get_value (enum_class,
+ gcr_certificate_chain_get_status (chain));
+ length = gcr_certificate_chain_get_length (chain);
+ DEBUG ("Certificate chain: length %u status %s",
+ length, enum_value ? enum_value->value_nick : "XXX");
+
+ for (idx = 0; idx < length; ++idx)
+ {
+ cert = gcr_certificate_chain_get_certificate (chain, idx);
+ debug_certificate (cert);
+ }
+}
+
+static void
+perform_verification (EmpathyTLSVerifier *self,
+ GcrCertificateChain *chain)
+{
+ gboolean ret = FALSE;
EmpTLSCertificateRejectReason reason =
EMP_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN;
+ gnutls_x509_crt_t *list, *anchors;
+ guint n_list, n_anchors;
+ guint verify_output;
+ gint res;
EmpathyTLSVerifierPriv *priv = GET_PRIV (self);
- DEBUG ("Starting verification");
+ DEBUG ("Performing verification");
+ debug_certificate_chain (chain);
+
+ list = anchors = NULL;
+ n_list = n_anchors = 0;
- /* check if the certificate matches the hostname first. */
- first_cert = g_ptr_array_index (priv->cert_chain, 0);
- if (gnutls_x509_crt_check_hostname (first_cert, priv->hostname) == 0)
+ /*
+ * If the first certificate is an pinned certificate then we completely
+ * ignore the rest of the verification process.
+ */
+ if (gcr_certificate_chain_get_status (chain) == GCR_CERTIFICATE_CHAIN_PINNED)
+ {
+ DEBUG ("Found pinned certificate for %s", priv->hostname);
+ complete_verification (self);
+ goto out;
+ }
+
+ build_certificate_list_for_gnutls (chain, &list, &n_list,
+ &anchors, &n_anchors);
+ if (list == NULL || n_list == 0) {
+ g_warn_if_reached ();
+ abort_verification (self, EMP_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN);
+ goto out;
+ }
+
+ verify_output = 0;
+ res = gnutls_x509_crt_list_verify (list, n_list, anchors, n_anchors,
+ NULL, 0, 0, &verify_output);
+ ret = verification_output_to_reason (res, verify_output, &reason);
+
+ DEBUG ("Certificate verification gave result %d with reason %u", ret,
+ reason);
+
+ if (!ret) {
+ abort_verification (self, reason);
+ goto out;
+ }
+
+ /* now check if the certificate matches the hostname. */
+ if (gnutls_x509_crt_check_hostname (list[0], priv->hostname) == 0)
{
gchar *certified_hostname;
- reason = EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH;
- certified_hostname = empathy_get_x509_certificate_hostname (first_cert);
+ certified_hostname = empathy_get_x509_certificate_hostname (list[0]);
tp_asv_set_string (priv->details,
"expected-hostname", priv->hostname);
tp_asv_set_string (priv->details,
certified_hostname, priv->hostname);
g_free (certified_hostname);
+ abort_verification (self,
+ EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH);
goto out;
}
DEBUG ("Hostname matched");
-
- num_certs = priv->cert_chain->len;
-
- if (priv->trusted_ca_list->len > 0)
- {
- /* 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 &&
- num_certs > 1)
- num_certs--;
- }
-
- for (idx = 1; idx < num_certs; idx++)
- {
- res = verify_certificate (self,
- g_ptr_array_index (priv->cert_chain, idx -1),
- g_ptr_array_index (priv->cert_chain, idx),
- &reason);
-
- DEBUG ("Certificate verification %d gave result %d with reason %u", idx,
- res, reason);
-
- if (!res)
- {
- abort_verification (self, reason);
- return;
- }
- }
-
- res = verify_last_certificate (self,
- g_ptr_array_index (priv->cert_chain, num_certs - 1),
- &reason);
-
- DEBUG ("Last verification gave result %d with reason %u", res, reason);
-
- out:
- if (!res)
- {
- abort_verification (self, reason);
- return;
- }
-
complete_verification (self);
-}
-static gboolean
-start_verification (gpointer user_data)
-{
- EmpathyTLSVerifier *self = user_data;
-
- real_start_verification (self);
-
- return FALSE;
+ out:
+ free_certificate_list_for_gnutls (list, n_list);
+ free_certificate_list_for_gnutls (anchors, n_anchors);
}
static void
-build_gnutls_cert_list (EmpathyTLSVerifier *self)
+perform_verification_cb (GObject *object,
+ GAsyncResult *res,
+ gpointer user_data)
{
- guint num_certs;
- guint idx;
- GPtrArray *certificate_data = NULL;
- EmpathyTLSVerifierPriv *priv = GET_PRIV (self);
-
- g_object_get (priv->certificate,
- "cert-data", &certificate_data,
- NULL);
- num_certs = certificate_data->len;
-
- priv->cert_chain = g_ptr_array_new_with_free_func (
- (GDestroyNotify) gnutls_x509_crt_deinit);
-
- for (idx = 0; idx < num_certs; idx++)
- {
- gnutls_x509_crt_t cert;
- GArray *one_cert;
- gnutls_datum_t datum = { NULL, 0 };
-
- one_cert = g_ptr_array_index (certificate_data, idx);
- datum.data = (guchar *) one_cert->data;
- datum.size = one_cert->len;
-
- gnutls_x509_crt_init (&cert);
- gnutls_x509_crt_import (cert, &datum, GNUTLS_X509_FMT_DER);
-
- g_ptr_array_add (priv->cert_chain, cert);
- }
-}
-
-static gint
-get_number_and_type_of_certificates (gnutls_datum_t *datum,
- gnutls_x509_crt_fmt_t *format)
-{
- gnutls_x509_crt_t fake;
- guint retval = 1;
- gint res;
-
- res = gnutls_x509_crt_list_import (&fake, &retval, datum,
- GNUTLS_X509_FMT_PEM, GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED);
-
- if (res == GNUTLS_E_SHORT_MEMORY_BUFFER || res > 0)
- {
- DEBUG ("Found PEM, with %u certificates", retval);
- *format = GNUTLS_X509_FMT_PEM;
- return retval;
- }
-
- /* try DER */
- res = gnutls_x509_crt_list_import (&fake, &retval, datum,
- GNUTLS_X509_FMT_DER, 0);
-
- if (res > 0)
- {
- *format = GNUTLS_X509_FMT_DER;
- return retval;
- }
-
- return res;
-}
-
-static gboolean
-build_gnutls_ca_and_crl_lists (GIOSchedulerJob *job,
- GCancellable *cancellable,
- gpointer user_data)
-{
- gint idx;
- gchar *user_certs_dir;
- GDir *dir;
GError *error = NULL;
- EmpathyTLSVerifier *self = user_data;
- EmpathyTLSVerifierPriv *priv = GET_PRIV (self);
- priv->trusted_ca_list = g_ptr_array_new_with_free_func
- ((GDestroyNotify) gnutls_x509_crt_deinit);
+ GcrCertificateChain *chain = GCR_CERTIFICATE_CHAIN (object);
+ EmpathyTLSVerifier *self = EMPATHY_TLS_VERIFIER (user_data);
- for (idx = 0; idx < (gint) G_N_ELEMENTS (system_ca_paths) - 1; idx++)
+ /* Even if building the chain fails, try verifying what we have */
+ if (!gcr_certificate_chain_build_finish (chain, res, &error))
{
- const gchar *path;
- gchar *contents = NULL;
- gsize length = 0;
- gint res, n_certs;
- gnutls_x509_crt_t *cert_list;
- gnutls_datum_t datum = { NULL, 0 };
- gnutls_x509_crt_fmt_t format = 0;
-
- path = system_ca_paths[idx];
- g_file_get_contents (path, &contents, &length, &error);
-
- if (error != NULL)
- {
- DEBUG ("Unable to read system CAs from path %s: %s", path,
- error->message);
- g_clear_error (&error);
- continue;
- }
-
- datum.data = (guchar *) contents;
- datum.size = length;
- n_certs = get_number_and_type_of_certificates (&datum, &format);
-
- if (n_certs < 0)
- {
- DEBUG ("Unable to parse the system CAs from path %s: GnuTLS "
- "returned error %d", path, n_certs);
-
- g_free (contents);
- continue;
- }
-
- cert_list = g_malloc0 (sizeof (gnutls_x509_crt_t) * n_certs);
- res = gnutls_x509_crt_list_import (cert_list, (guint *) &n_certs, &datum,
- format, 0);
-
- if (res < 0)
- {
- DEBUG ("Unable to import system CAs from path %s; "
- "GnuTLS returned error %d", path, res);
-
- g_free (contents);
- continue;
- }
-
- DEBUG ("Successfully imported %d system CA certificates from path %s",
- n_certs, path);
-
- /* append the newly created cert structutes into the global GPtrArray */
- for (idx = 0; idx < n_certs; idx++)
- g_ptr_array_add (priv->trusted_ca_list, cert_list[idx]);
-
- g_free (contents);
- g_free (cert_list);
+ DEBUG ("Building of certificate chain failed: %s", error->message);
+ g_clear_error (&error);
}
- /* user certs */
- user_certs_dir = g_build_filename (g_get_user_config_dir (),
- "telepathy", "certs", NULL);
- dir = g_dir_open (user_certs_dir, 0, &error);
-
- if (error != NULL)
- {
- DEBUG ("Can't open the user certs dir at %s: %s", user_certs_dir,
- error->message);
+ perform_verification (self, chain);
- g_error_free (error);
- }
- else
- {
- const gchar *cert_name;
-
- while ((cert_name = g_dir_read_name (dir)) != NULL)
- {
- gchar *contents = NULL, *cert_path = NULL;
- gsize length = 0;
- gint res;
- gnutls_datum_t datum = { NULL, 0 };
- gnutls_x509_crt_t cert;
-
- cert_path = g_build_filename (user_certs_dir, cert_name, NULL);
-
- g_file_get_contents (cert_path, &contents, &length, &error);
-
- if (error != NULL)
- {
- DEBUG ("Can't open the certificate file at path %s: %s",
- cert_path, error->message);
-
- g_clear_error (&error);
- g_free (cert_path);
- continue;
- }
-
- datum.data = (guchar *) contents;
- datum.size = length;
-
- gnutls_x509_crt_init (&cert);
- res = gnutls_x509_crt_import (cert, &datum, GNUTLS_X509_FMT_PEM);
-
- if (res != GNUTLS_E_SUCCESS)
- {
- DEBUG ("Can't import the certificate at path %s: "
- "GnuTLS returned %d", cert_path, res);
- }
- else
- {
- g_ptr_array_add (priv->trusted_ca_list, cert);
- }
-
- g_free (contents);
- g_free (cert_path);
- }
-
- g_dir_close (dir);
- }
-
- g_free (user_certs_dir);
-
- /* TODO: do the CRL too */
-
- g_io_scheduler_job_send_to_mainloop_async (job,
- start_verification, self, NULL);
-
- return FALSE;
+ /* Matches ref when staring chain build */
+ g_object_unref (self);
}
static void
DEBUG ("%p", object);
- tp_clear_pointer (&priv->trusted_ca_list, g_ptr_array_unref);
- tp_clear_pointer (&priv->cert_chain, g_ptr_array_unref);
tp_clear_boxed (G_TYPE_HASH_TABLE, &priv->details);
g_free (priv->hostname);
G_OBJECT_CLASS (empathy_tls_verifier_parent_class)->finalize (object);
}
-static void
-empathy_tls_verifier_constructed (GObject *object)
-{
- EmpathyTLSVerifier *self = EMPATHY_TLS_VERIFIER (object);
-
- build_gnutls_cert_list (self);
-
- if (G_OBJECT_CLASS (empathy_tls_verifier_parent_class)->constructed != NULL)
- G_OBJECT_CLASS (empathy_tls_verifier_parent_class)->constructed (object);
-}
-
static void
empathy_tls_verifier_init (EmpathyTLSVerifier *self)
{
oclass->get_property = empathy_tls_verifier_get_property;
oclass->finalize = empathy_tls_verifier_finalize;
oclass->dispose = empathy_tls_verifier_dispose;
- oclass->constructed = empathy_tls_verifier_constructed;
pspec = g_param_spec_object ("certificate", "The EmpathyTLSCertificate",
"The EmpathyTLSCertificate to be verified.",
GAsyncReadyCallback callback,
gpointer user_data)
{
+ GcrCertificateChain *chain;
+ GcrCertificate *cert;
+ GPtrArray *cert_data = NULL;
+ GArray *data;
+ guint idx;
EmpathyTLSVerifierPriv *priv = GET_PRIV (self);
+ DEBUG ("Starting verification");
+
g_return_if_fail (priv->verify_result == NULL);
+ g_object_get (priv->certificate, "cert-data", &cert_data, NULL);
+ g_return_if_fail (cert_data);
+
priv->verify_result = g_simple_async_result_new (G_OBJECT (self),
callback, user_data, NULL);
- g_io_scheduler_push_job (build_gnutls_ca_and_crl_lists,
- self, NULL, G_PRIORITY_DEFAULT, NULL);
+ /* Create a certificate chain */
+ chain = gcr_certificate_chain_new ();
+ for (idx = 0; idx < cert_data->len; ++idx) {
+ data = g_ptr_array_index (cert_data, idx);
+ cert = gcr_simple_certificate_new (data->data, data->len);
+ gcr_certificate_chain_add (chain, cert);
+ g_object_unref (cert);
+ }
+
+ gcr_certificate_chain_build_async (chain, GCR_PURPOSE_CLIENT_AUTH, priv->hostname, 0,
+ NULL, perform_verification_cb, g_object_ref (self));
+
+ g_object_unref (chain);
+ g_boxed_free (TP_ARRAY_TYPE_UCHAR_ARRAY_LIST, cert_data);
}
gboolean
return TRUE;
}
+
+void
+empathy_tls_verifier_store_exception (EmpathyTLSVerifier *self)
+{
+ GArray *data;
+ GcrCertificate *cert;
+ GPtrArray *cert_data = NULL;
+ GError *error = NULL;
+ EmpathyTLSVerifierPriv *priv = GET_PRIV (self);
+
+ g_object_get (priv->certificate, "cert-data", &cert_data, NULL);
+ g_return_if_fail (cert_data);
+
+ if (!cert_data->len)
+ {
+ DEBUG ("No certificate to pin.");
+ return;
+ }
+
+ /* The first certificate in the chain is for the host */
+ data = g_ptr_array_index (cert_data, 0);
+ cert = gcr_simple_certificate_new ((gpointer)data->data, data->len);
+
+ DEBUG ("Storing pinned certificate:");
+ debug_certificate (cert);
+
+ if (!gcr_trust_add_pinned_certificate (cert, GCR_PURPOSE_CLIENT_AUTH,
+ priv->hostname, NULL, &error))
+ DEBUG ("Can't store the pinned certificate: %s", error->message);
+
+ g_object_unref (cert);
+ g_boxed_free (TP_ARRAY_TYPE_UCHAR_ARRAY_LIST, cert_data);
+}
GHashTable **details,
GError **error);
+void empathy_tls_verifier_store_exception (EmpathyTLSVerifier *self);
+
G_END_DECLS
#endif /* #ifndef __EMPATHY_TLS_VERIFIER_H__*/
[type: gettext/glade]libempathy-gtk/empathy-contact-selector-dialog.ui
libempathy-gtk/empathy-new-message-dialog.c
libempathy-gtk/empathy-new-call-dialog.c
+libempathy-gtk/empathy-password-dialog.c
libempathy-gtk/empathy-presence-chooser.c
libempathy-gtk/empathy-protocol-chooser.c
[type: gettext/glade]libempathy-gtk/empathy-search-bar.ui
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-22 19:36+0100\n"
+"POT-Creation-Date: 2010-12-12 11:18+0000\n"
"PO-Revision-Date: 2010-09-22 19:37+0100\n"
-"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
+"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
"Language-Team: British English <en@li.org>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
msgstr "Empathy default download folder"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy has asked about importing accounts"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy has migrated butterfly logs"
-#: ../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 should auto-away when idle"
-#: ../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 should auto-connect on startup"
-#: ../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 should reduce the location's accuracy"
-#: ../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 should use the avatar of the contact as the chat window icon"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
msgstr "Enable WebKit Developer Tools"
-#: ../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 "Enable popup notifications for new messages"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
msgstr "Enable spell checker"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "Hide main window"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "Hide the main window."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "Nick completed character"
-#: ../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 "Open new chats in separate windows"
-#: ../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 "Path of the Adium theme to use"
-#: ../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 "Path of the Adium theme to use if the theme used for chat is 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 "Play a sound for incoming messages"
-#: ../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 "Play a sound for new conversations"
-#: ../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 "Play a sound for outgoing messages"
-#: ../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 "Play a sound when a contact logs in"
-#: ../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 "Play a sound when a contact logs out"
-#: ../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 "Play a sound when we log in"
-#: ../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 "Play a sound when we log out"
-#: ../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 "Pop up notifications if the chat isn't focused"
-#: ../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 "Pop up notifications when a contact logs in"
-#: ../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 "Pop up notifications when a contact logs out"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "Show avatars"
-#: ../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 "Show contact list in rooms"
-#: ../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 "Show hint about closing the main window"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "Show offline contacts"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "Show protocols"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "Spell checking languages"
-#: ../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 "The default folder to save file transfers in."
-#: ../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 "The last directory that an avatar image was chosen from."
-#: ../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 "The position for the chat window side pane"
-#: ../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 "The stored position (in pixels) of the chat window side pane."
-#: ../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 "The theme that is used to display the conversation in chat windows."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "Use graphical smileys"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "Use notification sounds"
-#: ../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 "Use theme for chat rooms"
-#: ../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 "Whether Empathy can publish the user's location to their contacts."
-#: ../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 "Whether Empathy can use the GPS to guess the location."
-#: ../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 ""
"Whether Empathy can use the mobile phone network to guess the location."
-#: ../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 "Whether Empathy can use the network to guess the location."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr ""
-"Whether Empathy has asked about importing accounts from other programs."
-
-#: ../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 "Whether Empathy has migrated butterfly logs."
-#: ../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 ""
"Whether Empathy should automatically log into your accounts on startup."
-#: ../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 ""
"Whether Empathy should go into away mode automatically if the user is idle."
-#: ../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 ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
-#: ../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 ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
-#: ../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 ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-#: ../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."
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
-#: ../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 ""
"Whether to check words typed against the languages you want to check with."
-#: ../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 "Whether to convert smileys into graphical images in conversations."
-#: ../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 ""
"Whether to play a sound to notify of contacts logging into the network."
-#: ../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 ""
"Whether to play a sound to notify of contacts logging out of the network."
-#: ../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 "Whether to play a sound to notify of events."
-#: ../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 "Whether to play a sound to notify of incoming messages."
-#: ../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 "Whether to play a sound to notify of new conversations."
-#: ../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 "Whether to play a sound to notify of outgoing messages."
-#: ../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 "Whether to play a sound when logging into a network."
-#: ../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 "Whether to play a sound when logging out of a network."
-#: ../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 "Whether to play sound notifications when away or busy."
-#: ../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 "Whether to show a popup notification when a contact goes offline."
-#: ../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 "Whether to show a popup notification when a contact goes online."
-#: ../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."
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
-#: ../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 "Whether to show a popup notification when receiving a new message."
-#: ../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 ""
"Whether to show avatars for contacts in the contact list and chat windows."
-#: ../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 "Whether to show contacts that are offline in the contact list."
-#: ../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 "Whether to show popup notifications when away or busy."
-#: ../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 "Whether to show protocols for contacts in the contact list."
-#: ../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 "Whether to show the contact list in chat rooms."
-#: ../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 "Whether to show the contact list in compact mode."
-#: ../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."
"Whether to show the message dialogue about closing the main window with the "
"'x' button in the title bar."
-#: ../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 "Whether to use the theme for chat rooms."
-#: ../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 "
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2105
msgid "Messaging and VoIP Accounts"
msgstr "Messaging and VoIP Accounts"
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr "The hash of the received file and the sent one do not match"
+#: ../libempathy/empathy-ft-handler.c:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr "File transfer completed, but the file was corrupted"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1121
msgid "File transfer not supported by remote contact"
msgstr "File transfer not supported by remote contact"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1177
msgid "The selected file is not a regular file"
msgstr "The selected file is not a regular file"
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1186
msgid "The selected file is empty"
msgstr "The selected file is empty"
msgid "Offline"
msgstr "Offline"
-#: ../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:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Unknown"
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "People Nearby"
-#: ../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"
msgid "in the future"
msgstr "in the future"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
msgid "All"
msgstr "All"
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../libempathy-gtk/empathy-account-widget.c:670
+#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Account"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:671
msgid "Password"
msgstr "Password"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:672
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:673
#: ../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
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1127
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "The account %s is edited via My Web Accounts."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1133
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "The account %s cannot be edited in Empathy."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1153
+msgid "Launch My Web Accounts"
+msgstr "Launch My Web Accounts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1465
msgid "Username:"
msgstr "Username:"
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "A_pply"
msgstr "A_pply"
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "L_og in"
msgstr "L_og in"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../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:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1913
msgid "_Enabled"
msgstr "_Enabled"
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1978
msgid "This account already exists on the server"
msgstr "This account already exists on the server"
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1981
msgid "Create a new account on the server"
msgstr "Create a new account on the server"
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2095
msgid "Ca_ncel"
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:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2392
#, 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:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2418
#, c-format
msgid "%s Account"
msgstr "%s Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2422
msgid "New account"
msgstr "New account"
msgid "_Room List locale:"
msgstr "_Room List locale:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "Couldn't convert image"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "None of the accepted image formats are supported on your system"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Select Your Avatar Image"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "No Image"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Images"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "All Files"
msgid "Click to enlarge"
msgstr "Click to enlarge"
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Failed to open private chat"
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "Topic not supported on this conversation"
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "You are not allowed to change the topic"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: clear all messages from the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: set the topic of the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact ID> [<message>]: open a private chat"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact ID> <message>: open a private chat"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>: change your nickname on the current server"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>: send an ACTION message to the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:851
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 "
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:856
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."
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Usage: %s"
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Unknown command"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Unknown command; see /help for the available commands"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "offline"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "invalid contact"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "permission denied"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "too long message"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "not implemented"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "unknown"
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error sending message '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "Topic:"
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "Topic set to: %s"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "No topic defined"
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(No Suggestions)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1818
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Add '%s' to Dictionary"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1855
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Add '%s' to %s Dictionary"
+
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Insert Smiley"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
msgid "_Send"
msgstr "_Send"
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "_Spelling Suggestions"
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Failed to retrieve recent logs"
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s has disconnected"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s was kicked by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s was kicked"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s was banned by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s was banned"
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s has left the room"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s has joined the room"
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s is now known as %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Disconnected"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "Wrong password; please try again:"
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Retry"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "This room is protected by a password:"
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Join"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Connected"
-#: ../libempathy-gtk/empathy-chat.c:3134
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Conversation"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Copy Link Address"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Open Link"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
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:265
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Edit Contact Information"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Personal Information"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "New Contact"
msgid "Favorite People"
msgstr "Favourite People"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Do you really want to remove the group '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
msgid "Removing group"
msgstr "Removing group"
#. Remove
-#: ../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
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Remove"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Do you really want to remove the contact '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
msgid "Removing contact"
msgstr "Removing contact"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Add Contact…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:516
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Chat"
-#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-contact-menu.c:261
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audio Call"
-#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-contact-menu.c:292
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Video Call"
-#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
-#: ../src/empathy-main-window.ui.h:25
+#: ../libempathy-gtk/empathy-contact-menu.c:333
+#: ../libempathy-gtk/empathy-individual-menu.c:644
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "_Previous Conversations"
-#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-contact-menu.c:355
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "Send File"
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "Share My Desktop"
-#: ../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
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
msgid "Favorite"
msgstr "Favourite"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:447
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "Infor_mation"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Edit"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr "Inviting you to this room"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr "_Invite to Chat Room"
msgid "Select a contact"
msgstr "Select a contact"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Full name:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Phone number:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "E-mail address:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Website:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Birthday:"
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Country ISO Code:"
msgstr "Country ISO Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "Country:"
msgstr "Country:"
-#: ../libempathy-gtk/empathy-contact-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "State:"
msgstr "County:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "City:"
msgstr "City:"
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Postal Code:"
msgstr "Postal Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:590
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Street:"
msgstr "Street:"
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Building:"
msgstr "Building:"
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Floor:"
msgstr "Floor:"
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Room:"
msgstr "Room:"
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Description:"
msgstr "Description:"
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Accuracy Level:"
msgstr "Accuracy Level:"
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Vertical Error (meters):"
msgstr "Vertical Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Horizontal Error (meters):"
msgstr "Horizontal Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Speed:"
msgstr "Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "Bearing:"
msgstr "Bearing:"
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Climb Speed:"
msgstr "Climb Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Last Updated on:"
msgstr "Last Updated on:"
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Longitude:"
msgstr "Longitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Altitude:"
msgstr "Altitude:"
-#: ../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
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:621
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Location"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:623
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:672
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B, %Y at %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:921
msgid "Save Avatar"
msgstr "Save Avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:979
msgid "Unable to save avatar"
msgstr "Unable to save avatar"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
msgid "Alias:"
msgstr "Alias:"
#. 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:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "Identifier:"
msgid "_Add Group"
msgstr "_Add Group"
-#: ../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 "Select"
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1247
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1276
msgid "Group"
msgstr "Group"
#. 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 "Linked Contacts"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:836
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Edit"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Link Contacts…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1649
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
msgid "<b>Location</b> at (date)"
msgstr "<b>Location</b> at (date)"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "Online from a phone or mobile device"
+
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
msgstr "New Network"
msgid "Choose an IRC network"
msgstr "Choose an IRC network"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Select"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "new server"
#. 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 "Link Contacts"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "_Unlink…"
-#: ../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 ""
#. 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 "_Link"
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "Unlink meta-contact '%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."
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Unlink"
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgstr "Date"
msgstr "Conversations"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Find Next"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Find Previous"
msgstr "Contact ID:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "C_hat"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "New Conversation"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "Send _Video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "C_all"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "New Call"
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Enter your password for account\n"
+"<b>%s</b>"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr "Remember password"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
msgstr "Custom Message…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
msgstr "Edit Custom Messages…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
msgstr "Click to remove this status as a favourite"
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
msgid "Click to make this status a favorite"
msgstr "Click to make this status a favourite"
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
msgid "Set status"
msgstr "Set status"
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
msgid "Set your presence and current status"
msgstr "Set your presence and current status"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
msgstr "Custom messages…"
-#: ../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 "New %s account"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Find:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Match case"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Phrase not found"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Received an instant message"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Sent an instant message"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Incoming chat request"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Contact connected"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Contact disconnected"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Connected to server"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Disconnected from server"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Incoming voice call"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Outgoing voice call"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Voice call ended"
msgstr "Edit Custom Messages"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "Add _New Preset"
+msgid "Save _New Status Message"
+msgstr "Save _New Status Message"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "Saved Presets"
+msgid "Saved Status Messages"
+msgstr "Saved Status Messages"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
msgstr "Blue"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "The identity provided by the chat server cannot be verified.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "The identity provided by the chat server cannot be verified."
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "The certificate is not signed by a Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "The certificate is not signed by a Certification Authority."
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "The certificate has expired"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "The certificate has expired."
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "The certificate hasn't yet been activated"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "The certificate hasn't yet been activated."
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "The certificate does not have the expected fingerprint"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "The certificate does not have the expected fingerprint."
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr "The hostname verified by the certificate doesn't match the server name"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "The hostname verified by the certificate doesn't match the server name."
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
-msgstr "The certificate is self-signed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "The certificate is self-signed."
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
msgstr ""
-"The certificate has been revoked by the issuing Certification Authority"
+"The certificate has been revoked by the issuing Certification Authority."
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "The certificate is cryptographically weak"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "The certificate is cryptographically weak."
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "The certificate length exceeds verifiable limits"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "The certificate length exceeds verifiable limits."
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
-msgstr "The certificate is malformed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "The certificate is malformed."
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "Expected hostname: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "Certificate hostname: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "Continue"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "This connection is untrusted. Would you like to continue anyway?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "Remember this choice for future connections"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "Certificate Details"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
msgid "Unable to open URI"
msgstr "Unable to open URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "Select a file"
msgstr "Select a file"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
#, c-format
msgid "Incoming file from %s"
msgstr "Incoming file from %s"
msgid "Instant Message (Empathy)"
msgstr "Instant Message (Empathy)"
-#: ../src/empathy.c:414
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Don't connect on startup"
-#: ../src/empathy.c:418
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Don't display the contact list or any other dialogues on startup"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy IM Client"
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy.c:500
+msgid "Error contacting the Account Manager"
+msgstr "Error contacting the Account Manager"
+
+#: ../src/empathy.c:502
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
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 Licence, or (at your option) any later "
"version."
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
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 Licence for more "
"details."
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
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 "
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "An Instant Messaging client for GNOME"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"David Lodge <dave@cirt.net>\n"
"this assistant and add accounts later from the Edit menu."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "An error occurred"
-#. 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 "New %s account"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "What kind of chat account do you have?"
-#: ../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 "Do you have any other chat accounts you want to set up?"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "Enter your account details"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr "What kind of chat account do you want to create?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "Do you want to create other chat accounts?"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "Enter the details for the new account"
-#: ../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 "
"programs. With a microphone or a webcam you can also have audio or video "
"calls."
-#: ../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 "Do you have an account you've been using with another chat program?"
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "Yes, import my account details from "
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "Yes, I'll enter my account details now"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "No, I want a new account"
-#: ../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 "No, I just want to see people online nearby for now"
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "Select the accounts you want to import:"
-#: ../src/empathy-account-assistant.c:858
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-account-assistant.c:810
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "Yes"
msgstr "Yes"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "No, that's all for now"
-#: ../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 "
"details below are correct. You can easily change these details later or "
"disable this feature by using the 'Accounts' dialogue"
-#: ../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 "Edit->Accounts"
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1104
msgid "I don't want to enable this feature for now"
msgstr "I don't want to enable this feature for now"
-#: ../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 "
"install the telepathy-salut package and create a People Nearby account from "
"the Accounts dialogue"
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut not installed"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Messaging and VoIP Accounts Assistant"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "Welcome to Empathy"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "Import your existing accounts"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgstr "Please enter personal details"
#. 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 "There are unsaved modifications to your %s account."
#. 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 "Your new account has not been saved yet."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "Connecting…"
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline — %s"
msgstr "Offline — %s"
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
msgstr "Disconnected — %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
msgstr "Offline — No Network Connection"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "Unknown Status"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline — Account Disabled"
msgstr "Offline — Account Disabled"
-#: ../src/empathy-accounts-dialog.c:811
+#: ../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?"
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Do you want to remove %s from your computer?"
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr "This will not remove your account on the server."
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../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?"
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../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?"
msgid "_Import…"
msgstr "_Import…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr " - Empathy authentication client"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Empathy authentication client"
msgid "People nearby"
msgstr "People nearby"
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy Audio/Video Client"
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
msgid "Empathy Audio/Video Client"
msgstr "Empathy Audio/Video Client"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Contrast"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Brightness"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "_Sidebar"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Audio input"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Video input"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Dialpad"
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1201
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:1270
#, c-format
msgid "Call with %s"
msgstr "Call with %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:1349
msgid "Call"
msgstr "Call"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "The IP address as seen by the machine"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "The IP address as seen by a server on the Internet"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "The IP address of the peer as seen by the other side"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "The IP address of a relay server"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr "The IP address of the multicast group"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Connected — %d:%02dm"
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Technical Details"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"%s's software does not understand any of the audio formats supported by your "
"computer"
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"%s's software does not understand any of the video formats supported by your "
"computer"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "There was a failure on the network"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"The audio formats necessary for this call are not installed on your computer"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"The video formats necessary for this call are not installed on your computer"
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2394
#, 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."
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "There was a failure in the call engine"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "The end of the stream was reached"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "Can't establish audio stream"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "Can't establish video stream"
msgid "_Call"
msgstr "_Call"
-#: ../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:28
msgid "_View"
msgstr "_View"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d unread)"
msgstr[1] "%s (%d unread)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (and %u other)"
msgstr[1] "%s (and %u others)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d unread from others)"
msgstr[1] "%s (%d unread from others)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d unread from all)"
msgstr[1] "%s (%d unread from all)"
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr "Typing a message."
msgid "Notify for All Messages"
msgstr "Notify for All Messages"
-#: ../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:17
msgid "_Contents"
msgstr "_Contents"
msgid "_Detach Tab"
msgstr "_Detach Tab"
-#: ../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:19
msgid "_Edit"
msgstr "_Edit"
msgid "_Favorite Chat Room"
msgstr "_Favourite Chat Room"
-#: ../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:21
msgid "_Help"
msgstr "_Help"
msgid "Manage Favorite Rooms"
msgstr "Manage Favourite Rooms"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming video call"
msgstr "Incoming video call"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming call"
msgstr "Incoming call"
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s is video calling you. Do you want to answer?"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:477
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s is calling you. Do you want to answer?"
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming call from %s"
msgstr "Incoming call from %s"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:505
msgid "_Reject"
msgstr "_Reject"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511
msgid "_Answer"
msgstr "_Answer"
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming video call from %s"
msgstr "Incoming video call from %s"
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:702
msgid "Room invitation"
msgstr "Room invitation"
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "Invitation to join %s"
msgstr "Invitation to join %s"
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:711
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s is inviting you to join %s"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:719
msgid "_Decline"
msgstr "_Decline"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:724
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Join"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:751
#, c-format
msgid "%s invited you to join %s"
msgstr "%s invited you to join %s"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:757
#, c-format
msgid "You have been invited to join %s"
msgstr "You have been invited to join %s"
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:807
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Incoming file transfer from %s"
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1018
#, c-format
-msgid "Subscription requested by %s"
-msgstr "Subscription requested by %s"
+msgid "%s would like permission to see when you are available"
+msgstr "%s would like permission to see when you are available"
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1022
#, c-format
msgid ""
"\n"
"\n"
"Message: %s"
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1066
#, c-format
msgid "%s is now offline."
msgstr "%s is now offline."
-#: ../src/empathy-event-manager.c:1072
+#: ../src/empathy-event-manager.c:1087
#, c-format
msgid "%s is now online."
msgstr "%s is now online."
msgstr "Import Accounts"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "Import"
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "Protocol"
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "Source"
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:385
msgid "No match found"
msgstr "No match found"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:540
msgid "Reconnect"
msgstr "Reconnect"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:546
msgid "Edit Account"
msgstr "Edit Account"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:552
msgid "Close"
msgstr "Close"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1258
msgid "Contact"
msgstr "Contact"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1585
msgid "Contact List"
msgstr "Contact List"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1695
msgid "Show and edit accounts"
msgstr "Show and edit accounts"
msgstr "Context"
#: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "Find in Contact _List"
+
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "Join _Favourites"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "Manage Favourites"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "N_ormal Size"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "New _Call…"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Normal Size With _Avatars"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "P_references"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "Show P_rotocols"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Sort by _Name"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Sort by _Status"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Accounts"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "_Compact Size"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "_Debug"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "_File Transfers"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
msgstr "_Join…"
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_New Conversation…"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "_Offline Contacts"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "_Personal Information"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Room"
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
msgid "Chat Room"
msgstr "Chat Room"
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
msgid "Members"
msgstr "Members"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:634
#, c-format
msgid ""
"%s\n"
"Password required: %s\n"
"Members: %s"
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "No"
msgstr "No"
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
msgid "Could not start room listing"
msgstr "Could not start room listing"
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
msgid "Could not stop room listing"
msgstr "Could not stop room listing"
msgid "_Room:"
msgstr "_Room:"
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
msgid "Message received"
msgstr "Message received"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
msgstr "Message sent"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr "New conversation"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr "Contact goes online"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr "Contact goes offline"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr "Account connected"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr "Account disconnected"
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "Language"
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
msgid "Preferences"
msgstr "Preferences"
msgid "_Reduce location accuracy"
msgstr "_Reduce location accuracy"
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "Respond"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "Reject"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "Answer"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "Decline"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "Accept"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Status"
msgid "Invite"
msgstr "Invite"
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Don't display any dialogues; do any work (eg, importing) and exit"
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "Don't display any dialogues if there are any non-Salut accounts"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Don't display any dialogues unless there are only \"People Nearby\" accounts"
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Empathy Accounts"
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Empathy Accounts"
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Empathy Debugger"
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy Chat Client"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Respond"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Reject"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Answer"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Decline"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Accept"
+
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy has asked about importing accounts"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "The hash of the received file and the sent one do not match"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "Add _New Preset"
+
+#~ msgid "Saved Presets"
+#~ msgstr "Saved Presets"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "Subscription requested by %s"
+
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "Use _Yahoo! Japan"
#~ msgid "unknown size"
#~ msgstr "unknown size"
-#~ msgid "%s would like to send you a file"
-#~ msgstr "%s would like to send you a file"
-
#~ msgid "Do you want to accept the file \"%s\" (%s)?"
#~ msgstr "Do you want to accept the file \"%s\" (%s)?"
#~ msgid "Clear List"
#~ msgstr "Clear List"
-#~ msgid "Enter status message:"
-#~ msgstr "Enter status message:"
-
-#~ msgid "Status Message Presets"
-#~ msgstr "Status Message Presets"
-
#~ msgid "_Add to status message list"
#~ msgstr "_Add to status message list"
# Esperanto translation of Empathy
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the Empathy package.
#
# Brient HESS <brient@brient.net>, 2004.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: Gossip 0.7.5\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-06-09 15:10+0000\n"
-"PO-Revision-Date: 2010-06-10 17:43+0200\n"
+"POT-Creation-Date: 2010-12-15 21:09+0000\n"
+"PO-Revision-Date: 2010-12-19 14:21+0100\n"
"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
"Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
+"Language: eo\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-Launchpad-Export-Date: 2010-06-10 15:08+0000\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Launchpad-Export-Date: 2010-12-17 07:56+0000\n"
"X-Generator: Launchpad (build Unknown)\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 "Retbabilo per Google Talk, Vizaĝlibro, MSN kaj multaj aliaj servoj"
#: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy Internet Messaging"
-msgstr "Empathy ret-mesaĝado"
+msgid "Empathy"
+msgstr "Empatio"
#: ../data/empathy.desktop.in.in.h:3
-msgid "IM Client"
-msgstr "Tujmesaĝilo"
+msgid "Empathy Internet Messaging"
+msgstr "Empatio ret-mesaĝado"
#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "Sendi kaj ricevi mesaĝojn"
+msgid "IM Client"
+msgstr "Tujmesaĝilo"
-#: ../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 "Ĉiam malfermu apartan babil-fenestron por nova babilado."
+msgstr "Ĉiam malfermi apartan babil-fenestron por novaj babiladoj."
-#: ../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 ""
-"Signo uzenda post pseŭdonimo, kiam kompletigo de pseŭdonimoj estas uzata en "
-"grupa babilado."
+"Signo kiu aligatos post kromnomo dum uzado de plenumigoklavo (Tab) en "
+"grupbabilejo."
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
-msgstr ""
+msgstr "Babil-fenestra etoso"
-#: ../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 ""
+"Listo disigita per komoj, kun uzendaj lingvoj por la kontrolilo (ekz. \"eo, "
+"fr, nl\")."
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
msgstr "Kompakta listo de kontaktuloj"
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Connection managers should be used"
-msgstr ""
+msgstr "Konekto-administrilo estu uzata"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Contact list sort criterion"
-msgstr ""
+msgstr "Kontaktlista ordigkriterio"
-#: ../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 ""
+msgstr "Defaŭlta dosierujo por elekto de uzantobildo"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Disable popup notifications when away"
-msgstr ""
+msgstr "Elŝalti ŝprucfenestro-sciigojn dum foresto"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable sounds when away"
msgstr "Malaktivigi sonon kiam fora"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "Montri envenantajn eventojn en la statusa areo"
+
+#: ../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 ""
+"Montri envenantajn eventojn en la statusa areo. Se negativa, prezenti ilin "
+"al la uzanto tuj."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
-msgstr "Empathy povas publikigi la lokon de la uzanto"
+msgstr "Empatio povas publikigi la lokon de la uzanto"
-#: ../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 ""
+msgstr "Empatio rajtas uzi la GPS-on por diveni la lokon"
-#: ../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 ""
+"Empatio rajtas uzi la reton de la portebla telefoneto por diveni la lokon"
-#: ../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 ""
+msgstr "Empatio rajtas uzi la reton por diveni la lokon"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:16
-msgid "Empathy has asked about importing accounts"
-msgstr ""
+msgstr "Defaŭlta elŝutujo de Empatio"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has migrated butterfly logs"
msgstr ""
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy should auto-away when idle"
-msgstr ""
+msgstr "Kaŝi Empation aŭtomate kiam senokupe"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-connect on startup"
-msgstr ""
+msgstr "Aŭtomata konekto ĉe startigo de Empatio"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should reduce the location's accuracy"
-msgstr ""
+msgstr "Empatio devas redukti la ekzakton pri la loko"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
+"Empatio devas uzi la uzantobildin de la kontaktulo kiel piktogramo de la "
+"babilo-fenestro"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
-msgstr ""
+msgstr "Enŝalti programistiloj de WebKit"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable popup notifications for new messages"
-msgstr ""
+msgstr "Enŝalti ŝprucfenestro-sciigojn pri novaj mesaĝoj"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
-msgstr "Ebligi literumadan kontrolilon"
+msgstr "Enŝalti literumadan kontrolilon"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
-msgstr "Kaŝu precipa fenestro"
+msgstr "Kaŝi ĉeffenestron"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
-msgstr "Kaŝu la precipa fenestro."
-
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported"
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:28
-msgid "MC 4 accounts have been imported."
-msgstr ""
+msgstr "Kaŝi la ĉefan fenestron."
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr ""
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Open new chats in separate windows"
-msgstr ""
+msgstr "Malfermi novajn babilejojn en apartaj fenestroj"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Path of the Adium theme to use"
-msgstr ""
+msgstr "Pado de la uzenda etoso por Adium"
-#: ../data/empathy.schemas.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 ""
+"Pado de la uzenda etoso por Adium se la etoso de la babilejo estas Adium"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Play a sound for incoming messages"
-msgstr ""
+msgstr "Ludi sonon pro alvenintaj mesaĝoj"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for new conversations"
-msgstr ""
+msgstr "Ludi sonon pro novaj babiloj"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for outgoing messages"
-msgstr ""
+msgstr "Ludi sonon pro elirantaj mesaĝoj"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound when a contact logs in"
-msgstr ""
+msgstr "Ludi sonon kiam kontaktulo ensalutas"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs out"
-msgstr ""
+msgstr "Ludi sonon kiam kontaktulo elsalutas"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when we log in"
-msgstr ""
+msgstr "Ludi sonon kiam ni ensalutas"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log out"
-msgstr ""
+msgstr "Ludi sonon kiam ni elsalutas"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Pop up notifications if the chat isn't focused"
-msgstr ""
+msgstr "Ŝprucfenestri sciigojn se la babilejo ne estas fokusite"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications when a contact logs in"
-msgstr ""
+msgstr "Ŝprucfenestri sciigojn kiam kontaktulo ensalutas"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs out"
-msgstr ""
+msgstr "Ŝprucfenestri sciigojn kiam kontaktulo elsalutas"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "Montri avatarojn"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show contact list in rooms"
-msgstr ""
+msgstr "Montri kontakto-liston per ĉambroj"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show hint about closing the main window"
-msgstr ""
+msgstr "Montri konsileton pri fermado de la ĉefa fenestro"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
-msgstr "Vidigu ne kontaktebloj"
+msgstr "Montri malkonektitulojn"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
-msgstr ""
+msgstr "Montri protokolojn"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
-msgstr ""
+msgstr "Literum-kontrolataj lingvoj"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "The default folder to save file transfers in."
-msgstr ""
+msgstr "La defaŭlta dosierujo por konservi ricevitajn dosierojn."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The last directory that an avatar image was chosen from."
+msgstr "La lasta dosierujo el kie estis elektita avataron."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "The position for the chat window side pane"
+msgstr "La loko por la flanka babilfenestro"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The stored position (in pixels) of the chat window side pane."
msgstr ""
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
+"La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
-msgstr "Uzas grafika ridetoj"
+msgstr "Uzi grafikajn mienetojn"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
-msgstr "Uzas anoncadaj sonoj"
+msgstr "Uzi atentig-sonojn"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use theme for chat rooms"
-msgstr ""
+msgstr "Uzi etoson por la babilo-ĉambroj"
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
+"Ĉu Empatio rajtas publikigi la pozicion de la uzanto al ties kontaktuloj."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
-msgstr ""
+msgstr "Ĉu Empatio rajtas uzi la GPS-on por diveni la pozicion."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
+"Ĉu Empatio rajtas uzi la reton de la portebla telefoneto por diveni la "
+"pozicion."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the network to guess the location."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:59
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr ""
+msgstr "Ĉu Empatio rajtas uzi la reton por diveni la pozicion."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy has migrated butterfly logs."
msgstr ""
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
+msgstr "Ĉu Empatio aŭtomate konektiĝu al via kontoj dum startigo."
-#: ../data/empathy.schemas.in.h:62
-msgid "Whether Empathy should go into away mode automatically if user is idle."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
+msgstr "Ĉu Empatio reduktu la ekzakton de la loko pro privatec-kialoj."
-#: ../data/empathy.schemas.in.h:64
+#: ../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 ""
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr ""
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether to convert smileys into graphical images in conversations."
msgstr ""
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
-#: ../data/empathy.schemas.in.h:70
+#: ../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 ""
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of events."
msgstr ""
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of incoming messages."
msgstr ""
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of new conversations."
msgstr ""
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of outgoing messages."
msgstr ""
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound when logging into a network."
msgstr ""
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound when logging out of a network."
msgstr ""
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play sound notifications when away or busy."
msgstr ""
-#: ../data/empathy.schemas.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
-#: ../data/empathy.schemas.in.h:80
+#: ../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."
msgstr ""
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show popup notifications when away or busy."
msgstr ""
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show the contact list in chat rooms."
msgstr ""
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show the contact list in compact mode."
msgstr ""
-#: ../data/empathy.schemas.in.h:88
+#: ../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."
msgstr ""
-#: ../data/empathy.schemas.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to use the theme for chat rooms."
msgstr ""
-#: ../data/empathy.schemas.in.h:90
+#: ../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 "
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2094 ../src/cc-empathy-accounts-page.c:244
-#: ../src/cc-empathy-accounts-panel.c:91
+#: ../src/empathy-accounts-dialog.c:2105
msgid "Messaging and VoIP Accounts"
msgstr ""
-#: ../libempathy/empathy-ft-handler.c:843
-msgid "The hash of the received file and the sent one do not match"
+#: ../libempathy/empathy-ft-handler.c:830
+msgid "File transfer completed, but the file was corrupted"
msgstr ""
-#: ../libempathy/empathy-ft-handler.c:1103
+#: ../libempathy/empathy-ft-handler.c:1121
msgid "File transfer not supported by remote contact"
msgstr ""
-#: ../libempathy/empathy-ft-handler.c:1161
+#: ../libempathy/empathy-ft-handler.c:1177
msgid "The selected file is not a regular file"
-msgstr ""
+msgstr "La elektita dosiero ne estas regula"
-#: ../libempathy/empathy-ft-handler.c:1170
+#: ../libempathy/empathy-ft-handler.c:1186
msgid "The selected file is empty"
-msgstr ""
+msgstr "La elektita dosiero estas malplena"
-#: ../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 ""
+msgstr "Neniu kialo estis indikita"
-#: ../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:315
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
-msgstr ""
+msgstr "Nekonata kialo"
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Disponeble"
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Okupita"
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Fora"
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
-msgstr ""
+msgstr "Nevideble"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Ne kontaktebla"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
-msgstr ""
+msgstr "Nekonate"
-#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
-msgstr ""
+msgstr "Neniu kialo indikita"
-#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
-msgstr ""
+msgstr "Stato estas agortite al nekonaktite"
-#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
-msgstr ""
+msgstr "Reta eraro"
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
-msgstr ""
+msgstr "Aŭtentokontrolo fiaskis"
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
-msgstr ""
+msgstr "Ĉifrad-eraro"
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
-msgstr ""
+msgstr "Jam uzata nomo"
-#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr ""
-#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
-msgstr ""
+msgstr "Atestilo nekonfida"
-#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
-msgstr ""
+msgstr "Atestilo eksvalidiĝis"
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr ""
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr ""
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr ""
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr ""
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
+msgstr "Atestil-eraro"
+
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "Ĉifrado ne estas diponebla"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "Atestilo estas nevalida"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
msgstr ""
-#: ../libempathy/empathy-utils.c:430 ../src/empathy-import-mc4-accounts.c:106
-msgid "People Nearby"
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
msgstr ""
-#: ../libempathy/empathy-utils.c:435
-msgid "Yahoo! Japan"
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "Perdis konekton"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
msgstr ""
-#: ../libempathy/empathy-utils.c:436
-msgid "Facebook Chat"
+#: ../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 "La konto jam ekzistas sur la servilo"
+
+#: ../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:543
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
+msgid "People Nearby"
+msgstr "Proksimaj homoj"
+
+#: ../libempathy/empathy-utils.c:548
+msgid "Yahoo! Japan"
+msgstr "Japana Yahoo!"
+
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:578
+msgid "Facebook Chat"
+msgstr "Facebook-babilejo"
+
#: ../libempathy/empathy-time.c:137
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Antaŭ %d sekundo"
+msgstr[1] "Antaŭ %d sekundoj"
#: ../libempathy/empathy-time.c:142
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Antaŭ %d minuto"
+msgstr[1] "Antaŭ %d minutoj"
#: ../libempathy/empathy-time.c:147
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Antaŭ %d horo"
+msgstr[1] "Antaŭ %d horoj"
#: ../libempathy/empathy-time.c:152
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Antaŭ %d tago"
+msgstr[1] "Antaŭ %d tagoj"
#: ../libempathy/empathy-time.c:157
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Antaŭ %d semajno"
+msgstr[1] "Antaŭ %d semajnoj"
#: ../libempathy/empathy-time.c:162
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Antaŭ %d monato"
+msgstr[1] "Antaŭ %d monatoj"
#: ../libempathy/empathy-time.c:167
msgid "in the future"
-msgstr ""
+msgstr "en la estonteco"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
msgid "All"
-msgstr ""
+msgstr "Ĉiuj"
+
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../src/empathy-import-widget.c:321
+msgid "Account"
+msgstr "Konto"
+
+#: ../libempathy-gtk/empathy-account-widget.c:680
+msgid "Password"
+msgstr "Pasvorto"
+
+#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Servilo"
+
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Pordo"
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:605
+#: ../libempathy-gtk/empathy-account-widget.c:754
+#: ../libempathy-gtk/empathy-account-widget.c:811
#, c-format
msgid "%s:"
-msgstr ""
+msgstr "%s:"
#: ../libempathy-gtk/empathy-account-widget.c:1136
-msgid "Username:"
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget.c:1479
-msgid "L_og in"
+#: ../libempathy-gtk/empathy-account-widget.c:1142
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1162
+msgid "Launch My Web Accounts"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget.c:1547
+#: ../libempathy-gtk/empathy-account-widget.c:1500
+msgid "Username:"
+msgstr "Uzantonomo:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1868
+msgid "A_pply"
+msgstr "A_pliki"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1898
+msgid "L_og in"
+msgstr "E_nsaluti"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1964
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1486
#: ../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 ""
+msgstr "Konto:"
-#: ../libempathy-gtk/empathy-account-widget.c:1558
-msgid "Enabled"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget.c:1975
+msgid "_Enabled"
+msgstr "_Ebligita"
-#: ../libempathy-gtk/empathy-account-widget.c:1623
+#: ../libempathy-gtk/empathy-account-widget.c:2040
msgid "This account already exists on the server"
-msgstr ""
+msgstr "Tiu konto jam ekzistas sur la servilo"
-#: ../libempathy-gtk/empathy-account-widget.c:1626
+#: ../libempathy-gtk/empathy-account-widget.c:2043
msgid "Create a new account on the server"
-msgstr ""
+msgstr "Krei novan konton sur la servilo"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2235
+msgid "Ca_ncel"
+msgstr "_Nuligi"
#. 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:2532
#, c-format
msgid "%1$s on %2$s"
-msgstr ""
+msgstr "%1$s ĉe %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:2558
#, c-format
msgid "%s Account"
-msgstr ""
+msgstr "%s Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2025
+#: ../libempathy-gtk/empathy-account-widget.c:2562
msgid "New account"
-msgstr ""
+msgstr "Nova konto"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
msgid "<b>Example:</b> MyScreenName"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
msgid "Advanced"
-msgstr ""
+msgstr "Altnivele"
#: ../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 ""
+msgstr "Pas_vorto:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-msgid "Screen _Name:"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "Remember Password"
+msgstr "Pasvorto"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-msgid "What is your AIM password?"
+msgid "Screen _Name:"
msgstr ""
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "What is your AIM screen name?"
+msgid "What is your AIM password?"
msgstr ""
#: ../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
-msgid "_Port:"
+msgid "What is your AIM screen name?"
msgstr ""
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
#: ../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
+msgid "_Port:"
+msgstr "_Pordo:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:13
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Servilo:"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
msgid "<b>Example:</b> username"
-msgstr ""
+msgstr "<b>Ekzemplo:</b> uzantonomo"
#: ../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 ""
+msgstr "Ensalut-I_D:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise User ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise password?"
msgstr ""
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
msgid "<b>Example:</b> 123456789"
-msgstr ""
+msgstr "<b>Ekzemplo:</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 "Sign_a agordo:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ UIN?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ password?"
msgstr ""
-#: ../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"
-msgstr ""
+msgstr "Aŭtomate"
#: ../libempathy-gtk/empathy-account-widget-sip.c:186
msgid "UDP"
#. * best to keep the English version.
#: ../libempathy-gtk/empathy-account-widget-sip.c:226
msgid "Options"
-msgstr ""
+msgstr "Agordoj"
#: ../libempathy-gtk/empathy-account-widget-sip.c:229
msgid "None"
-msgstr ""
+msgstr "Neniu"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
msgid "Character set:"
-msgstr ""
+msgstr "Signa agordo:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Network"
-msgstr ""
+msgstr "Reto"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
msgid "Network:"
-msgstr ""
+msgstr "Reto:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Nickname:"
-msgstr ""
+msgstr "Kromnomo:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Password:"
-msgstr ""
+msgstr "Pasvorto:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Quit message:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Real name:"
-msgstr ""
+msgstr "Reala nomo:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Servers"
+msgstr "Serviloj"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
msgstr ""
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user@jabber.org"
msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr ""
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "Override server settings"
+msgid "I_gnore SSL certificate errors"
msgstr ""
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+msgid "Override server settings"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr "Priori_tato:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
msgid "Reso_urce:"
-msgstr ""
+msgstr "Res_urso:"
#. 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:13
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
"Facebook username if you don't have one."
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "Use old SS_L"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook username?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber password?"
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 ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr ""
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user@hotmail.com"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
msgid "What is your Windows Live ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live password?"
msgstr ""
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr ""
+msgid "E-_mail address:"
+msgstr "Ret_poŝtadreso:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name:"
-msgstr ""
+msgid "Nic_kname:"
+msgstr "_Kromnomo:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Jabber ID:"
-msgstr ""
+msgid "_First Name:"
+msgstr ":Persona nomo:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Last Name:"
-msgstr ""
+msgid "_Jabber ID:"
+msgstr "_Jabber-ID:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "Krom_nomo:"
+msgid "_Last Name:"
+msgstr "_Familia nomo:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
msgid "Authentication username:"
-msgstr ""
+msgstr "Aŭtentig-uzantonomo:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
msgid "Discover Binding"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "Interval (seconds)"
-msgstr ""
+msgstr "Intervalo (sekundoj)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Keep-Alive Options"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Mechanism:"
-msgstr ""
+msgstr "Meĥanismo:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Miscellaneous Options"
-msgstr ""
+msgstr "Diversaj agordoj"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "NAT Traversal Options"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Proxy Options"
-msgstr ""
+msgstr "Prokuril-agordoj"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "STUN Server:"
msgstr "STUN-servilo:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Server:"
msgstr "Servilo:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Transport:"
-msgstr ""
+msgstr "Transporto:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP account password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP login ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "_Username:"
msgstr "_Uzantonomo:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
+msgid "I_gnore conference and chat room invitations"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-password-dialog.c:276
+msgid "Remember password"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "What is your Yahoo! password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "Yahoo! I_D:"
-msgstr ""
+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:12
msgid "_Room List locale:"
msgstr ""
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr ""
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr ""
-#: ../libempathy-gtk/empathy-avatar-chooser.c:928
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr ""
-#: ../libempathy-gtk/empathy-avatar-chooser.c:931
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "Sen bildo"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:993
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Bildoj"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:997
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "Ĉiuj dosieroj"
-#: ../libempathy-gtk/empathy-avatar-image.c:325
+#: ../libempathy-gtk/empathy-avatar-image.c:323
msgid "Click to enlarge"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:249
-msgid "Failed to reconnect this chat"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-chat.c:671
-msgid "Failed to join chat room"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:728
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:734
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:874
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:877
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:880
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:883
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:889
+#: ../libempathy-gtk/empathy-chat.c:851
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:904
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
-msgstr ""
+msgstr "Uzo: %s"
-#: ../libempathy-gtk/empathy-chat.c:933
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
-msgstr ""
+msgstr "Ne konata komado"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "nekonektite"
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
-msgstr ""
+msgstr "nevalida kontakto"
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
-msgstr ""
+msgstr "aliron malpermesitis"
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
-msgstr ""
+msgstr "tro longa mesaĝo"
-#: ../libempathy-gtk/empathy-chat.c:1204
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
-msgstr ""
+msgstr "ne realigite"
-#: ../libempathy-gtk/empathy-chat.c:1207
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "nekonate"
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1321 ../src/empathy-chat-window.c:688
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "Temo:"
-#: ../libempathy-gtk/empathy-chat.c:1333
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1335
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1811
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
-msgstr ""
+msgstr "(Neniuj proponoj)"
+
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1818
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Aldoni '%s' al vortaro"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1855
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Aldoni '%s' al %s vortaro"
-#: ../libempathy-gtk/empathy-chat.c:1865
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr ""
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1883
-#: ../libempathy-gtk/empathy-ui-utils.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "_Send"
msgstr "_Sendi"
-#: ../libempathy-gtk/empathy-chat.c:1917
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
-msgstr ""
+msgstr "_Literumadaj proponoj"
-#: ../libempathy-gtk/empathy-chat.c:2011
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
-msgstr ""
+msgstr "%s nekonektiĝis"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2149
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
-msgstr ""
+msgstr "%1$s estas forpelita de %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
-msgstr ""
+msgstr "%s estas forpelita"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2160
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
-msgstr ""
+msgstr "%1$s estas ekzilita de %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2163
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
-msgstr ""
+msgstr "%s estas ekzilita"
-#: ../libempathy-gtk/empathy-chat.c:2167
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
-msgstr ""
+msgstr "%s forlasis la ĉambron"
#. 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:2176
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
-msgstr "%s"
+msgstr " %s"
-#: ../libempathy-gtk/empathy-chat.c:2201
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
-msgstr ""
+msgstr "%s aliĝis la ĉambron"
-#: ../libempathy-gtk/empathy-chat.c:2226
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
-msgstr ""
+msgstr "%s nun estas konata kiel %s"
-#: ../libempathy-gtk/empathy-chat.c:2365 ../src/empathy-call-window.c:1653
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Malkonektis"
-#: ../libempathy-gtk/empathy-chat.c:3004
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:3005
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Reprovi"
-#: ../libempathy-gtk/empathy-chat.c:3010
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:3011
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Membriĝi"
-#: ../libempathy-gtk/empathy-chat.c:3151
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Konektite"
-#: ../libempathy-gtk/empathy-chat.c:3204
-#: ../libempathy-gtk/empathy-log-window.c:710
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Konversacio"
#. 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:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Kopii ligiladreson"
#. 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:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Malfermi ligilon"
#. 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:420
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
-msgstr ""
+msgstr "Redakti kontakto-informojn"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Personaj informoj"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "Nova kontakto"
msgid "Subscription Request"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-list-view.c:1864
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Negrupite"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1999
+#: ../libempathy-gtk/empathy-individual-view.c:2262
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-list-view.c:1866
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2265
msgid "Removing group"
-msgstr ""
+msgstr "Forigi grupon"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1915
-#: ../libempathy-gtk/empathy-contact-list-view.c:1992
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-contact-list-view.c:2050
+#: ../libempathy-gtk/empathy-contact-list-view.c:2127
+#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Forigi"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1945
+#: ../libempathy-gtk/empathy-contact-list-view.c:2080
+#: ../libempathy-gtk/empathy-individual-view.c:2370
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-list-view.c:1947
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2386
msgid "Removing contact"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:209
+#: ../libempathy-gtk/empathy-contact-menu.c:203
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
-msgstr ""
+msgstr "_Aldoni kontakton…"
-#: ../libempathy-gtk/empathy-contact-menu.c:237
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:516
#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Babilejo"
-#: ../libempathy-gtk/empathy-contact-menu.c:268
+#: ../libempathy-gtk/empathy-contact-menu.c:261
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
-msgstr ""
+msgstr "_Sonalvoko"
-#: ../libempathy-gtk/empathy-contact-menu.c:300
+#: ../libempathy-gtk/empathy-contact-menu.c:292
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
-msgstr ""
+msgstr "_Videoalvoko"
-#: ../libempathy-gtk/empathy-contact-menu.c:351
+#: ../libempathy-gtk/empathy-contact-menu.c:333
+#: ../libempathy-gtk/empathy-individual-menu.c:644
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:373
+#: ../libempathy-gtk/empathy-contact-menu.c:355
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "Sendi dosierojn"
-#: ../libempathy-gtk/empathy-contact-menu.c:396
+#: ../libempathy-gtk/empathy-contact-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-contact-widget.c:1430
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1377
msgid "Favorite"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:466
+#: ../libempathy-gtk/empathy-contact-menu.c:447
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:512
+#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "R_edakti"
-#: ../libempathy-gtk/empathy-contact-menu.c:566
-#: ../src/empathy-chat-window.c:899
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:597
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr ""
msgid "Select a contact"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:237
-msgid "Select"
-msgstr "Elekti"
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:153
+msgid "Full name:"
+msgstr "Tuta nomo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:246
-#: ../src/empathy-main-window.c:1132
-msgid "Group"
-msgstr "Grupo"
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:154
+msgid "Phone number:"
+msgstr "Telefonnumero:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:155
+msgid "E-mail address:"
+msgstr "Retpoŝtadreso:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:156
+msgid "Website:"
+msgstr "Retpaĝo:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:157
+msgid "Birthday:"
+msgstr "Naskiĝtago:"
-#: ../libempathy-gtk/empathy-contact-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Country ISO Code:"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Country:"
msgstr "Lando:"
-#: ../libempathy-gtk/empathy-contact-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "State:"
msgstr "Ŝtato:"
-#: ../libempathy-gtk/empathy-contact-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "City:"
msgstr "Urbo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Area:"
-msgstr ""
+msgstr "Areo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Postal Code:"
-msgstr ""
+msgstr "Poŝtkodo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Street:"
msgstr "Strato:"
-#: ../libempathy-gtk/empathy-contact-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Building:"
-msgstr ""
+msgstr "Konstruaĵo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Floor:"
-msgstr ""
+msgstr "Etaĝo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Room:"
msgstr "Ĉambro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Text:"
msgstr "Teksto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Description:"
-msgstr ""
+msgstr "Priskribo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Accuracy Level:"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Error:"
msgstr "Eraro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Vertical Error (meters):"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Horizontal Error (meters):"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Speed:"
msgstr "Rapideco:"
-#: ../libempathy-gtk/empathy-contact-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Bearing:"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Climb Speed:"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Last Updated on:"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "Longitude:"
-msgstr ""
+msgstr "Longitudo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Latitude:"
-msgstr ""
+msgstr "Latitudo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Altitude:"
-msgstr ""
+msgstr "Altitudo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../src/empathy-preferences.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Loko"
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-msgid "<b>Location</b>, "
-msgstr "<b>Loko</b>"
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:624
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:735
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:922
msgid "Save Avatar"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:980
msgid "Unable to save avatar"
msgstr ""
msgid "<b>Location</b> at (date)\t"
msgstr ""
+#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1312
msgid "Alias:"
msgstr "Kromnomo:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "Naskiĝtago:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client Information"
-msgstr ""
+msgstr "Klientaj informoj"
# babililo = chat-tool
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client:"
msgstr "Kliento:"
-#: ../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 ""
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr ""
+#: ../libempathy-gtk/empathy-individual-widget.c:1516
+msgid "Identifier:"
+msgstr "Identigilo:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "Tuta nomo:"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Information requested…"
+msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "OS:"
+msgstr "Mastruma sistemo:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "Versio:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
msgid "Groups"
msgstr "Grupoj"
-#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
-msgid "Identifier:"
+#: ../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-contact-widget.ui.h:13
-msgid "Information requested…"
+#: ../libempathy-gtk/empathy-groups-widget.c:363
+msgid "_Add Group"
+msgstr "_Aldoni grupon"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "Elekti"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1423
+msgid "Group"
+msgstr "Grupo"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+msgid "Linked Contacts"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "OS:"
-msgstr "Mastruma sistemo:"
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../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:836
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "R_edakti"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:862
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-view.c:2378
+#, c-format
msgid ""
-"Select the groups you want this contact to appear in. Note that you can "
-"select more than one group or no groups."
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
-msgid "Version:"
-msgstr "Versio:"
+#: ../libempathy-gtk/empathy-individual-widget.c:1657
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] ""
+msgstr[1] ""
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "Retpaĝo:"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "_Add Group"
-msgstr "_Aldoni grupon"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr ""
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "Nova reto"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
msgstr ""
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "Servilo"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Elekti"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "Pordo"
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+msgid "new server"
+msgstr "nova servilo"
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:703
-#: ../src/empathy-import-widget.c:312
-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:115
+msgid "Link Contacts"
+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 linked contacts into the separate contacts."
+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:136
+msgid "_Link"
+msgstr "_Ligilo"
-#: ../libempathy-gtk/empathy-log-window.c:720
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink linked contacts '%s'?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgstr "Dato"
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Conversations"
msgstr "Konversacioj"
-#: ../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 "Trovi sekvan"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "Trovi antaŭan"
+
+#: ../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 "Serĉi"
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
msgstr ""
msgstr ""
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "_Babilo"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "Nova konversacio"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:184
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr ""
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:192
-#: ../src/empathy-call-window.ui.h:17
-msgid "_Call"
-msgstr "_Voko"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+msgid "C_all"
+msgstr "V_oki"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "Nova voko"
+#: ../libempathy-gtk/empathy-password-dialog.c:241
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
msgstr ""
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
-msgstr ""
+msgstr "Redakti kutimajn mesaĝojn..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
msgstr ""
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
msgid "Click to make this status a favorite"
msgstr ""
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
msgid "Set status"
-msgstr ""
+msgstr "Agordi staton"
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
msgid "Set your presence and current status"
msgstr ""
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
msgstr ""
-#: ../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 "Nova %s konto"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Trovi:"
-#: ../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-manager.c:51
msgid "Received an instant message"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr ""
#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
-msgstr ""
+msgstr "Redakti kutimajn mesaĝoj"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
+msgid "Save _New Status Message"
msgstr ""
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr ""
+msgid "Saved Status Messages"
+msgstr "Redakti kutimajn mesaĝoj"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
msgid "Blue"
msgstr "Bluo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1516
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
+msgid "Continue"
+msgstr "Daŭrigi"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Remember this choice for future connections"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
+msgid "Certificate Details"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1708
msgid "Unable to open URI"
msgstr ""
-#: ../libempathy-gtk/empathy-ui-utils.c:1611
+#: ../libempathy-gtk/empathy-ui-utils.c:1803
msgid "Select a file"
msgstr "Elekti dosieron"
-#: ../libempathy-gtk/empathy-ui-utils.c:1675
-msgid "Select a destination"
-msgstr "Elekti celon"
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#, c-format
+msgid "Incoming file from %s"
+msgstr ""
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
-msgstr ""
+msgstr "Aktuala lokaĵaro"
#: ../libempathy-gtk/totem-subtitle-encoding.c:161
#: ../libempathy-gtk/totem-subtitle-encoding.c:163
#: ../libempathy-gtk/totem-subtitle-encoding.c:187
#: ../libempathy-gtk/totem-subtitle-encoding.c:189
msgid "Central European"
-msgstr "Mezeŭropa"
+msgstr "Mezeŭropa"
#: ../libempathy-gtk/totem-subtitle-encoding.c:192
#: ../libempathy-gtk/totem-subtitle-encoding.c:194
#: ../libempathy-gtk/totem-subtitle-encoding.c:196
#: ../libempathy-gtk/totem-subtitle-encoding.c:198
msgid "Chinese Simplified"
-msgstr "Ĉina (simpligita)"
+msgstr "Ĉina Simpligite"
#: ../libempathy-gtk/totem-subtitle-encoding.c:201
#: ../libempathy-gtk/totem-subtitle-encoding.c:203
#: ../libempathy-gtk/totem-subtitle-encoding.c:205
msgid "Chinese Traditional"
-msgstr "Ĉina (tradicia)"
+msgstr "Ĉina tradicie"
#: ../libempathy-gtk/totem-subtitle-encoding.c:208
msgid "Croatian"
#: ../libempathy-gtk/totem-subtitle-encoding.c:227
#: ../libempathy-gtk/totem-subtitle-encoding.c:229
msgid "Cyrillic/Ukrainian"
-msgstr "Cirila/Ukrana"
+msgstr "Cirila/Ukraina"
#: ../libempathy-gtk/totem-subtitle-encoding.c:232
msgid "Georgian"
#: ../libempathy-gtk/totem-subtitle-encoding.c:260
msgid "Hindi"
-msgstr ""
+msgstr "Hindia"
#: ../libempathy-gtk/totem-subtitle-encoding.c:263
msgid "Icelandic"
#: ../libempathy-gtk/totem-subtitle-encoding.c:282
msgid "Nordic"
-msgstr ""
+msgstr "Norda"
#: ../libempathy-gtk/totem-subtitle-encoding.c:285
msgid "Persian"
#: ../libempathy-gtk/totem-subtitle-encoding.c:293
msgid "South European"
-msgstr "Sudeŭropa"
+msgstr "Sudeŭropa"
#: ../libempathy-gtk/totem-subtitle-encoding.c:296
msgid "Thai"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
msgid "No error message"
-msgstr ""
+msgstr "Neniu erarmesaĝo"
#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
msgid "Instant Message (Empathy)"
-msgstr ""
+msgstr "Tujmesaĝo (Empatio)"
-#: ../src/empathy.c:608
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Ne konekti dum lanĉo"
-#: ../src/empathy.c:612
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr ""
-#: ../src/empathy.c:624
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr ""
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy.c:500
+msgid "Error contacting the Account Manager"
+msgstr ""
+
+#: ../src/empathy.c:502
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/empathy-about-dialog.c:81
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 estas libera softvaro; vi povas disvastigi ĝin kaj/aŭ modifi ĝin sub "
+"Empatio estas libera softvaro; vi povas disvastigi ĝin kaj/aŭ modifi ĝin sub "
"la kondiĉoj de la GNU Ĝenerala Publika Permesilo kiel publikita de la Libera "
"Softvara Fonduso; ĉu versio 2 de la permesilo, ĉu \n"
-"(laŭ via elekto) iu ajn posta versio."
+"(laŭ via elekto) iu ajn posta versio."
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
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 estas distribuata kun la espero ke ĝi estas utila, sed SEN IU "
-"GARANTIO; eĉ sen implicita garantio de NEGOCEBLO aŭ TAŬGECO POR SPECIFA "
+"Empatio estas distribuata kun la espero ke ĝi estas utila, sed SEN IU "
+"GARANTIO; eĉ sen implicita garantio de NEGOCEBLO aŭ TAŭGECO POR SPECIFA "
"CELO. Vidu la GNU Ĝeneralan Publikan Permesilon por pli da detaloj."
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
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 ""
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "Tujmesaĝilo por GNOME"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"Launchpad Contributions:\n"
" Aisano https://launchpad.net/~info-ais-sanmarino\n"
" Brient Hess https://launchpad.net/~brient\n"
+" Eliovir https://launchpad.net/~eliovir\n"
" ISHII Eiju https://launchpad.net/~lumidina\n"
" Javier Lancha https://launchpad.net/~javierlancha\n"
" Kristjan SCHMIDT https://launchpad.net/~kristjan-eo\n"
+" Kvantumo https://launchpad.net/~ordnascrazy\n"
" Lucas Larson https://launchpad.net/~lucaslarson\n"
" Michael MORONI https://launchpad.net/~haikara90\n"
-" Robert BOGENSCHNEIDER https://launchpad.net/~robog"
+" Petr Adam Dohnálek https://launchpad.net/~dohnp5a1\n"
+" Robert BOGENSCHNEIDER https://launchpad.net/~robog\n"
+" Serge Leblanc https://launchpad.net/~serge-leblanc-wanadoo\n"
+" Yamiharu https://launchpad.net/~yamiharu84"
-#: ../src/empathy-account-assistant.c:168
+#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
msgstr ""
-#: ../src/empathy-account-assistant.c:171
+#: ../src/empathy-account-assistant.c:170
msgid "There was an error while parsing the account details."
msgstr ""
-#: ../src/empathy-account-assistant.c:174
+#: ../src/empathy-account-assistant.c:173
msgid "There was an error while creating the account."
msgstr ""
-#: ../src/empathy-account-assistant.c:176
+#: ../src/empathy-account-assistant.c:175
msgid "There was an error."
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:180
-#, c-format
-msgid "The error message was: %s"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:184
-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 ""
+msgstr "Okazis eraro."
-#: ../src/empathy-account-assistant.c:221
-#: ../src/empathy-account-assistant.c:1316
-msgid "An error occurred"
-msgstr ""
-
-#. 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:413 ../src/empathy-accounts-dialog.c:606
+#: ../src/empathy-account-assistant.c:179
#, c-format
-msgid "New %s account"
+msgid "The error message was: %s"
+msgstr "La erarmesaĝo estis: %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 ""
-#: ../src/empathy-account-assistant.c:511
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1268
+msgid "An error occurred"
+msgstr "Eraro aperis"
+
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr ""
-#: ../src/empathy-account-assistant.c:517
+#: ../src/empathy-account-assistant.c:473
msgid "Do you have any other chat accounts you want to set up?"
msgstr ""
-#: ../src/empathy-account-assistant.c:523
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr ""
-#: ../src/empathy-account-assistant.c:528
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr ""
-#: ../src/empathy-account-assistant.c:534
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr ""
-#: ../src/empathy-account-assistant.c:541
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr ""
-#: ../src/empathy-account-assistant.c:656
+#: ../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 "
"calls."
msgstr ""
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:629
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
-#: ../src/empathy-account-assistant.c:696
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr ""
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr ""
-#: ../src/empathy-account-assistant.c:739
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
-msgstr ""
+msgstr "Ne, mi volas novan konton"
-#: ../src/empathy-account-assistant.c:749
+#: ../src/empathy-account-assistant.c:705
msgid "No, I just want to see people online nearby for now"
msgstr ""
-#: ../src/empathy-account-assistant.c:770
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr ""
-#: ../src/empathy-account-assistant.c:854
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:810
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "Yes"
msgstr "Jes"
-#: ../src/empathy-account-assistant.c:861
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
-msgstr ""
+msgstr "Ne, tio sufiĉas nun"
-#: ../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 "
"disable this feature by using the 'Accounts' dialog"
msgstr ""
-#: ../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 ""
+msgstr "Redakti->Kontoj"
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1104
msgid "I don't want to enable this feature for now"
msgstr ""
-#: ../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 "
"the Accounts dialog"
msgstr ""
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr ""
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr ""
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
-msgstr "Bonvenon al Empathy"
+msgstr "Bonvenon al Empatio"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr ""
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
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:65
+#: ../src/empathy-accounts-dialog.c:64
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr ""
#. 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 ""
-#: ../src/empathy-accounts-dialog.c:273 ../src/empathy-call-window.c:792
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
-msgstr ""
+msgstr "Konektante..."
-#: ../src/empathy-accounts-dialog.c:314
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline — %s"
-msgstr ""
+msgstr "Nekonektite — %s"
-#: ../src/empathy-accounts-dialog.c:326
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
-msgstr ""
+msgstr "Nekonektite — %s"
-#: ../src/empathy-accounts-dialog.c:337
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
-msgstr ""
+msgstr "Nekonektite — Neniu retkonekto"
-#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "Nekonata stato"
-#: ../src/empathy-accounts-dialog.c:356
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline — Account Disabled"
-msgstr ""
+msgstr "Nekonektite — Konto estas elŝaltite"
-#: ../src/empathy-accounts-dialog.c:797
+#: ../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?"
msgstr ""
-#: ../src/empathy-accounts-dialog.c:1144
+#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
-msgstr ""
+msgstr "Ĉu vi volas forigi %s de la komputilo?"
-#: ../src/empathy-accounts-dialog.c:1148
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr ""
-#: ../src/empathy-accounts-dialog.c:1385
+#: ../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?"
msgstr ""
-#: ../src/empathy-accounts-dialog.c:1962
+#: ../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?"
msgstr ""
#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "No protocol installed"
-msgstr ""
+msgid "Loading account information"
+msgstr "Ŝargi kontoinformojn"
#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Protocol:"
-msgstr ""
+msgid "No protocol installed"
+msgstr "Neniu protokolo estas instalita"
#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "Protocol:"
+msgstr "Protokolo:"
+
+#: ../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:4
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
msgstr "_Aldoni..."
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
msgstr "_Importi..."
-#: ../src/empathy-auto-salut-account-helper.c:79
+#: ../src/empathy-auth-client.c:237
+msgid " - Empathy authentication client"
+msgstr ""
+
+#: ../src/empathy-auth-client.c:253
+msgid "Empathy authentication client"
+msgstr ""
+
+#: ../src/empathy-auto-salut-account-helper.c:83
msgid "People nearby"
+msgstr "Proksimaj homoj"
+
+#: ../src/empathy-av.c:118
+msgid "- Empathy Audio/Video Client"
+msgstr ""
+
+#: ../src/empathy-av.c:134
+msgid "Empathy Audio/Video Client"
msgstr ""
-#: ../src/empathy-call-window.c:463
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Kontrasto"
-#: ../src/empathy-call-window.c:466
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Heleco"
-#: ../src/empathy-call-window.c:469
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
-msgstr ""
+msgstr "Gamo"
-#: ../src/empathy-call-window.c:574
+#: ../src/empathy-call-window.c:592
msgid "Volume"
-msgstr "Laŭteco"
+msgstr "Laŭteco"
-#: ../src/empathy-call-window.c:1134
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
-msgstr ""
+msgstr "_Flanka breto"
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
-msgstr ""
+msgstr "Sonenigo"
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
-msgstr ""
+msgstr "Videoenigo"
-#: ../src/empathy-call-window.c:1161
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr ""
+#: ../src/empathy-call-window.c:1201
+msgid "Details"
+msgstr "Detaloj"
+
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1232
+#: ../src/empathy-call-window.c:1270
#, c-format
msgid "Call with %s"
msgstr ""
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1309
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "Voko"
+#: ../src/empathy-call-window.c:1503
+msgid "The IP address as seen by the machine"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1505
+msgid "The IP address as seen by a server on the Internet"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1507
+msgid "The IP address of the peer as seen by the other side"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1509
+msgid "The IP address of a relay server"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1511
+msgid "The IP address of the multicast group"
+msgstr ""
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1966
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
-msgstr ""
+msgstr "Konektite — %d:%02dm"
-#: ../src/empathy-call-window.c:2027
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
-msgstr ""
+msgstr "Teknikaj detaloj"
-#: ../src/empathy-call-window.c:2065
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr ""
-#: ../src/empathy-call-window.c:2070
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr ""
-#: ../src/empathy-call-window.c:2076
+#: ../src/empathy-call-window.c:2371
#, 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 ""
-#: ../src/empathy-call-window.c:2082
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
-msgstr ""
+msgstr "Okazis paneo je la reto"
-#: ../src/empathy-call-window.c:2086
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
-#: ../src/empathy-call-window.c:2089
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
-#: ../src/empathy-call-window.c:2099
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"the Help menu."
msgstr ""
-#: ../src/empathy-call-window.c:2107
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr ""
-#: ../src/empathy-call-window.c:2146
+#: ../src/empathy-call-window.c:2405
+msgid "The end of the stream was reached"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr ""
-#: ../src/empathy-call-window.c:2156
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr ""
#: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "Sono"
+
+#: ../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 "Antaŭrigardo"
+msgstr "Antaŭrigardo"
-#: ../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 ""
+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 ""
-#: ../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 ""
+msgstr "Videa antaŭvido"
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "_Voko"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "_Vido"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d nelegite)"
+msgstr[1] "%s (%d nelegite)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (kaj %u alia)"
+msgstr[1] "%s (kaj %u aliaj)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr ""
msgstr "Babilejo"
#: ../src/empathy-chat-window.ui.h:4
-msgid "Important Room"
+msgid "Insert _Smiley"
msgstr ""
#: ../src/empathy-chat-window.ui.h:5
-msgid "Insert _Smiley"
+msgid "Invite _Participant…"
msgstr ""
#: ../src/empathy-chat-window.ui.h:6
-msgid "Invite _Participant…"
-msgstr ""
+#, fuzzy
+msgid "Move Tab _Left"
+msgstr "Movi Tabo _Maldekstre"
#: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Left"
-msgstr "Movu Tabo _Maldekstre"
+#, fuzzy
+msgid "Move Tab _Right"
+msgstr "Movi Tabo _Dekstre"
#: ../src/empathy-chat-window.ui.h:8
-msgid "Move Tab _Right"
-msgstr "Movu Tabo _Dekstre"
+msgid "Notify for All Messages"
+msgstr "Atentigi pri ciuj mesaĝoj"
#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "_Konversacio"
#: ../src/empathy-chat-window.ui.h:11
+#, fuzzy
msgid "_Detach Tab"
-msgstr "_Deigu Tabo"
+msgstr "_Malligi Tabo"
#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
msgid "_Edit"
#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
-msgstr "_Sekva tabo"
+msgstr "_Sekva langeto"
#: ../src/empathy-chat-window.ui.h:16
msgid "_Previous Tab"
-msgstr "_Antaŭa tabo"
+msgstr "_Antaŭa langeto"
#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgid "Manage Favorite Rooms"
msgstr ""
-#: ../src/empathy-event-manager.c:351
+#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
msgstr ""
-#: ../src/empathy-event-manager.c:351
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
-msgstr ""
+msgstr "Eniranta telefonvoko"
-#: ../src/empathy-event-manager.c:355
+#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr ""
-#: ../src/empathy-event-manager.c:356
+#: ../src/empathy-event-manager.c:513
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr ""
-#: ../src/empathy-event-manager.c:378
-msgid "_Reject"
+#: ../src/empathy-event-manager.c:516 ../src/empathy-event-manager.c:661
+#, c-format
+msgid "Incoming call from %s"
msgstr ""
-#: ../src/empathy-event-manager.c:384
+#: ../src/empathy-event-manager.c:541
+msgid "_Reject"
+msgstr "_Rifuzi"
+
+#: ../src/empathy-event-manager.c:547
msgid "_Answer"
msgstr "_Respondo"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming video call from %s"
msgstr ""
-#: ../src/empathy-event-manager.c:501
-#, c-format
-msgid "Incoming call from %s"
+#: ../src/empathy-event-manager.c:738
+msgid "Room invitation"
msgstr ""
-#: ../src/empathy-event-manager.c:585
-msgid "Room invitation"
+#: ../src/empathy-event-manager.c:740
+#, c-format
+msgid "Invitation to join %s"
msgstr ""
-#: ../src/empathy-event-manager.c:588
+#: ../src/empathy-event-manager.c:747
#, c-format
msgid "%s is inviting you to join %s"
msgstr ""
-#: ../src/empathy-event-manager.c:596
+#: ../src/empathy-event-manager.c:755
msgid "_Decline"
msgstr ""
-#: ../src/empathy-event-manager.c:601
+#: ../src/empathy-event-manager.c:760
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Membriĝi"
-#: ../src/empathy-event-manager.c:640
+#: ../src/empathy-event-manager.c:787
#, c-format
msgid "%s invited you to join %s"
msgstr ""
-#: ../src/empathy-event-manager.c:666
+#: ../src/empathy-event-manager.c:793
+#, c-format
+msgid "You have been invited to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:844
#, c-format
msgid "Incoming file transfer from %s"
msgstr ""
-#: ../src/empathy-event-manager.c:816
+#: ../src/empathy-event-manager.c:1014 ../src/empathy-main-window.c:367
+msgid "Password required"
+msgstr "Pasvorto"
+
+#: ../src/empathy-event-manager.c:1070
#, c-format
-msgid "Subscription requested by %s"
+msgid "%s would like permission to see when you are available"
msgstr ""
-#: ../src/empathy-event-manager.c:820
+#: ../src/empathy-event-manager.c:1074
#, c-format
msgid ""
"\n"
"\n"
"Mesaĝo: %s"
-#: ../src/empathy-event-manager.c:864
+#: ../src/empathy-event-manager.c:1118
#, c-format
msgid "%s is now offline."
-msgstr ""
+msgstr "%s estas nun nekonektite."
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:1139
#, c-format
msgid "%s is now online."
-msgstr ""
+msgstr "%s estas nun konektite."
#. 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 "Nekonate"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
#, c-format
msgid "%s of %s at %s/s"
msgstr ""
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s"
-msgstr ""
+msgstr "%s de %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 ""
+msgstr "Ricevante \"%s\" de %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 ""
+msgstr "Sendante \"%s\" al %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 ""
-#: ../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 ""
-#: ../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 ""
#. 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 ""
-#: ../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 ""
-#: ../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 ""
-#: ../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 "Dosiero"
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1030
msgid "Remaining"
-msgstr ""
+msgstr "Restante"
#: ../src/empathy-ft-manager.ui.h:1
msgid "File Transfers"
msgstr ""
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "Importi"
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
-msgstr ""
+msgstr "Protokolo"
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "Fonto"
-#: ../src/empathy-import-mc4-accounts.c:108
-#, c-format
-msgid "%s account"
+#: ../src/empathy-main-window.c:384
+msgid "Provide Password"
+msgstr "Pasvorto"
+
+#: ../src/empathy-main-window.c:390
+msgid "Disconnect"
+msgstr "Malkonektis"
+
+#: ../src/empathy-main-window.c:530
+msgid "No match found"
msgstr ""
-#: ../src/empathy-main-window.c:442
+#: ../src/empathy-main-window.c:685
msgid "Reconnect"
-msgstr ""
+msgstr "Rekonekti"
-#: ../src/empathy-main-window.c:448
+#: ../src/empathy-main-window.c:691
msgid "Edit Account"
msgstr "Redakti konton"
-#: ../src/empathy-main-window.c:454
+#: ../src/empathy-main-window.c:697
msgid "Close"
msgstr "Fermi"
-#: ../src/empathy-main-window.c:1115
+#: ../src/empathy-main-window.c:1405
msgid "Contact"
msgstr "Kontakto"
-#: ../src/empathy-main-window.c:1502
-msgid "Show and edit accounts"
-msgstr ""
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window.c:1732
msgid "Contact List"
msgstr "Kontaktlisto"
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window.c:1845
+msgid "Show and edit accounts"
+msgstr "Montri kaj redakti kontojn"
+
+#: ../src/empathy-main-window.ui.h:1
msgid "Contacts on a _Map"
msgstr ""
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
msgid "Context"
msgstr "Kunteksto"
+#: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "Kontaktlisto"
+
#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr ""
#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
-msgstr ""
+msgstr "Montri p_rotokolojn"
#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
-msgstr ""
+msgstr "Ordigi laŭ _nomo"
#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
-msgstr ""
+msgstr "Ordigi laŭ _stato"
#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgid "_Room"
msgstr "Ĉamb_ro"
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
msgid "Chat Room"
-msgstr ""
+msgstr "Babilĉambro"
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
msgid "Members"
msgstr "Membroj"
#. 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:634
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "No"
msgstr "Ne"
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:665
msgid "Could not start room listing"
msgstr ""
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:675
msgid "Could not stop room listing"
msgstr ""
#: ../src/empathy-new-chatroom-dialog.ui.h:2
msgid "Couldn't load room list"
-msgstr ""
+msgstr "Ne eblis ŝargi ĉambroliston"
#: ../src/empathy-new-chatroom-dialog.ui.h:3
msgid ""
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "Join Room"
-msgstr ""
+msgstr "Aliĝi ĉambron"
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Room List"
-msgstr ""
+msgstr "Ĉambrolisto"
#: ../src/empathy-new-chatroom-dialog.ui.h:8
msgid "_Room:"
msgstr "Ĉamb_ro:"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
msgid "Message received"
-msgstr ""
+msgstr "Ricevis mesaĝon"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
-msgstr ""
+msgstr "Senis mesaĝon"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr ""
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr ""
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr ""
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr ""
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr ""
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "Lingvo"
+#: ../src/empathy-preferences.c:875
+msgid "Preferences"
+msgstr "Agordoj"
+
#: ../src/empathy-preferences.ui.h:1
msgid "Appearance"
-msgstr ""
+msgstr "Aspekto"
#: ../src/empathy-preferences.ui.h:2
msgid "Behavior"
-msgstr ""
+msgstr "Konduto"
#: ../src/empathy-preferences.ui.h:3
msgid "Chat Th_eme:"
-msgstr ""
+msgstr "Babileja _etoso:"
#: ../src/empathy-preferences.ui.h:4
msgid "Disable notifications when _away or busy"
msgstr ""
#: ../src/empathy-preferences.ui.h:6
-msgid "Enable notifications when a contact comes online"
+msgid "Display incoming events in the notification area"
msgstr ""
#: ../src/empathy-preferences.ui.h:7
-msgid "Enable notifications when a contact goes offline"
+msgid "Enable notifications when a contact comes online"
msgstr ""
#: ../src/empathy-preferences.ui.h:8
-msgid "Enable notifications when the _chat is not focused"
+msgid "Enable notifications when a contact goes offline"
msgstr ""
#: ../src/empathy-preferences.ui.h:9
-msgid "Enable spell checking for languages:"
+msgid "Enable notifications when the _chat is not focused"
msgstr ""
#: ../src/empathy-preferences.ui.h:10
+msgid "Enable spell checking for languages:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:11
msgid "General"
msgstr "Ĝenerale"
-#: ../src/empathy-preferences.ui.h:12
-msgid "Location sources:"
-msgstr ""
-
#: ../src/empathy-preferences.ui.h:13
-msgid "Notifications"
+msgid "Location sources:"
msgstr ""
#: ../src/empathy-preferences.ui.h:14
-msgid "Play sound for events"
+msgid "Log conversations"
msgstr ""
#: ../src/empathy-preferences.ui.h:15
-msgid "Preferences"
-msgstr "Agordoj"
+msgid "Notifications"
+msgstr "Atentigoj"
#: ../src/empathy-preferences.ui.h:16
-msgid "Privacy"
+msgid "Play sound for events"
msgstr ""
#: ../src/empathy-preferences.ui.h:17
+msgid "Privacy"
+msgstr "Privateco"
+
+#: ../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 ""
-#: ../src/empathy-preferences.ui.h:18
+#: ../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 "Sonoj"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
msgid "Spell Checking"
-msgstr ""
+msgstr "Literumkontrolo"
-#: ../src/empathy-preferences.ui.h:22
+#: ../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:23
+#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
msgstr "Etosoj"
-#: ../src/empathy-preferences.ui.h:24
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:25
msgid "_Automatically connect on startup"
-msgstr "Ne konekti dum lanĉo"
+msgstr ""
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
msgid "_Cellphone"
msgstr "_Poŝtelefono"
-#: ../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 ""
+msgstr "Aktivigi sonajn at_entigojn"
-#: ../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 ""
-#: ../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:178
-msgid "Respond"
-msgstr "Repondo"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Stato"
#: ../src/empathy-status-icon.ui.h:4
msgid "_Quit"
-msgstr "_Ĉesi"
+msgstr "Ĉ_esi"
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
msgid "Contact Map View"
-msgstr ""
+msgstr "Vido de la mapo de kontakoj"
-#: ../src/empathy-debug-window.c:1154
+#: ../src/empathy-debug-window.c:1219
msgid "Save"
msgstr "Konservi"
-#: ../src/empathy-debug-window.c:1330
+#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
-msgstr ""
+msgstr "Sencimig-fenestro"
-#: ../src/empathy-debug-window.c:1410
+#: ../src/empathy-debug-window.c:1475
msgid "Pause"
msgstr "Paŭzo"
-#: ../src/empathy-debug-window.c:1422
+#: ../src/empathy-debug-window.c:1487
msgid "Level "
-msgstr "Nivelo"
+msgstr "Nivelo "
-#: ../src/empathy-debug-window.c:1442
+#: ../src/empathy-debug-window.c:1507
msgid "Debug"
msgstr "Sencimigo"
-#: ../src/empathy-debug-window.c:1448
+#: ../src/empathy-debug-window.c:1513
msgid "Info"
-msgstr ""
+msgstr "Informo"
-#: ../src/empathy-debug-window.c:1454 ../src/empathy-debug-window.c:1503
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "Mesaĝo"
-#: ../src/empathy-debug-window.c:1460
+#: ../src/empathy-debug-window.c:1525
msgid "Warning"
msgstr "Averto"
-#: ../src/empathy-debug-window.c:1466
+#: ../src/empathy-debug-window.c:1531
msgid "Critical"
-msgstr ""
+msgstr "Kritika"
-#: ../src/empathy-debug-window.c:1472
+#: ../src/empathy-debug-window.c:1537
msgid "Error"
msgstr "Eraro"
-#: ../src/empathy-debug-window.c:1491
+#: ../src/empathy-debug-window.c:1556
msgid "Time"
msgstr "Tempo"
-#: ../src/empathy-debug-window.c:1494
+#: ../src/empathy-debug-window.c:1559
msgid "Domain"
-msgstr ""
+msgstr "Retregiono"
-#: ../src/empathy-debug-window.c:1496
+#: ../src/empathy-debug-window.c:1561
msgid "Category"
msgstr "Kategorio"
-#: ../src/empathy-debug-window.c:1498
+#: ../src/empathy-debug-window.c:1563
msgid "Level"
msgstr "Nivelo"
-#: ../src/empathy-debug-window.c:1535
+#: ../src/empathy-debug-window.c:1600
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgid "Invite"
msgstr "Inviti"
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-accounts.c:178
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:182
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr ""
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:186
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:188
msgid "<account-id>"
msgstr "<konto-id>"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:193
msgid "- Empathy Accounts"
-msgstr "- Empathy-kontoj"
+msgstr "- Empatio-kontoj"
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:232
msgid "Empathy Accounts"
-msgstr "Empathy-kontoj"
+msgstr "Empatio-kontoj"
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
-msgstr "Empathy-sencimigilo"
+msgstr "Empatio-sencimigilo"
-#~ msgid "Empathy IM Client"
-#~ msgstr "Tujmesaĝilo Empathy"
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empatio-kontoj"
-#~ msgid ""
-#~ "Whether or not to convert smileys into graphical images in conversations."
-#~ msgstr "Ĉu konverti ridetoj al iĝi grafika bildo en konversacioj."
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Repondo"
-#~ msgid ""
-#~ "Whether or not to show contacts that are offline in the contact list."
-#~ msgstr "Ĉu montru kontaktoj kiun estas ne kontaktebla en la kontaktlisto."
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Rifuzi"
-#~ msgid "_Add Contact..."
-#~ msgstr "_Aldonu Kontakto..."
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Respondo"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+#, fuzzy
+msgid "Decline"
+msgstr "Malakcepti"
-#~ msgid "Web site:"
-#~ msgstr "TTT-ejo:"
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Akcepti"
-#~ msgid "Email:"
-#~ msgstr "Retpoŝto:"
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empatio demandis pri gravaj kontoj"
"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-11-18 14:22+0000\n"
-"PO-Revision-Date: 2010-11-18 17:01+0100\n"
+"POT-Creation-Date: 2010-12-24 06:04+0000\n"
+"PO-Revision-Date: 2010-12-24 18:08+0100\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2200
msgid "Messaging and VoIP Accounts"
msgstr "Cuentas de mensajería y Voz IP"
msgid "Offline"
msgstr "Desconectado"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Desconocido"
msgid "All"
msgstr "Todo"
-#: ../libempathy-gtk/empathy-account-widget.c:637
+#: ../libempathy-gtk/empathy-account-widget.c:679
#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Cuenta"
-#: ../libempathy-gtk/empathy-account-widget.c:638
+#: ../libempathy-gtk/empathy-account-widget.c:680
msgid "Password"
msgstr "Contraseña"
-#: ../libempathy-gtk/empathy-account-widget.c:639
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:640
+#: ../libempathy-gtk/empathy-account-widget.c:682
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Puerto"
-#: ../libempathy-gtk/empathy-account-widget.c:712
-#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:754
+#: ../libempathy-gtk/empathy-account-widget.c:811
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1094
+#: ../libempathy-gtk/empathy-account-widget.c:1152
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "La vuenta %s se edita a través de My Web Accounts."
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1158
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "No se puede editar la cuenta %s en Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1120
+#: ../libempathy-gtk/empathy-account-widget.c:1178
msgid "Launch My Web Accounts"
msgstr "Lanzar My Web Accounts"
-#: ../libempathy-gtk/empathy-account-widget.c:1418
+#: ../libempathy-gtk/empathy-account-widget.c:1516
msgid "Username:"
msgstr "Nombre de usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1753
+#: ../libempathy-gtk/empathy-account-widget.c:1884
msgid "A_pply"
msgstr "_Aplicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1783
+#: ../libempathy-gtk/empathy-account-widget.c:1914
msgid "L_og in"
msgstr "Iniciar _sesión"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1980
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
+#: ../libempathy-gtk/empathy-individual-widget.c:1486
#: ../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 "Cuenta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1860
+#: ../libempathy-gtk/empathy-account-widget.c:1991
msgid "_Enabled"
msgstr "_Activada"
-#: ../libempathy-gtk/empathy-account-widget.c:1925
+#: ../libempathy-gtk/empathy-account-widget.c:2056
msgid "This account already exists on the server"
msgstr "Esta cuenta ya existe en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1928
+#: ../libempathy-gtk/empathy-account-widget.c:2059
msgid "Create a new account on the server"
msgstr "Crear una cuenta nueva en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:2042
+#: ../libempathy-gtk/empathy-account-widget.c:2251
msgid "Ca_ncel"
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:2334
+#: ../libempathy-gtk/empathy-account-widget.c:2548
#, 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:2360
+#: ../libempathy-gtk/empathy-account-widget.c:2574
#, c-format
msgid "%s Account"
msgstr "Cuenta %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2364
+#: ../libempathy-gtk/empathy-account-widget.c:2578
msgid "New account"
msgstr "Cuenta nueva"
msgstr "Contra_seña:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "Remember Password"
+msgstr "Recordar contraseña"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
msgid "Screen _Name:"
msgstr "_Nombre en pantalla:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "What is your AIM password?"
msgstr "¿Cuál es su contraseña de AIM?"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
msgid "What is your AIM screen name?"
msgstr "¿Cuál es su nombre en pantalla para 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:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Port:"
-msgstr "_Puerto:"
-
#: ../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:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "_Port:"
+msgstr "_Puerto:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:13
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Servidor:"
msgid "Login I_D:"
msgstr "_ID de sesión:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise User ID?"
msgstr "¿Cuál es su ID de usuario para GroupWise?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise password?"
msgstr "¿Cuál es su contraseña de GroupWise?"
msgid "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 UIN?"
msgstr "¿Cuál es su UIN de ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ password?"
msgstr "¿Cuál es su contraseña de ICQ?"
msgid "Priori_ty:"
msgstr "Pri_oridad:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
msgid "Reso_urce:"
msgstr "Re_curso:"
#. 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
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
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/\">esta página</a> para "
"elegir un nombre de usuario en Facebook si no tiene uno."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "Use old SS_L"
msgstr "Usar SS_L antiguo"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook password?"
msgstr "¿Cuál es su contraseña de Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook username?"
msgstr "¿Cuál es su usuario de Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google ID?"
msgstr "¿Cuál es su ID de Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google password?"
msgstr "¿Cuál es su contraseña de Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber ID?"
msgstr "¿Cuál es su ID de Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber password?"
msgstr "¿Cuál es su contraseña de Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber ID?"
msgstr "¿Cuál es el ID de usuario que quiere para Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber password?"
msgstr "¿Cuál es la contraseña que quiere para Jabber?"
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Ejemplo:</b> usuario@hotmail.com"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
msgid "What is your Windows Live ID?"
msgstr "¿Cuál es su ID de Windows Live?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live password?"
msgstr "¿Cuál es su contraseña de Windows Live?"
msgid "Proxy Options"
msgstr "Opciones del proxy"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "STUN Server:"
msgstr "Servidor STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Server:"
msgstr "Servidor:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Transport:"
msgstr "Transporte:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP account password?"
msgstr "¿Cuál es la contraseña de su cuenta SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP login ID?"
msgstr "¿Cuál es su ID de inicio de sesión SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "_Username:"
msgstr "_Usuario:"
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
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-password-dialog.c:283
+msgid "Remember password"
+msgstr "Recordar contraseña"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
msgstr "¿Cuál es su ID de Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "What is your Yahoo! password?"
msgstr "¿Cuál es su contraseña de Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "Yahoo! I_D:"
msgstr "I_D de Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
msgid "_Room List locale:"
msgstr "Configuración de la lista de _salas:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "No se pudo convertir la imagen"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "Su sistema no soporta ninguno de los formatos de imagen aceptados"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Seleccione su imagen de avatar"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "Sin imagen"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Imágenes"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "Todos los archivos"
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:324
msgid "Click to enlarge"
msgstr "Pulse para agrandar"
-#: ../libempathy-gtk/empathy-chat.c:643
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Falló al abrir el chat privado"
-#: ../libempathy-gtk/empathy-chat.c:683
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "El tema no está soportado en esta conversación"
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "No le está permitido cambiar el tema"
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: limpiar todos los mensajes de la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tema>: establecer el tema para la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <id de sala de chat>: unirse a una sala de chat nueva"
-#: ../libempathy-gtk/empathy-chat.c:832
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <id de sala de chat>: unirse a una sala de chat nueva"
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <apodo>: cambiar su apodo en el servidor actual"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <mensaje>: enviar un mensaje de ACCIÓN a la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:851
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 <mensaje>: enviar un <mensaje> a la conversación actual. Esto se usa "
-"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa "
-"para unirse a una sala de chat nueva»"
+"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se "
+"usa para unirse a una sala de chat nueva»"
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
"/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
"definido, muestra su uso."
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Comando desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "contacto no válido"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "permiso denegado"
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "mensaje demasiado largo"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "no implementado"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error al enviar el mensaje «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1234 ../src/empathy-chat-window.c:703
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:713
msgid "Topic:"
msgstr "Tema:"
-#: ../libempathy-gtk/empathy-chat.c:1246
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "El tema se ha establecido a: %s"
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "No se ha definido el tema"
-#: ../libempathy-gtk/empathy-chat.c:1747
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(Sin sugerencias)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Añadir «%s» al diccionario"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1852
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Añadir «%s» al diccionario de «%s»"
-#: ../libempathy-gtk/empathy-chat.c:1911
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Insertar emoticono"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1929
-#: ../libempathy-gtk/empathy-ui-utils.c:1806
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "_Send"
msgstr "E_nviar"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "_Sugerencias ortográficas"
-#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Falló al recibir los registros recientes"
-#: ../libempathy-gtk/empathy-chat.c:2158
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s se ha desconectado"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2165
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s expulsó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2168
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s fue expulsado"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s vetó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s fue vetado"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s ha dejado la sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2217
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s ha entrado en la sala"
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "Ahora %s se llama %s"
-#: ../libempathy-gtk/empathy-chat.c:2381 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "Contraseña incorrecta; inténtelo de nuevo:"
-#: ../libempathy-gtk/empathy-chat.c:2995
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Volver a intentarlo"
-#: ../libempathy-gtk/empathy-chat.c:3000
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "Esta sala está protegida por contraseña:"
-#: ../libempathy-gtk/empathy-chat.c:3001
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3141
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3194
+#: ../libempathy-gtk/empathy-chat.c:3216
#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Conversación"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:319
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Copiar la dirección del enlace"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:326
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Abrir enlace"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:419
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Editar información del contacto"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Información personal"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:424
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "Contacto nuevo"
msgid "Favorite People"
msgstr "Gente favorita"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:1999
+#: ../libempathy-gtk/empathy-individual-view.c:2262
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "¿Realmente quiere quitar el grupo «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2268
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2265
msgid "Removing group"
msgstr "Quitando grupo"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2322
-#: ../libempathy-gtk/empathy-individual-view.c:2436
+#: ../libempathy-gtk/empathy-contact-list-view.c:2050
+#: ../libempathy-gtk/empathy-contact-list-view.c:2127
+#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-individual-view.c:2467
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Quitar"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2353
+#: ../libempathy-gtk/empathy-contact-list-view.c:2080
+#: ../libempathy-gtk/empathy-individual-view.c:2370
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "¿Realmente quiere quitar el contacto «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2386
msgid "Removing contact"
msgstr "Quitando el contacto"
#: ../libempathy-gtk/empathy-contact-menu.c:418
#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-individual-widget.c:1377
msgid "Favorite"
msgstr "Favorita"
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:915
+#: ../src/empathy-chat-window.c:925
msgid "Inviting you to this room"
msgstr "Invitándolo a esta sala"
msgstr "Cumpleaños:"
#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Country ISO Code:"
msgstr "Código ISO de país:"
#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Country:"
msgstr "País:"
#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "State:"
msgstr "Estado:"
#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "City:"
msgstr "Ciudad:"
#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Area:"
msgstr "Área:"
#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Postal Code:"
msgstr "Código postal:"
#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Street:"
msgstr "Calle:"
#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Building:"
msgstr "Edificio:"
#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Floor:"
msgstr "Planta:"
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Room:"
msgstr "Habitación:"
#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Text:"
msgstr "Texto:"
#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Description:"
msgstr "Descripción:"
#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "URI:"
msgstr "URI:"
#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Accuracy Level:"
msgstr "Nivel de precisión:"
#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Error:"
msgstr "Error:"
#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Error vertical (metros):"
#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Error horizontal (metros):"
#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Speed:"
msgstr "Velocidad:"
#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Bearing:"
msgstr "Retardo:"
#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Climb Speed:"
msgstr "Velocidad de ascenso:"
#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Last Updated on:"
msgstr "Actualizado por última vez:"
#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "Longitude:"
msgstr "Longitud_"
#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Latitude:"
msgstr "Latitud:"
#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Altitude:"
msgstr "Altitud:"
#: ../libempathy-gtk/empathy-contact-widget.c:779
#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:622
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Ubicación geográfica"
#. translators: format is "Location, $date"
#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:624
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr "%e de %B de %Y a las %R UTC"
#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:922
msgid "Save Avatar"
msgstr "Guardar avatar"
#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:979
+#: ../libempathy-gtk/empathy-individual-widget.c:980
msgid "Unable to save avatar"
msgstr "No se pudo guardar el avatar"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1312
msgid "Alias:"
msgstr "Apodo:"
#. 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:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1516
msgid "Identifier:"
msgstr "Identificador:"
msgstr "Seleccionar"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1423
msgid "Group"
msgstr "Grupo"
msgid "_Link Contacts…"
msgstr "_Enlazar contactos…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1649
+#: ../libempathy-gtk/empathy-individual-view.c:2378
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"¿Realmente quiere quitar el contacto enlazado «%s»? Tenga en cuenta que esto "
+"quitará todos los contactos que componen este contacto enlazado."
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1657
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "Metacontacto que contiene %u contacto"
-msgstr[1] "Metacontacto que contiene %u contactos"
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Contacto enlazado que contiene %u contacto"
+msgstr[1] "Contacto enlazado que contiene %u contactos"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
+"Completely split the displayed linked contacts into the separate contacts."
msgstr ""
-"Separar completamente la información de los metacontactos en los contactos "
-"que contiene."
+"Separar completamente los contactos enlazados mostrados en contactos "
+"separados."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
msgid "_Link"
msgstr "_Enlazar"
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
-msgid "Unlink meta-contact '%s'?"
-msgstr "¿Desenlazar el metacontacto «%s»?"
+msgid "Unlink linked contacts '%s'?"
+msgstr "¿Desenlazar los contactos enlazados «%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."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
msgstr ""
-"¿Está seguro de que quiere desenlazar este metacontacto? Esto separará "
-"completamente la información del metacontacto en los contactos que contiene."
+"¿Está seguro de querer desenlazar estos contactos enlazados? Esto separará "
+"completamente los contactos enlazados en contactos separados."
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "New Call"
msgstr "Llamada nueva"
+#: ../libempathy-gtk/empathy-password-dialog.c:248
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Introduzca su contraseña para la cuenta\n"
+"<b>%s</b>"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
msgid "Phrase not found"
msgstr "No se encontró la frase"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Mensaje instantáneo recibido"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Enviar un mensaje instantáneo"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Solicitud de chat entrante"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Contacto conectado"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Contacto desconectado"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Conectado con el servidor"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Desconectado del servidor"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Llamada de voz entrante"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Llamada de voz saliente"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Finalizó la llamada de voz"
msgid "Certificate Details"
msgstr "Detalles del certificado"
-#: ../libempathy-gtk/empathy-ui-utils.c:1703
+#: ../libempathy-gtk/empathy-ui-utils.c:1708
msgid "Unable to open URI"
msgstr "No se pudo abrir el URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1798
+#: ../libempathy-gtk/empathy-ui-utils.c:1803
msgid "Select a file"
msgstr "Seleccionar un archivo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "Archivo entrante de %s"
msgid "Instant Message (Empathy)"
msgstr "Mensaje instantáneo (Empathy)"
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "No conectarse automáticamente al inicio"
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "No mostrar la lista de contactos o cualquier otro diálogo al inicio"
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Cliente de mensajería instantánea Empathy"
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Error al contactar con el Gestor de cuentas"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
msgid "Your new account has not been saved yet."
msgstr "Aún no se ha guardado su cuenta nueva."
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "Conectando…"
"Va a seleccionar otra cuenta lo que descartará sus cambios.\n"
"¿Seguro que quiere continuar?"
-#: ../src/empathy-accounts-dialog.c:1951
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1544
+#| msgid "_Enabled"
+msgid "_Enable"
+msgstr "_Activar"
+
+#: ../src/empathy-accounts-dialog.c:1545
+#| msgid "_Enabled"
+msgid "_Disable"
+msgstr "_Desactivar"
+
+#: ../src/empathy-accounts-dialog.c:2044
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgid "_Import…"
msgstr "_Importar…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr ": Cliente de autenticación de Empathy"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Cliente de autenticación de Empathy"
msgid "Empathy Audio/Video Client"
msgstr "Cliente de sonido/vídeo Empathy"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Contraste"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Brillo"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Volumen"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "Barra _lateral"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Entrada de voz"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Teclado de llamada"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
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:1266
+#: ../src/empathy-call-window.c:1270
#, 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:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "Llamar"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
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:1501
+#: ../src/empathy-call-window.c:1505
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:1503
+#: ../src/empathy-call-window.c:1507
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:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "La dirección IP de un servidor de desvío"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
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:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"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:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "Hubo un fallo en la red"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
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:2377
+#: ../src/empathy-call-window.c:2384
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:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"\">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:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "Hubo un fallo en el motor de llamadas"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "Se llegó al final del flujo"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "No se puede establecer el flujo de voz"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "No se puede establecer el flujo de vídeo"
msgid "_View"
msgstr "_Ver"
-#: ../src/empathy-chat-window.c:468 ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:478 ../src/empathy-chat-window.c:498
#, 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:480
+#: ../src/empathy-chat-window.c:490
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (y otra)"
msgstr[1] "%s (y otras %u)"
-#: ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:506
#, 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:505
+#: ../src/empathy-chat-window.c:515
#, 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:707
+#: ../src/empathy-chat-window.c:717
msgid "Typing a message."
msgstr "Tecleando un mensaje."
msgid "Manage Favorite Rooms"
msgstr "Gestionar salas favoritas"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
msgstr "Llamada de vídeo entrante"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Llamada entrante"
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s le está llamando con vídeo. ¿Quiere responder?"
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:513
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s le está llamando. ¿Quiere responder?"
-#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:516 ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming call from %s"
msgstr "Llamada entrante de %s"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:541
msgid "_Reject"
msgstr "_Rechazar"
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:547
msgid "_Answer"
msgstr "Re_spuesta"
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming video call from %s"
msgstr "Llamada de vídeo entrante de %s"
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:738
msgid "Room invitation"
msgstr "Invitación a una sala"
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:740
#, c-format
msgid "Invitation to join %s"
msgstr "Invitación para unirse a %s"
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:747
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s le está invitando a unirse a %s"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:755
msgid "_Decline"
msgstr "_Rechazar"
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:760
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Unirse"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:787
#, c-format
msgid "%s invited you to join %s"
msgstr "%s le ha invitado a unirse a %s"
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:793
#, c-format
msgid "You have been invited to join %s"
msgstr "Le han invitado a unirse a %s"
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:844
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Transferencia de archivo entrante de %s"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1014 ../src/empathy-main-window.c:367
+msgid "Password required"
+msgstr "Se requiere una contraseña"
+
+#: ../src/empathy-event-manager.c:1070
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s quiere permiso para ver cuándo está disponible"
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1074
#, c-format
msgid ""
"\n"
"\n"
"Mensaje: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1118
#, c-format
msgid "%s is now offline."
msgstr "Ahora %s está desconectado."
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1139
#, c-format
msgid "%s is now online."
msgstr "Ahora %s está conectado."
msgstr "Origen"
#: ../src/empathy-main-window.c:384
+msgid "Provide Password"
+msgstr "Escriba su contraseña"
+
+#: ../src/empathy-main-window.c:390
+msgid "Disconnect"
+msgstr "Desconectar"
+
+#: ../src/empathy-main-window.c:530
msgid "No match found"
msgstr "No se encontró ninguna coincidencia"
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:685
msgid "Reconnect"
msgstr "Reconectar"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:691
msgid "Edit Account"
msgstr "Editar cuenta"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:697
msgid "Close"
msgstr "Cerrar"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1405
msgid "Contact"
msgstr "Contacto"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1741
msgid "Contact List"
msgstr "Lista de contactos"
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1854
msgid "Show and edit accounts"
msgstr "Mostrar y editar cuentas"
msgid "_Reduce location accuracy"
msgstr "_Reducir la precisión de la ubicación"
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr "Respuesta"
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "Rechazar"
-
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "Responder"
-
-#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "Rechazar"
-
-#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "Aceptar"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Estado"
msgid "Invite"
msgstr "Invitar"
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:178
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"No mostrar ningún diálogo; realizar cualquier trabajo (ej. importar) y salir"
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:182
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr ""
"No mostrar ningún diálogo a no ser que sólo existan cuentas «Gente cerca»"
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:186
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Cuenta proporcionada inicialmente seleccionada (ej. gabble/jabber/ejemplo)"
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:188
msgid "<account-id>"
msgstr "<id-de-cuenta>"
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:193
msgid "- Empathy Accounts"
msgstr ": Cuentas en Empathy"
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:232
msgid "Empathy Accounts"
msgstr "Cuentas en Empathy"
msgid "Empathy Debugger"
msgstr "Depurador de Empathy"
-#: ../src/empathy-chat.c:91
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr ": Cliente de chat Empathy"
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Respuesta"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Rechazar"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Responder"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Rechazar"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Aceptar"
+
#~ msgid "Add _New Preset"
#~ msgstr "Añadir esta_do guardado"
"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-11-17 14:29+0000\n"
-"PO-Revision-Date: 2010-11-16 10:46+0200\n"
-"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
+"POT-Creation-Date: 2010-12-26 17:56+0000\n"
+"PO-Revision-Date: 2010-12-28 19:01+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"
-"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: Estonian\n"
"X-Poedit-Country: ESTONIA\n"
msgid "Pass_word:"
msgstr "_Parool:"
+msgid "Remember Password"
+msgstr "Parooli peetakse meeles"
+
msgid "Screen _Name:"
msgstr "Ekraani_nimi:"
"See on sinu kasutajanimi, mitte tavaline Facebooki sisselogimise nimi.\n"
"Kui sinu leht on facebook.com/<b>hüüdnimi</b>, sisesta <b>hüüdnimi</b>.\n"
"Kui sul veel ei ole Facebooki kasutajanime, saad selle luua <a href=\"http://"
-"www.facebook.com/username/\">siin</a>."
+"www.facebook.com/username/\">siin lehel</a>."
msgid "Use old SS_L"
msgstr "Kasutatakse _vana SSL-i"
msgid "I_gnore conference and chat room invitations"
msgstr "Konverentside ja jututubade kutseid _eiratakse"
+#. remember password ticky box
+msgid "Remember password"
+msgstr "Parooli peetakse meeles"
+
msgid "What is your Yahoo! ID?"
msgstr "Mis on sinu Yahoo! ID?"
msgstr "_Ühenda kontaktid…"
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "Metakontakt, mis sisaldab %u kontakti"
-msgstr[1] "Metakontakt, mis sisaldab %u kontakti"
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"Kas tõesti tahad eemaldada lingitud kontakti '%s'? See eemaldab kõik "
+"kontaktid, millest lingitud kontakt koosneb."
+
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Lingitud kontakt, mis sisaldab %u kontakti"
+msgstr[1] "Lingitud kontakt, mis sisaldab %u kontakti"
msgid "<b>Location</b> at (date)"
msgstr "<b>Asukoht</b> kuupäeval"
msgstr "_Eralda kontaktid…"
msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
-msgstr "Metakontakti lahutamine seda moodustavateks kontaktideks."
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr "Lingitud kontakti lahutamine seda moodustavateks kontaktideks."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
msgstr "_Ühenda"
#, c-format
-msgid "Unlink meta-contact '%s'?"
-msgstr "Kas lahutada metakontakt '%s' osadeks?"
+msgid "Unlink linked contacts '%s'?"
+msgstr "Kas lahutada lingitud kontakt '%s' osadeks?"
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 these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
msgstr ""
-"Kas sa oled kindel, et tahad selle metakontakti osadeks lahutada? Sellega "
-"muutuvad metakontakti moodustavad kontaktid jälle iseseisvateks."
+"Kas sa oled kindel, et tahad need lingitud kontakti eraldada? Sellega muutub "
+"lingitud kontakt jälle eraldi kontaktideks."
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgid "New Call"
msgstr "Uus kõne"
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Sisesta järgneva konto parool\n"
+"<b>%s</b>"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
"Sa oled valimas teist kontot ja see tühistab tehtud muudatused\n"
"Kas sa soovid seda teha?"
+#. Menu items: to enabled/disable the account
+msgid "_Enable"
+msgstr "_Luba"
+
+msgid "_Disable"
+msgstr "_Keela"
+
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgid "Incoming file transfer from %s"
msgstr "Failiülekanne kasutajalt %s"
+msgid "Password required"
+msgstr "Parool on vajalik"
+
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s palub luba sinu saadavaloleku nägemiseks"
msgid "Source"
msgstr "Allikas"
+msgid "Provide Password"
+msgstr "Parooli sisestamine"
+
+msgid "Disconnect"
+msgstr "Katkesta ühendus"
+
msgid "No match found"
msgstr "Vastavust ei leitud"
msgid "_Reduce location accuracy"
msgstr "_Asukoha täpsust vähendatakse"
-msgid "Respond"
-msgstr "Vastamine"
-
-msgid "Reject"
-msgstr "Lükka tagasi"
-
-msgid "Answer"
-msgstr "Vasta"
-
-msgid "Decline"
-msgstr "Lükka tagasi"
-
-msgid "Accept"
-msgstr "Nõustu"
-
msgid "Status"
msgstr "Olek"
msgid "- Empathy Chat Client"
msgstr "- Empathy sõnumivahetusklient"
+msgid "Respond"
+msgstr "Vastamine"
+
+msgid "Reject"
+msgstr "Lükka tagasi"
+
+msgid "Answer"
+msgstr "Vasta"
+
+msgid "Decline"
+msgstr "Lükka tagasi"
+
+msgid "Accept"
+msgstr "Nõustu"
+
#~ 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"
# Antón Méixome <meixome@certima.net>, 2010.
# Francisco Diéguez <frandieguez@ubuntu.com>, 2010.
# Fran Dieguez <frandieguez@ubuntu.com>, 2009, 2010.
-# Fran Diéguez <frandieguez@ubuntu.com>,2009, 2010.
+# Fran Diéguez <frandieguez@ubuntu.com>,2009, 2010, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-20 01:43+0100\n"
-"PO-Revision-Date: 2010-11-20 01:44+0100\n"
+"POT-Creation-Date: 2011-01-09 00:30+0100\n"
+"PO-Revision-Date: 2011-01-09 00:34+0100\n"
"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
"Language-Team: Galician <gnome-gl-list@gnome.org>\n"
"Language: gl\n"
# rever
#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show the contact list in chat rooms."
-msgstr "Indica se mostrar ou non a lista de contactos nas salas de chat."
+msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa."
# rever
#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2202
msgid "Messaging and VoIP Accounts"
msgstr "Contas de mensaxaría e VoIP"
msgid "Offline"
msgstr "Desconectado"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Descoñecido"
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"O certificado usa un algoritmo de cifrado inseguro ou cripotograficamente "
-"débil."
+"débil"
#: ../libempathy/empathy-utils.c:380
msgid ""
msgid "All"
msgstr "Todas"
-#: ../libempathy-gtk/empathy-account-widget.c:637
+#: ../libempathy-gtk/empathy-account-widget.c:679
#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Conta"
-#: ../libempathy-gtk/empathy-account-widget.c:638
+#: ../libempathy-gtk/empathy-account-widget.c:680
msgid "Password"
msgstr "Contrasinal"
-#: ../libempathy-gtk/empathy-account-widget.c:639
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:640
+#: ../libempathy-gtk/empathy-account-widget.c:682
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Porto"
-#: ../libempathy-gtk/empathy-account-widget.c:712
-#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:754
+#: ../libempathy-gtk/empathy-account-widget.c:811
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1094
+#: ../libempathy-gtk/empathy-account-widget.c:1152
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "A conta %s edítase mediante My Web Accounts."
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1158
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Non é posíbel editar a conta %s en Empathy."
# rever
-#: ../libempathy-gtk/empathy-account-widget.c:1120
+#: ../libempathy-gtk/empathy-account-widget.c:1178
msgid "Launch My Web Accounts"
msgstr "Iniciar My Web Accounts"
-#: ../libempathy-gtk/empathy-account-widget.c:1418
+#: ../libempathy-gtk/empathy-account-widget.c:1516
msgid "Username:"
msgstr "Nome de _usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1753
+#: ../libempathy-gtk/empathy-account-widget.c:1884
msgid "A_pply"
msgstr "A_plicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1783
+#: ../libempathy-gtk/empathy-account-widget.c:1914
msgid "L_og in"
msgstr "Iniciar sesi_ón"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1980
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
+#: ../libempathy-gtk/empathy-individual-widget.c:1486
#: ../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 "Conta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1860
+#: ../libempathy-gtk/empathy-account-widget.c:1991
msgid "_Enabled"
msgstr "_Activado"
-#: ../libempathy-gtk/empathy-account-widget.c:1925
+#: ../libempathy-gtk/empathy-account-widget.c:2056
msgid "This account already exists on the server"
msgstr "Esta conta xa existe no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1928
+#: ../libempathy-gtk/empathy-account-widget.c:2059
msgid "Create a new account on the server"
msgstr "Crear unha nova conta no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:2042
+#: ../libempathy-gtk/empathy-account-widget.c:2251
msgid "Ca_ncel"
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:2334
+#: ../libempathy-gtk/empathy-account-widget.c:2548
#, 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:2360
+#: ../libempathy-gtk/empathy-account-widget.c:2574
#, c-format
msgid "%s Account"
msgstr "Conta %s"
# rever
-#: ../libempathy-gtk/empathy-account-widget.c:2364
+#: ../libempathy-gtk/empathy-account-widget.c:2578
msgid "New account"
msgstr "Conta nova"
msgid "Pass_word:"
msgstr "Con_trasinal:"
-# rever
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "Remember Password"
+msgstr "Lembrar o contrasinal"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
msgid "Screen _Name:"
msgstr "_Nome en pantalla:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "What is your AIM password?"
msgstr "Cal e o seu contrasinal para AIM?"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
msgid "What is your AIM screen name?"
msgstr "Cal é o seu nome en patalla para 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:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Port:"
-msgstr "_Porto:"
-
#: ../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:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "_Port:"
+msgstr "_Porto:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:13
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Servidor:"
msgid "Login I_D:"
msgstr "I_D de sesión:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise User ID?"
msgstr "Cal é o seu ID de usuario en GroupWise?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise password?"
msgstr "Cal é o seu contrasinal en GroupWise?"
msgid "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 UIN?"
msgstr "Cal é o seu UIN para ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ password?"
msgstr "Cal é o seu contrasinal pra ICQ?"
msgid "Priori_ty:"
msgstr "Pri_oridade:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
msgid "Reso_urce:"
msgstr "Rec_urso:"
#. 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
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
"seleccioar o nome de usuario de Facebook se non ten ningún."
# rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "Use old SS_L"
msgstr "Usar o SS_L antigo"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook password?"
msgstr "Cal é o seu contrasinal para Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook username?"
msgstr "Cal é o seu nome de usuario para Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google ID?"
msgstr "Cal é o seu ID de Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google password?"
msgstr "Cal é o seu contrasinal de Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber ID?"
msgstr "Cal é o seu identificador de Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber password?"
msgstr "Cal é o seu contrasinal de Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber ID?"
msgstr "Cal é o ID de Jabber que desexa?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber password?"
msgstr "Cal é o contrasinal de Jabber que desexa?"
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Exemplo:</b> usuario@hotmail.com"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
msgid "What is your Windows Live ID?"
msgstr "Cal é o seu contrasinal para Windows Live?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live password?"
msgstr "Cal é o seu contrasinal para Windows Live?"
msgid "Proxy Options"
msgstr "Opcións do proxy"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "STUN Server:"
msgstr "Servidor STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Server:"
msgstr "Servidor:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Transport:"
msgstr "Transporte:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP account password?"
msgstr "Cal é o contrasinal da súa conta SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP login ID?"
msgstr "Cal é o seu ID de inicio de sesión SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "_Username:"
msgstr "Nome de _usuario:"
msgid "I_gnore conference and chat room invitations"
msgstr "I_gnorar os convites para conferencias e salas de conversa"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-password-dialog.c:283
+msgid "Remember password"
+msgstr "Lembrar o contrasinal"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
-msgstr "Cal é o seu ID para Yahoo!?"
+msgstr "Cal é o seu ID para Yahoo?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "What is your Yahoo! password?"
-msgstr "Cal é o seu contrasinal para Yahoo!?"
+msgstr "Cal é o seu contrasinal para Yahoo?"
# rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "Yahoo! I_D:"
msgstr "I_D de Yahoo:"
# rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
msgid "_Room List locale:"
msgstr "Configuración da lista de _salas:"
# rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "Non foi posíbel converter a imaxe"
# rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "Ningún dos formatos aceptados de imaxe é compatíbel co seu sistema"
# rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Seleccione a súa imaxe de avatar"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "Sen imaxe"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Imaxes"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "Todos os ficheiros"
# rever
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:322
msgid "Click to enlarge"
msgstr "Prema para ampliar"
-#: ../libempathy-gtk/empathy-chat.c:643
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Produciuse un fallo ao abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:683
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "Ese asunto non se admite nesta conversación"
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "Non se lle permite cambiar o asunto"
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear, limpa todas as mensaxes da conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>, estabelece o asunto da conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
-#: ../libempathy-gtk/empathy-chat.c:832
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact id> [<message>], abre unha conversa privada"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact id> <message>, abre unha conversa privada"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:851
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 "
"unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
"unirse a unha nova sala de conversa\""
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
"/help [<command>], mostra todas as ordes admitidas. Se <command> está "
"definida, mostra o seu uso."
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Orde descoñecida"
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "contacto incorrecto"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "permiso denegado"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "a mensaxe é demasiado longa"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "non implementado"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "descoñecido"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1234 ../src/empathy-chat-window.c:703
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:708
msgid "Topic:"
msgstr "Asunto:"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1246
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "Cambiouse o asunto a: %s"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "Non se definiu un asunto"
-#: ../libempathy-gtk/empathy-chat.c:1747
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(Sen suxestións)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Engadir «%s» ao dicionario"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1852
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Engadir «%s» ao dicionario de %s"
-#: ../libempathy-gtk/empathy-chat.c:1911
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Inserir unha emoticona"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1929
-#: ../libempathy-gtk/empathy-ui-utils.c:1806
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "_Send"
msgstr "_Enviar"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "Suxestións de _ortografía"
-#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Produciuse un fallo ao obter os rexistros recentes"
# rever
-#: ../libempathy-gtk/empathy-chat.c:2158
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s desconectou"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2165
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s foi expulsado por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2168
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s foi expulsado"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s foi vetado por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s foi excluído"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s deixou a sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
# rever
-#: ../libempathy-gtk/empathy-chat.c:2217
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s uniuse á sala"
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s agora é coñecido como %s"
-#: ../libempathy-gtk/empathy-chat.c:2381 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "O contrasinal é incorrecto, ténteo de novo:"
-#: ../libempathy-gtk/empathy-chat.c:2995
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Reintentar"
-#: ../libempathy-gtk/empathy-chat.c:3000
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "Esta sala está protexida por un contrasinal:"
-#: ../libempathy-gtk/empathy-chat.c:3001
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3141
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3194
+#: ../libempathy-gtk/empathy-chat.c:3216
#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Conversa"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:319
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Copiar o enderezo da ligazón"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:326
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Abrir a ligazón"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:419
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A, %d de %B de %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Editar a información de contacto"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Información persoal"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:424
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "Contacto novo"
msgstr "Persoas favoritas"
# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:1999
+#: ../libempathy-gtk/empathy-individual-view.c:2262
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Está seguro de que quere eliminar o grupo '%s'?"
# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2268
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2265
msgid "Removing group"
msgstr "Eliminando o grupo"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2322
-#: ../libempathy-gtk/empathy-individual-view.c:2436
+#: ../libempathy-gtk/empathy-contact-list-view.c:2050
+#: ../libempathy-gtk/empathy-contact-list-view.c:2127
+#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-individual-view.c:2467
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Eliminar"
# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2353
+#: ../libempathy-gtk/empathy-contact-list-view.c:2080
+#: ../libempathy-gtk/empathy-individual-view.c:2370
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Está seguro de quere eliminar o contacto '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2386
msgid "Removing contact"
msgstr "Eliminando o contacto"
#: ../libempathy-gtk/empathy-contact-menu.c:203
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
-msgstr "Eng_adir un contacto..."
+msgstr "Eng_adir un contacto…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
#: ../libempathy-gtk/empathy-individual-menu.c:516
#: ../libempathy-gtk/empathy-contact-menu.c:418
#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-individual-widget.c:1377
msgid "Favorite"
msgstr "Favorito"
# rever
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:915
+#: ../src/empathy-chat-window.c:920
msgid "Inviting you to this room"
msgstr "Invítao a vostede a esta sala"
msgstr "Aniversario:"
#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Country ISO Code:"
msgstr "Código ISO de país:"
#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Country:"
msgstr "País:"
#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "State:"
msgstr "Rexión:"
#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "City:"
msgstr "Cidade:"
#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Area:"
msgstr "Área:"
#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Postal Code:"
msgstr "Código postal:"
#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Street:"
msgstr "Rúa:"
#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Building:"
msgstr "Edificio:"
# rever
#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Floor:"
msgstr "_Andar:"
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Room:"
msgstr "Sala:"
#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Text:"
msgstr "Texto:"
#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Description:"
msgstr "Descrición:"
#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "URI:"
msgstr "URI:"
#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Accuracy Level:"
msgstr "Nivel de precisión:"
#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Error:"
msgstr "Erro:"
#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Erro vertical (metros):"
#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Erro horizontal (metros):"
#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Speed:"
msgstr "Velocidade:"
#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Bearing:"
msgstr "Orientación:"
#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Climb Speed:"
msgstr "Velocidade de incremento:"
#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Last Updated on:"
msgstr "Última actualización:"
#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "Longitude:"
msgstr "Lonxitude:"
#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Latitude:"
msgstr "Latitude:"
#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Altitude:"
msgstr "Altitude:"
#: ../libempathy-gtk/empathy-contact-widget.c:779
#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:622
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Localización"
#. translators: format is "Location, $date"
#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:624
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y de %R UTC"
# rever
#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:922
msgid "Save Avatar"
msgstr "Gardar o avatar"
# rever
#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:979
+#: ../libempathy-gtk/empathy-individual-widget.c:980
msgid "Unable to save avatar"
msgstr "Non foi posíbel gardar o avatar"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1312
msgid "Alias:"
msgstr "Alias:"
#. 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:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1516
msgid "Identifier:"
msgstr "Identificador:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
-msgstr "Información solicitada..."
+msgstr "Información solicitada…"
# rever
#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgstr "Seleccionar"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1423
msgid "Group"
msgstr "Grupo"
#. Translators: the heading at the top of the Information dialogue
#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
-msgstr "contactos ligados"
+msgstr "Contactos ligados"
# rever
#: ../libempathy-gtk/empathy-individual-linker.c:354
#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
-msgstr "_Ligar contactos..."
+msgstr "_Ligar contactos…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1649
+#: ../libempathy-gtk/empathy-individual-view.c:2378
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "Metacontacto que contén %u contacto"
-msgstr[1] "Metacontacto que contén %u contactos"
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"Desexa eliminar o contacto ligado %s? Teña en conta que eliminaranse tamén "
+"todos os contactos que forman este contacto ligado."
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1657
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Contacto ligado que contén %u contacto"
+msgstr[1] "Contactos ligados que conteñen %u contactos"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
-msgstr "_Desligar..."
+msgstr "_Desligar…"
#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
-msgstr ""
-"Separar por completo o meta-contacto mostrado nos contactos que contén."
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr "Separar por completo o contacto ligado nos contactos que contén."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
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»?"
+msgid "Unlink linked contacts '%s'?"
+msgstr "Desexa desligar os contactos ligados «%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."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
msgstr ""
-"Está seguro que quere desligar este meta-contacto? Isto separará por "
-"completo o meta-contacto nos contactos que contén."
+"Está seguro que quere desligar estes contactos ligados? Isto separará por "
+"completo os contactos ligados en contactos separados."
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "New Call"
msgstr "Nova chamada"
+#: ../libempathy-gtk/empathy-password-dialog.c:248
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Escriba o contrasinal para a conta\n"
+"<b>%s</b>"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#: ../libempathy-gtk/empathy-presence-chooser.c:170
#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
-msgstr "Mensaxe personalizada..."
+msgstr "Mensaxe personalizada…"
#: ../libempathy-gtk/empathy-presence-chooser.c:223
#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
-msgstr "Editar mensaxes personalizadas..."
+msgstr "Editar mensaxes personalizadas…"
#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
#. Custom messages
#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
-msgstr "Mensaxes personalizadas..."
+msgstr "Mensaxes personalizadas…"
# rever
#. Create account
msgstr "Frase non encontrada"
# rever
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Recibir unha mensaxe instantánea"
# rever
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Enviar unha mensaxe instantánea"
# rever
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Solicitude de conversa entrante"
# rever
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Contacto conectado"
# rever
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Contacto desconectado"
# rever
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Conectado co servidor"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Desconectado do servidor"
# rever
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Chamada de voz entrante"
# rever
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Chamada de voz saínte"
# rever
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Chamada de voz finalizada"
msgid "Certificate Details"
msgstr "Detalles do certificado"
-#: ../libempathy-gtk/empathy-ui-utils.c:1703
+#: ../libempathy-gtk/empathy-ui-utils.c:1708
msgid "Unable to open URI"
msgstr "Non foi posíbel abrir o URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1798
+#: ../libempathy-gtk/empathy-ui-utils.c:1803
msgid "Select a file"
msgstr "Seleccione un ficheiro"
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "Ficheiro entrante de %s"
msgstr "Mensaxe instantáneo (Empathy)"
# rever
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Non conectarse ao inicio"
# rever
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
# rever
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
-msgstr "- Cliente de mensaxaría instantánea Empathy"
+msgstr " - Cliente de mensaxaría instantánea Empathy"
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Produciuse un erro ao contactar co Xestor de contas"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
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:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
-msgstr "Conectando..."
+msgstr "Conectando…"
#: ../src/empathy-accounts-dialog.c:321
#, c-format
"Vai seleccionar outra conta, e descartaranse os seus cambios\n"
"Está seguro de que quere proceder?"
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1544
+msgid "_Enable"
+msgstr "_Activar"
+
+#: ../src/empathy-accounts-dialog.c:1545
+msgid "_Disable"
+msgstr "_Desactivar"
+
# rever
-#: ../src/empathy-accounts-dialog.c:1951
+#: ../src/empathy-accounts-dialog.c:2046
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
# rever
#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
-msgstr "Eng_adir..."
+msgstr "Eng_adir…"
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
-msgstr "_Importar..."
+msgstr "_Importar…"
# rever
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:243
msgid " - Empathy authentication client"
msgstr "- Cliente de autenticación Empathy"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:259
msgid "Empathy authentication client"
msgstr "Cliente de autenticación Empathy"
msgid "Empathy Audio/Video Client"
msgstr "Cliente de son/vídeo Empathy"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Contraste"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Brillo"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "Barra _lateral"
# rever
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Entrada de audio"
# rever
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Marcador"
# rever
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
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:1266
+#: ../src/empathy-call-window.c:1270
#, 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:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "Chamar"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "O enderezo IP como é visto polo computador"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
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:1503
+#: ../src/empathy-call-window.c:1507
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:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "O enderezo IP dun servidor de desvío"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
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:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
# rever
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"O software de %s non entende algúns dos formatos de video admitidos polo seu "
"computador"
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
"computador"
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"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:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "Produciuse un fallo na rede"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
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:2377
+#: ../src/empathy-call-window.c:2384
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:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"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:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "Produciuse un fallo ao chamar ao motor"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "Chegouse ao final do fluxo"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "Non é posíbel estabelecer un fluxo de audio"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "Non é posíbel estabelecer un fluxo de vídeo"
msgid "_View"
msgstr "_Ver"
-#: ../src/empathy-chat-window.c:468 ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:473 ../src/empathy-chat-window.c:493
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d non lido)"
msgstr[1] "%s (%d non lidos)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:485
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (e outro %u)"
msgstr[1] "%s (e outros %u)"
-#: ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:501
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d non lido de outros)"
msgstr[1] "%s (%d non lidos de outros)"
-#: ../src/empathy-chat-window.c:505
+#: ../src/empathy-chat-window.c:510
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[1] "%s (%d non lidos de todos)"
# rever
-#: ../src/empathy-chat-window.c:707
+#: ../src/empathy-chat-window.c:712
msgid "Typing a message."
msgstr "Escribindo unha mensaxe."
#: ../src/empathy-chat-window.ui.h:5
msgid "Invite _Participant…"
-msgstr "Invitar _participante..."
+msgstr "Invitar _participante…"
#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
msgstr "Xestionar as salas preferidas"
# rever
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
msgstr "Chamada de vídeo entrante"
# rever
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Chamada entrante"
# rever
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s solicítalle unha videochamada. Desexa responderlle?"
# rever
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:513
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s estao chamando. Quérelle responder?"
-#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:516 ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming call from %s"
msgstr "Chamada entrante de %s"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:541
msgid "_Reject"
msgstr "_Rexeitar"
# rever
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:547
msgid "_Answer"
msgstr "_Responder"
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming video call from %s"
msgstr "Videochamada entrante de %s"
# rever
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:738
msgid "Room invitation"
msgstr "Convite para unha sala"
# rever
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:740
#, c-format
msgid "Invitation to join %s"
msgstr "Invitación a unirse a %s"
# rever
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:747
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s estao convidando a unirse a %s"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:755
msgid "_Decline"
msgstr "_Declinar"
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:760
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Unirse"
# rever
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:787
#, c-format
msgid "%s invited you to join %s"
msgstr "%s convidouno a unirse a %s"
# rever
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:793
#, c-format
msgid "You have been invited to join %s"
msgstr "Vostede foi convidado a unirse a %s"
# rever
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:844
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Transferencia de ficheiro entrante de %s"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1014 ../src/empathy-main-window.c:367
+msgid "Password required"
+msgstr "Requírese o contrasinal"
+
+#: ../src/empathy-event-manager.c:1070
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s solicita permiso para ver cando está dispoñíbel"
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1074
#, c-format
msgid ""
"\n"
"\n"
"Mensaxe: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1118
#, c-format
msgid "%s is now offline."
msgstr "%s está agora desconectado."
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1139
#, c-format
msgid "%s is now online."
msgstr "%s está agora conectado."
msgid "Source"
msgstr "Orixe"
-# rever
#: ../src/empathy-main-window.c:384
+msgid "Provide Password"
+msgstr "Escriba o seu contrasinal"
+
+#: ../src/empathy-main-window.c:390
+msgid "Disconnect"
+msgstr "Desconectar"
+
+# rever
+#: ../src/empathy-main-window.c:530
msgid "No match found"
msgstr "Non se encontrou ningunha coincidencia."
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:685
msgid "Reconnect"
msgstr "Reconectar"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:691
msgid "Edit Account"
msgstr "Editar a conta"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:697
msgid "Close"
msgstr "Pechar"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1405
msgid "Contact"
msgstr "Contacto"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1741
msgid "Contact List"
msgstr "Lista de contactos"
# rever
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1854
msgid "Show and edit accounts"
msgstr "Mostrar e editar contas"
#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
-msgstr "Nova _chamada..."
+msgstr "Nova _chamada…"
#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
-msgstr "_Unirse..."
+msgstr "_Unirse…"
#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
-msgstr "_Nova conversa..."
+msgstr "_Nova conversa…"
# rever
#: ../src/empathy-main-window.ui.h:24
msgid "_Reduce location accuracy"
msgstr "_Reducir a precisión de localización"
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr "Responder"
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "Rexeitar"
-
-# rever
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "Responder"
-
-#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "Declinar"
-
-#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "Aceptar"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Estado"
msgid "Invite"
msgstr "Invitar"
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:178
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Non mostra ningún diálogo, fai algún traballo (p.ex. importar) e sae"
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:182
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr ""
"Non mostrar ningún diálogo a non ser que só existan contas «Persoas próximas»"
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:186
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Conta fornecida seleccionada inicialmente (p.ex. gabble/jabber/"
"foo_40exemplo_2eorg0)"
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:188
msgid "<account-id>"
msgstr "<account-id>"
# rever
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:193
msgid "- Empathy Accounts"
msgstr "- Contas de Empathy"
# rever
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:232
msgid "Empathy Accounts"
msgstr "Contas de Empathy"
msgstr "Depurador de Empathy"
# rever
-#: ../src/empathy-chat.c:91
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr "- Cliente de conversa Empathy"
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Responder"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Rexeitar"
+
+# rever
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Responder"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Declinar"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Aceptar"
+
#~ msgid "The hash of the received file and the sent one do not match"
#~ msgstr "O hash do ficheiro recibido e o do enviado non coinciden"
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-21 12:59+0200\n"
-"PO-Revision-Date: 2010-11-21 13:00+0200\n"
+"POT-Creation-Date: 2010-12-26 19:54+0200\n"
+"PO-Revision-Date: 2010-12-26 19:54+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2200
msgid "Messaging and VoIP Accounts"
msgstr "חשבונות התכתבות ו־VoIP"
msgid "Offline"
msgstr "לא מחובר"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "לא ידוע"
msgid "All"
msgstr "הכול"
-#: ../libempathy-gtk/empathy-account-widget.c:637
+#: ../libempathy-gtk/empathy-account-widget.c:679
#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "חשבון"
-#: ../libempathy-gtk/empathy-account-widget.c:638
+#: ../libempathy-gtk/empathy-account-widget.c:680
msgid "Password"
msgstr "ססמה"
-#: ../libempathy-gtk/empathy-account-widget.c:639
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "שרת"
-#: ../libempathy-gtk/empathy-account-widget.c:640
+#: ../libempathy-gtk/empathy-account-widget.c:682
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "פתחה"
-#: ../libempathy-gtk/empathy-account-widget.c:712
-#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:754
+#: ../libempathy-gtk/empathy-account-widget.c:811
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1094
+#: ../libempathy-gtk/empathy-account-widget.c:1152
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "החשבון %s נערך דרך החשבונות המקוונים שלי."
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1158
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "לא ניתן לערוך את החשבון %s ב־Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1120
+#: ../libempathy-gtk/empathy-account-widget.c:1178
msgid "Launch My Web Accounts"
msgstr "טעינת החשבונות המקוונים שלי"
-#: ../libempathy-gtk/empathy-account-widget.c:1418
+#: ../libempathy-gtk/empathy-account-widget.c:1516
msgid "Username:"
msgstr "ש_ם משתמש:"
-#: ../libempathy-gtk/empathy-account-widget.c:1753
+#: ../libempathy-gtk/empathy-account-widget.c:1884
msgid "A_pply"
msgstr "ה_חלה"
-#: ../libempathy-gtk/empathy-account-widget.c:1783
+#: ../libempathy-gtk/empathy-account-widget.c:1914
msgid "L_og in"
msgstr "_כניסה"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1980
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
+#: ../libempathy-gtk/empathy-individual-widget.c:1486
#: ../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:1860
+#: ../libempathy-gtk/empathy-account-widget.c:1991
msgid "_Enabled"
msgstr "מו_פעל"
-#: ../libempathy-gtk/empathy-account-widget.c:1925
+#: ../libempathy-gtk/empathy-account-widget.c:2056
msgid "This account already exists on the server"
msgstr "חשבון זה כבר קיים על השרת"
-#: ../libempathy-gtk/empathy-account-widget.c:1928
+#: ../libempathy-gtk/empathy-account-widget.c:2059
msgid "Create a new account on the server"
msgstr "יצירת חשבון חדש על השרת"
-#: ../libempathy-gtk/empathy-account-widget.c:2042
+#: ../libempathy-gtk/empathy-account-widget.c:2251
msgid "Ca_ncel"
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:2334
+#: ../libempathy-gtk/empathy-account-widget.c:2548
#, 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:2360
+#: ../libempathy-gtk/empathy-account-widget.c:2574
#, c-format
msgid "%s Account"
msgstr "חשבון %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2364
+#: ../libempathy-gtk/empathy-account-widget.c:2578
msgid "New account"
msgstr "חשבון חדש"
msgstr "ססמ_ה:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "Remember Password"
+msgstr "שמירת הססמה"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
msgid "Screen _Name:"
msgstr "שם _מסך:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "What is your AIM password?"
msgstr "מהי ססמת ה־AIM שלך?"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
msgid "What is your AIM screen name?"
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:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../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:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "_Port:"
+msgstr "_פתחה:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:13
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_שרת:"
msgid "Login I_D:"
msgstr "מזהה משת_מש:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise User ID?"
msgstr "מזהה משתמש ה־GroupWise שלך?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise password?"
msgstr "ססמת ה־GroupWise שלך?"
msgid "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 UIN?"
msgstr "מספר מנוי ה־ICQ שלך?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ password?"
msgstr "ססמת ה־ICQ שלך?"
msgid "Priori_ty:"
msgstr "עדי_פות:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
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:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
"יש להשתמש ב<a href=\"http://www.facebook.com/username/\">עמוד זה</a> כדי "
"לבחור שם משתמש בפייסבוק אם עוד אין לך אחד כזה."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "Use old SS_L"
msgstr "שימוש ב־SS_L ישן"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook password?"
msgstr "מהי ססמת חשבון הפייסבוק שלך?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook username?"
msgstr "מהו שם המשתמש שלך בפייסבוק?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google ID?"
msgstr "מהו מזהה משתמש שלך ב־Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google password?"
msgstr "מהי ססמת ה־Google שלך?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber ID?"
msgstr "מהו מזהה משתמש ה־Jabber שלך?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber password?"
msgstr "מהי ססמת ה־Jabber שלך?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber ID?"
msgstr "מהי כתובת ה־Jabber המועדפת עליך?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber password?"
msgstr "מהי ססמת ה־Jabber המועדפת עליך?"
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<span size=\"small\"><b>דוגמה:</b> user@hotmail.com</span>"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
msgid "What is your Windows Live ID?"
msgstr "מהו שם המשתמש שלך ב־Windows Live?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live password?"
msgstr "מהי ססמתך ב־Windows Live?"
msgid "Proxy Options"
msgstr "אפשרויות מתווך"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "STUN Server:"
msgstr "שרת STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Server:"
msgstr "שרת:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Transport:"
msgstr "תעבורה:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP account password?"
msgstr "מהי ססמת חשבון ה־SIP שלך?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP login ID?"
msgstr "מהו מזהה ההתחברות של חשבון ה־SIP שלך?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "_Username:"
msgstr "ש_ם משתמש:"
msgid "I_gnore conference and chat room invitations"
msgstr "ה_תעלמות מהזמנות לשיחות ועידה ולחדרי שיחה"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-password-dialog.c:283
+msgid "Remember password"
+msgstr "שמירת הססמה"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
msgstr "מהו המזהה בחשבון ה־Yahoo! שלך?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "What is your Yahoo! password?"
msgstr "מהי ססמת חשבון ה־Yahoo! שלך?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "Yahoo! I_D:"
msgstr "מז_הה Yahoo!:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
msgid "_Room List locale:"
msgstr "שפת רשימת ה_חדרים:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "לא ניתן להמיר תמונה"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "אף אחד מסוגי התמונות המקובלים אינם נתמכים על ידי המערכת שלך"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "נא לבחור את התמונה האישית שלך"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "ללא תמונה"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "תמונות"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "כל הקבצים"
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:324
msgid "Click to enlarge"
msgstr "יש ללחוץ כדי להגדיל"
-#: ../libempathy-gtk/empathy-chat.c:643
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "ארע כשל בפתיחת שיחה פרטית"
-#: ../libempathy-gtk/empathy-chat.c:683
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "אין תמיכה בשימוש בנושא בדיון זה"
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "אין לך הרשאה לשנות את הנושא"
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: פינוי כל ההודעות מהדיון הנוכחי"
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <נושא>: הגדרת נושא השיחה הנוכחית"
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <זיהוי החדר>: הצטרפות לחדר שיחה חדש"
-#: ../libempathy-gtk/empathy-chat.c:832
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <זיהוי החדר>: הצטרפות לחדר שיחה חדש"
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <זיהוי איש הקשר> [<הודעה>]: פתיחת צ'אט אישי"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <זיהוי איש הקשר> <הודעה>: פתיחת צ'אט פרטי"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <כינוי>: שינוי הכינוי שלך בשרת הנוכחי"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <הודעה>: שליחת הודעת ACTION לדיון הנוכחי"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:851
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 "
"/say <הודעה>: שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות "
"המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\""
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
"/help [<פקודה>]: הצגת כל הפקודות הנתמכות. אם יש הגדרה ל־<פקודה> יוצג אופן "
"הפעלתה."
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "שימוש: %s"
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "פקודה לא ידועה"
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "פקודה בלתי מוכרת; יש לעיין ב־/help לצפייה בפקודות הזמינות"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "לא מחובר"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "איש קשר לא תקין"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "איש קשר לא תקין"
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "הודעה ארוכה מדי"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "לא ממומש"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "לא ידוע"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "שגיאה בשליחת ההודעה '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1234 ../src/empathy-chat-window.c:703
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:713
msgid "Topic:"
msgstr "נושא:"
-#: ../libempathy-gtk/empathy-chat.c:1246
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "הנושא הוגדר ל־: %s"
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "לא נקבע נושא"
-#: ../libempathy-gtk/empathy-chat.c:1747
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(אין הצעות)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "הוספת '%s' למילון"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1852
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "הוספת '%s' למילון %s"
-#: ../libempathy-gtk/empathy-chat.c:1911
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "הכנס סמיילי"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1929
-#: ../libempathy-gtk/empathy-ui-utils.c:1806
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "_Send"
msgstr "_שלח"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "הצעות _איות"
-#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "ארע כשל בקבלת הדוחות האחרונים"
-#: ../libempathy-gtk/empathy-chat.c:2158
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
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:2165
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s סולק על ידי %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2168
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
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:2176
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s נחסם על ידי %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s נחסם"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s עזב את החדר"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2217
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s הצטרף לחדר"
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s נודע כעת בכינוי %s"
-#: ../libempathy-gtk/empathy-chat.c:2381 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "מנותק"
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "ססמה שגויה; נא לנסות שוב:"
-#: ../libempathy-gtk/empathy-chat.c:2995
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "ניסיון חוזר"
-#: ../libempathy-gtk/empathy-chat.c:3000
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "חדר זה מוגן בססמה:"
-#: ../libempathy-gtk/empathy-chat.c:3001
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "הצטרפות"
-#: ../libempathy-gtk/empathy-chat.c:3141
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "מחובר"
-#: ../libempathy-gtk/empathy-chat.c:3194
+#: ../libempathy-gtk/empathy-chat.c:3216
#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "שיחה"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:319
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "העתקת _מיקום הקישור"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:326
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_פתיחת קישור"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:419
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %d ב%B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "עריכת מידע איש קשר"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "מידע אישי"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:424
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "איש קשר חדש"
msgid "Favorite People"
msgstr "אנשים מועדפים"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:1999
+#: ../libempathy-gtk/empathy-individual-view.c:2262
#, 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:2268
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2265
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:2322
-#: ../libempathy-gtk/empathy-individual-view.c:2436
+#: ../libempathy-gtk/empathy-contact-list-view.c:2050
+#: ../libempathy-gtk/empathy-contact-list-view.c:2127
+#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-individual-view.c:2467
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "ה_סרה"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2353
+#: ../libempathy-gtk/empathy-contact-list-view.c:2080
+#: ../libempathy-gtk/empathy-individual-view.c:2370
#, 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:2355
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2386
msgid "Removing contact"
msgstr "איש קשר מוסר"
#: ../libempathy-gtk/empathy-contact-menu.c:418
#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-individual-widget.c:1377
msgid "Favorite"
msgstr "מועדף"
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:915
+#: ../src/empathy-chat-window.c:925
msgid "Inviting you to this room"
msgstr "מזמין/ה אותך לחדר זה"
msgstr "יום הולדת:"
#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Country ISO Code:"
msgstr "קוד המדינה בתקן ISO:"
#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Country:"
msgstr "ארץ:"
#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "State:"
msgstr "מדינה:"
#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "City:"
msgstr "עיר:"
#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Area:"
msgstr "אזור:"
#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Postal Code:"
msgstr "מיקוד:"
#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Street:"
msgstr "רחוב:"
#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Building:"
msgstr "מבנה:"
#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Floor:"
msgstr "קומה:"
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Room:"
msgstr "חדר:"
#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Text:"
msgstr "טקסט:"
#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Description:"
msgstr "תיאור:"
#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "URI:"
msgstr "כתובת:"
#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Accuracy Level:"
msgstr "רמת דיוק:"
#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Error:"
msgstr "שגיאה:"
#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Vertical Error (meters):"
msgstr "סטייה אנכית (מטרים):"
#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "סטייה אופקית (מטרים):"
#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Speed:"
msgstr "מהירות:"
#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Bearing:"
msgstr "אזימוט:"
#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Climb Speed:"
msgstr "מהירות הטיפוס:"
#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Last Updated on:"
msgstr "עדכון אחרון ב־:"
#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "Longitude:"
msgstr "קו אורך:"
#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Latitude:"
msgstr "קו רוחב:"
#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Altitude:"
msgstr "גובה:"
#: ../libempathy-gtk/empathy-contact-widget.c:779
#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:622
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "מיקום"
#. translators: format is "Location, $date"
#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:624
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y ב־%R UTC"
#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:922
msgid "Save Avatar"
msgstr "שמירת תמונה אישית"
#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:979
+#: ../libempathy-gtk/empathy-individual-widget.c:980
msgid "Unable to save avatar"
msgstr "לא ניתן לשמור תמונה אישית"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1312
msgid "Alias:"
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:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1516
msgid "Identifier:"
msgstr "מזהה:"
msgstr "בחירה"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1423
msgid "Group"
msgstr "קבוצה"
msgid "_Link Contacts…"
msgstr "_קישור אנשי קשר…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1649
+#: ../libempathy-gtk/empathy-individual-view.c:2378
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"האם אכן ברצונך להסיר את איש הקשר המקושר '%s'? נא לשים לב שפעולה זו תסיר את "
+"כל אנשי הקשר המתאגדים לאיש קשר מקושר זה."
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1657
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "×\9eשת×\9eש ×¢×\9c המכיל איש קשר אחד"
-msgstr[1] "×\9eשת×\9eש ×¢×\9c המכיל %u אנשי קשר"
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "×\90×\99ש קשר ×\9eק×\95שר המכיל איש קשר אחד"
+msgstr[1] "×\90×\99ש קשר ×\9eק×\95שר המכיל %u אנשי קשר"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
-msgstr "פ×\99צ×\95×\9c ×\9eשת×\9eש ×\94×¢×\9c המוצג לאנשי הקשר אותם הוא מכיל."
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr "פ×\99צ×\95×\9c ×\90×\99ש ×\94קשר ×\94×\9eק×\95שר המוצג לאנשי הקשר אותם הוא מכיל."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
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 "×\94×\90×\9d ×\9cפרק ×\90ת ×\9eשת×\9eש ×\94×¢×\9c '%s'?"
+msgid "Unlink linked contacts '%s'?"
+msgstr "×\94×\90×\9d ×\9cפרק ×\90ת ×\90×\99ש ×\94קשר ×\94×\9eק×\95שר '%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."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
msgstr ""
-"×\94×\90×\9d ×\91×\90×\9eת ×\91רצ×\95× ×\9a ×\9cפרק ×\9eשת×\9eש ×¢×\9c ×\96×\94? פע×\95×\9c×\94 ×\96×\95 תפר×\99×\93 ×\90ת ×\9eשת×\9eש ×\94×¢×\9c ×\9c×\90× ×©×\99 ×\94קשר "
-"אותו הוא מכיל."
+"×\94×\90×\9d ×\91×\90×\9eת ×\91רצ×\95× ×\9a ×\9cפרק ×\90×\99ש קשר ×\9eק×\95שר ×\96×\94? פע×\95×\9c×\94 ×\96×\95 תפר×\99×\93 ×\90ת ×\94קשר ×\94×\9eק×\95שר ×\94×\96×\94 "
+"×\9c×\90× ×©×\99 ×\94קשר ×\90×\95ת×\95 ×\94×\95×\90 ×\9e×\9b×\99×\9c."
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "New Call"
msgstr "שיחה חדשה"
+#: ../libempathy-gtk/empathy-password-dialog.c:248
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"נא להזין את הססמה לחשבון\n"
+"<b>%s</b>"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
msgid "Phrase not found"
msgstr "הביטוי לא נמצא"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "התקבלה הודעה מידית"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "שליחת הודעה מידית"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "בקשת שיחה נכנסת"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "איש קשר התחבר"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "איש קשר התנתק"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "מחובר לשרת"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "מנותק מהשרת"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "שיחה קולית נכנסת"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "שיחה קולית פעילה"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "שיחה קולית הסתיימה"
msgid "Certificate Details"
msgstr "פרטי התעודה"
-#: ../libempathy-gtk/empathy-ui-utils.c:1703
+#: ../libempathy-gtk/empathy-ui-utils.c:1708
msgid "Unable to open URI"
msgstr "לא ניתן לפתוח את הכתובת"
-#: ../libempathy-gtk/empathy-ui-utils.c:1798
+#: ../libempathy-gtk/empathy-ui-utils.c:1803
msgid "Select a file"
msgstr "בחירת קובץ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "קובץ נכנס מ־%s"
msgid "Instant Message (Empathy)"
msgstr "הודעה מיידית (Empathy)"
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "לא להתחבר בהפעלה"
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "אין להציג את רשימת אנשי הקשר או כל דו־שיח אחר בהפעלה"
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- לקוח המסרים המידיים Empathy"
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "שגיאה ביצירת קשר עם מנהל החשבונות"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
msgid "Your new account has not been saved yet."
msgstr "החשבון החדש שלך לא נשמר עדיין."
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "בהתחברות…"
"אתה עומד לבחור חשבון חדש, מה שיבטל\n"
"את השינויים שלך. האת אתה בטוח שברצונך להמשיך?"
-#: ../src/empathy-accounts-dialog.c:1951
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1544
+msgid "_Enable"
+msgstr "ה_פעלה"
+
+#: ../src/empathy-accounts-dialog.c:1545
+msgid "_Disable"
+msgstr "נ_טרול"
+
+#: ../src/empathy-accounts-dialog.c:2044
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgid "_Import…"
msgstr "י_בוא…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:243
msgid " - Empathy authentication client"
msgstr "- לקוח האימות של Empathy"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:259
msgid "Empathy authentication client"
msgstr "לקוח האימות של Empathy"
msgid "Empathy Audio/Video Client"
msgstr "לקוח השמע/הווידאו Empathy"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "ניגוד"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "בהירות"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "גאמה"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "עצמה"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "_סרגל צד"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "קלט שמע"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "קלט וידאו"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "מקשי חיוג"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
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:1266
+#: ../src/empathy-call-window.c:1270
#, 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:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "שיחה"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "כתובת ה־IP כפי שנראית על ידי המחשב"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "כתובת ה־IP כפי שנראית על ידי שרת באינטרנט"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "כתובת ה־IP כדי שנראית על ידי עמית מהצד השני"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "כתובת ה־IP של שרת הממסר"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
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:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "מחובר — %d:%02d דק׳"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "פרטים טכניים"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, 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:2358
+#: ../src/empathy-call-window.c:2365
#, 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:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"לא ניתן להפעיל את החיבור אל %s. כנראה אחד ממשתתפי השיחה מחובר לרשת שאינה "
"מאפשרת חיבורים ישירים."
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "אירעה שגיאה ברשת"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "מבני השמע הדרושים לקיום שיחה זו אינם מותקנים במחשבך"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "מבני הווידאו הדרושים לקיום שיחה זו אינם מותקנים במחשבך"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"משהו בלתי צפוי ארע ברכיב של Telepathy. נא <a href=\"%s\">לדווח על באג זה</a> "
"ולהוסיף דוחות שנאספו מחלון 'ניפוי השגיאות' שבתפריט העזרה."
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "אירעה שגיאה במנוע הקריאה"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "התזרים הגיע לסיומו"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "לא ניתן לקיים תזרים שמע"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "לא ניתן לקיים תזרים וידאו"
msgid "_View"
msgstr "_תצוגה"
-#: ../src/empathy-chat-window.c:468 ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:478 ../src/empathy-chat-window.c:498
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (אחת שלא נקראה)"
msgstr[1] "%s (%d שלא נקראו)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:490
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (ואחד נוסף)"
msgstr[1] "%s (ו־%u נוספים)"
-#: ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:506
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (אחת שלא נקראה מאחרים)"
msgstr[1] "%s (%d שלא נקראו מאחרים)"
-#: ../src/empathy-chat-window.c:505
+#: ../src/empathy-chat-window.c:515
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (אחת שלא נקראה מכולם)"
msgstr[1] "%s (%d שלא נקראו מכולם)"
-#: ../src/empathy-chat-window.c:707
+#: ../src/empathy-chat-window.c:717
msgid "Typing a message."
msgstr "הודעה מוקלדת."
msgid "Manage Favorite Rooms"
msgstr "ניהול חדרי שיחה מועדפים"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
msgstr "שיחה קולית נכנסת"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "שיחה נכנסת"
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s מתקשר אליך עם וידאו, האם ברצונך לענות?"
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:513
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s מתקשר אליך, האם ברצונך לענות?"
-#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:516 ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming call from %s"
msgstr "שיחה נכנסת מ־%s"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:541
msgid "_Reject"
msgstr "_דחייה"
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:547
msgid "_Answer"
msgstr "_מענה"
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming video call from %s"
msgstr "שיחת וידאו נכנסת מ־%s"
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:738
msgid "Room invitation"
msgstr "הזמנה לחדר"
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:740
#, c-format
msgid "Invitation to join %s"
msgstr "הזמנה להצטרף ל־%s"
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:747
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s מזמין/ה אותך להצטרף אל %s"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:755
msgid "_Decline"
msgstr "_סירוב"
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:760
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "ה_צטרפות"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:787
#, c-format
msgid "%s invited you to join %s"
msgstr "%s הזמין/ה אותך להצטרף אל %s"
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:793
#, c-format
msgid "You have been invited to join %s"
msgstr "הוזמנת להצטרף אל %s"
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:844
#, c-format
msgid "Incoming file transfer from %s"
msgstr "העברת קבצים נכנסת מ־%s"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1014 ../src/empathy-main-window.c:367
+msgid "Password required"
+msgstr "נדרשת ססמה"
+
+#: ../src/empathy-event-manager.c:1070
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s רוצה הרשאות לצפייה מתי התחברת"
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1074
#, c-format
msgid ""
"\n"
"\n"
"הודעה: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1118
#, c-format
msgid "%s is now offline."
msgstr "%s מנותק/ת כעת."
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1139
#, c-format
msgid "%s is now online."
msgstr "%s מחובר/ת כעת."
msgstr "מקור"
#: ../src/empathy-main-window.c:384
+msgid "Provide Password"
+msgstr "הזנת ססמה"
+
+#: ../src/empathy-main-window.c:390
+msgid "Disconnect"
+msgstr "ניתוק"
+
+#: ../src/empathy-main-window.c:530
msgid "No match found"
msgstr "לא נמצאה התאמה"
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:685
msgid "Reconnect"
msgstr "התחברות מחדש"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:691
msgid "Edit Account"
msgstr "עריכת חשבון"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:697
msgid "Close"
msgstr "סגירה"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1405
msgid "Contact"
msgstr "איש קשר"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1741
msgid "Contact List"
msgstr "רשימת אנשי קשר"
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1854
msgid "Show and edit accounts"
msgstr "הצגה ועריכה של חשבונות"
msgid "_Reduce location accuracy"
msgstr "ה_פחתת דיוק המיקום"
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr "תגובה"
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "דחייה"
-
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "מענה"
-
-#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "סירוב"
-
-#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "אישור"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "מצב"
msgid "Invite"
msgstr "הזמנה"
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:178
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
"אין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבוא) ולאחריה התכנית תסגר"
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:182
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr "אין להציג תיבות דו־שיח כלשהן אלא אם כן ישנן חשבונות \"אנשים בקרבתי\""
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:186
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"בחירת החשבון הנתון כבר בהתחלה (לדוגמה gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:188
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:193
msgid "- Empathy Accounts"
msgstr "- חשבונות Empathy"
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:232
msgid "Empathy Accounts"
msgstr "חשבונות Empathy"
msgid "Empathy Debugger"
msgstr "מנפה השגיאות של Empathy"
-#: ../src/empathy-chat.c:91
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr "- לקוח הצ׳אטים Empathy"
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "תגובה"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "דחייה"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "מענה"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "סירוב"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "אישור"
+
#~ msgid "Add _New Preset"
#~ msgstr "הוספת נוכחות _חדשה"
# Copyright © 2003-2005 Free Software Foundation, Inc.
# Kjartan Maraas <kmaraas@gnome.org>, 2003-2010.
# Sigurd Gartmann <sigurdga@yahoo-inc.com>, 2005, 2006.
+# Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: empathy 2.92.x\n"
-"Report-Msgid-Bugs-To:\n"
-"POT-Creation-Date: 2010-11-20 11:54+0100\n"
-"PO-Revision-Date: 2010-11-20 11:57+0100\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
-"Language: no\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=empathy&component=general\n"
+"POT-Creation-Date: 2010-12-24 06:04+0000\n"
+"PO-Revision-Date: 2010-12-30 22:06+0100\n"
+"Last-Translator: Torstein Adolf Winterseth <kvikende@fsfe.org>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: no\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.1\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
-msgstr "Empathy kan publisere brukers lokasjon"
+msgstr "Empathy kan publisere brukers plassering"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy kan bruke GPS til å gjette lokasjonen"
+msgstr "Empathy kan bruke GPS til å gjette plassering"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy kan bruke mobilnettverk til å gjette lokasjon"
+msgstr "Empathy kan bruke mobilnettverk til å gjette plassering"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
-msgstr "Empathy kan bruke nettverket til å gjette lokasjon"
+msgstr "Empathy kan bruke nettverket til å gjette plassering"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy skal redusere nøyaktighet for lokasjonen"
+msgstr "Empathy skal redusere nøyaktighet for plasseringenseri"
#: ../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 skal bruke personbildet for kontakten som ikon for pratevinduet"
+msgstr "Empathy skal bruke personbildet for kontakten som ikon for pratevinduet"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Om Empathy kan publisere brukers lokasjon til kontakter."
+msgstr "Om Empathy kan publisere brukers plassering til kontakter."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Om Empathy kan bruke GPS for å gjette lokasjon."
+msgstr "Om Empathy kan bruke GPS for å gjette plassering."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Om Empathy kan bruke mobilnettverk for å gjette lokasjon."
+msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the network to guess the location."
-msgstr "Om Empathy kan bruke nettverket for å gjette lokasjon."
+msgstr "Om Empathy kan bruke nettverket for å gjette plassering."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy has migrated butterfly logs."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Om Empathy skal redusere nøyaktighet for lokasjon av personvernhensyn."
+msgstr ""
+"Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid ""
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2200
msgid "Messaging and VoIP Accounts"
msgstr "Meldings- og VoIP-kontoer"
msgid "Offline"
msgstr "Frakoblet"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Ukjent"
msgstr "Denne ressursen er allerede koblet til tjeneren"
#: ../libempathy/empathy-utils.c:368
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
-msgstr ""
-"Tilkoblingen er erstattet med en ny tilkobling som bruker samme ressurs"
+msgid "Connection has been replaced by a new connection using the same resource"
+msgstr "Tilkoblingen er erstattet med en ny tilkobling som bruker samme ressurs"
#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgid "All"
msgstr "Alle"
-#: ../libempathy-gtk/empathy-account-widget.c:637
+#: ../libempathy-gtk/empathy-account-widget.c:679
#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:638
+#: ../libempathy-gtk/empathy-account-widget.c:680
msgid "Password"
msgstr "Passord"
-#: ../libempathy-gtk/empathy-account-widget.c:639
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Tjener"
-#: ../libempathy-gtk/empathy-account-widget.c:640
+#: ../libempathy-gtk/empathy-account-widget.c:682
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-account-widget.c:712
-#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:754
+#: ../libempathy-gtk/empathy-account-widget.c:811
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1094
+#: ../libempathy-gtk/empathy-account-widget.c:1152
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "Konto %s er redigert via Mine nettkontoer."
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1158
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Konto %s kan ikke redigeres i Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1120
+#: ../libempathy-gtk/empathy-account-widget.c:1178
msgid "Launch My Web Accounts"
msgstr "Start Mine nettkontoer"
-#: ../libempathy-gtk/empathy-account-widget.c:1418
+#: ../libempathy-gtk/empathy-account-widget.c:1516
msgid "Username:"
msgstr "Brukernavn:"
-#: ../libempathy-gtk/empathy-account-widget.c:1753
+#: ../libempathy-gtk/empathy-account-widget.c:1884
msgid "A_pply"
msgstr "_Bruk"
-#: ../libempathy-gtk/empathy-account-widget.c:1783
+#: ../libempathy-gtk/empathy-account-widget.c:1914
msgid "L_og in"
msgstr "L_ogg inn"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1980
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
+#: ../libempathy-gtk/empathy-individual-widget.c:1486
#: ../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:1860
+#: ../libempathy-gtk/empathy-account-widget.c:1991
msgid "_Enabled"
msgstr "Slått _på"
-#: ../libempathy-gtk/empathy-account-widget.c:1925
+#: ../libempathy-gtk/empathy-account-widget.c:2056
msgid "This account already exists on the server"
msgstr "Denne kontoen eksisterer allerede på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:1928
+#: ../libempathy-gtk/empathy-account-widget.c:2059
msgid "Create a new account on the server"
msgstr "Lag en ny konto på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:2042
+#: ../libempathy-gtk/empathy-account-widget.c:2251
msgid "Ca_ncel"
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:2334
+#: ../libempathy-gtk/empathy-account-widget.c:2548
#, 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:2360
+#: ../libempathy-gtk/empathy-account-widget.c:2574
#, c-format
msgid "%s Account"
msgstr "%s-konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2364
+#: ../libempathy-gtk/empathy-account-widget.c:2578
msgid "New account"
msgstr "Ny konto"
msgstr "_Passord:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "Remember Password"
+msgstr "Husk passord"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
msgid "Screen _Name:"
msgstr "Skjerm_navn:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "What is your AIM password?"
msgstr "HVa er ditt AIM-passord?"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
msgid "What is your AIM screen name?"
msgstr "Hva er ditt skjermnavn for 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:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../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:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:13
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Tjener:"
msgid "Login I_D:"
msgstr "InnloggingsI_D:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise User ID?"
msgstr "Hva er din bruker-ID for GroupWise?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise password?"
msgstr "Hva er ditt passord for GroupWise?"
msgid "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 UIN?"
msgstr "Hva er din UIN for ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ password?"
msgstr "Hva er ditt passord for ICQ?"
msgid "Priori_ty:"
msgstr "Priori_tet"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
msgid "Reso_urce:"
msgstr "_Ressurs:"
#. 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
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
"Bruk <a href=\"http://www.facebook.com/username/\">denne siden</a> for å "
"velge et brukernavn på Facebook hvis du ikke har et."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "Use old SS_L"
msgstr "Bruk gammel SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook password?"
msgstr "Hva er ditt passord for Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook username?"
msgstr "Hva er ditt brukernavn for Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google ID?"
msgstr "Hva er din Google-ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google password?"
msgstr "Hva er ditt passord for Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber ID?"
msgstr "Hva er din Jabber-ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber password?"
msgstr "Hva er ditt passord for Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber ID?"
msgstr "Hvilken Jabber-ID ønsker du?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber password?"
msgstr "Hvilket passord ønsker du for Jabber?"
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Eksempel:</b> bruker@hotmail.com"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
msgid "What is your Windows Live ID?"
msgstr "Hva er din ID på Windows Live?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live password?"
msgstr "Hva er ditt passord for Windows Live?"
msgid "Proxy Options"
msgstr "Alternativer for proxy"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "STUN Server:"
msgstr "STUN-tjener:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Server:"
msgstr "Tjener:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Transport:"
msgstr "Transport:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP account password?"
msgstr "Hva er passordet for din SIP-konto?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP login ID?"
msgstr "Hva er din påloggings-ID for SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "_Username:"
msgstr "Br_ukernavn:"
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
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-password-dialog.c:283
+msgid "Remember password"
+msgstr "Husk passord"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
msgstr "Hva er din Yahoo!-ID?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "What is your Yahoo! password?"
msgstr "Hva er ditt passord for Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "Yahoo! I_D:"
msgstr "Yahoo!-I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
msgid "_Room List locale:"
msgstr "Locale for _romliste:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "Kunne ikke konvertere bilde"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "Ingen av de godkjente bildeformatene støttes av ditt system"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Velg personbilde"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "Ingen bilde"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Bilder"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "Alle filer"
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:324
msgid "Click to enlarge"
msgstr "Klikk for å forstørre"
-#: ../libempathy-gtk/empathy-chat.c:643
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Klarte ikke å åpne privat prat"
-#: ../libempathy-gtk/empathy-chat.c:683
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "Emne er ikke støttet for denne samtalen"
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "Du har ikke lov til å bytte emne"
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: tøm alle meldinger fra aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <emne>: sett emne for aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID for praterom>: bli med i et nytt praterom"
-#: ../libempathy-gtk/empathy-chat.c:832
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <prateroms-ID>: bli med i et nytt praterom"
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:851
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 <melding>: send <melding> til aktiv samtale. Dette brukes for for å "
-"sende en melding som starter med tegnet «/». For eksempel: «/say /join "
-"brukes til å bli med i et nytt praterom»"
+"sende en melding som starter med tegnet «/». For eksempel: «/say /join brukes "
+"til å bli med i et nytt praterom»"
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
"/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> "
"hvis den er definert."
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Bruk: %s"
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Ukjent kommando"
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "frakoblet"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "ugyldig kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "tilgang nektet"
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "meldingen er for lang"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "ikke implementert"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "ukjent"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Feil ved sending av melding «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1234 ../src/empathy-chat-window.c:703
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:713
msgid "Topic:"
msgstr "Emne:"
-#: ../libempathy-gtk/empathy-chat.c:1246
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "Emnet er satt til: %s"
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "Emne ikke definert"
-#: ../libempathy-gtk/empathy-chat.c:1747
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(Ingen forslag)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Legg til «%s» i ordboken"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1852
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Legg til «%s» i ordbok for %s"
-#: ../libempathy-gtk/empathy-chat.c:1911
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Sett inn smilefjes"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1929
-#: ../libempathy-gtk/empathy-ui-utils.c:1806
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "_Send"
msgstr "_Send"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "_Staveforslag"
-#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Klarte ikke å hente siste logger"
-#: ../libempathy-gtk/empathy-chat.c:2158
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s har koblet fra"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2165
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s ble sparket av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2168
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s ble sparket"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s ble bannlyst av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s ble bannlyst"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s har forlatt rommet"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2217
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s har blitt med i rommet"
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s er nå kjent som %s"
-#: ../libempathy-gtk/empathy-chat.c:2381 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Koblet fra"
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "Feil passord; vennligst prøv igjen:"
-#: ../libempathy-gtk/empathy-chat.c:2995
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Prøv igjen"
-#: ../libempathy-gtk/empathy-chat.c:3000
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "Dette rommet er beskyttet med et passord:"
-#: ../libempathy-gtk/empathy-chat.c:3001
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Bli med"
-#: ../libempathy-gtk/empathy-chat.c:3141
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Koblet til"
-#: ../libempathy-gtk/empathy-chat.c:3194
+#: ../libempathy-gtk/empathy-chat.c:3216
#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Samtale"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:319
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Kopier lenkens adresse"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:326
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Åpne lenke"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:419
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Endre kontaktinformasjon"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Personlig informasjon"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:424
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "Ny kontakt"
msgid "Favorite People"
msgstr "Favorittpersoner"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:1999
+#: ../libempathy-gtk/empathy-individual-view.c:2262
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Vil du virkelig fjerne gruppen «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2268
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2265
msgid "Removing group"
msgstr "Fjerner gruppe"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2322
-#: ../libempathy-gtk/empathy-individual-view.c:2436
+#: ../libempathy-gtk/empathy-contact-list-view.c:2050
+#: ../libempathy-gtk/empathy-contact-list-view.c:2127
+#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-individual-view.c:2467
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "Fje_rn"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2353
+#: ../libempathy-gtk/empathy-contact-list-view.c:2080
+#: ../libempathy-gtk/empathy-individual-view.c:2370
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Vil du virkelig fjerne kontakten «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2386
msgid "Removing contact"
msgstr "Fjerner kontakt"
#: ../libempathy-gtk/empathy-contact-menu.c:203
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
-msgstr "_Legg til kontakt..."
+msgstr "_Legg til kontakt …"
#: ../libempathy-gtk/empathy-contact-menu.c:230
#: ../libempathy-gtk/empathy-individual-menu.c:516
#: ../libempathy-gtk/empathy-contact-menu.c:418
#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-individual-widget.c:1377
msgid "Favorite"
msgstr "Favoritt"
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:915
+#: ../src/empathy-chat-window.c:925
msgid "Inviting you to this room"
msgstr "Inviterer deg til dette rommet"
msgstr "Fødselsdag:"
#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Country ISO Code:"
msgstr "ISO-kode for land:"
#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Country:"
msgstr "Land:"
#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "State:"
msgstr "Tilstand:"
#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "City:"
msgstr "By:"
#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Area:"
msgstr "Område:"
#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Postal Code:"
msgstr "Postkode:"
#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Street:"
msgstr "Gate:"
#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Building:"
msgstr "Bygning:"
#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Floor:"
msgstr "Etasje:"
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Room:"
msgstr "Rom:"
#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Text:"
msgstr "Tekst:"
#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Description:"
msgstr "Beskrivelse:"
#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "URI:"
msgstr "URI:"
#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Accuracy Level:"
msgstr "Nøyaktighetsnivå:"
#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Error:"
msgstr "Feil:"
#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Vertikal feil (meter):"
#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Horisontal feil (meter):"
#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Speed:"
msgstr "Hastighet:"
#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Bearing:"
msgstr "Retning:"
#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Climb Speed:"
msgstr "Klatrehastighet:"
#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Last Updated on:"
msgstr "Sist oppdatert:"
#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "Longitude:"
msgstr "Lengdegrad:"
#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Latitude:"
msgstr "Breddegrad:"
#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Altitude:"
msgstr "Høyde:"
#: ../libempathy-gtk/empathy-contact-widget.c:779
#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:622
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Sted"
#. translators: format is "Location, $date"
#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:624
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y, %R UTC"
#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:922
msgid "Save Avatar"
msgstr "Lagre personbilder"
#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:979
+#: ../libempathy-gtk/empathy-individual-widget.c:980
msgid "Unable to save avatar"
msgstr "Kan ikke lagre personbilde"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Lokasjon</b> (dato)\t"
+msgstr "<b>Plassering</b> (dato)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1312
msgid "Alias:"
msgstr "Alias:"
#. 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:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1516
msgid "Identifier:"
msgstr "Identifikator:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
-msgstr "Forespurt informasjon..."
+msgstr "Forespurt informasjon …"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
msgstr "Velg"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1423
msgid "Group"
msgstr "Gruppe"
msgid "_Link Contacts…"
msgstr "Koble kontakter …"
-#: ../libempathy-gtk/empathy-individual-widget.c:1649
+#: ../libempathy-gtk/empathy-individual-view.c:2378
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle "
+"kontaktene den lenkede kontakten består av."
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1657
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "Meta-kontakt som inneholder %u kontakt"
-msgstr[1] "Meta-kontakt som inneholder %u kontakter"
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Lenket kontakt som inneholder %u kontakt"
+msgstr[1] "Lenket kontakt som inneholder %u kontakter"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
-msgstr "<b>Lokasjon</b> (dato)"
+msgstr "<b>Plassering</b> (dato)"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
msgid "Online from a phone or mobile device"
#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
-msgstr "Del opp vist metakontakt i kontaktene den inneholder."
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr "Del opp vist lenket kontakt i kontaktene den inneholder."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
msgid "_Link"
msgstr "_Koble"
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
-msgid "Unlink meta-contact '%s'?"
-msgstr "Fjern kobling for metakontakt «%s»?"
+msgid "Unlink linked contacts '%s'?"
+msgstr "Fjern kobling for lenkede kontakter «%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."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
msgstr ""
-"Er du sikker på at du vil fjerne kobling for denne metakontakten? Dette vil "
-"dele metakontakten opp i kontaktene den inneholder."
+"Er du sikker på at du vil fjerne kobling for disse lenkede kontaktene? Dette "
+"vil dele de lenkede kontaktene opp i enkelte kontakter."
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "New Call"
msgstr "Ny samtale"
+#: ../libempathy-gtk/empathy-password-dialog.c:248
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Oppgi ditt passord for konto\n"
+"<b>%s</b>"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
msgid "Phrase not found"
msgstr "Teksten ble ikke funnet"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Mottok en lynmelding"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Send en lynmelding"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Innkommende samtaleforespørsel"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Kontakt koblet til"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Kontakt koblet fra"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Koblet til tjener"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Koblet fra tjener"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Innkommende samtale"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Utgående samtale"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Samtale avsluttet"
msgstr "Sertifikatet er selvsignert."
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
msgstr ""
"Sertifikatet har blitt trukket tilbake av utstedende sertifikatmyndighet."
msgid "Certificate Details"
msgstr "Sertifikatdetaljer"
-#: ../libempathy-gtk/empathy-ui-utils.c:1703
+#: ../libempathy-gtk/empathy-ui-utils.c:1708
msgid "Unable to open URI"
msgstr "Kan ikke åpne URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1798
+#: ../libempathy-gtk/empathy-ui-utils.c:1803
msgid "Select a file"
msgstr "Velg en fil"
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "Innkommende fil fra %s"
msgid "Instant Message (Empathy)"
msgstr "Lynmelding (Empathy)"
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Ikke koble til ved oppstart"
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy lynmeldingsprogram"
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Feil ved forsøk på å kontakte kontohåndtering"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
msgstr ""
"Kjartan Maraas\n"
"Sigurd Gartmann\n"
-"Espen Stefansen"
+"Espen Stefansen\n"
+"Torstein Adolf Winterseth <kvikende@fsfe.org>"
#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
msgid "Your new account has not been saved yet."
msgstr "Din nye konto er ikke lagret ennå."
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
-msgstr "Kobler til..."
+msgstr "Kobler til …"
#: ../src/empathy-accounts-dialog.c:321
#, c-format
"Du er i ferd med å velge en annen konto hvilket vil forkaste\n"
"dine endringer. Er du sikker på at du vil fortsette?"
-#: ../src/empathy-accounts-dialog.c:1951
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1544
+#, fuzzy
+#| msgid "_Enabled"
+msgid "_Enable"
+msgstr "Slått _på"
+
+#: ../src/empathy-accounts-dialog.c:1545
+#, fuzzy
+#| msgid "_Enabled"
+msgid "_Disable"
+msgstr "Slått _på"
+
+#: ../src/empathy-accounts-dialog.c:2044
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgid "_Import…"
msgstr "_Importer …"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr "- Empathy autentiseringsklient"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Empathy autentiseringsklient"
msgid "Empathy Audio/Video Client"
msgstr "Empathy lyd-/bildeklient"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Lysstyrke"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Volum"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "_Sidelinje"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Lydinngang"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Videoinngang"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Nummertavle"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
msgid "Details"
msgstr "Detaljer"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1266
+#: ../src/empathy-call-window.c:1270
#, c-format
msgid "Call with %s"
msgstr "Samtale med %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "Ring"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "IP-adresse som sett av maskinen"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "IP-adresse som sett av en tjener på internett"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "IP-adresse for peer som sett av andre siden"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "IP-adresse for en relay-tjener"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr "IP-adresse for multicast-gruppe"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Koblet til - %d:%02dm"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Tekniske detaljer"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
"ikke tillater direkte tilkoblinger."
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "Det oppsto en feil på nettverket"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Lydformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Videoformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
"«Feilsøking»-vinduet i Hjelp-menyen."
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "Det oppsto en feil i samtalemotoren"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "Slutt på strømmen ble nådd"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "Kan ikke etablere lydstrøm"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "Kan ikke etablere videostrøm"
msgid "_View"
msgstr "_Vis"
-#: ../src/empathy-chat-window.c:468 ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:478 ../src/empathy-chat-window.c:498
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ulest)"
msgstr[1] "%s (%d uleste)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:490
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (og %u annen)"
msgstr[1] "%s (og %u andre)"
-#: ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:506
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d ulest fra andre)"
msgstr[1] "%s (%d uleste fra andre)"
-#: ../src/empathy-chat-window.c:505
+#: ../src/empathy-chat-window.c:515
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d ulest fra alle)"
msgstr[1] "%s (%d uleste fra alle)"
-#: ../src/empathy-chat-window.c:707
+#: ../src/empathy-chat-window.c:717
msgid "Typing a message."
msgstr "Skriver en melding"
#: ../src/empathy-chat-window.ui.h:5
msgid "Invite _Participant…"
-msgstr "Inviter _deltaker..."
+msgstr "Inviter _deltaker …"
#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
msgid "Manage Favorite Rooms"
msgstr "Håndter favorittrom"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
msgstr "Innkommende videosamtale"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Innkommende samtale"
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s ringer deg med video. Vil du svare?"
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:513
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s ringer deg. Vil du svare?"
-#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:516 ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming call from %s"
msgstr "Innkommende samtale fra %s"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:541
msgid "_Reject"
msgstr "Av_vis"
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:547
msgid "_Answer"
msgstr "Sv_ar"
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming video call from %s"
msgstr "Innkommende videosamtale fra %s"
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:738
msgid "Room invitation"
msgstr "Invitasjon til rom"
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:740
#, c-format
msgid "Invitation to join %s"
msgstr "Invitasjon til å bli med i %s"
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:747
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s inviterer deg til å bli med i %s"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:755
msgid "_Decline"
msgstr "_Avslå"
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:760
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Bli med"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:787
#, c-format
msgid "%s invited you to join %s"
msgstr "%s inviterte deg til å bli med i %s"
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:793
#, c-format
msgid "You have been invited to join %s"
msgstr "Du har blitt invitert til å bli med i %s"
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:844
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Innkommende filoverføring fra %s"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1014 ../src/empathy-main-window.c:367
+msgid "Password required"
+msgstr "Passord kreves"
+
+#: ../src/empathy-event-manager.c:1070
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s ønsker rettigheter til å se når du er tilgjengelig"
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1074
#, c-format
msgid ""
"\n"
"\n"
"Melding: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1118
#, c-format
msgid "%s is now offline."
msgstr "%s er nå frakoblet."
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1139
#, c-format
msgid "%s is now online."
msgstr "%s er nå tilkoblet."
msgstr "Kilde"
#: ../src/empathy-main-window.c:384
+msgid "Provide Password"
+msgstr "Oppgi passord"
+
+#: ../src/empathy-main-window.c:390
+msgid "Disconnect"
+msgstr "Koble fra"
+
+#: ../src/empathy-main-window.c:530
msgid "No match found"
msgstr "Ingen treff funnet"
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:685
msgid "Reconnect"
msgstr "Koble til på nytt"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:691
msgid "Edit Account"
msgstr "Rediger konto"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:697
msgid "Close"
msgstr "Lukk"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1405
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1741
msgid "Contact List"
msgstr "Kontaktliste"
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1854
msgid "Show and edit accounts"
msgstr "Vis og rediger kontoer"
#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
-msgstr "_Ny samtale..."
+msgstr "_Ny samtale …"
#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
"state and country will be published. GPS coordinates will be accurate to 1 "
"decimal place."
msgstr ""
-"Redusert nøyaktighet for lokasjon betyr at kun by, område og land vil "
+"Redusert nøyaktighet for plassering betyr at kun by, område og land vil "
"publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass."
#: ../src/empathy-preferences.ui.h:19
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
-msgstr ""
-"Listen med språk viser bare de språkene det er installert ordliste for."
+msgstr "Listen med språk viser bare de språkene det er installert ordliste for."
#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
#: ../src/empathy-preferences.ui.h:32
msgid "_Publish location to my contacts"
-msgstr "_Publiser lokasjon til mine kontakter"
+msgstr "_Publiser plassering til mine kontakter"
#. 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 "_Reduser nøyaktighet for lokasjon"
-
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr "Svar"
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "Avvis"
-
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "Svar"
-
-#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "Avslå"
-
-#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "Godta"
+msgstr "_Reduser nøyaktighet for plassering"
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgid "Invite"
msgstr "Inviter"
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:178
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Ikke vis noen dialoger. Utfør arbeid (f.eks import) og avslutt"
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:182
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-kontoer"
+msgstr ""
+"Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-kontoer"
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:186
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Velg en gitt konto ved oppstart (f.eks. gabble/jabber/foo_40eksempel_2eorg0)"
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:188
msgid "<account-id>"
msgstr "<konto-id>"
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:193
msgid "- Empathy Accounts"
msgstr "- Empathy-kontoer"
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:232
msgid "Empathy Accounts"
msgstr "Empathy-kontoer"
msgid "Empathy Debugger"
msgstr "Empathy feilsøking"
-#: ../src/empathy-chat.c:91
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr "- Empathy lynmeldingsprogram"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Svar"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Avvis"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Svar"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Avslå"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Godta"
+
+
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-11-24 12:53+0000\n"
-"PO-Revision-Date: 2010-11-25 09:05+0530\n"
+"POT-Creation-Date: 2010-12-24 06:04+0000\n"
+"PO-Revision-Date: 2010-12-29 07:36+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"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2200
msgid "Messaging and VoIP Accounts"
msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ"
#: ../libempathy/empathy-ft-handler.c:830
-#| msgid "File transfer completed"
msgid "File transfer completed, but the file was corrupted"
msgstr "ਫਾਇਲ ਸੰਚਾਰ ਪੂਰਾ ਹੋਇਆ, ਪਰ ਫਾਇਲ ਖ਼ਰਾਬ ਸੀ"
msgid "Offline"
msgstr "ਆਫਲਾਈਨ"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "ਅਣਜਾਣ"
msgid "All"
msgstr "ਸਭ"
-#: ../libempathy-gtk/empathy-account-widget.c:637
+#: ../libempathy-gtk/empathy-account-widget.c:679
#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "ਅਕਾਊਂਟ"
-#: ../libempathy-gtk/empathy-account-widget.c:638
+#: ../libempathy-gtk/empathy-account-widget.c:680
msgid "Password"
msgstr "ਪਾਸਵਰਡ"
-#: ../libempathy-gtk/empathy-account-widget.c:639
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "ਸਰਵਰ"
-#: ../libempathy-gtk/empathy-account-widget.c:640
+#: ../libempathy-gtk/empathy-account-widget.c:682
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "ਪੋਰਟ"
-#: ../libempathy-gtk/empathy-account-widget.c:712
-#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:754
+#: ../libempathy-gtk/empathy-account-widget.c:811
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1094
+#: ../libempathy-gtk/empathy-account-widget.c:1152
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ ਰਾਹੀਂ ਅਕਾਊਂਟ %s ਸੋਧਿਆ ਗਿਆ।"
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1158
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "ਅਕਾਊਂਟ %s ਇੰਪੈਥੀ 'ਚ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
-#: ../libempathy-gtk/empathy-account-widget.c:1120
-#| msgid "Empathy Accounts"
+#: ../libempathy-gtk/empathy-account-widget.c:1178
msgid "Launch My Web Accounts"
msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ ਚਲਾਉ"
-#: ../libempathy-gtk/empathy-account-widget.c:1418
+#: ../libempathy-gtk/empathy-account-widget.c:1516
msgid "Username:"
msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
-#: ../libempathy-gtk/empathy-account-widget.c:1764
+#: ../libempathy-gtk/empathy-account-widget.c:1884
msgid "A_pply"
msgstr "ਲਾਗੂ ਕਰੋ(_p)"
-#: ../libempathy-gtk/empathy-account-widget.c:1794
+#: ../libempathy-gtk/empathy-account-widget.c:1914
msgid "L_og in"
msgstr "ਲਾਗਇਨ(_o)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1860
+#: ../libempathy-gtk/empathy-account-widget.c:1980
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
+#: ../libempathy-gtk/empathy-individual-widget.c:1486
#: ../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:1871
+#: ../libempathy-gtk/empathy-account-widget.c:1991
msgid "_Enabled"
msgstr "ਯੋਗ(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:1936
+#: ../libempathy-gtk/empathy-account-widget.c:2056
msgid "This account already exists on the server"
msgstr "ਇਹ ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:2059
msgid "Create a new account on the server"
msgstr "ਸਰਵਰ ਉੱਤੇ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ"
-#: ../libempathy-gtk/empathy-account-widget.c:2053
+#: ../libempathy-gtk/empathy-account-widget.c:2251
msgid "Ca_ncel"
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:2345
+#: ../libempathy-gtk/empathy-account-widget.c:2548
#, 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:2371
+#: ../libempathy-gtk/empathy-account-widget.c:2574
#, c-format
msgid "%s Account"
msgstr "%s ਅਕਾਊਂਟ"
-#: ../libempathy-gtk/empathy-account-widget.c:2375
+#: ../libempathy-gtk/empathy-account-widget.c:2578
msgid "New account"
msgstr "ਨਵਾਂ ਅਕਾਊਂਟ"
msgstr "ਪਾਸਵਰਡ(_w):"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#| msgid "Password"
+msgid "Remember Password"
+msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
msgid "Screen _Name:"
msgstr "ਸਕਰੀਨ ਨਾਂ(_N):"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "What is your AIM password?"
msgstr "ਤੁਹਾਡਾ AIM ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
msgid "What is your AIM screen name?"
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:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Port:"
-msgstr "ਪੋਰਟ(_P):"
-
#: ../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:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "_Port:"
+msgstr "ਪੋਰਟ(_P):"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:13
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "ਸਰਵਰ(_S):"
msgid "Login I_D:"
msgstr "ਲਾਗਇਨ I_D:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise User ID?"
msgstr "ਤੁਹਾਡਾ ਗਰੁੱਪਵਾਈਜ਼ ਯੂਜ਼ਰ ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise password?"
msgstr "ਤੁਹਾਡਾ ਗਰੁੱਪਵਾਈਜ਼ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
msgid "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 UIN?"
msgstr "ਤੁਹਾਡਾ ICQ UIN ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ password?"
msgstr "ਤੁਹਾਡਾ ICQ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
msgid "Priori_ty:"
msgstr "ਤਰਜੀਹ(_t):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
msgid "Reso_urce:"
msgstr "ਸਰੋਤ(_u):"
#. 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
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
"ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਫੇਸਬੁੱਕ ਯੂਜ਼ਰ ਨਾਂ ਨਹੀਂ ਹੈ ਤਾਂ ਇਹ ਚੁਣਨ ਵਾਸਤੇ <a href=\"http://www.facebook.com/"
"username/\">ਇਹ ਪੇਜ਼</a> ਵਰਤੋਂ।"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "Use old SS_L"
msgstr "ਪੁਰਾਣੀ SS_L ਵਰਤੋਂ"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook password?"
msgstr "ਤੁਹਾਡਾ ਫੇਸਬੁੱਕ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook username?"
msgstr "ਤੁਹਾਡਾ ਫੇਸਬੁੱਕ ਯੂਜ਼ਰ ਨਾਂ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google ID?"
msgstr "ਤੁਹਾਡਾ ਗੂਗਲ ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google password?"
msgstr "ਤੁਹਾਡਾ ਗੂਗਲ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber ID?"
msgstr "ਤੁਹਾਡਾ ਜੱਬਰ ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber password?"
msgstr "ਤੁਹਾਡਾ ਜੱਬਰ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber ID?"
msgstr "ਤੁਹਾਡਾ ਚਾਹੀਦਾ ਜੱਬਰ ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber password?"
msgstr "ਤੁਹਾਡਾ ਚਾਹੀਦਾ ਜੱਬਰ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>ਜਿਵੇਂ:</b> user@hotmail.com"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
msgid "What is your Windows Live ID?"
msgstr "ਤੁਹਾਡਾ ਵਿੰਡੋਜ਼ ਲਾਈਵ ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live password?"
msgstr "ਤੁਹਾਡਾ ਵਿੰਡੋਜ਼ ਲਾਈਵ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
msgid "Proxy Options"
msgstr "ਪਰਾਕਸੀ ਚੋਣਾਂ"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "STUN Server:"
msgstr "STUN ਸਰਵਰ:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Server:"
msgstr "ਸਰਵਰ:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Transport:"
msgstr "ਟਰਾਂਸਪੋਰਟ:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP account password?"
msgstr "ਤੁਹਾਡਾ SIP ਅਕਾਊਂਟ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP login ID?"
msgstr "ਤੁਹਾਡਾ SIP ਲਾਗਇਨ ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "_Username:"
msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):"
msgid "I_gnore conference and chat room invitations"
msgstr "ਕਨਫਰੰਸ ਅਤੇ ਗੱਲਬਾਤ ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ(_g)"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-password-dialog.c:283
+msgid "Remember password"
+msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
msgstr "ਤੁਹਾਡਾ ਯਾਹੂ! ID ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "What is your Yahoo! password?"
msgstr "ਤੁਹਾਡਾ ਯਾਹੂ! ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "Yahoo! I_D:"
msgstr "ਯਾਹੂ! I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
msgid "_Room List locale:"
msgstr "ਰੂਮ ਲਿਸਟ ਭਾਸ਼ਾ(_R):"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "ਚਿੱਤਰ ਨਾ ਬਦਲੋ"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "ਕੋਈ ਵੀ ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਚਿੱਤਰ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਸਿਸਟਮ ਵਲੋਂ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "ਆਪਣਾ ਅਵਤਾਰ ਲੇਖ ਚੁਣੋ"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "ਚਿੱਤਰ"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "ਸਭ ਫਾਇਲਾਂ"
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:324
msgid "Click to enlarge"
msgstr "ਵੱਡਾ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:645
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "ਪ੍ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ"
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "ਇਹ ਗੱਲਬਾਤ ਲਈ ਵਿਸ਼ਾ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-#: ../libempathy-gtk/empathy-chat.c:691
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "ਤੁਹਾਨੂੰ ਵਿਸ਼ਾ ਬਦਲਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਤੋਂ ਸਭ ਸੁਨੇਹੇ ਸਾਫ਼ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਦਾ ਵਿਸ਼ਾ ਸੈੱਟ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chat room ID>: ਨਵਾਂ ਗੱਲਬਾਤ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:834
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chat room ID>: ਨਵਾਂ ਗੱਲਬਾਤ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact ID> [<message>]: ਪ੍ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਖੋਲ੍ਹੋ"
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact ID> <message>: ਪ੍ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਕਰੋ"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>: ਮੌਜੂਦਾ ਸਰਵਰ ਉੱਤੇ ਆਪਣਾ ਨਾਂ ਬਦਲੋ"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>:ਇੱਕ ਐਕਸ਼ਨ ਸੁਨੇਹਾ ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਵਿੱਚ ਭੇਜੋ"
-#: ../libempathy-gtk/empathy-chat.c:852
+#: ../libempathy-gtk/empathy-chat.c:851
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 "
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
-#: ../libempathy-gtk/empathy-chat.c:857
+#: ../libempathy-gtk/empathy-chat.c:856
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."
-#: ../libempathy-gtk/empathy-chat.c:867
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "ਵਰਤੋਂ: %s"
-#: ../libempathy-gtk/empathy-chat.c:896
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "ਅਣਜਾਣ ਕਮਾਂਡ"
-#: ../libempathy-gtk/empathy-chat.c:1017
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "ਅਣਜਾਣ ਕਮਾਂਡ; ਉਪਲੱਬਧ ਕਮਾਂਡ ਵਾਸਤੇ ਮੱਦਦ ਲਈ /help ਵਰਤੋਂ"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "ਆਫਲਾਈਨ"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "ਗਲਤ ਸੰਪਰਕ"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "ਬਹੁਤ ਲੰਮਾ ਸੁਨੇਹਾ"
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "ਸਥਾਪਤ ਨਹੀਂ"
-#: ../libempathy-gtk/empathy-chat.c:1171
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "ਅਣਜਾਣ"
-#: ../libempathy-gtk/empathy-chat.c:1175
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "ਸੁਨੇਹਾ '%s' ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
-#: ../libempathy-gtk/empathy-chat.c:1236 ../src/empathy-chat-window.c:703
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:713
msgid "Topic:"
msgstr "ਵਿਸ਼ਾ:"
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "ਵਿਸ਼ਾ ਨਹੀਂ ਕੀਤਾ: %s"
-#: ../libempathy-gtk/empathy-chat.c:1250
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ"
-#: ../libempathy-gtk/empathy-chat.c:1749
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1817
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "'%s' ਨੂੰ ਡਿਕਸ਼ਨਰੀ 'ਚ ਜੋੜੋ"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1854
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "'%s' ਨੂੰ %s ਡਿਕਸ਼ਨਰੀ 'ਚ ਜੋੜੋ"
-#: ../libempathy-gtk/empathy-chat.c:1913
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "ਚਿਹਰਾ ਸ਼ਾਮਲ ਕਰੋ"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1931
-#: ../libempathy-gtk/empathy-ui-utils.c:1806
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "_Send"
msgstr "ਭੇਜੋ(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1966
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "ਸਪੈਲਿੰਗ ਸੁਝਾਅ(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2055
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "ਤਾਜ਼ਾ ਲਾਗ ਲੈਣ ਲਈ ਫੇਲ੍ਹ"
-#: ../libempathy-gtk/empathy-chat.c:2161
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
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:2168
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s ਨੇ %1$s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
-#: ../libempathy-gtk/empathy-chat.c:2171
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
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:2179
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s ਵਲੋਂ %1$s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
-#: ../libempathy-gtk/empathy-chat.c:2182
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2195
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2220
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s ਨੂੰ ਹੁਣ %s ਵਜੋਂ ਜਾਣਿਆ ਜਾਵੇਗਾ"
-#: ../libempathy-gtk/empathy-chat.c:2384 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
-#: ../libempathy-gtk/empathy-chat.c:3015
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "ਗਲਤ ਪਾਸਵਰਡ; ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ:"
-#: ../libempathy-gtk/empathy-chat.c:3016
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "ਮੁੜ-ਕੋਸ਼ਿਸ਼"
-#: ../libempathy-gtk/empathy-chat.c:3021
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "ਇਹ ਰੂਮ ਪਾਸਵਰਡ ਨਾਲ ਸੁਰੱਖਿਅਤ ਹੈ:"
-#: ../libempathy-gtk/empathy-chat.c:3022
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "ਦਾਖਲ"
-#: ../libempathy-gtk/empathy-chat.c:3162
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ"
-#: ../libempathy-gtk/empathy-chat.c:3215
+#: ../libempathy-gtk/empathy-chat.c:3216
#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "ਗੱਲਬਾਤ"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:319
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "ਲਿੰਕ ਐਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:326
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:419
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸੋਧ"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:424
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "ਨਵਾਂ ਸੰਪਰਕ"
msgid "Favorite People"
msgstr "ਪਸੰਦ ਦੇ ਲੋਕ"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:1999
+#: ../libempathy-gtk/empathy-individual-view.c:2262
#, 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:2268
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2265
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:2322
-#: ../libempathy-gtk/empathy-individual-view.c:2436
+#: ../libempathy-gtk/empathy-contact-list-view.c:2050
+#: ../libempathy-gtk/empathy-contact-list-view.c:2127
+#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-individual-view.c:2467
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "ਹਟਾਓ(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2353
+#: ../libempathy-gtk/empathy-contact-list-view.c:2080
+#: ../libempathy-gtk/empathy-individual-view.c:2370
#, 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:2355
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2386
msgid "Removing contact"
msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
#: ../libempathy-gtk/empathy-contact-menu.c:418
#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-individual-widget.c:1377
msgid "Favorite"
msgstr "ਪਸੰਦ"
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:915
+#: ../src/empathy-chat-window.c:925
msgid "Inviting you to this room"
msgstr "ਇਸ ਰੂਮ ਲਈ ਤੁਹਾਨੂੰ ਸੱਦਾ"
msgstr "ਜਨਮਦਿਨ:"
#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Country ISO Code:"
msgstr "ਦੇਸ਼ ISO ਕੋਡ:"
#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Country:"
msgstr "ਦੇਸ਼:"
#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "State:"
msgstr "ਹਾਲਤ:"
#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "City:"
msgstr "ਸ਼ਹਿਰ:"
#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Area:"
msgstr "ਏਰੀਆ:"
#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Postal Code:"
msgstr "ਡਾਕ ਕੋਡ:"
#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Street:"
msgstr "ਗਲੀ:"
#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Building:"
msgstr "ਇਮਾਰਤ:"
#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Floor:"
msgstr "ਮੰਜ਼ਲ:"
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Room:"
msgstr "ਘਰ:"
#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Text:"
msgstr "ਟੈਕਸਟ:"
#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Description:"
msgstr "ਵੇਰਵਾ:"
#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "URI:"
msgstr "URI:"
#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Accuracy Level:"
msgstr "ਸ਼ੁੱਧਤਾ ਲੈਵਲ:"
#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Error:"
msgstr "ਗਲਤੀ:"
#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Vertical Error (meters):"
msgstr "ਵਰਟੀਕਲ ਗਲਤੀ (ਮੀਟਰ):"
#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "ਹਰੀਜੱਟਲ ਗਲਤੀ (ਮੀਟਰ):"
#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Speed:"
msgstr "ਗਤੀ:"
#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Bearing:"
msgstr "ਬੀਰਿੰਗ:"
#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Climb Speed:"
msgstr "ਚੜ੍ਹਨ ਗਤੀ:"
#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Last Updated on:"
msgstr "ਆਖਰੀ ਅੱਪਡੇਟ:"
#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "Longitude:"
msgstr "ਲੰਬਕਾਰੀ:"
#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Latitude:"
msgstr "ਵਿਥਕਾਰ:"
#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Altitude:"
msgstr "ਉਚਾਈ:"
#: ../libempathy-gtk/empathy-contact-widget.c:779
#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:622
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "ਟਿਕਾਣਾ"
#. translators: format is "Location, $date"
#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:624
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr "%R UTC %e %B %Y ਨੂੰ"
#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:922
msgid "Save Avatar"
msgstr "ਅਵਤਾਰ ਸੰਭਾਲੋ"
#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:979
+#: ../libempathy-gtk/empathy-individual-widget.c:980
msgid "Unable to save avatar"
msgstr "ਅਵਤਾਰ ਸੰਭਾਲਣ ਲਈ ਅਸਮਰੱਥ"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1312
msgid "Alias:"
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:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1516
msgid "Identifier:"
msgstr "ਪਛਾਣਕਰਤਾ:"
msgstr "ਚੁਣੋ"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1423
msgid "Group"
msgstr "ਗਰੁੱਪ"
msgid "_Link Contacts…"
msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ(_L)…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1649
+#: ../libempathy-gtk/empathy-individual-view.c:2378
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"ਕੀ ਤੁਸੀਂ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ? ਯਾਦ ਰੱਖੋ ਕਿ ਇਸ ਨਾਲ ਸਭ ਸੰਪਰਕ "
+"ਹਟਾਏ ਜਾਣਗੇ, ਜੋ ਕਿ ਇਸ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ ਨੂੰ ਬਣਾਉਂਦੇ ਹਨ।"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1657
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "ਮੇਟਾ-ਸੰਪਰਕ %u ਸੰਪਰਕ ਰੱਖਦਾ ਹੈ"
-msgstr[1] "ਮੇਟਾ-ਸੰਪਰਕ %u ਸੰਪਰਕ ਰੱਖਦਾ ਹੈ"
+#| msgid "Meta-contact containing %u contact"
+#| msgid_plural "Meta-contact containing %u contacts"
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "ਲਿੰਕ ਕੀਤਾ ਸੰਪਰਕ %u ਸੰਪਰਕ ਰੱਖਦਾ ਹੈ"
+msgstr[1] "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ %u ਸੰਪਰਕ ਰੱਖਦੇ ਹਨ"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
msgstr "ਲਿੰਕ ਹਟਾਓ(_U)…"
#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed meta-contact into the contacts it contains."
-msgstr "ਵੇਖਾਏ ਮੇਟਾ-ਸੰਪਰਕ ਨੂੰ ਇਸ 'ਚ ਮੌਜੂਦਾ ਸੰਪਰਕਾਂ 'ਚ ਪੂਰੀ ਤਰ੍ਹਾਂ ਵੰਡ ਦਿਉ।"
+#| msgid ""
+#| "Completely split the displayed meta-contact into the contacts it contains."
+msgid "Completely split the displayed linked contacts into the separate contacts."
+msgstr "ਵੇਖਾਏ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਇਸ 'ਚ ਮੌਜੂਦਾ ਸੰਪਰਕਾਂ 'ਚ ਪੂਰੀ ਤਰ੍ਹਾਂ ਵੰਡ ਦਿਉ।"
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
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
+#| msgid "Unlink meta-contact '%s'?"
+msgid "Unlink linked contacts '%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."
msgid ""
-"Are you sure you want to unlink this meta-contact? This will completely "
-"split the meta-contact into the contacts it contains."
-msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਮੇਟਾ-ਲਿੰਕ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ? ਇਹ ਮੇਟਾ-ਸੰਪਰਕਾਂ ਨੂੰ ਮੌਜੂਦ ਸੰਪਰਕਾਂ 'ਚ ਵੰਡ ਦੇਵੇਗਾ।"
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
+msgstr ""
+"ਕੀ ਤੁਸੀਂ ਇਹ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ? ਇਹ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਵੱਖ ਵੱਖ "
+"ਸੰਪਰਕਾਂ 'ਚ ਵੰਡ ਦੇਵੇਗਾ।"
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
-msgstr "ਲਿੰà¨\95 ਹà¨\9fਾà¨\93(_U)"
+msgstr "à¨\85ਣ-ਲਿੰà¨\95 à¨\95ਰà©\8b(_U)"
#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgid "New Call"
msgstr "ਨਵੀਂ ਕਾਲ"
+#: ../libempathy-gtk/empathy-password-dialog.c:248
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"<b>%s</b> ਅਕਾਊਂਟ\n"
+"ਲਈ ਆਪਣਾ ਪਾਸਵਰਡ ਦਿਓ"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
msgid "Phrase not found"
msgstr "ਸ਼ਬਦ ਨਹੀਂ ਲੱਭੇ"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "ਇੱਕ ਤੁਰੰਤ ਸੁਨੇਹੇ ਮਿਲਿਆ"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "ਇੱਕ ਤੁਰੰਤ ਸੁਨੇਹੇ ਭੇਜਿਆ"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "ਆ ਰਹੀ ਗੱਲਬਾਤ ਮੰਗ"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "ਸੰਪਰਕ ਕੁਨੈਕਟ ਹੋਇਆ"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "ਸੰਪਰਕ ਦਾ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "ਸਰਵਰ ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "ਆ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "ਜਾ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "ਆਵਾਜ਼ ਕਾਲ ਖਤਮ ਕੀਤੀ"
msgstr "ਨਵਾਂ ਹਾਲਤ ਸੁਨੇਹਾ ਸੰਭਾਲੋ(_N)"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-#| msgid "Edit Custom Messages"
msgid "Saved Status Messages"
msgstr "ਸੰਭਾਲੇ ਹਾਲਤ ਸੁਨੇਹੇ"
msgid "Certificate Details"
msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਰਵਾ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1703
+#: ../libempathy-gtk/empathy-ui-utils.c:1708
msgid "Unable to open URI"
msgstr "URI ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1798
+#: ../libempathy-gtk/empathy-ui-utils.c:1803
msgid "Select a file"
msgstr "ਫਾਇਲ ਚੁਣੋ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "%s ਵਲੋਂ ਫਾਇਲ ਆ ਰਹੀ ਹੈ"
msgid "Instant Message (Empathy)"
msgstr "ਤੁਰੰਤ ਸੁਨੇਹਾ (ਇੰਪੈਥੀ)"
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਕੁਨੈਕਟ ਨਾ ਕਰੋ"
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਸੰਪਰਕ ਲਿਸਟ ਜਾਂ ਕੋਈ ਹੋਰ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ"
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- ਇੰਪੈਥੀ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਕਲਾਇਟ"
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "ਅਕਾਊਂਟ ਮੈਨੇਜਰ ਨਾਲ ਸੰਪਰਕ ਕਰਨ 'ਚ ਗਲਤੀ"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
-#| msgid "There was an error while parsing the account details."
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
"The error was:\n"
"\n"
"%s"
msgstr ""
-"ਟੈਲੀਪੈਂਥੀ ਅਕਾਊਂਟ ਮੈਨੇਜਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਗਲਤੀ ਆਈ। "
-"ਗਲਤੀ ਸੀ:\n"
+"ਟੈਲੀਪੈਂਥੀ ਅਕਾਊਂਟ ਮੈਨੇਜਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਗਲਤੀ ਆਈ। ਗਲਤੀ ਸੀ:\n"
"\n"
"%s"
msgid "Your new account has not been saved yet."
msgstr "ਤੁਹਾਡਾ ਨਵਾਂ ਅਕਾਊਂਟ ਹਾਲੇ ਨਹੀਂ ਸੰਭਾਲਿਆ ਗਿਆ ਹੈ।"
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
"ਤੁਸੀਂ ਨਵਾਂ ਅਕਾਊਂਟ ਚੁਣਨ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਬਦਲਾਅ ਅਣਡਿੱਠੇ ਕਰ ਦੇਵੇਗਾ।\n"
"ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-accounts-dialog.c:1951
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1544
+#| msgid "_Enabled"
+msgid "_Enable"
+msgstr "ਯੋਗ(_E)"
+
+#: ../src/empathy-accounts-dialog.c:1545
+#| msgid "_Enabled"
+msgid "_Disable"
+msgstr "ਆਯੋਗ(_D)"
+
+#: ../src/empathy-accounts-dialog.c:2044
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgid "_Import…"
msgstr "ਇੰਪੋਰਟ(_I)…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr "- ਇੰਪੈਥੀ ਪਰਮਾਣਕਿਤਾ ਕਲਾਇਟ"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "ਇੰਪੈਥੀ ਪਰਮਾਣਕਿਤਾ ਕਲਾਇਟ"
msgid "Empathy Audio/Video Client"
msgstr "ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "ਕਨਟਰਾਸਟ"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "ਚਮਕ"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "ਗਾਮਾ"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "ਆਵਾਜ਼"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "ਬਾਹੀ(_S)"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "ਆਡੀਓ ਆਉਟਪੁੱਟ"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "ਵਿਡੀਓ ਆਉਟਪੁੱਟ"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "ਡਾਇਲ-ਪੈਡ"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
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:1266
+#: ../src/empathy-call-window.c:1270
#, 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:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "ਕਾਲ ਕਰੋ"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "ਮਸ਼ੀਨ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ IP ਐਡਰੈੱਸ"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "IP ਐਡਰੈੱਸ, ਜੋ ਕਿ ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਸਰਵਰ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ ਹੈ"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "ਪੀਅਰ ਦਾ IP ਐਡਰੈੱਸ, ਜੋ ਦੂਜੇ ਪਾਸੇ ਵਿਖਾਈ ਦਿੰਦਾ ਹੈ"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "ਰੀਲੇਅ ਸਰਵਰ ਦਾ IP ਐਡਰੈੱਸ"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
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:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "ਕੁਨੈਕਟ ਹੈ -- %d:%02dm"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, 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:2358
+#: ../src/empathy-call-window.c:2365
#, 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:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਤੁਹਾਡੇ ਵਿੱਚੋਂ ਕੋਈ ਅਜਿਹੇ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੈ, ਜੋ ਸਿੱਧਾ ਕੁਨੈਕਸ਼ਨ "
"ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਆਡੀਓ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid "The video formats necessary for this call are not installed on your computer"
msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਵਿਡੀਓ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"ਟੈਲੀਪੈਥੀ ਭਾਗ ਵਿੱਚ ਕੁਝ ਗੜਬੜ ਹੋ ਗਈ ਹੈ। <a href=\"%s\">ਇਹ ਬੱਗ ਜਾਣਕਾਰੀ</a> ਦਿਓ ਅਤੇ ਮੱਦਦ "
"ਮੇਨੂ ਵਿੱਚੋਂ 'ਡੀਬੱਗ' ਵਿੰਡੋ ਤੋਂ ਲੈ ਕੇ ਲਾਗ ਨੱਥੀ ਕਰੋ।"
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "ਕਾਲ ਇੰਜਣ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "ਸਟਰੀਮ ਦਾ ਅੰਤ ਆ ਗਿਆ ਹੈ"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "ਆਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "ਵਿਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
msgid "_View"
msgstr "ਵੇਖੋ(_V)"
-#: ../src/empathy-chat-window.c:468 ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:478 ../src/empathy-chat-window.c:498
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ਨਾ-ਪੜ੍ਹੇ)"
msgstr[1] "%s (%d ਨਾ-ਪੜ੍ਹੇ)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:490
#, 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:496
+#: ../src/empathy-chat-window.c:506
#, 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:505
+#: ../src/empathy-chat-window.c:515
#, 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:707
+#: ../src/empathy-chat-window.c:717
msgid "Typing a message."
msgstr "ਸੁਨੇਹਾ ਲਿਖਦਾ/ਲਿਖਦੀ ਹੈ।"
msgid "Manage Favorite Rooms"
msgstr "ਪਸੰਦੀਦਾ ਰੂਮ ਪਰਬੰਧ"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
msgstr "ਆ ਰਹੀ ਵਿਡੀਓ ਕਾਲ"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "ਆ ਰਹੀ ਕਾਲ"
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s ਤੁਹਾਨੂੰ ਵਿਡੀਓ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤੁਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:513
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s ਤੁਹਾਨੂੰ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤੁਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:516 ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming call from %s"
msgstr "%s ਤੋਂ ਕਾਲ ਆ ਰਹੀ ਹੈ"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:541
msgid "_Reject"
msgstr "ਰੱਦ ਕਰੋ(_R)"
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:547
msgid "_Answer"
msgstr "ਜਵਾਬ ਦਿਓ(_A)"
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming video call from %s"
msgstr "%s ਤੋਂ ਵਿਡੀਓ ਕਾਲ ਆ ਰਹੀ ਹੈ"
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:738
msgid "Room invitation"
msgstr "ਰੂਮ ਸੱਦਾ"
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:740
#, c-format
msgid "Invitation to join %s"
msgstr "%s ਜੁਆਇੰਣ ਕਰਨ ਲਈ ਸੱਦਾ"
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:747
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s ਤੁਹਾਨੂੰ %s ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:755
msgid "_Decline"
msgstr "ਇਨਕਾਰ(_D)"
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:760
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "ਦਾਖਲ(_J)"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:787
#, c-format
msgid "%s invited you to join %s"
msgstr "%s ਨੇ ਤੁਹਾਨੂੰ %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦਿਆ"
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:793
#, c-format
msgid "You have been invited to join %s"
msgstr "ਤੁਹਾਨੂੰ %s ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦਾ ਆਇਆ ਹੈ"
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:844
#, c-format
msgid "Incoming file transfer from %s"
msgstr "%s ਤੋਂ ਆ ਰਿਹਾ ਫਾਇਲ ਸੰਚਾਰ"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1014 ../src/empathy-main-window.c:367
+#| msgid "Password"
+msgid "Password required"
+msgstr "ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
+
+#: ../src/empathy-event-manager.c:1070
#, c-format
-#| msgid "%s would like to send you a file"
msgid "%s would like permission to see when you are available"
msgstr "%s ਤੁਹਾਨੂੰ ਵੇਖਣ ਦਾ ਅਧਿਕਾਰ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ, ਜਦੋਂ ਵੀ ਉਪਲੱਬਧ ਹੋਵੋ"
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1074
#, c-format
msgid ""
"\n"
"\n"
"ਸੁਨੇਹਾ: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1118
#, c-format
msgid "%s is now offline."
msgstr "%s ਹੁਣ ਆਫਲਾਈਨ ਹੈ।"
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1139
#, c-format
msgid "%s is now online."
msgstr "%s ਹੁਣ ਆਨਲਾਈਨ ਹੈ।"
msgstr "ਸਰੋਤ"
#: ../src/empathy-main-window.c:384
+#| msgid "Password"
+msgid "Provide Password"
+msgstr "ਪਾਸਵਰਡ ਦਿਓ"
+
+#: ../src/empathy-main-window.c:390
+#| msgid "Disconnected"
+msgid "Disconnect"
+msgstr "ਡਿਸ-ਕੁਨੈਕਸ਼ਨ"
+
+#: ../src/empathy-main-window.c:530
msgid "No match found"
msgstr "ਕੋਈ ਮੇਲ ਨਹੀਂ ਲੱਭਿਆ"
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:685
msgid "Reconnect"
msgstr "ਮੁੜ-ਕੁਨੈਕਟ"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:691
msgid "Edit Account"
msgstr "ਅਕਾਊਂਟ ਸੋਧ"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:697
msgid "Close"
msgstr "ਬੰਦ ਕਰੋ"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1405
msgid "Contact"
msgstr "ਸੰਪਰਕ"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1741
msgid "Contact List"
msgstr "ਸੰਪਰਕ ਲਿਸਟ"
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1854
msgid "Show and edit accounts"
msgstr "ਅਕਾਊਂਟ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"
msgstr "ਪਰਸੰਗ"
#: ../src/empathy-main-window.ui.h:3
-#| msgid "Contact List"
msgid "Find in Contact _List"
msgstr "ਸੰਪਰਕ ਲਿਸਟ 'ਚ ਲੱਭੋ(_L)"
msgid "_Reduce location accuracy"
msgstr "ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਘਟਾਓ(_R)"
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr "ਜਵਾਬ"
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "ਰੱਦ ਕਰੋ"
-
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "ਜਵਾਬ ਦਿਓ"
-
-#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "ਇਨਕਾਰ"
-
-#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "ਮਨਜ਼ੂਰ"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "ਹਾਲਤ"
msgid "Invite"
msgstr "ਸੱਦਾ"
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:178
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "ਕੋਈ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ; ਕੁਝ ਵੀ ਕਰੋ (ਇੰਪੋਰਟ ਆਦਿ) ਅਤੇ ਬੰਦ ਕਰੋ"
-#: ../src/empathy-accounts.c:187
-#| msgid "Don't display any dialogs if there are any non-Salut accounts"
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr "ਜੇ ਕੋਈ \"ਨੇੜਲੇ ਲੋਕ\" ਅਕਾਊਂਟ ਹੋਵੇ ਤਾਂ ਕੋਈ ਵੀ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ"
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:186
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "ਦਿੱਤਾ ਅਕਾਊਂਟ ਸ਼ੁਰੂ ਵੇਲੇ ਚੁਣੋ (ਜਿਵੇਂ gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:188
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:193
msgid "- Empathy Accounts"
msgstr "- ਇੰਪੈਥੀ ਅਕਾਊਂਟ"
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:232
msgid "Empathy Accounts"
msgstr "ਇੰਪੈਥੀ ਅਕਾਊਂਟ"
msgid "Empathy Debugger"
msgstr "ਇੰਪੈਥੀ ਡੀਬੱਗਰ"
-#: ../src/empathy-chat.c:102
-#| msgid "- Empathy IM Client"
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr "- ਇੰਪੈਥੀ ਚੈਟ ਕਲਾਇਟ"
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "ਜਵਾਬ"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "ਰੱਦ ਕਰੋ"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "ਜਵਾਬ ਦਿਓ"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "ਇਨਕਾਰ"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "ਮਨਜ਼ੂਰ"
+
#~ msgid "The hash of the received file and the sent one do not match"
#~ msgstr "ਮਿਲੀ ਫਾਇਲ ਅਤੇ ਭੇਜੀ ਦਾ ਹੈਸ਼ ਰਲਦਾ ਨਹੀਂ ਹੈ"
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-11-13 22:47+0000\n"
-"PO-Revision-Date: 2010-11-14 12:11+0100\n"
+"POT-Creation-Date: 2010-12-26 17:56+0000\n"
+"PO-Revision-Date: 2010-12-28 23:04+0100\n"
"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
"Language-Team: Slovenščina <gnome-si@googlegroups.com>\n"
"Language: \n"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2200
msgid "Messaging and VoIP Accounts"
msgstr "Sporočanje in računi VoIP"
msgstr "Nepovezano"
#: ../libempathy/empathy-utils.c:257
-#: ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895
-#: ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897
+#: ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901
+#: ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903
#: ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Neznano"
msgid "in the future"
msgstr "v prihodnosti"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
msgid "All"
msgstr "Vse"
-#: ../libempathy-gtk/empathy-account-widget.c:617
-#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Račun"
-#: ../libempathy-gtk/empathy-account-widget.c:618
+#: ../libempathy-gtk/empathy-account-widget.c:680
msgid "Password"
msgstr "Geslo"
-#: ../libempathy-gtk/empathy-account-widget.c:619
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Strežnik"
-#: ../libempathy-gtk/empathy-account-widget.c:620
+#: ../libempathy-gtk/empathy-account-widget.c:682
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Vrata"
-#: ../libempathy-gtk/empathy-account-widget.c:692
-#: ../libempathy-gtk/empathy-account-widget.c:749
+#: ../libempathy-gtk/empathy-account-widget.c:754
+#: ../libempathy-gtk/empathy-account-widget.c:811
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1074
+#: ../libempathy-gtk/empathy-account-widget.c:1152
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "Račun %s se ureja preko upravljalnika spletnih računov."
-#: ../libempathy-gtk/empathy-account-widget.c:1080
+#: ../libempathy-gtk/empathy-account-widget.c:1158
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Računa %s s programom Empathy ni mogoče urejati."
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1178
msgid "Launch My Web Accounts"
msgstr "Zaženi spletne račune"
-#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget.c:1516
msgid "Username:"
msgstr "Uporabniško ime:"
-#: ../libempathy-gtk/empathy-account-widget.c:1733
+#: ../libempathy-gtk/empathy-account-widget.c:1884
msgid "A_pply"
msgstr "_Uveljavi"
-#: ../libempathy-gtk/empathy-account-widget.c:1763
+#: ../libempathy-gtk/empathy-account-widget.c:1914
msgid "L_og in"
msgstr "_Prijava"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1829
+#: ../libempathy-gtk/empathy-account-widget.c:1980
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1400
+#: ../libempathy-gtk/empathy-individual-widget.c:1486
#: ../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 "Račun:"
-#: ../libempathy-gtk/empathy-account-widget.c:1840
+#: ../libempathy-gtk/empathy-account-widget.c:1991
msgid "_Enabled"
msgstr "_Omogoči"
-#: ../libempathy-gtk/empathy-account-widget.c:1905
+#: ../libempathy-gtk/empathy-account-widget.c:2056
msgid "This account already exists on the server"
msgstr "Ta račun na strežniku že obstaja"
-#: ../libempathy-gtk/empathy-account-widget.c:1908
+#: ../libempathy-gtk/empathy-account-widget.c:2059
msgid "Create a new account on the server"
msgstr "Ustvari nov račun na strežniku"
-#: ../libempathy-gtk/empathy-account-widget.c:2022
+#: ../libempathy-gtk/empathy-account-widget.c:2251
msgid "Ca_ncel"
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:2314
+#: ../libempathy-gtk/empathy-account-widget.c:2548
#, 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:2340
+#: ../libempathy-gtk/empathy-account-widget.c:2574
#, c-format
msgid "%s Account"
msgstr "%s račun"
-#: ../libempathy-gtk/empathy-account-widget.c:2344
+#: ../libempathy-gtk/empathy-account-widget.c:2578
msgid "New account"
msgstr "Nov račun"
msgstr "_Geslo:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "Remember Password"
+msgstr "Zapomni si geslo"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
msgid "Screen _Name:"
msgstr "Zaslonsko _ime:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "What is your AIM password?"
msgstr "Kakšno je vaše geslo AIM?"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
msgid "What is your AIM screen name?"
msgstr "Kakšno je vaše zaslonsko ime 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:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Port:"
-msgstr "_Vrata:"
-
#: ../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:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "_Port:"
+msgstr "_Vrata:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:13
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Strežnik:"
msgid "Login I_D:"
msgstr "I_D prijave:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise User ID?"
msgstr "Kakšen je vaš uporabniški ID GroupWise?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise password?"
msgstr "Kakšno je vaše geslo GroupWise?"
msgid "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 UIN?"
msgstr "Kakšen je vaš UIN ICQ?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ password?"
msgstr "Kakšno je vaše geslo ICQ?"
msgid "Priori_ty:"
msgstr "Prednos_t:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
msgid "Reso_urce:"
msgstr "_Vir:"
#. 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
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\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."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "Use old SS_L"
msgstr "Uporabi stari SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook password?"
msgstr "Kakšno je vaše geslo Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook username?"
msgstr "kakšno je vaše uporabniško ime Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google ID?"
msgstr "Kakšen je vaš uporabniški ID Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google password?"
msgstr "Kakšno je vaše geslo Google?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber ID?"
msgstr "Kakšen je vaš uporabniški ID Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber password?"
msgstr "Kakšno je vaše geslo Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber ID?"
msgstr "Kakšen je vaš želeni uporabniški ID Jabber?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber password?"
msgstr "Kakšno je vaše želeno geslo Jabber?"
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Primer:</b> uporabnik@hotmail.com"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
msgid "What is your Windows Live ID?"
msgstr "Kakšen je vaš ID Windows Live?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live password?"
msgstr "Kakšno je vaše geslo Windows Live?"
msgid "Proxy Options"
msgstr "Možnosti posredniškega strežnika"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "STUN Server:"
msgstr "Strežnik STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Server:"
msgstr "Strežnik:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Transport:"
msgstr "Prenos:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP account password?"
msgstr "Kakšno je vaše geslo SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP login ID?"
msgstr "Kakšen je prijavni ID vaše SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "_Username:"
msgstr "_Uporabniško ime:"
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
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-password-dialog.c:283
+msgid "Remember password"
+msgstr "Zapomni si geslo"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
msgstr "Kakšen je vaš uporabniški ID Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "What is your Yahoo! password?"
msgstr "Kakšno je vaše geslo Yahoo!?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "Yahoo! I_D:"
msgstr "Yahoo! I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
msgid "_Room List locale:"
msgstr "_Jezikovne nastavitve seznama klepetalnic:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "Ni bilo mogoče pretvoriti slike"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "Vaš sistem ne podpira nobene izmed sprejetih vrst slik"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Izberite sliko za svojo podobo"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "Brez slike"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Slike"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "Vse datoteke"
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:324
msgid "Click to enlarge"
msgstr "Kliknite za povečavo"
-#: ../libempathy-gtk/empathy-chat.c:643
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Napaka med odpiranjem zasebnega klepeta"
-#: ../libempathy-gtk/empathy-chat.c:683
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "Tema ni podprta pri tem pogovoru"
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "Za spreminjanje teme nimate ustreznih dovoljenj."
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: počisti vsa sporočila trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tema>: določi temo trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:832
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID stika> [<sporočilo>]: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID stika> <sporočilo>: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <vzdevek>: spremeni vaš vzdevek na trenutnem strežniku"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:848
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:850
+#: ../libempathy-gtk/empathy-chat.c:851
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:855
+#: ../libempathy-gtk/empathy-chat.c:856
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:865
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Uporaba: %s"
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Neznan ukaz"
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Neznan ukaz, za več si vpišite /help"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "brez povezave"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "neveljaven stik"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "ni dovoljenja"
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "predolgo sporočilo"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "ni del programa"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "neznano"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Napaka med pošiljanjem sporočila '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1234
-#: ../src/empathy-chat-window.c:705
+#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../src/empathy-chat-window.c:713
msgid "Topic:"
msgstr "Tema:"
-#: ../libempathy-gtk/empathy-chat.c:1246
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "Tema je določena na: %s"
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "Ni določene teme"
-#: ../libempathy-gtk/empathy-chat.c:1747
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(Ni predlogov)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Dodaj '%s' v slovar"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1852
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Dodaj '%s' v slovar %s"
-#: ../libempathy-gtk/empathy-chat.c:1911
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Vstavi smeška"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1929
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "_Send"
msgstr "_Pošlji"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "Predlogi čr_kovalnika"
-#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
-#: ../libempathy-gtk/empathy-chat.c:2158
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s je prekinil povezavo"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2165
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s je izgnal %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2168
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s je bil izgnan"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s je izobčil %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s je izobčen"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s je zapustil klepetalnico"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2217
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s je vstopil v klepetalnico"
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s je preimenovan v %s"
-#: ../libempathy-gtk/empathy-chat.c:2381
-#: ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385
+#: ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Prekinjena povezava"
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "Napačno geslo; poskusite znova:"
-#: ../libempathy-gtk/empathy-chat.c:2995
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Poskusi znova"
-#: ../libempathy-gtk/empathy-chat.c:3000
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "Klepetalnica je zaščitena z geslom:"
-#: ../libempathy-gtk/empathy-chat.c:3001
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Pridruži se"
-#: ../libempathy-gtk/empathy-chat.c:3141
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Povezano"
-#: ../libempathy-gtk/empathy-chat.c:3194
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Pogovor"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:797
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "Kopiraj _naslov povezave"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:804
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Odpri povezavo"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %d. %B. %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Uredi podrobnosti stika"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Osebni podatki"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:420
-#: ../libempathy-gtk/empathy-individual-dialogs.c:110
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "Nov stik"
msgid "Favorite People"
msgstr "Priljubljene osebe"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-contact-list-view.c:1999
#: ../libempathy-gtk/empathy-individual-view.c:2262
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Ali zares želite odstraniti skupino '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
#: ../libempathy-gtk/empathy-individual-view.c:2265
msgid "Removing group"
msgstr "Odstranjevanje skupine"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2319
-#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-contact-list-view.c:2050
+#: ../libempathy-gtk/empathy-contact-list-view.c:2127
+#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-individual-view.c:2467
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Odstrani"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2350
+#: ../libempathy-gtk/empathy-contact-list-view.c:2080
+#: ../libempathy-gtk/empathy-individual-view.c:2370
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Ali zares želite odstraniti stik '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2352
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2386
msgid "Removing contact"
msgstr "Odstranjevanje stika"
#: ../libempathy-gtk/empathy-contact-menu.c:418
#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1291
+#: ../libempathy-gtk/empathy-individual-widget.c:1377
msgid "Favorite"
msgstr "Priljubljeno"
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:917
+#: ../src/empathy-chat-window.c:925
msgid "Inviting you to this room"
msgstr "Vabila v klepetalnico"
msgstr "Izberi stik"
#: ../libempathy-gtk/empathy-contact-widget.c:252
-#: ../libempathy-gtk/empathy-individual-widget.c:147
+#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Polno ime:"
#: ../libempathy-gtk/empathy-contact-widget.c:253
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Telefonska številka:"
#: ../libempathy-gtk/empathy-contact-widget.c:254
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "Elektronski naslov:"
#: ../libempathy-gtk/empathy-contact-widget.c:255
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Spletišče:"
#: ../libempathy-gtk/empathy-contact-widget.c:256
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Rojstni dan:"
#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Country ISO Code:"
msgstr "ISO oznaka države:"
#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Country:"
msgstr "Država:"
#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "State:"
msgstr "Okraj:"
#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "City:"
msgstr "Mesto:"
#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Area:"
msgstr "Področje:"
#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Postal Code:"
msgstr "Poštna številka:"
#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Street:"
msgstr "Ulica:"
#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Building:"
msgstr "Stavba:"
#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Floor:"
msgstr "Nadstropje:"
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Room:"
msgstr "Klepetalnica:"
#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Text:"
msgstr "Besedilo:"
#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Description:"
msgstr "Opis:"
#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "URI:"
msgstr "URI:"
#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Accuracy Level:"
msgstr "Raven natančnosti:"
#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Error:"
msgstr "Napaka:"
#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Napaka navpično (v metrih):"
#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Napaka vodoravno (v metrih):"
#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Speed:"
msgstr "Hitrost:"
#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Bearing:"
msgstr "Smer:"
#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Climb Speed:"
msgstr "Hitrost dviganja:"
#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Last Updated on:"
msgstr "Zadnjič posodobljeno:"
#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "Longitude:"
msgstr "Zemljepisna dolžina:"
#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Latitude:"
msgstr "Zemljepisna širina:"
#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Altitude:"
msgstr "Nadmorska višina:"
#: ../libempathy-gtk/empathy-contact-widget.c:779
#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../libempathy-gtk/empathy-individual-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:622
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Mesto"
#. translators: format is "Location, $date"
#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:600
+#: ../libempathy-gtk/empathy-individual-widget.c:624
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr "%e.%B.%Y ob %R UTC"
#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:840
+#: ../libempathy-gtk/empathy-individual-widget.c:922
msgid "Save Avatar"
msgstr "Shrani podobo"
#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:980
msgid "Unable to save avatar"
msgstr "Ni mogoče shraniti podobe"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1226
+#: ../libempathy-gtk/empathy-individual-widget.c:1312
msgid "Alias:"
msgstr "Vzdevek:"
#. 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:1430
+#: ../libempathy-gtk/empathy-individual-widget.c:1516
msgid "Identifier:"
msgstr "Določilo:"
msgstr "Izbor"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1423
msgid "Group"
msgstr "Skupina"
msgid "_Link Contacts…"
msgstr "_Poveži stike ..."
-#: ../libempathy-gtk/empathy-individual-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-view.c:2378
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "Metastik s skupaj %u stiki"
-msgstr[1] "Metastik s skupaj %u stikom"
-msgstr[2] "Metastik s skupaj %u stikoma"
-msgstr[3] "Metastik s skupaj %u stiki"
+msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
+msgstr "Ali res želite odstraniti povezan stik '%s'? S tem bo odstranjeni tudi vsi stiki, ki so opredeljeni kot povezani."
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1657
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Povezan stik vključuje %u stikov."
+msgstr[1] "Povezan stik vključuje %u stik."
+msgstr[2] "Povezan stik vključuje %u stika."
+msgstr[3] "Povezan stik vključuje %u stike."
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
msgstr "<b>Mesto</b> na (datum)"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "Povezava je vzpostavljena preko telefona ali druge mobilne naprave"
+
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
msgstr "Novo omrežje"
msgstr "_Odstrani povezavo ..."
#: ../libempathy-gtk/empathy-linking-dialog.c:121
-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."
+msgid "Completely split the displayed linked contacts into the separate contacts."
+msgstr "Popolnoma razdeli prikazan povezani stik na posamezne stike."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
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'?"
+msgid "Unlink linked contacts '%s'?"
+msgstr "Ali naj se razdelijo povezani stiki '%s' na posamezne stike?"
-#: ../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 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:186
+msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
+msgstr "Ali ste prepričani, da želite odstraniti povezane stike? S tem se bodo stiki razdelil na posamezne stike."
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Odstrani povezavo"
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgstr "Datum"
msgstr "ID stika:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "Kle_pet"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "Nov pogovor"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "Pošlji _video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "_Kliči"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "Nov klic"
+#: ../libempathy-gtk/empathy-password-dialog.c:248
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Treba je vnesti geslo za račun\n"
+"<b>%s</b>"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
msgid "Phrase not found"
msgstr "Rekla ni mogoče najti"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Prejeto je bilo hipno sporočilo"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Poslano je bilo hipno sporočilo"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Prejeta je bila zahteva za klepet"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Povezava s stikom je bila vzpostavljena"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Povezava s stikom je bila prekinjena"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Povezano s strežnikom"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Povezava s strežnikom je bila prekinjena"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Dohodni klic"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Odhodni klic"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Klic je končan"
msgid "Certificate Details"
msgstr "Podrobnosti potrdila"
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1708
msgid "Unable to open URI"
msgstr "Ni mogoče odpreti naslova URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1803
msgid "Select a file"
msgstr "Izbor datoteke"
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "Prihajajoča datoteka od %s"
msgid "Instant Message (Empathy)"
msgstr "Hipno sporočanje (Empathy)"
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Brez samodejne povezave ob zagonu"
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Ne prikaži seznama stikov in drugih pogovornih oken ob zagonu"
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy sporočilnik"
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Napaka delovanja upravljalnika računov"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
msgstr "Izbor račune za uvoz:"
#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "Yes"
msgstr "Da"
msgstr "Novi račun še ni bil shranjen."
#: ../src/empathy-accounts-dialog.c:280
-#: ../src/empathy-call-window.c:809
+#: ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "Povezovanje ..."
"Izbran bo nov račun, trenutne spremembe pa bodo izgubljene\n"
"Ali ste prepričani, da želite nadaljevati?"
-#: ../src/empathy-accounts-dialog.c:1951
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1544
+msgid "_Enable"
+msgstr "_Omogoči"
+
+#: ../src/empathy-accounts-dialog.c:1545
+msgid "_Disable"
+msgstr "O_nemogoči"
+
+#: ../src/empathy-accounts-dialog.c:2044
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgid "_Import…"
msgstr "_Uvozi ..."
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:243
msgid " - Empathy authentication client"
msgstr "- Empathy odjemalec overitve"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:259
msgid "Empathy authentication client"
msgstr "Empathy odjemalec overitve"
msgid "Empathy Audio/Video Client"
msgstr "Empathy odjemalec zvoka in slike"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Svetlost"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gama"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Glasnost"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "_Stranska vrstica"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Zvočni vhod"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Video vhod"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Številčnica"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
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:1266
+#: ../src/empathy-call-window.c:1270
#, 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:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "Kliči"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "Naslov IP kot ga zazna strojna oprema"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
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:1503
+#: ../src/empathy-call-window.c:1507
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:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "Naslov IP posredovalnega strežnika"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
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:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Povezan - %d:%02d m"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Tehnične podrobnosti"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
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:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
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:2364
+#: ../src/empathy-call-window.c:2371
#, 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."
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "Prišlo je do napake na omrežju"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
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:2377
+#: ../src/empathy-call-window.c:2384
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:2387
+#: ../src/empathy-call-window.c:2394
#, 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."
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "Prišlo je do napake v klicnem programniku"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "Dosežen je konec pretoka"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "Ni mogoče vzpostaviti zvočnega pretoka"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "Ni mogoče vzpostaviti video pretoka"
msgid "_View"
msgstr "_Pogled"
-#: ../src/empathy-chat-window.c:466
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:478
+#: ../src/empathy-chat-window.c:498
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[2] "%s (%d neprebrani)"
msgstr[3] "%s (%d neprebrana)"
-#: ../src/empathy-chat-window.c:478
+#: ../src/empathy-chat-window.c:490
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[2] "%s (in %u drugi)"
msgstr[3] "%s (in %u druga)"
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:506
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[2] "%s (%d neprebrani od drugih)"
msgstr[3] "%s (%d neprebrana od drugih)"
-#: ../src/empathy-chat-window.c:503
+#: ../src/empathy-chat-window.c:515
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[2] "%s (%d neprebrani od vseh)"
msgstr[3] "%s (%d neprebrana od vseh)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:717
msgid "Typing a message."
msgstr "Pisanje sporočila."
msgid "Manage Favorite Rooms"
msgstr "Upravljanje priljubljenih klepetalnic"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
msgstr "Dohodni video klic"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Dohodni klic"
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s vas kliče preko video kanala. Ali se želite javiti?"
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:513
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s vas kliče. Ali se želite javiti?"
-#: ../src/empathy-event-manager.c:482
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming call from %s"
msgstr "Dohodni klic od %s"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:541
msgid "_Reject"
msgstr "_Zavrni"
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:547
msgid "_Answer"
msgstr "_Odgovori"
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming video call from %s"
msgstr "Dohodni video klic od %s"
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:738
msgid "Room invitation"
msgstr "Vabilo v klepetalnico"
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:740
#, c-format
msgid "Invitation to join %s"
msgstr "Povabilo v %s"
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:747
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s vas vabi, da se pridružite v %s"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:755
msgid "_Decline"
msgstr "_Odkloni"
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:760
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Pridruži se"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:787
#, c-format
msgid "%s invited you to join %s"
msgstr "%s vas je povabil v %s"
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:793
#, c-format
msgid "You have been invited to join %s"
msgstr "Povabljeni ste v %s"
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:844
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Prihajajoč prenos datoteke od %s"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1014
+#: ../src/empathy-main-window.c:367
+msgid "Password required"
+msgstr "Zahtevano geslo"
+
+#: ../src/empathy-event-manager.c:1070
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s želi dovoljenje za pregled dosegljivosti"
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1074
#, c-format
msgid ""
"\n"
"\n"
"Sporočilo: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1118
#, c-format
msgid "%s is now offline."
msgstr "%s ni povezan."
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1139
#, c-format
msgid "%s is now online."
msgstr "%s je povezan."
msgstr "Vir"
#: ../src/empathy-main-window.c:384
+msgid "Provide Password"
+msgstr "Vpis gesla"
+
+#: ../src/empathy-main-window.c:390
+msgid "Disconnect"
+msgstr "Prekini povezavo"
+
+#: ../src/empathy-main-window.c:530
msgid "No match found"
msgstr "Ni najdenih zadetkov."
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:685
msgid "Reconnect"
msgstr "Ponovno se poveži"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:691
msgid "Edit Account"
msgstr "Uredi račun"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:697
msgid "Close"
msgstr "Zapri"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1405
msgid "Contact"
msgstr "Stik"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1741
msgid "Contact List"
msgstr "Seznam stikov"
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1854
msgid "Show and edit accounts"
msgstr "Pokaži in uredi račune"
msgid "_Room"
msgstr "_Klepetalnica"
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
msgid "Chat Room"
msgstr "Klepetelnica"
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
msgid "Members"
msgstr "Člani"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:634
#, c-format
msgid ""
"%s\n"
"Zahtevano geslo: %s\n"
"Člani: %s"
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "No"
msgstr "Ne"
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
msgid "Could not start room listing"
msgstr "Seznama klepetalnic ni bilo mogoče začeti"
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
msgid "Could not stop room listing"
msgstr "Seznama klepetalnic ni bilo mogoče dokončati"
msgid "_Reduce location accuracy"
msgstr "_Zmanjšaj natančnost mesta"
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr "Odgovori"
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "Zavrni"
-
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "Odgovori"
-
-#: ../src/empathy-status-icon.c:201
-#: ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "Odkloni"
-
-#: ../src/empathy-status-icon.c:205
-#: ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "Sprejmi"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Stanje"
msgid "Invite"
msgstr "Povabi"
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:178
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"
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr "Ne prikaži pogovornega okna, če so na voljo le računov \"uporabnikov v bližini\" "
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:186
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "Predhodno izberite račun (na primer: gabble/jabber/foo_40primer_2eorg0)"
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:188
msgid "<account-id>"
msgstr "<id-računa>"
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:193
msgid "- Empathy Accounts"
msgstr "- Empathy računi"
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:232
msgid "Empathy Accounts"
msgstr "Empathy računi"
msgid "Empathy Debugger"
msgstr "Empathy razhroščevalnik"
-#: ../src/empathy-chat.c:91
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr "- sporočilnik Empathy"
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Odgovori"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Zavrni"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Odgovori"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Odkloni"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Sprejmi"
+
#~ msgid "Add _New Preset"
#~ msgstr "Dodaj novo _predlogo"
#~ msgid "Saved Presets"
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 15:30+0200\n"
-"PO-Revision-Date: 2010-09-06 15:32+0100\n"
+"POT-Creation-Date: 2010-12-29 14:32+0100\n"
+"PO-Revision-Date: 2010-12-29 18:18+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
msgstr "Standardhämtningsmapp för Empathy"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy har frågat om att importera konton"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy har migrerat butterfly-loggar"
-#: ../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 ska ställa in automatiskt frånvaro vid inaktivitet"
-#: ../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 ska ansluta automatiskt vid uppstart"
-#: ../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 bör minska precisionen för platsen"
-#: ../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 ska använda profilbilden för kontakten som ikon i chattfönstret"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
msgstr "Aktivera utvecklingsverktyg för 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 "Aktivera popupnotifieringar för nya meddelanden"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
msgstr "Aktivera stavningskontroll"
# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
# inte ska hittas, döljer gör man för att det inte ska synas.
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "Dölj huvudfönstret"
# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
# inte ska hittas, döljer gör man för att det inte ska synas.
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "Dölj huvudfönstret."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "Tecken för smeknamnskomplettering"
-#: ../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 "Öppna nya chattar i separata fönster"
-#: ../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 "Sökväg för Adium-temat att använda"
-#: ../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 "Sökväg för Adium-temat som ska användas om temat som används för chatt är 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 "Spela upp ljud för inkommande meddelanden"
-#: ../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 "Spela upp ett ljud för nya samtal"
-#: ../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 "Spela upp ljud för utgående meddelanden"
-#: ../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 "Spela upp ljud när en kontakt loggar in"
-#: ../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 "Spela upp ett ljud när en kontakt loggar ut"
-#: ../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 "Spela upp ljud när vi loggar in"
-#: ../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 "Spela upp ljud när vi loggar ut"
-#: ../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 "Visa popupnotifieringar om chatten inte är fokuserad"
-#: ../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 "Visa popupnotifieringar när en kontakt loggar in"
-#: ../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 "Visa popupnotifieringar när en kontakt loggar ut"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "Visa profilbilder"
-#: ../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 "Visa kontaktlista i rum"
-#: ../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 "Visa tips om att stänga huvudfönstret"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "Visa frånkopplade kontakter"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "Visa protokoll"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "Rättstavningsspråk"
-#: ../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 "Standardmappen att spara filöverföringar i."
-#: ../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 "Den senaste katalogen som en profilbild valdes från."
-#: ../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 "Positionen för chattfönstrets sidopanel"
-#: ../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 "Den lagrade positionen (i bildpunkter) för chattfönstrets sidopanel."
-#: ../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 "Det tema som används för att visa samtal i chattfönster."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "Använd grafiska smilisar"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "Använd notifieringsljud"
-#: ../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 "Använd tema för chattrum"
-#: ../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 "Huruvida Empathy kan publicera användarens plats till sina kontakter."
-#: ../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 "Huruvida Empathy kan använda GPS för att gissa platsen."
-#: ../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 "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen."
-#: ../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 "Huruvida Empathy kan använda nätverket för att gissa platsen."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Huruvida Empathy har frågat om att importera konton från andra program."
-
-#: ../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 "Huruvida Empathy har migrerat butterfly-loggar."
-#: ../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 "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart."
-#: ../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 "Huruvida Empathy automatiskt ska gå in i frånvaroläge om användaren är inaktiv."
-#: ../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 "Huruvida Empathy ska minska platsens precision av integritetsskäl."
-#: ../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 "Huruvida Empathy ska använda profilbilden för kontakten som ikon i chattfönstret."
-#: ../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 "Huruvida utvecklingsverktyg för WebKit, såsom Webbinspekteraren, ska aktiveras."
-#: ../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."
msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta."
-#: ../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 "Huruvida ord som matas in ska kontrolleras mot de språk som du vill kontrollera med."
-#: ../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 "Huruvida smilisar ska omvandlas till grafiska bilder i samtal."
-#: ../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 "Huruvida ett ljud ska spelas upp för kontakter som loggar in i nätverket."
-#: ../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 "Huruvida ett ljud ska spelas upp för kontakter som loggar ut från nätverket."
-#: ../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 "Huruvida ett ljud ska spelas upp för att notifiera om händelser."
-#: ../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 "Huruvida ett ljud ska spelas upp för inkommande meddelanden."
-#: ../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 "Huruvida ett ljud ska spelas upp för nya samtal."
-#: ../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 "Huruvida ett ljud ska spelas upp för utgående meddelanden."
-#: ../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 "Huruvida ett ljud ska spelas upp vid inloggning i ett nätverk."
-#: ../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 "Huruvida ett ljud ska spelas upp vid utloggning från ett nätverk."
-#: ../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 "Huruvida ljudnotifieringar ska spelas upp vid frånvaro eller upptagen."
-#: ../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 "Huruvida popupnotifieringar ska visas när en kontakt kopplar från."
-#: ../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 "Huruvida popupnotifieringar ska visas när en kontakt ansluter."
-#: ../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."
msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad."
-#: ../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 "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot."
-#: ../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 "Huruvida profilbilder ska visas för kontakter i kontaktlistan och chattfönster."
-#: ../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 "Huruvida frånkopplade kontakter ska visas i kontaktlistan."
-#: ../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 "Huruvida popupnotifieringar ska visas vid frånvaro eller upptagen."
-#: ../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 "Huruvida protokoll för kontakter ska visas i kontaktlistan."
-#: ../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 "Huruvida kontaktlistan ska visas i chattrum."
-#: ../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 "Huruvida kontaktlistan ska visas i kompakt läge."
-#: ../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."
msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas när man klickar på \"x\"-knappen i titelraden."
-#: ../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 "Huruvida temat för chattrum ska användas."
-#: ../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 the contact list by state."
msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd."
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2202
msgid "Messaging and VoIP Accounts"
msgstr "Meddelande och VoIP-konton"
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr "Hashsumman för den mottagna filen och den som skickades stämmer inte överens"
+#: ../libempathy/empathy-ft-handler.c:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr "Filöverföringen är färdig men filen blev skadad"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1121
msgid "File transfer not supported by remote contact"
msgstr "Filöverföringar stöds inte fjärrkontakten"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1177
msgid "The selected file is not a regular file"
msgstr "Den valda filen är inte en vanlig fil"
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1186
msgid "The selected file is empty"
msgstr "Den valda filen är tom"
msgstr "Den andra deltagaren kunde inte överföra filen"
#: ../libempathy/empathy-tp-file.c:420
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Okänd anledning"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Tillgänglig"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Upptagen"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Frånvarande"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Osynlig"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Frånkopplad"
-#: ../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
+#: ../libempathy/empathy-utils.c:257
+#: ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901
+#: ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903
#: ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Okänt"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Ingen anledning angavs"
-#: ../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 "Status är inställd till frånkopplad"
-#: ../libempathy/empathy-utils.c:296
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Nätverksfel"
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Autentisering misslyckades"
-#: ../libempathy/empathy-utils.c:300
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Krypteringsfel"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Namnet används"
-#: ../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 "Certifikat inte tillhandahållet"
-#: ../libempathy/empathy-utils.c:306
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Certifikatet är inte betrott"
-#: ../libempathy/empathy-utils.c:308
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Certifikatet har gått ut"
-#: ../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 "Certifikatet är inte aktiverat"
-#: ../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 "Värdnamnet i certifikatet stämmer inte"
-#: ../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 "Certifikatets fingeravtryck stämmer inte"
-#: ../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 "Självsignerat certifikat"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Certifikatfel"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "Kryptering är inte tillgängligt"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "Certifikatet är ogiltigt"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "Anslutningen vägrades"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "Anslutningen kunde inte etableras"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "Anslutningen förlorades"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "Denna resurs är redan ansluten till servern"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:368
msgid "Connection has been replaced by a new connection using the same resource"
msgstr "Anslutningen har ersatts av en ny anslutning med samma resurs"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "Kontot finns redan på servern"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr "Servern är för tillfället för upptagen för att hantera anslutningen"
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
msgstr "Certifikatet har spärrats"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "Certifikatet använder en osäker skifferalgoritm eller är kryptografiskt svag"
-#: ../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"
msgstr "Längd på servercertifikatet, eller djup för servercertifikatkedjan, överstiger begränsningen för krypteringsbiblioteket"
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:543
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Personer i närheten"
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:548
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../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 "Facebook-chatt"
msgid "in the future"
msgstr "i framtiden"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
msgid "All"
msgstr "Alla"
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:680
msgid "Password"
msgstr "Lösenord"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:682
#: ../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
+#: ../libempathy-gtk/empathy-account-widget.c:754
+#: ../libempathy-gtk/empathy-account-widget.c:811
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1152
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "Kontot %s är redigerbart via Mina webbkonton."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1158
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "Kontot %s kan inte redigeras i Empathy."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1178
+msgid "Launch My Web Accounts"
+msgstr "Starta Mina webbkonton"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1516
msgid "Username:"
msgstr "Användarnamn:"
-#: ../libempathy-gtk/empathy-account-widget.c:1522
+#: ../libempathy-gtk/empathy-account-widget.c:1884
msgid "A_pply"
msgstr "V_erkställ"
-#: ../libempathy-gtk/empathy-account-widget.c:1552
+#: ../libempathy-gtk/empathy-account-widget.c:1914
msgid "L_og in"
msgstr "L_ogga in"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1980
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1486
#: ../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:1629
+#: ../libempathy-gtk/empathy-account-widget.c:1991
msgid "_Enabled"
msgstr "_Aktiverad"
-#: ../libempathy-gtk/empathy-account-widget.c:1694
+#: ../libempathy-gtk/empathy-account-widget.c:2056
msgid "This account already exists on the server"
msgstr "Detta konto finns redan på servern"
-#: ../libempathy-gtk/empathy-account-widget.c:1697
+#: ../libempathy-gtk/empathy-account-widget.c:2059
msgid "Create a new account on the server"
msgstr "Skapa ett nytt konto på servern"
-#: ../libempathy-gtk/empathy-account-widget.c:1790
+#: ../libempathy-gtk/empathy-account-widget.c:2251
msgid "Ca_ncel"
msgstr "Av_bryt"
#. * 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:2548
#, 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:2574
#, c-format
msgid "%s Account"
msgstr "%s-konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2108
+#: ../libempathy-gtk/empathy-account-widget.c:2578
msgid "New account"
msgstr "Nytt konto"
msgstr "L_ösenord:"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "Remember Password"
+msgstr "Kom ihåg lösenordet"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
msgid "Screen _Name:"
msgstr "Skärm_namn:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
msgid "What is your AIM password?"
msgstr "Vad är ditt AIM-lösenord?"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
msgid "What is your AIM screen name?"
msgstr "Vad är ditt AIM-skärmnamn?"
-#: ../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
-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: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
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:13
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Server:"
msgid "Login I_D:"
msgstr "Inloggningsi_d:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise User ID?"
msgstr "Vad är ditt användar-id för GroupWise?"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise password?"
msgstr "Vad är ditt lösenord för GroupWise?"
msgid "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 UIN?"
msgstr "Vad är ditt ICQ UIN?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ password?"
msgstr "Vad är ditt ICQ-lösenord?"
msgid "Priori_ty:"
msgstr "Pri_oritet:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
msgid "Reso_urce:"
msgstr "_Resurs:"
#. 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
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
"Om du är facebook.com/<b>hamster</b> så ange <b>hamster</b>.\n"
"Använd <a href=\"http://www.facebook.com/username/\">denna sida</a> för att välja ett Facebook-användarnamn om du inte redan har ett."
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "Use old SS_L"
msgstr "Använd gammal SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook password?"
msgstr "Vad är ditt Facebook-lösenord?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook username?"
msgstr "Vad är ditt användarnamn för Facebook?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google ID?"
msgstr "Vad är ditt Google ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google password?"
msgstr "Vad är ditt Google-lösenord?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber ID?"
msgstr "Vad är ditt Jabber ID?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber password?"
msgstr "Vad är ditt Jabber-lösenord?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber ID?"
msgstr "Vilket Jabber ID vill du använda?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber password?"
msgstr "Vilket lösenord vill du använda för Jabber?"
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>Exempel:</b> användare@hotmail.com"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
msgid "What is your Windows Live ID?"
msgstr "Vad är ditt id för Windows Live?"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live password?"
msgstr "Vad är ditt lösenord för Windows Live?"
msgid "Proxy Options"
msgstr "Proxyalternativ"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "STUN Server:"
msgstr "STUN-server:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Server:"
msgstr "Server:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Transport:"
msgstr "Transport:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP account password?"
msgstr "Vad är lösenordet för ditt SIP-konto?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP login ID?"
msgstr "Vad är ditt inloggnings-id för SIP?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "_Username:"
msgstr "A_nvändarnamn:"
msgid "I_gnore conference and chat room invitations"
msgstr "I_gnorera inbjudningar till konferenser och chattrum"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Använd _Yahoo! Japan"
-
+#. remember password ticky box
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-password-dialog.c:283
+msgid "Remember password"
+msgstr "Kom ihåg lösenordet"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
msgstr "Vad är ditt Yahoo! ID?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "What is your Yahoo! password?"
msgstr "Vad är ditt Yahoo!-lösenord?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
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:12
msgid "_Room List locale:"
msgstr "Lokalanpassning för _rumslista:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "Kunde inte konvertera bild"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "Inget av de accepterade bildformaten stöds på ditt system"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Välj din profilbild"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "Ingen bild"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Bilder"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "Alla filer"
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:322
msgid "Click to enlarge"
msgstr "Klicka för att förstora"
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Misslyckades med att öppna privat chatt"
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "Ämne stöds inte för detta samtal"
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "Du tillåts inte att ändra ämnet"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: töm alla meddelanden från det aktuella samtalet"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <ämne>: ställ in ämnet för det aktuella samtalet"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chattrummets ID>: gå in i ett nytt chattrum"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chattrummets ID>: gå in i ett nytt chattrum"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <kontaktens ID> [<meddelande>]: öppna en privat chatt"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <kontaktens ID> <meddelande>: öppna en privat chatt"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <smeknamn>: ändra ditt smeknamn på aktuell server"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <meddelande>: skicka ett ACTION-meddelande till aktuellt samtal"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:851
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 <meddelande>: skicka <meddelande> till det aktuella samtalet. Detta används för att skicka ett meddelande som börjar med ett \"/\". Till exempel: \"/say /join används för att gå in i ett nytt chattrum\""
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
msgstr "/help [<kommando>]: visa alla kommandon som stöds. Om <kommando> har definierats, visa dess användning."
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Användning: %s"
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Okänt kommando"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Okänt kommando; se /help för tillgängliga kommandon"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "frånkopplad"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "ogiltig kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "åtkomst nekad"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "för långt meddelande"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "inte implementerat"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "okänt"
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Fel vid sändning av meddelandet \"%s\": %s"
-#: ../libempathy-gtk/empathy-chat.c:1282
-#: ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../src/empathy-chat-window.c:708
msgid "Topic:"
msgstr "Ämne:"
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "Ämnet inställt till: %s"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "Inget ämne definierat"
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(Inga förslag)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1818
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Lägg till \"%s\" till ordbok"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1855
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Lägg till \"%s\" till %s-ordboken"
+
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Infoga smilis"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "_Send"
msgstr "_Skicka"
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "Sta_vningsförslag"
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Misslyckades med att hämta senaste loggar"
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s har kopplat från"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s sparkades ut av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s sparkades ut"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s blev bannlyst av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s blev bannlyst"
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s har lämnat rummet"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s har gått in i rummet"
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s är nu känd som %s"
-#: ../libempathy-gtk/empathy-chat.c:2287
-#: ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2385
+#: ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Frånkopplad"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "Felaktigt lösenord. Försök igen:"
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Försök igen"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "Detta rum är skyddat med ett lösenord:"
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Gå in"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Ansluten"
-#: ../libempathy-gtk/empathy-chat.c:3134
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Samtal"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Kopiera länkadress"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Öppna länk"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %e %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Redigera kontaktinformation"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Personlig information"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "Ny kontakt"
msgid "Subscription Request"
msgstr "Prenumerationsbegäran"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Ogrupperade"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Favoritpersoner"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1999
+#: ../libempathy-gtk/empathy-individual-view.c:2262
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Vill du verkligen ta bort gruppen \"%s\"?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2265
msgid "Removing group"
msgstr "Tar bort grupp"
#. Remove
-#: ../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
+#: ../libempathy-gtk/empathy-contact-list-view.c:2050
+#: ../libempathy-gtk/empathy-contact-list-view.c:2127
+#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-individual-view.c:2467
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Ta bort"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2080
+#: ../libempathy-gtk/empathy-individual-view.c:2370
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Vill du verkligen ta bort kontakten \"%s\"?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2386
msgid "Removing contact"
msgstr "Tar bort kontakt"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Lägg till kontakt..."
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:516
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Chatt"
-#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-contact-menu.c:261
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Ljudsamtal"
-#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-contact-menu.c:292
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videosamtal"
-#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
-#: ../src/empathy-main-window.ui.h:25
+#: ../libempathy-gtk/empathy-contact-menu.c:333
+#: ../libempathy-gtk/empathy-individual-menu.c:644
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "Ti_digare samtal"
-#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-contact-menu.c:355
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "Skicka fil"
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "Dela ut mitt skrivbord"
-#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1541
-#: ../libempathy-gtk/empathy-individual-menu.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1377
msgid "Favorite"
msgstr "Favorit"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:447
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "Infor_mation"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "R_edigera"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:920
msgid "Inviting you to this room"
msgstr "Bjuder in dig till detta rum"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr "_Bjud in till chattrum"
msgid "Select a contact"
msgstr "Välj en kontakt"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Fullständigt namn:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Telefonnummer:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "E-postadress:"
# "Web site" är "webbplats". "Web page" är "webbsida".
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Webbplats:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Födelsedag:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Country ISO Code:"
msgstr "Landets ISO-kod:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Country:"
msgstr "Land:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "State:"
msgstr "Län:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "City:"
msgstr "Stad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Area:"
msgstr "Område:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Postal Code:"
msgstr "Postnummer:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Street:"
msgstr "Gata:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Building:"
msgstr "Byggnad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Floor:"
msgstr "Våning:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Room:"
msgstr "Rum:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Description:"
msgstr "Beskrivning:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Accuracy Level:"
msgstr "Precisionsnivå:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Error:"
msgstr "Fel:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Vertical Error (meters):"
msgstr "Vertikalt fel (meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "Horisontellt fel (meter):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Speed:"
msgstr "Hastighet:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Bearing:"
msgstr "Riktning:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Climb Speed:"
msgstr "Höjdökning:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Last Updated on:"
msgstr "Senast uppdaterad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "Longitude:"
msgstr "Longitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Latitude:"
msgstr "Latitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Altitude:"
msgstr "Höjd:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
-#: ../libempathy-gtk/empathy-individual-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:622
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Plats"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:624
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B, %Y klockan %H.%M UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:922
msgid "Save Avatar"
msgstr "Spara profilbild"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:980
msgid "Unable to save avatar"
msgstr "Kunde inte spara profilbild"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1312
msgid "Alias:"
msgstr "Alias:"
#. 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:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1516
msgid "Identifier:"
msgstr "Identifierare:"
msgid "_Add Group"
msgstr "_Lägg till grupp"
-#: ../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 "Markera"
+msgstr "Välj"
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1247
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1423
msgid "Group"
msgstr "Grupp"
#. 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 "Länkade kontakter"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:836
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "R_edigera"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Länka kontakter..."
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-view.c:2378
+#, c-format
+msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
+msgstr "Vill du verkligen ta bort den länkade kontakten \"%s\"? Observera att detta kommer att ta bort alla kontakter som denna länkade kontakt innehåller."
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1657
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "Metakontakt innehåller %u kontakt"
-msgstr[1] "Metakontakt innehåller %u kontakter"
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Länkade kontakten innehåller %u kontakt"
+msgstr[1] "Länkade kontakter innehåller %u kontakter"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
msgstr "<b>Plats</b> den (datum)"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "Ansluten från en telefon eller mobil enhet"
+
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
msgstr "Nytt nätverk"
msgid "Choose an IRC network"
msgstr "Välj ett IRC-nätverk"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Välj"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "ny server"
msgstr "A_vlänka..."
#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed meta-contact into the contacts it contains."
-msgstr "Dela helt upp den visade metakontakten till kontakterna som den innehåller."
+msgid "Completely split the displayed linked contacts into the separate contacts."
+msgstr "Dela helt upp den visade länkade kontakten till separata kontakter."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
msgid "_Link"
msgstr "_Länka"
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
-msgid "Unlink meta-contact '%s'?"
-msgstr "Avlänka metakontakten \"%s\"?"
+msgid "Unlink linked contacts '%s'?"
+msgstr "Avlänka länkade kontakter \"%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 "Är du säker på att du vill avlänka denna metakontakt? Detta kommer helt att dela upp metakontakten till de kontakter som den innehåller."
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
+msgstr "Är du säker på att du vill avlänka dessa länkade kontakter? Detta kommer helt att dela upp de länkade kontakterna till separata kontakter."
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "Av_länka"
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgstr "Datum"
msgstr "Samtal"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Sök nästa"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Sök föregående"
msgstr "Kontakt-id:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "C_hatta"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "Nytt samtal"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "Skicka _video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "Rin_g"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "Nytt samtal"
+#: ../libempathy-gtk/empathy-password-dialog.c:248
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Ange ditt lösenord för kontot\n"
+"<b>%s</b>"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
msgstr "Anpassat meddelande..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
msgstr "Redigera anpassade meddelanden..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
msgstr "Klicka för att ta bort denna status som favorit"
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
msgid "Click to make this status a favorite"
msgstr "Klicka för att göra denna status till favorit"
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
msgid "Set status"
msgstr "Ange status"
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
msgid "Set your presence and current status"
msgstr "Ange din närvaro och aktuell status"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
msgstr "Anpassade meddelanden..."
-#: ../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 "Nytt %s-konto"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Sök:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Matcha skiftläge"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Frasen hittades inte"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Tog emot ett snabbmeddelande"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Skickade ett snabbmeddelande"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Inkommande chattbegäran"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Kontakten ansluten"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Kontakten frånkopplad"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Ansluten till server"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Frånkopplad från server"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Inkommande röstsamtal"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Utgående röstsamtal"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Röstsamtal avslutat"
msgstr "Redigera anpassade meddelanden"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "Lägg till _nytt förval"
+msgid "Save _New Status Message"
+msgstr "Spara _nytt statusmeddelande"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "Sparade förval"
+msgid "Saved Status Messages"
+msgstr "Sparade statusmeddelanden"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
msgstr "Blått"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "Identiteten som tillhandahålls av chattservern kan inte verifieras.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "Identiteten som tillhandahålls av chattservern kan inte verifieras."
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "Certifikatet har inte signerats av en certifikatutgivare"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "Certifikatet har inte signerats av en certifikatutgivare."
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "Certifikatet har gått ut"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "Certifikatet har gått ut."
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "Certifikatet har inte aktiverats än"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "Certifikatet har inte aktiverats än."
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "Certifikatet har inte något förväntat fingeravtryck"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "Certifikatet innehåller inte det förväntade fingeravtrycket."
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr "Värdnamnet som anges av certifikatet matchar inte servernamnet"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "Värdnamnet som anges av certifikatet matchar inte servernamnet."
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
-msgstr "Certifikatet är självsignerat"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "Certifikatet är självsignerat."
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr "Certifikatet har spärrats av certifikatutgivaren"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid "The certificate has been revoked by the issuing Certification Authority."
+msgstr "Certifikatet har spärrats av certifikatutgivaren."
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "Certifikatet är kryptografiskt svagt"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "Certifikatet är kryptografiskt svagt."
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "Certifikatets längd överstiger verifierbara gränser"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "Certifikatets längd överstiger verifierbara gränser."
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
-msgstr "Certifikatet är felformulerat"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "Certifikatet är felformulerat."
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "Förväntat värdnamn: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "Certifikatets värdnamn: %s"
# Hm?
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "Fortsätt"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "Denna anslutning är inte pålitlig. Vill du fortsätta ändå?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "Kom ihåg detta val för framtida anslutningar"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "Certifikatinformation"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1708
msgid "Unable to open URI"
msgstr "Kunde inte öppna uri"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1803
msgid "Select a file"
msgstr "Välj en fil"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "Inkommande fil från %s"
msgid "Instant Message (Empathy)"
msgstr "Snabbmeddelanden (Empathy)"
-#: ../src/empathy.c:414
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Anslut inte vid uppstart"
-#: ../src/empathy.c:418
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Visa inte kontaktlistan eller några andra dialogrutor vid uppstart"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy snabbmeddelandeklient"
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy.c:500
+msgid "Error contacting the Account Manager"
+msgstr "Fel vid anslutning till kontohanteraren"
+
+#: ../src/empathy.c:502
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"Det inträffade ett fel vid försök att ansluta till Telepathy Account Manager. Felet var:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
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 är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version."
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
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 distribueras i hopp om att det ska vara användbart, men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information."
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
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 "Du bör ha fått en kopia av GNU General Public License tillsammans med Empathy. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "En snabbmeddelandeklient för GNOME"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"Daniel Nylander <po@danielnylander.se>\n"
msgstr "Du kan antingen gå tillbaka och försöka att ange dina kontouppgifter igen eller avsluta denna guide och lägga till konton senare från Redigera-menyn."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "Ett fel inträffade"
-#. 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 "Nytt %s-konto"
-
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "Vilken typ av chattkonto har du?"
-#: ../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 "Har du ytterligare chattkonton som du vill konfigurera?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "Ange dina kontouppgifter"
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr "Vilken typ av chattkonto vill du skapa?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "Vill du skapa andra chattkonton?"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "Ange uppgifterna för det nya kontot"
-#: ../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 programs. With a microphone or a webcam you can also have audio or video calls."
msgstr "Med Empathy kan du chatta med anslutna personer i närheten och med vänner och kollegor som använder Google Talk, AIM, Windows Live och många andra chattprogram. Du kan även använda ljud- och videosamtal om du har en mikrofon eller webbkamera."
-#: ../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 "Har du ett konto som du har använt med andra chattprogram?"
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "Ja, importera mina kontouppgifter från "
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "Ja, jag vill ange mina kontouppgifter nu"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "Nej, jag vill ha ett nytt konto"
-#: ../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 "Nej, jag vill bara se anslutna personer i närheten just nu"
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "Välj de konton som du vill importera:"
-#: ../src/empathy-account-assistant.c:852
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-account-assistant.c:810
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "Yes"
msgstr "Ja"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "Nej, det är allt för stunden"
-#: ../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 details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
msgstr "Empathy kan automatiskt upptäcka och chatta med personer som är anslutna på samma nätverk som du är. Om du vill använda denna funktion så kontrollera att uppgifterna nedan är korrekta. Du kan enkelt ändra dessa uppgifter senare eller inaktivera denna funktion genom att använda \"Konton\"-dialogrutan"
-#: ../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 "Redigera->Konton"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1104
msgid "I don't want to enable this feature for now"
msgstr "Jag vill inte aktivera denna funktion just nu"
-#: ../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 install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
msgstr "Du kommer inte att kunna chatta med personer som är anslutna till ditt lokala nätverk eftersom telepathy-salut inte är installerat. Om du vill aktivera denna funktion så installera paketet telepathy-salut och skapa ett Personer i närheten-konto från Konto-dialogrutan"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut är inte installerat"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Guide för meddelanden och VoIP-konton"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "Välkommen till Empathy"
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "Importera dina befintliga konton"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgstr "Ange personlig information"
#. 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 "Det finns osparade ändringar för ditt %s-konto."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
msgstr "Ditt nya konto har inte sparats än."
-#: ../src/empathy-accounts-dialog.c:281
-#: ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:280
+#: ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "Ansluter..."
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline — %s"
msgstr "Frånkopplad — %s"
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
msgstr "Frånkopplad — %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
msgstr "Frånkopplad — Ingen nätverksanslutning"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "Okänd status"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline — Account Disabled"
msgstr "Frånkopplad — Kontot är inaktiverat"
-#: ../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?"
"Du är på väg att skapa ett nytt konto vilket kommer att\n"
"förkasta dina ändringar. Är du säker att du vill fortsätta?"
-#: ../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 "Vill du ta bort %s från din dator?"
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr "Detta kommer inte att ta bort ditt konto på servern."
-#: ../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?"
"Du är på väg att välja ett annat konto vilket kommer att\n"
"förkasta dina ändringar. Är du säker att du vill fortsätta?"
-#: ../src/empathy-accounts-dialog.c:1997
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1544
+msgid "_Enable"
+msgstr "_Aktivera"
+
+#: ../src/empathy-accounts-dialog.c:1545
+msgid "_Disable"
+msgstr "_Inaktivera"
+
+#: ../src/empathy-accounts-dialog.c:2046
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgid "_Import…"
msgstr "_Importera…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:243
msgid " - Empathy authentication client"
msgstr "- Autentiseringsklienten Empathy"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:259
msgid "Empathy authentication client"
msgstr "Autentiseringsklienten Empathy"
msgid "People nearby"
msgstr "Personer i närheten"
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
msgid "- Empathy Audio/Video Client"
msgstr "- Ljud/Videoklienten Empathy"
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
msgid "Empathy Audio/Video Client"
msgstr "Ljud/Videoklienten Empathy"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Ljusstyrka"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Volym"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "_Sidopanel"
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Ljudingång"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Videoingång"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Knappsats"
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1201
msgid "Details"
msgstr "Detaljer"
#. 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:1270
#, c-format
msgid "Call with %s"
msgstr "Ring med %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:1349
msgid "Call"
msgstr "Ring"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "IP-adressen som den ses av datorn"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "IP-adressen som den ses av en server på Internet"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "IP-adressen för klienten som den ses av andra sidan"
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "IP-adressen för en reläserver"
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr "IP-adressen för multicast-gruppen"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Ansluten — %d:%02dm"
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Tekniska detaljer"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid "%s's software does not understand any of the audio formats supported by your computer"
msgstr "Programvaran hos %s förstår inte något av de ljudformat som stöds av din dator"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid "%s's software does not understand any of the video formats supported by your computer"
msgstr "Programvaran hos %s förstår inte något av de videoformat som stöds av din dator"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2371
#, 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 "Kan inte etablera en anslutning till %s. Någon av er kanske befinner er på ett nätverk som inte tillåter direktanslutningar."
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "Det inträffade ett fel på nätverket"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2381
msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "Ljudformaten som krävs för detta samtal är inte installerade på din dator"
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:2384
msgid "The video formats necessary for this call are not installed on your computer"
msgstr "Videoformaten som krävs för detta samtal är inte installerade på din dator"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2394
#, 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 "Någonting oväntat hände i en Telepathy-komponent. <a href=\"%s\">Rapportera detta fel</a> och bifoga loggarna som samlats in från \"Felsök\"-fönstret i Hjälp-menyn."
-#: ../src/empathy-call-window.c:2378
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "Det uppstod ett fel i samtalsmotorn"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "Slutet på strömmen nåddes"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "Kan inte etablera ljudström"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "Kan inte etablera videoström"
msgstr "_Ring"
#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "_Visa"
-#: ../src/empathy-chat-window.c:452
-#: ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:473
+#: ../src/empathy-chat-window.c:493
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d oläst)"
msgstr[1] "%s (%d olästa)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:485
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (och %u annat)"
msgstr[1] "%s (och %u andra)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:501
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d oläst från andra)"
msgstr[1] "%s (%d olästa från andra)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:510
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d oläst från alla)"
msgstr[1] "%s (%d olästa från alla)"
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:712
msgid "Typing a message."
msgstr "Skriver ett meddelande."
msgstr "Notifiera för alla meddelanden"
#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "I_nnehåll"
msgstr "_Koppla loss flik"
#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:19
msgid "_Edit"
msgstr "R_edigera"
msgstr "_Favoritchattrum"
#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "_Hjälp"
msgid "Manage Favorite Rooms"
msgstr "Hantera favoritrum"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
msgstr "Inkommande videosamtal"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "Inkommande samtal"
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s ringer ett videosamtal till dig. Vill du svara?"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:513
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s ringer dig. Vill du svara?"
-#: ../src/empathy-event-manager.c:476
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming call from %s"
msgstr "Inkommande samtal från %s"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:541
msgid "_Reject"
msgstr "Avv_isa"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:547
msgid "_Answer"
msgstr "_Svara"
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming video call from %s"
msgstr "Inkommande videosamtal från %s"
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:738
msgid "Room invitation"
msgstr "Rumsinbjudan"
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:740
#, c-format
msgid "Invitation to join %s"
msgstr "Inbjudan till att gå in i %s"
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:747
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s bjuder in dig till %s"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:755
msgid "_Decline"
msgstr "_Neka"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:760
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Gå in"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:787
#, c-format
msgid "%s invited you to join %s"
msgstr "%s har bjudit in dig till %s"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:793
#, c-format
msgid "You have been invited to join %s"
msgstr "Du har blivit inbjuden att gå med i %s"
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:844
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Inkommande filöverföring från %s"
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1014
+#: ../src/empathy-main-window.c:367
+msgid "Password required"
+msgstr "Lösenord krävs"
+
+#: ../src/empathy-event-manager.c:1070
#, c-format
-msgid "Subscription requested by %s"
-msgstr "Prenumeration begärd av %s"
+msgid "%s would like permission to see when you are available"
+msgstr "%s vill få tillåtelse att se när du är tillgänglig"
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1074
#, c-format
msgid ""
"\n"
"\n"
"Meddelande: %s"
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1118
#, c-format
msgid "%s is now offline."
msgstr "%s är nu frånkopplad."
-#: ../src/empathy-event-manager.c:1072
+#: ../src/empathy-event-manager.c:1139
#, c-format
msgid "%s is now online."
msgstr "%s är nu ansluten."
msgstr "Importera konton"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "Importera"
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "Protokoll"
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "Källa"
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:384
+msgid "Provide Password"
+msgstr "Ange lösenord"
+
+#: ../src/empathy-main-window.c:390
+msgid "Disconnect"
+msgstr "Koppla ifrån"
+
+#: ../src/empathy-main-window.c:530
msgid "No match found"
msgstr "Ingen träff hittades"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:685
msgid "Reconnect"
msgstr "Anslut igen"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:691
msgid "Edit Account"
msgstr "Redigera konto"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:697
msgid "Close"
msgstr "Stäng"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1405
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1741
msgid "Contact List"
msgstr "Kontaktlista"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1854
msgid "Show and edit accounts"
msgstr "Visa och redigera konton"
msgid "Context"
msgstr "Sammanhang"
+# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
+# inte ska hittas, döljer gör man för att det inte ska synas.
#: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "Sök i kontakt_lista"
+
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "Gå in i _favoriter"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "Hantera favoriter"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "N_ormal storlek"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:7
#: ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Nytt sa_mtal…"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Normal storlek med _profilbilder"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "I_nställningar"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "Visa protoko_ll"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Sortera efter _namn"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Sortera efter _status"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Konton"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "_Kompakt storlek"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "_Felsökning"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "Fi_löverföringar"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
msgstr "_Gå in..."
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:23
#: ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Nytt samtal..."
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "_Frånkopplade kontakter"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "_Personlig information"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Rum"
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
msgid "Chat Room"
msgstr "Chattrum"
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
msgid "Members"
msgstr "Medlemmar"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:634
#, c-format
msgid ""
"%s\n"
"Lösenord krävs: %s\n"
"Medlemmar: %s"
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "No"
msgstr "Nej"
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
msgid "Could not start room listing"
msgstr "Kunde inte starta rumslistningen"
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
msgid "Could not stop room listing"
msgstr "Kunde inte stoppa rumslistningen"
msgid "_Room:"
msgstr "_Rum:"
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
msgid "Message received"
msgstr "Meddelande togs emot"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
msgstr "Meddelandet skickat"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr "Nytt samtal"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr "Kontakt ansluter"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr "Kontakt kopplar från"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr "Kontot anslutet"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr "Kontot frånkopplat"
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "Språk"
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
msgid "Preferences"
msgstr "Inställningar"
msgid "_Reduce location accuracy"
msgstr "_Minska precision för plats"
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "Svara"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "Avvisa"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "Svara"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "Neka"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "Acceptera"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Status"
msgid "Invite"
msgstr "Bjud in"
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:178
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Visa inte några dialogrutor; gör valfri åtgärd (t.ex, importera) och avsluta"
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "Visa inte några dialogrutor om det finns några icke-Salut-konton"
+#: ../src/empathy-accounts.c:182
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "Visa inte några dialogrutor såvida inte det endast finns \"Personer i närheten\"-konton"
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:186
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "Välj initiallt angivet konto (t.ex., gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:188
msgid "<account-id>"
msgstr "<konto-id>"
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:193
msgid "- Empathy Accounts"
msgstr "- Empathy-konton"
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:232
msgid "Empathy Accounts"
msgstr "Empathy-konton"
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Empathy-felsökare"
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy chattklient"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Svara"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Avvisa"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Svara"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Neka"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Acceptera"
+
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy har frågat om att importera konton"
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr ""
+#~ "Huruvida Empathy har frågat om att importera konton från andra program."
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr ""
+#~ "Hashsumman för den mottagna filen och den som skickades stämmer inte "
+#~ "överens"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Använd _Yahoo! Japan"
+#~ msgid "Add _New Preset"
+#~ msgstr "Lägg till _nytt förval"
+#~ msgid "Saved Presets"
+#~ msgstr "Sparade förval"
+#~ msgid "Subscription requested by %s"
+#~ msgstr "Prenumeration begärd av %s"
#~ msgctxt "Link individual (contextual menu)"
#~ msgid "_Link…"
#~ msgstr "_Länka…"
#~ msgstr "Spara fil som..."
#~ msgid "unknown size"
#~ msgstr "okänd storlek"
-#~ msgid "%s would like to send you a file"
-#~ msgstr "%s vill skicka en fil till dig"
#~ msgid "Do you want to accept the file \"%s\" (%s)?"
#~ msgstr "Vill du ta emot filen \"%s\" (%s)?"
#~ msgid "_Accept"
#~ msgstr "Använd för _chattrum"
#~ msgid "%s went offline"
#~ msgstr "%s kopplade från"
-#~ msgid "Disable"
-#~ msgstr "Inaktivera"
#~ msgid "_New Message..."
#~ msgstr "_Nytt meddelande..."
#~ msgid "A unique name for this account to identify it personally to you."
#~ msgstr "Använder bakänden %s"
#~ msgid "Stop"
#~ msgstr "Stopp"
-#~ msgid "Disconnect"
-#~ msgstr "Koppla ifrån"
#~ msgid "Bye bye"
#~ msgstr "Hej då"
#~ msgid "Successfully registered your new account settings."
#~ msgstr "Du ska nu kunna ansluta med ditt nya lösenord."
#~ msgid "Failed to change your account password."
#~ msgstr "Misslyckades med att ändra ditt kontolösenord."
-#~ msgid ""
-#~ "Please enter a new password for this account:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ange ett nytt lösenord för det här kontot:\n"
-#~ "%s"
#~ msgid "No information is available for this contact."
#~ msgstr "Ingen information finns tillgänglig för denna kontakt."
#~ msgid "Information requested, please wait..."
#~ msgstr "Ämne: %s"
#~ msgid "Do you want to add this person to your contact list?"
#~ msgstr "Vill du lägga till denna person till din kontaktlista?"
-#~ msgid "Remember Password?"
-#~ msgstr "Kom ihåg lösenord?"
#~ msgid "Do not show this again"
#~ msgstr "Visa inte det här igen"
#~ msgid "Could not display the help contents."
#~ "%s"
#~ msgid "Edit groups for %s"
#~ msgstr "Redigera grupper för %s"
-# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
-# inte ska hittas, döljer gör man för att det inte ska synas.
-#~ msgid "_Hide Contact List"
-#~ msgstr "_Dölj kontaktlista"
#~ msgid "/Contact Infor_mation"
#~ msgstr "/Kontaktinfor_mation"
#~ msgid "/_View Previous Conversations"
#~ msgstr "Jabberkonto"
#~ msgid "Personal information"
#~ msgstr "Personlig information"
-#~ msgid "Status Message"
-#~ msgstr "Statusmeddelande"
#~ msgid "What request message do you want to send to %s?"
#~ msgstr "Vilket förfrågansmeddelande vill du skicka till %s?"
#~ msgid "%s wants to be notified of your status."
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-11-18 23:03+0000\n"
+"POT-Creation-Date: 2010-12-15 08:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Gheyret Kenji<gheyret@yahoo.com>\n"
"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
+msgstr "Google Talk، Facebook، MSN ۋە باشقا پاراڭ مۇلازىمەتلىرىنى ئىشلىتىپ پاراڭلىشىش"
#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy"
-msgstr "تۇتاش كۆڭۈللەر"
+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"
#: ../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 to the "
"user immediately."
-msgstr ""
+msgstr "كەلگەن ھادىسىلەرنى ھالەت رايونىدا كۆرسەت. ئەگەر تاللانمىسا(false بولسا)، ئىشلەتكۈچىگە شۇ ھامان كۆرسىتىدۇ."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
-msgstr ""
+msgstr "Empathy ئىشلەتكۈچىنىڭ ئورنىنى ئېلان قىلالايدۇ"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
-msgstr ""
+msgstr "ئورۇننى ئېنىقلاش ئۈچۈن Empathy دە GPS نى ئىشلەتكىلى بولىدۇ"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
+msgstr "ئورۇننى ئېنىقلاش ئۈچۈن Empathy دە يانفون تورىنى ئىشلەتكىلى بولىدۇ"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
-msgstr ""
+msgstr "ئورۇننى ئېنىقلاش ئۈچۈن Empathy دە تورنى ئىشلەتكىلى بولىدۇ"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
-msgstr ""
+msgstr "WebKit ئىجادىيەت قورالىنى قوزغات"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable popup notifications for new messages"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Open new chats in separate windows"
-msgstr ""
+msgstr "ئايرىم كۆزنەكتە يېڭى پاراڭ ئاچىدۇ"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Path of the Adium theme to use"
#: ../libempathy/empathy-ft-handler.c:830
msgid "File transfer completed, but the file was corrupted"
-msgstr ""
+msgstr "ھۆججەت يوللاش تاماملاندى"
#: ../libempathy/empathy-ft-handler.c:1121
msgid "File transfer not supported by remote contact"
#: ../libempathy/empathy-tp-file.c:402
msgid "No reason was specified"
-msgstr ""
+msgstr "سەۋەب كۆرسىتىلمىگەن"
#: ../libempathy/empathy-tp-file.c:405
msgid "The change in state was requested"
#: ../libempathy/empathy-utils.c:246
msgid "Available"
-msgstr "ئÙ\89Ø´Ù\84Ù\89تÙ\89Ù\84Ù\89Ø´Ú\86اÙ\86"
+msgstr "بار"
#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgid "Offline"
msgstr "تورسىز"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "نامەلۇم"
#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
-msgstr ""
+msgstr "سەۋەبى كۆرسىتىلمىدى"
#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
-msgstr ""
+msgstr "شىفىرلاش خاتالىقى"
#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
-msgstr ""
+msgstr "ئات ئىشلىتىلىۋاتىدۇ"
#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
-msgstr ""
+msgstr "شىفىرلاشنى ئىشلەتكىلى بولمايدۇ"
#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
#: ../libempathy/empathy-utils.c:577
msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
-msgstr ""
+msgstr "Facebook پاراڭ"
#: ../libempathy/empathy-time.c:137
#, c-format
msgid "All"
msgstr "ھەممىسى"
-#: ../libempathy-gtk/empathy-account-widget.c:637
+#: ../libempathy-gtk/empathy-account-widget.c:678
#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "ھېسابات"
-#: ../libempathy-gtk/empathy-account-widget.c:638
+#: ../libempathy-gtk/empathy-account-widget.c:679
msgid "Password"
msgstr "ئىم"
-#: ../libempathy-gtk/empathy-account-widget.c:639
+#: ../libempathy-gtk/empathy-account-widget.c:680
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "مۇلازىمېتىر"
-#: ../libempathy-gtk/empathy-account-widget.c:640
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "ئېغىز"
-#: ../libempathy-gtk/empathy-account-widget.c:712
-#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:753
+#: ../libempathy-gtk/empathy-account-widget.c:810
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1094
+#: ../libempathy-gtk/empathy-account-widget.c:1135
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1141
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget.c:1120
+#: ../libempathy-gtk/empathy-account-widget.c:1161
msgid "Launch My Web Accounts"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget.c:1418
+#: ../libempathy-gtk/empathy-account-widget.c:1499
msgid "Username:"
msgstr "ئىشلەتكۈچى ئاتى:"
-#: ../libempathy-gtk/empathy-account-widget.c:1753
+#: ../libempathy-gtk/empathy-account-widget.c:1867
msgid "A_pply"
msgstr "قوللان(_P)"
-#: ../libempathy-gtk/empathy-account-widget.c:1783
+#: ../libempathy-gtk/empathy-account-widget.c:1897
msgid "L_og in"
-msgstr ""
+msgstr "تىزىمغا كىر(_O)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1963
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
+#: ../libempathy-gtk/empathy-individual-widget.c:1486
#: ../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:1860
+#: ../libempathy-gtk/empathy-account-widget.c:1974
msgid "_Enabled"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget.c:1925
+#: ../libempathy-gtk/empathy-account-widget.c:2039
msgid "This account already exists on the server"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget.c:1928
+#: ../libempathy-gtk/empathy-account-widget.c:2042
msgid "Create a new account on the server"
-msgstr ""
+msgstr "مۇلازىمېتىردا يېڭى ھېسابات قۇرىدۇ"
-#: ../libempathy-gtk/empathy-account-widget.c:2042
+#: ../libempathy-gtk/empathy-account-widget.c:2234
msgid "Ca_ncel"
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:2334
+#: ../libempathy-gtk/empathy-account-widget.c:2531
#, 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:2360
+#: ../libempathy-gtk/empathy-account-widget.c:2557
#, c-format
msgid "%s Account"
msgstr "%s ھېسابات"
-#: ../libempathy-gtk/empathy-account-widget.c:2364
+#: ../libempathy-gtk/empathy-account-widget.c:2561
msgid "New account"
-msgstr ""
+msgstr "يېڭى ھېسابات"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
msgid "<b>Example:</b> MyScreenName"
msgstr "ئىم(_W):"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-msgid "Screen _Name:"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#| msgid "Password"
+msgid "Remember Password"
+msgstr "ئىمنى ئەستە تۇتۇش"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-msgid "What is your AIM password?"
+msgid "Screen _Name:"
msgstr ""
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "What is your AIM screen name?"
+msgid "What is your AIM password?"
msgstr ""
#: ../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:9
-msgid "_Port:"
-msgstr "ئېغىز(_P):"
+msgid "What is your AIM screen name?"
+msgstr ""
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
#: ../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:11
+msgid "_Port:"
+msgstr "ئېغىز(_P):"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:13
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "مۇلازىمېتىر(_S):"
msgid "Login I_D:"
msgstr "تىزىمغا كىرىش ID: (_D)"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
msgid "What is your GroupWise User ID?"
msgstr "GroupWise ئىشلەتكۈچى كىملىكىڭىز نېمە؟"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise password?"
msgstr ""
msgid "ICQ _UIN:"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ UIN?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ password?"
msgstr ""
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Quit message:"
-msgstr ""
+msgstr "ئاخىرلاشتۇرۇش ئۇچۇرى:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Real name:"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
msgid "Encr_yption required (TLS/SSL)"
-msgstr ""
+msgstr "شىفىرلاش زۆرۈر(TLS/SSL)(_Y)"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
msgid "I_gnore SSL certificate errors"
msgid "Priori_ty:"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
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:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
"Facebook username if you don't have one."
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "Use old SS_L"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook username?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber password?"
msgstr ""
msgid "<b>Example:</b> user@hotmail.com"
msgstr "<b>مىسال:</b> user@hotmail.com"
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
msgid "What is your Windows Live ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live password?"
msgstr ""
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
msgid "E-_mail address:"
-msgstr ""
+msgstr "ئېلخەت ئادرېسى(_M):"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "Nic_kname:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
msgid "Discover the STUN server automatically"
-msgstr ""
+msgstr "STUN مۇلازىمېتىرىنى ئاپتوماتىك تاپىدۇ"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "Interval (seconds)"
-msgstr ""
+msgstr "ئىنتېرۋال(سېكۇنت)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Keep-Alive Options"
msgid "Proxy Options"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "STUN Server:"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Server:"
msgstr "مۇلازىمېتىر:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Transport:"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP account password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP login ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "_Username:"
msgstr "ئىشلەتكۈچى ئاتى(_U):"
msgid "I_gnore conference and chat room invitations"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr "ئىم ئەستە تۇت"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "What is your Yahoo! password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "Yahoo! I_D:"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
msgid "_Room List locale:"
msgstr ""
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
-msgstr ""
+msgstr "رەسىمنى ئايلاندۇرالمىدى"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr ""
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr ""
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "سۈرەت يوق"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "سۈرەتلەر"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "ھەممە ھۆججەتلەر"
msgid "Click to enlarge"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:643
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:683
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: ھازىرقى پاراڭدىكى بارلىق ئۇچۇرلارنى تازىلىۋېتىدۇ"
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:832
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:851
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "ئىشلىتىش ئۇسۇلى：%s"
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
-msgstr ""
+msgstr "ھوقۇقىڭىز يەتمىدى"
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "تېخى ئىشلەتكىلى بولمايدۇ"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "نامەلۇم"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
-msgstr ""
+msgstr "ئۇچۇر %s' نى يوللاۋاتقاندا خاتالىق كۆرۈلدى: %s"
-#: ../libempathy-gtk/empathy-chat.c:1234 ../src/empathy-chat-window.c:703
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1246
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1747
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(تەۋسىيىلەر يوق)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "'%s' نى لۇغەتكە قوش"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1852
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "'%s' نى لۇغەت %s غا قوش"
-#: ../libempathy-gtk/empathy-chat.c:1911
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr ""
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1929
-#: ../libempathy-gtk/empathy-ui-utils.c:1806
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "_Send"
msgstr "يوللا(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:2158
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr ""
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2165
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:2168
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr ""
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s چەكلەنگەن"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr ""
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2217
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:2381 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "ئۈزۈلدى"
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:2995
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "قايتا سىنا"
-#: ../libempathy-gtk/empathy-chat.c:3000
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:3001
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:3141
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "باغلاندى"
-#: ../libempathy-gtk/empathy-chat.c:3194
+#: ../libempathy-gtk/empathy-chat.c:3216
#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr ""
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:319
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
-msgstr "ئۇلانما ئادرېس كۆچۈر(_C)"
+msgstr "ئۇلانما مەنزىلىنى كۆچۈر(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:326
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "ئۇلانما ئاچ(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:419
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "شەخسىي ئۇچۇرلارنى"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:424
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "يېڭى دوست"
msgid "Favorite People"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, c-format
msgid "Do you really want to remove the group '%s'?"
-msgstr ""
+msgstr "«%s» دېگەن گۇرۇپپىنى راستلا چىقىرىۋېتەمسىز؟"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2268
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
msgid "Removing group"
-msgstr ""
+msgstr "گۇرۇپپا ئۆچۈرۈۋاتىدۇ"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2322
-#: ../libempathy-gtk/empathy-individual-view.c:2436
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2468
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "ئۆچۈر(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2353
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2371
#, c-format
msgid "Do you really want to remove the contact '%s'?"
-msgstr ""
+msgstr "«%s» دېگەن ئالاقەداشنى راستلا چىقىرىۋېتەمسىز؟"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2387
msgid "Removing contact"
-msgstr ""
+msgstr "ئالاقەداشلارنى ئۆچۈرۈۋاتىدۇ"
#: ../libempathy-gtk/empathy-contact-menu.c:203
#: ../src/empathy-main-window.ui.h:14
#: ../libempathy-gtk/empathy-contact-menu.c:418
#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-individual-widget.c:1377
msgid "Favorite"
msgstr "يىغقۇچ"
#: ../libempathy-gtk/empathy-contact-menu.c:447
#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
-msgstr ""
+msgstr "ئۇچۇر(_M)"
#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:915
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:252
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
-msgstr ""
+msgstr "ئىسىم ۋە تەگاتى:"
#: ../libempathy-gtk/empathy-contact-widget.c:253
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgstr "تۇغۇلغان كۈن:"
#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Country ISO Code:"
-msgstr ""
+msgstr "دۆلەتنىڭ ISO كودى:"
#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Country:"
-msgstr ""
+msgstr "دۆلەت:"
#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "State:"
msgstr "ھالەت:"
#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "City:"
msgstr "شەھەر :"
#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Area:"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Postal Code:"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Street:"
msgstr "كوچا:"
#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Building:"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Floor:"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Room:"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Text:"
msgstr "تېكىست:"
#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Description:"
msgstr "چۈشەندۈرۈش:"
#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "URI:"
msgstr "URI:"
#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Accuracy Level:"
msgstr "توغرىلىق دەرىجىسى"
#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Error:"
msgstr "خاتالىق:"
#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Vertical Error (meters):"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Horizontal Error (meters):"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Speed:"
msgstr "سۈرئەت:"
#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Bearing:"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Climb Speed:"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Last Updated on:"
-msgstr ""
+msgstr "ئاخىرقى يېڭىلانغان:"
#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "Longitude:"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Latitude:"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Altitude:"
msgstr "ئېگىزلىك(دېڭىز يۈزىدىن):"
#: ../libempathy-gtk/empathy-contact-widget.c:779
#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:622
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "ئورنى"
#. translators: format is "Location, $date"
#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:624
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e، %Y at %R UTC"
#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:922
msgid "Save Avatar"
msgstr ""
#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:979
+#: ../libempathy-gtk/empathy-individual-widget.c:980
msgid "Unable to save avatar"
msgstr ""
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1312
msgid "Alias:"
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:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1516
msgid "Identifier:"
msgstr "بەلگە:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
-msgstr ""
+msgstr "ئۇچۇر تەلەپ قىلىندى…"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
msgstr "تاللا"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1423
msgid "Group"
msgstr "گۇرۇپپا"
msgid "_Link Contacts…"
msgstr ""
-#: ../libempathy-gtk/empathy-individual-widget.c:1649
+#: ../libempathy-gtk/empathy-individual-view.c:2379
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1657
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
msgstr[0] ""
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
-msgstr ""
+msgstr "يەڭ تور"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
msgid "Choose an IRC network"
#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
+"Completely split the displayed linked contacts into the separate contacts."
msgstr ""
#. Add button
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'?"
+msgid "Unlink linked contacts '%s'?"
msgstr ""
-#: ../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."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
msgstr ""
#: ../libempathy-gtk/empathy-linking-dialog.c:190
#. Tweak the dialog
#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
-msgstr ""
+msgstr "يېڭى پاراڭ"
#. add video toggle
#: ../libempathy-gtk/empathy-new-call-dialog.c:253
#. Tweak the dialog
#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
+msgstr "يېڭى چاقىرىش"
+
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
msgstr ""
#. COL_STATUS_TEXT
#: ../libempathy-gtk/empathy-presence-chooser.c:170
#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
-msgstr ""
+msgstr "ئىختىيارىي ئۇچۇر..."
#: ../libempathy-gtk/empathy-presence-chooser.c:223
#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
-msgstr ""
+msgstr "ئىختىيارىي ئۇچۇرنى تەھرىرلەش..."
#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
#. Custom messages
#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
-msgstr ""
+msgstr "ئىختىيارىي ئۇچۇر..."
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
msgid "Phrase not found"
msgstr "ئاتالغۇنى تاپالمىدى"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
-msgstr ""
+msgstr "پاراڭ ئىلتىماسى كەلدى"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "مۇلازىمېتىر بىلەن بولغان باغلىنىش ئۈزۈلدى"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
-msgstr ""
+msgstr "كەلگەن ئاۋازلىق چاقىرىش"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr ""
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr ""
#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
msgid "Enter Custom Message"
-msgstr ""
+msgstr "ئىختىيارى ئۇچۇر كىرگۈزۈش"
#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
-msgstr ""
+msgstr "ئىختىيارىي ئۇچۇرنى تەھرىرلەش"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
msgid "Save _New Status Message"
msgid "Certificate Details"
msgstr ""
-#: ../libempathy-gtk/empathy-ui-utils.c:1703
+#: ../libempathy-gtk/empathy-ui-utils.c:1708
msgid "Unable to open URI"
msgstr ""
-#: ../libempathy-gtk/empathy-ui-utils.c:1798
+#: ../libempathy-gtk/empathy-ui-utils.c:1803
msgid "Select a file"
msgstr "ھۆججەت تاللاش"
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
-msgstr ""
+msgstr "%s دىن كەلگەن ھۆججەت"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgid "Instant Message (Empathy)"
msgstr "مۇڭداشقۇ ئۇچۇرى(Empathy)"
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
-msgstr ""
+msgstr "قوزغالغاندا باغلانما"
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr ""
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr ""
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
-msgstr ""
+msgstr "Account Manager(ھېسابات باشقۇرغۇ) غا باغلىنىۋاتقاندا خاتالىق كۆرۈلدى"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
"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 ""
+msgstr "Empathy ئەركىن يۇمشاق دېتال؛ سىز ئەركىن يۇمشاق دېتال فوندى تارقاتقان GNU ئادەتتىكى ئاممىۋى ئىجازەتنامىسىنىڭ ماددىلىرىغا ئاساسەن ئۇنى ئەركىن تارقىتىپ ياكى ئۆزگەرتسىڭىز بولىدۇ؛ ئىجازەتنامىنىڭ ئىككىنچى نەشرى ياكى ئۇنىڭدىن كېيىنكى نەشرىنى ئىشلىتىڭ."
#: ../src/empathy-about-dialog.c:85
msgid ""
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
"details."
-msgstr ""
+msgstr "Empathy نى تارقىتىشنىڭ مەقسىتى ئۇنىڭ سىزگە كېرەكلىك بولۇشى ئۈچۈن، ئەمما ئۇنىڭ ھېچقانداق كاپالىتى يوق؛ ئۇنى ئىشلىتىپ كېلىپ چىققان ھەر قانداق بىۋاسىتە ياكى ۋاسىتىلىك ئاقىۋەتكە ھېچقانداق مەسئۇلىيەتنى ئۈستىگە ئالمايمىز. GNU ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىدىكى تەپسىلاتنى كۆرۈڭ."
#: ../src/empathy-about-dialog.c:89
msgid ""
#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
-msgstr "Sahran <sahran@live.com>\n"
-"Gheyret T.Kenji <gheyret@yahoo.com>\n"
-"Zeper <zeper@msn.com>\n"
-"Abduxukur Abdurixit <abduxukur.abdurixit@t-systems.ch>"
+msgstr "Gheyret Kenji <gheyret@gmail.com>\n"
+"Sahran<sahran@live.com>"
#: ../src/empathy-account-assistant.c:167
msgid "There was an error while importing the accounts."
#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
-msgstr ""
+msgstr "ھېساباتىڭىزنىڭ تەپسىلاتىنى كىرگۈزۈڭ"
#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
-msgstr ""
+msgstr "باشقا مۇڭداشقۇ ھېساباتى قۇرغۇڭىز بارمۇ؟"
#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
-msgstr ""
+msgstr "يېڭى ھېساباتنىڭ تەپسىلاتىنى كىرگۈزۈڭ"
#: ../src/empathy-account-assistant.c:612
msgid ""
#: ../src/empathy-account-assistant.c:629
msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
+msgstr "باشقا مۇڭداشقۇلاردا ئىشلەتكەن ھېساباتىڭىز بارمۇ؟"
#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
-msgstr ""
+msgstr "ياق، يېڭى ھېسابات قۇرغۇم بار"
#: ../src/empathy-account-assistant.c:705
msgid "No, I just want to see people online nearby for now"
-msgstr ""
+msgstr "ياق، مېنىڭ يېقىندىكى كىشىلەرنى ھازىرلا كۆرگۈم بار"
#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
-msgstr ""
+msgstr "ياق، ھازىرچە مۇشۇلارلا"
#: ../src/empathy-account-assistant.c:1082
msgid ""
#: ../src/empathy-account-assistant.c:1088
#: ../src/empathy-account-assistant.c:1144
msgid "Edit->Accounts"
-msgstr ""
+msgstr "تەھرىر->ھېساباتلار"
#: ../src/empathy-account-assistant.c:1104
msgid "I don't want to enable this feature for now"
-msgstr ""
+msgstr "بۇ ئىقتىدارىنى ھازىر ئىناۋەتلىك قىلغۇم يوق"
#: ../src/empathy-account-assistant.c:1140
msgid ""
#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
-msgstr ""
+msgstr "ئۆزىڭىزنىڭ ھېساباتلىرىنى ئىمپورت قىلىدۇ"
#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgid "Your new account has not been saved yet."
msgstr ""
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "ئۇلىنىۋاتىدۇ…"
#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
-msgstr ""
+msgstr "ئۈزۈلدى — %s"
#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
-msgstr ""
+msgstr "كومپيۇتېرىڭىزدىن %s نى چىقىرىۋېتەمسىز؟"
#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
-msgstr ""
+msgstr "كېلىشىم ئورنىتىلمىغان"
#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgid "_Import…"
msgstr ""
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr ""
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr ""
#: ../src/empathy-av.c:134
msgid "Empathy Audio/Video Client"
-msgstr ""
+msgstr "Empathy ئۈن/سىن Client پروگراممىسى"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "ئاق-قارىلىقى"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "يورۇقلۇق"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "گامما"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
-msgstr "قىممەت"
+msgstr "دىسكا"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "يان بالداق(_S)"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "ئۈن كىرگۈزۈش"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr ""
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "نومۇر تاختىسى"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
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:1266
+#: ../src/empathy-call-window.c:1270
#, c-format
msgid "Call with %s"
msgstr ""
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "چاقىر"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr ""
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr ""
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr ""
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr ""
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr ""
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr ""
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "تېخنىكىلىق تەپسىلات"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s's يۇمشاق دېتالى كومپيۇتېرىڭىزدا بار بولغان ھېچقانداق ئۈن فورماتىنى تونۇمىدى."
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s's يۇمشاق دېتالى كومپيۇتېرىڭىزدا بار بولغان ھېچقانداق سىن فورماتىنى تونۇمىدى."
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
#, 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 ""
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr ""
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"the Help menu."
msgstr ""
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr ""
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr ""
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "ئۈن ئېقىمىنى قۇرغىلى بولمىدى"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "سىن ئېقىمىنى قۇرغىلى بولمىدى"
#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
-msgstr ""
+msgstr "كامېرانى ئىناۋەتسىز قىلىپ سىن يوللاشنى توختىتىدۇ"
#: ../src/empathy-call-window.ui.h:7
msgid "Enable camera and send video"
-msgstr ""
+msgstr "كامېرانى قوزغىتىپ سىن يوللا"
#: ../src/empathy-call-window.ui.h:8
msgid "Enable camera but don't send video"
-msgstr ""
+msgstr "كامېرانى قوزغات بىراق سىننى يوللىما"
#: ../src/empathy-call-window.ui.h:9
msgid "Encoding Codec:"
-msgstr ""
+msgstr "كودلىغۇچلار:"
#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
#: ../src/empathy-call-window.ui.h:15
msgid "Remote Candidate:"
-msgstr ""
+msgstr "يىراقتىكى كاندىدات:"
#: ../src/empathy-call-window.ui.h:16
msgid "Send Audio"
msgid "_View"
msgstr "كۆرۈنۈش(_V)"
-#: ../src/empathy-chat-window.c:468 ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ئوقۇلمىدى)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (ۋە %u باشقىلار)"
-#: ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (باشقىلاردىن %d ئوقۇلمىدى)"
-#: ../src/empathy-chat-window.c:505
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (ھەممىسىدىن %d ئوقۇلمىدى)"
-#: ../src/empathy-chat-window.c:707
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr ""
#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
-msgstr "بەتكۈچ(_T)"
+msgstr "بەتكۈچلەر(_T)"
#: ../src/empathy-chat-window.ui.h:19
msgid "_Undo Close Tab"
msgid "Manage Favorite Rooms"
msgstr ""
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming video call"
-msgstr ""
+msgstr "كەلگەن سىنلىق چاقىرىش"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:508
msgid "Incoming call"
msgstr "سۆزلىشىۋاتىدۇ"
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:512
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s سىزنى چاقىرىۋاتىدۇ(سىنغا). جاۋاب بېرەمسىز؟"
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:513
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s سىزنى چاقىرىۋاتىدۇ. جاۋاب بېرەمسىز؟"
-#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:516 ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming call from %s"
msgstr "%s دىن كەلگەن تېلېفون"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:541
msgid "_Reject"
msgstr "رەت قىل(_R)"
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:547
msgid "_Answer"
msgstr ""
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:661
#, c-format
msgid "Incoming video call from %s"
-msgstr ""
+msgstr "%s دىن كەلگەن سىنلىق چاقىرىش"
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:738
msgid "Room invitation"
msgstr ""
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:740
#, c-format
msgid "Invitation to join %s"
msgstr ""
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:747
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s سىزنى %s غا تەكلىپ قىلىۋاتىدۇ"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:755
msgid "_Decline"
msgstr ""
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:760
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "قاتناش(_J)"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:787
#, c-format
msgid "%s invited you to join %s"
msgstr "%s سىزنى %s غا تەكلىپ قىلدى"
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:793
#, c-format
msgid "You have been invited to join %s"
msgstr ""
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:844
#, c-format
msgid "Incoming file transfer from %s"
-msgstr ""
+msgstr "%s نىڭدىن كەلگەن ھۆججەت"
+
+#: ../src/empathy-event-manager.c:1014 ../src/empathy-main-window.c:367
+#| msgid "Password"
+msgid "Password required"
+msgstr "ئىم كىرگۈزۈڭ"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1070
#, c-format
msgid "%s would like permission to see when you are available"
msgstr ""
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1074
#, c-format
msgid ""
"\n"
"Message: %s"
-msgstr ""
+msgstr "\n"
+"ئۇچۇر: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1118
#, c-format
msgid "%s is now offline."
msgstr "%s ھازىر توردىن ئايرىلدى."
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1139
#, c-format
msgid "%s is now online."
msgstr "%s ھازىر تورغا پەيدا بولدى."
#: ../src/empathy-ft-manager.c:305
#, c-format
msgid "Receiving \"%s\" from %s"
-msgstr ""
+msgstr "\"%s\" نى %s دىن قوبۇل قىلدى"
#. translators: first %s is filename, second %s is the contact name
#: ../src/empathy-ft-manager.c:308
#: ../src/empathy-ft-manager.c:341
msgid "Error receiving a file"
-msgstr ""
+msgstr "ھۆججەت قوبۇل قىلىۋاتقاندا خاتالىق كۆرۈلدى"
#: ../src/empathy-ft-manager.c:346
#, c-format
msgid "Error sending \"%s\" to %s"
-msgstr ""
+msgstr "«%s» نى %s غا يوللاۋاتقاندا خاتالىق كۆرۈلدى"
#: ../src/empathy-ft-manager.c:349
msgid "Error sending a file"
-msgstr ""
+msgstr "ھۆججەت يوللاۋاتقاندا خاتالىق كۆرۈلدى"
#. translators: first %s is filename, second %s
#. * is the contact name
#: ../src/empathy-ft-manager.c:496
msgid "File transfer completed"
-msgstr ""
+msgstr "ھۆججەت يوللاش تاماملاندى"
#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
msgid "Waiting for the other participant's response"
#: ../src/empathy-ft-manager.ui.h:1
msgid "File Transfers"
-msgstr ""
+msgstr "ھۆججەت يوللاش"
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
-msgstr ""
+msgstr "ھېساباتلارنى ئىمپورت قىلىش"
#. Translators: this is the header of a treeview column
#: ../src/empathy-import-widget.c:301
msgstr "مەنبە"
#: ../src/empathy-main-window.c:384
+#| msgid "Password"
+msgid "Provide Password"
+msgstr ""
+
+#: ../src/empathy-main-window.c:390
+#| msgid "Disconnected"
+msgid "Disconnect"
+msgstr "ئۈز"
+
+#: ../src/empathy-main-window.c:530
msgid "No match found"
msgstr ""
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:685
msgid "Reconnect"
-msgstr ""
+msgstr "قايتا باغلىنىش"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:691
msgid "Edit Account"
-msgstr ""
+msgstr "ھېساباتنى تەھرىرلەش"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:697
msgid "Close"
msgstr "ياپ"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1405
msgid "Contact"
msgstr "ئالاقىلەشكۈچى"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1732
msgid "Contact List"
msgstr "ئالاقەداشلار تىزىملىكى"
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1845
msgid "Show and edit accounts"
msgstr ""
#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
-msgstr ""
+msgstr "ئالاقەداشلاردىن ئىزدە(_L)"
#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
-msgstr ""
+msgstr "نورمال چوڭلۇق(_O)"
#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
-msgstr ""
+msgstr "يېڭى چاقىرىش(_C)..."
#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
-msgstr "تەڭشەك(_R)"
+msgstr "مايىللىق(_R)"
#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
#: ../src/empathy-preferences.c:139
msgid "Message received"
-msgstr ""
+msgstr "ئۇچۇر كەلدى"
#: ../src/empathy-preferences.c:140
msgid "Message sent"
-msgstr ""
+msgstr "ئۇچۇر يوللاندى"
#: ../src/empathy-preferences.c:141
msgid "New conversation"
-msgstr ""
+msgstr "يېڭى پاراڭ"
#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
#: ../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"
#: ../src/empathy-preferences.ui.h:10
msgid "Enable spell checking for languages:"
-msgstr ""
+msgstr "بۇ تىلغا نىسبەتەن ئىملا تەكشۈرۈشنى قوزغات:"
#: ../src/empathy-preferences.ui.h:11
msgid "General"
-msgstr "ئادەتتە"
+msgstr "ئادەتتىكى"
#: ../src/empathy-preferences.ui.h:13
msgid "Location sources:"
-msgstr ""
+msgstr "ئورۇن مەنبەلىرى:"
#: ../src/empathy-preferences.ui.h:14
msgid "Log conversations"
msgid "_Reduce location accuracy"
msgstr ""
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr ""
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "رەت قىل"
-
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "جاۋاب"
-
-#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "قوشۇلما"
-
-#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "قوشۇل"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "ھالىتى"
#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
-msgstr ""
+msgstr "سازلاش كۆزنىكى"
#: ../src/empathy-debug-window.c:1475
msgid "Pause"
#: ../src/empathy-debug-window.c:1513
msgid "Info"
-msgstr "ئۇچۇر"
+msgstr "ئۇچۇرى"
#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
-msgstr ""
+msgstr "Empathy ھېساباتلىرى"
#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Empathy سازلىغۇچ"
-#: ../src/empathy-chat.c:91
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr ""
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "رەت قىل"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "جاۋاب"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "قوشۇلما"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "قوشۇل"
msgstr ""
"Project-Id-Version: empathy 2.91.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-13 15:39+0800\n"
-"PO-Revision-Date: 2010-10-13 15:40+0800\n"
+"POT-Creation-Date: 2010-12-09 19:53+0800\n"
+"PO-Revision-Date: 2010-12-09 19:54+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
"Language: zh_TW\n"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
-msgstr "Empathy 可以發佈使用者的位置"
+msgstr "Empathy 可以發布使用者的位置"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 可以利用流動電話網絡基地台來推測位置"
+msgstr "Empathy 可以利用流動電話網絡基地臺來推測位置"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy 是否要將使用者的位置發佈給他的聯絡人。"
+msgstr "Empathy 是否要將使用者的位置發布給他的聯絡人。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
-#: ../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:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr "檔案傳輸完畢，但是檔案已損毀"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1121
msgid "File transfer not supported by remote contact"
msgstr "遠端聯絡人不支援檔案傳輸"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1177
msgid "The selected file is not a regular file"
msgstr "選取的檔案不是正規的檔案"
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1186
msgid "The selected file is empty"
msgstr "選取的檔案是空白的"
msgid "Offline"
msgstr "離線"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "不明"
#: ../libempathy/empathy-utils.c:577
msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgid "in the future"
msgstr "未來"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:670
+#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:671
msgid "Password"
msgstr "密碼"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:672
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "伺服器"
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:673
#: ../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
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
#, c-format
msgid "%s:"
msgstr "%s："
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1127
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "%s 帳號已透過我的網絡帳號修改。"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1133
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "%s 帳號無法於 Empathy 內修改。"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1153
+msgid "Launch My Web Accounts"
+msgstr "啟動我的網絡帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1465
msgid "Username:"
msgstr "使用者名稱："
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "A_pply"
msgstr "套用(_A)"
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "L_og in"
msgstr "登入(_O)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1399
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../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:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1913
msgid "_Enabled"
msgstr "已啟用(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1978
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1981
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2095
msgid "Ca_ncel"
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:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2392
#, 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:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2418
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2422
msgid "New account"
msgstr "新增帳號"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
-msgstr "發佈的名稱(_P)："
+msgstr "發布的名稱(_P)："
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
msgid "<b>Example:</b> user@my.sip.server"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
-msgstr "聊天室清單地區(_R)："
+msgstr "聊天室清單地區資訊(_R)："
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "無法轉換圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "你的系統上沒有支援已接受的圖片格式"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "選擇你的大頭貼圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "沒有圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "所有檔案"
msgid "Click to enlarge"
msgstr "請按這裏放大"
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "開啟私人對話失敗"
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "你不被允許更改這個主題"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: 清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>：設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>：加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>：加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>：開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <網名>：更改在目前伺服器上的你的網名"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:851
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:854
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr "/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "用法：%s"
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令；請參見 /help 以取得可用的指令"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "無效的聯絡人"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤；%s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "主題："
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(沒有建議)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1818
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "加入「%s」至辭典"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1855
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "加入「%s」至 %s 辭典"
+
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
msgid "_Send"
msgstr "傳送(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "無法取得最近的日誌"
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
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:2071
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
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:2082
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經加入此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "已斷線"
-#: ../libempathy-gtk/empathy-chat.c:2910
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "密碼錯誤；請再試一次："
-#: ../libempathy-gtk/empathy-chat.c:2911
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:2916
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護："
-#: ../libempathy-gtk/empathy-chat.c:2917
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3110
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "談話"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "複製連結位址(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "開啟連結(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "編輯聯絡人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "個人資料"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
-#: ../libempathy-gtk/empathy-individual-dialogs.c:111
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "新增聯絡人"
msgid "Favorite People"
msgstr "喜好的人"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, 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:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
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:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "移除(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
#, 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:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
msgid "Removing contact"
msgstr "正在移除聯絡人"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "新增聯絡人(_A)…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
#: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-contact-menu.c:261
#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-contact-menu.c:292
#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "視像通話(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-contact-menu.c:333
#: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-contact-menu.c:355
#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "傳送檔案"
-#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-contact-menu.c:378
#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "分享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:414
-#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1290
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
msgid "Favorite"
msgstr "喜好"
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:447
#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "資訊(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:489
+#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:543
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:917
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr "邀請你到這個聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:574
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
msgid "Select a contact"
msgstr "選擇聯絡人"
-#: ../libempathy-gtk/empathy-contact-widget.c:225
-#: ../libempathy-gtk/empathy-individual-widget.c:147
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "全名："
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "電話號碼："
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "電子信箱位址："
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "網站："
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "生日："
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Country ISO Code:"
msgstr "國家 ISO 碼："
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "Country:"
msgstr "國家："
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "State:"
msgstr "州："
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "City:"
msgstr "市："
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Area:"
msgstr "區域："
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Postal Code:"
msgstr "郵遞區號："
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Street:"
msgstr "街："
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Building:"
msgstr "建築："
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Floor:"
msgstr "樓層："
-#: ../libempathy-gtk/empathy-contact-widget.c:626
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Room:"
msgstr "室："
-#: ../libempathy-gtk/empathy-contact-widget.c:628
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Text:"
msgstr "文字："
-#: ../libempathy-gtk/empathy-contact-widget.c:630
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Description:"
msgstr "描述："
-#: ../libempathy-gtk/empathy-contact-widget.c:632
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "URI:"
msgstr "URI："
-#: ../libempathy-gtk/empathy-contact-widget.c:634
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Accuracy Level:"
msgstr "準確度等級："
-#: ../libempathy-gtk/empathy-contact-widget.c:636
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Error:"
msgstr "錯誤："
-#: ../libempathy-gtk/empathy-contact-widget.c:638
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (米)："
-#: ../libempathy-gtk/empathy-contact-widget.c:640
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (米)："
-#: ../libempathy-gtk/empathy-contact-widget.c:642
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Speed:"
msgstr "速度："
-#: ../libempathy-gtk/empathy-contact-widget.c:644
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "Bearing:"
msgstr "方位："
-#: ../libempathy-gtk/empathy-contact-widget.c:646
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Climb Speed:"
msgstr "爬升速度："
-#: ../libempathy-gtk/empathy-contact-widget.c:648
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Last Updated on:"
msgstr "上次更新於："
-#: ../libempathy-gtk/empathy-contact-widget.c:650
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Longitude:"
msgstr "經度："
-#: ../libempathy-gtk/empathy-contact-widget.c:652
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Latitude:"
msgstr "緯度："
-#: ../libempathy-gtk/empathy-contact-widget.c:654
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Altitude:"
msgstr "緯度："
-#: ../libempathy-gtk/empathy-contact-widget.c:717
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:621
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:623
#, c-format
msgid "%s, %s"
msgstr "%s、%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:672
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-individual-widget.c:840
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:921
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:979
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1226
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
msgid "Alias:"
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:1429
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "識別身分："
msgstr "加入羣組(_G)"
#: ../libempathy-gtk/empathy-groups-widget.c:398
-#, fuzzy
-#| msgid "Select"
msgctxt "verb in a column header displaying group names"
msgid "Select"
-msgstr "選擇"
+msgstr "選取"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1250
+#: ../src/empathy-main-window.c:1276
msgid "Group"
msgstr "羣組"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:836
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "連結聯絡人(_L)…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1567
+#: ../libempathy-gtk/empathy-individual-widget.c:1649
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
msgid "<b>Location</b> at (date)"
msgstr "<b>位置</b> 於 (日期)"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "從手機或流動通訊器材上線"
+
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
msgstr "新增網絡"
msgstr "選擇 IRC 網絡"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
-#, fuzzy
-#| msgid "Select"
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
-msgstr "選擇"
+msgstr "選取"
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgid "_Unlink"
msgstr "取消連結(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgstr "日期"
msgstr "聯絡人 ID："
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "聊天(_C)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "新增談話"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "傳送視像(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "通話(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "新增通話"
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr ""
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
msgstr "自選訊息…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
msgstr "編輯自選訊息…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
msgstr "按這裏將這個狀態從喜好中移除"
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
msgid "Click to make this status a favorite"
msgstr "按這裏將這個狀態設為喜好"
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
msgid "Set status"
msgstr "設定狀態"
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
msgid "Set your presence and current status"
msgstr "設定你的上線與目前的狀態"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
msgstr "自選訊息…"
msgid "Phrase not found"
msgstr "找不到詞彙"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "收到即時訊息"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "傳送即時訊息"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "收到聊天要求"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "聯絡人已連線"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "聯絡人已斷線"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "連接到伺服器"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "與伺服器斷線"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "收到語音通話"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "播出語音通話"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "語音通話結束"
msgstr "編輯自選訊息"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "å\8a å\85¥æ\96°ç\9a\84é \90å\85\88è¨å®\9a(_N)"
+msgid "Save _New Status Message"
+msgstr "å\84²å\98æ\96°ç\9a\84ç\8b\80æ\85\8bè¨\8aæ\81¯(_N)"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "å·²å\84²å\98ç\9a\84é \90å\85\88è¨å®\9a"
+msgid "Saved Status Messages"
+msgstr "å\84²å\98ç\9a\84ç\8b\80æ\85\8bè¨\8aæ\81¯"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
msgstr "藍色"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-#, fuzzy
-#| msgid "The identity provided by the chat server cannot be verified.\n"
msgid "The identity provided by the chat server cannot be verified."
-msgstr "對話伺服器所提供的識別身分無法通過驗證。\n"
+msgstr "對話伺服器所提供的識別身分無法通過驗證。"
#: ../libempathy-gtk/empathy-tls-dialog.c:157
-#, fuzzy
-#| msgid "The certificate is not signed by a Certification Authority"
msgid "The certificate is not signed by a Certification Authority."
-msgstr "該證書並非由證書授權中心所簽署"
+msgstr "該證書並非由證書授權中心所簽署。"
#: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
-#| msgid "The certificate has expired"
msgid "The certificate has expired."
-msgstr "證書已逾期"
+msgstr "證書已逾期。"
#: ../libempathy-gtk/empathy-tls-dialog.c:164
-#, fuzzy
-#| msgid "The certificate hasn't yet been activated"
msgid "The certificate hasn't yet been activated."
-msgstr "證書尚未啟用"
+msgstr "證書尚未啟用。"
#: ../libempathy-gtk/empathy-tls-dialog.c:167
-#, fuzzy
-#| msgid "The certificate does not have the expected fingerprint"
msgid "The certificate does not have the expected fingerprint."
-msgstr "證書並未擁有預期的指紋"
+msgstr "證書並未擁有預期的指紋。"
#: ../libempathy-gtk/empathy-tls-dialog.c:170
-#, fuzzy
-#| msgid ""
-#| "The hostname verified by the certificate doesn't match the server name"
msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "證書所驗證的主機名稱與伺服器名稱不符"
+msgstr "證書所驗證的主機名稱與伺服器名稱不符。"
#: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "The certificate is self-signed"
msgid "The certificate is self-signed."
-msgstr "證書為自我簽署"
+msgstr "證書為自我簽署。"
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-#, fuzzy
-#| msgid ""
-#| "The certificate has been revoked by the issuing Certification Authority"
msgid ""
"The certificate has been revoked by the issuing Certification Authority."
-msgstr "證書已被原本發出的證書授權機構撤銷"
+msgstr "證書已被原本發出的證書授權機構撤銷。"
#: ../libempathy-gtk/empathy-tls-dialog.c:181
-#, fuzzy
-#| msgid "The certificate is cryptographically weak"
msgid "The certificate is cryptographically weak."
-msgstr "證書於密碼防護上較弱"
+msgstr "證書於密碼防護上較弱。"
#: ../libempathy-gtk/empathy-tls-dialog.c:184
-#, fuzzy
-#| msgid "The certificate length exceeds verifiable limits"
msgid "The certificate length exceeds verifiable limits."
-msgstr "證書長度超出可驗證的範圍"
+msgstr "證書長度超出可驗證的範圍。"
#: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
-#| msgid "The certificate is malformed"
msgid "The certificate is malformed."
-msgstr "證書格式不良"
+msgstr "證書格式不良。"
#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Certificate Details"
msgstr "證書詳細資料"
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
msgid "Unable to open URI"
msgstr "無法開啓 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "Select a file"
msgstr "選擇一個檔案"
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
#, c-format
msgid "Incoming file from %s"
msgstr "收到來自 %s 的檔案"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
-msgstr "目前的地區設定"
+msgstr "ç\9b®å\89\8dç\9a\84å\9c°å\8d\80è³\87è¨\8aè¨å®\9a"
#: ../libempathy-gtk/totem-subtitle-encoding.c:161
#: ../libempathy-gtk/totem-subtitle-encoding.c:163
#: ../libempathy-gtk/totem-subtitle-encoding.c:208
msgid "Croatian"
-msgstr "克羅地亞語"
+msgstr "克羅地亞文"
#: ../libempathy-gtk/totem-subtitle-encoding.c:211
#: ../libempathy-gtk/totem-subtitle-encoding.c:213
#: ../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"
msgid "Instant Message (Empathy)"
msgstr "即時通訊 (Empathy)"
-#: ../src/empathy.c:414
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "啟動時不要自動連線"
-#: ../src/empathy.c:418
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "啟動時不顯示聯絡人清單或任何其他對話窗"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy 即時通用戶端"
+#: ../src/empathy.c:500
+msgid "Error contacting the Account Manager"
+msgstr "聯絡帳號管理程式時發生錯誤"
+
+#: ../src/empathy.c:502
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"嘗試連接至 Telepathy 帳號管理程式時發生錯誤。錯誤為：\n"
+"\n"
+"%s"
+
#: ../src/empathy-about-dialog.c:81
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 是自由軟件，你可以遵照自由軟件基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈這一程式，或者自由選擇使用任何更新的版本。"
+msgstr "Empathy 是自由軟件，你可以遵照自由軟件基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發布這一程式，或者自由選擇使用任何更新的版本。"
#: ../src/empathy-about-dialog.c:85
msgid ""
"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 通用公共許可證。"
+msgstr "發布 Empathy 的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的擔保。更詳細的情況請參閱 GNU 通用公共許可證。"
#: ../src/empathy-about-dialog.c:89
msgid ""
msgstr "選擇要匯入的帳號："
#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "Yes"
msgstr "是"
msgid "Your new account has not been saved yet."
msgstr "尚未儲存你的新帳號。"
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "連線中…"
msgid "_Import…"
msgstr "匯入(_I)…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr "- Empathy 認證用戶端"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Empathy 認證用戶端"
msgid "People nearby"
msgstr "附近的人"
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy 音訊視像用戶端"
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
msgid "Empathy Audio/Video Client"
msgstr "Empathy 音訊視像用戶端"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "對比"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "側邊欄(_S)"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "音效輸入"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "視像輸入"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "播號盤"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
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:1266
+#: ../src/empathy-call-window.c:1270
#, 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:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "通話"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "機器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "互聯網上的伺服器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "其他端看見的點的 IP 位址"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "中繼伺服器的 IP 位址"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
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:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已連線 — %d:%02dm"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "技術細節"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, 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:2358
+#: ../src/empathy-call-window.c:2365
#, 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:2364
+#: ../src/empathy-call-window.c:2371
#, 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 建立連線。你們其中之一可能在一個不允許直接連線的網絡之上。"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "這個網絡上有錯誤發生"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的音訊格式尚未在你的電腦上安裝"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的視像格式尚未在你的電腦上安裝"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"the Help menu."
msgstr "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助選單內的「除錯」視窗中所收集的紀錄。"
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "通話引擎內有錯誤發生"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "已達串流末端"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "無法建立音訊串流"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "無法建立視像串流"
msgid "_Call"
msgstr "通話(_C)"
-#: ../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:28
msgid "_View"
msgstr "檢視(_V)"
-#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 個未讀)"
-#: ../src/empathy-chat-window.c:478
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (與 %u 其他的)"
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (來自其他人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:503
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (來自所有人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr "正在輸入訊息。"
msgid "Notify for All Messages"
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:17
msgid "_Contents"
msgstr "內容(_C)"
msgid "_Detach Tab"
msgstr "分離分頁(_D)"
-#: ../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:19
msgid "_Edit"
msgstr "編輯(_E)"
msgid "_Favorite Chat Room"
msgstr "喜好的聊天室(_F)"
-#: ../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:21
msgid "_Help"
msgstr "求助(_H)"
msgid "Manage Favorite Rooms"
msgstr "管理喜好的聊天室"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming video call"
msgstr "傳入的視像通話"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming call"
msgstr "來電"
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s 要與你進行視像通話。你是否要接聽？"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:477
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 要與你進行通話。你是否要接聽？"
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的來電"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:505
msgid "_Reject"
msgstr "拒絕(_R)"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511
msgid "_Answer"
msgstr "接聽(_A)"
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming video call from %s"
msgstr "來自 %s 的視像電話"
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:702
msgid "Room invitation"
msgstr "聊天邀請"
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "Invitation to join %s"
msgstr "邀請加入 %s"
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:711
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正在邀請你加入 %s"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:719
msgid "_Decline"
msgstr "拒絕(_D)"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:724
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:751
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 曾邀請你加入 %s"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:757
#, c-format
msgid "You have been invited to join %s"
msgstr "你被邀請加入 %s"
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:807
#, c-format
msgid "Incoming file transfer from %s"
msgstr "收到來自 %s 的檔案傳輸"
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1018
#, c-format
-msgid "Subscription requested by %s"
-msgstr "來自 %s 的訂閱要求"
+msgid "%s would like permission to see when you are available"
+msgstr "%s 想要在你有空時得到查看的許可"
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1022
#, c-format
msgid ""
"\n"
"\n"
"訊息：%s"
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1066
#, c-format
msgid "%s is now offline."
msgstr "%s 現在離線。"
-#: ../src/empathy-event-manager.c:1072
+#: ../src/empathy-event-manager.c:1087
#, c-format
msgid "%s is now online."
msgstr "%s 現在上線。"
msgid "Source"
msgstr "來源"
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:385
msgid "No match found"
msgstr "找不到符合項目"
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:540
msgid "Reconnect"
msgstr "重新連接"
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:546
msgid "Edit Account"
msgstr "編輯帳號"
-#: ../src/empathy-main-window.c:550
+#: ../src/empathy-main-window.c:552
msgid "Close"
msgstr "關閉"
-#: ../src/empathy-main-window.c:1232
+#: ../src/empathy-main-window.c:1258
msgid "Contact"
msgstr "聯絡人"
-#: ../src/empathy-main-window.c:1557
+#: ../src/empathy-main-window.c:1585
msgid "Contact List"
msgstr "聯絡人清單"
-#: ../src/empathy-main-window.c:1666
+#: ../src/empathy-main-window.c:1695
msgid "Show and edit accounts"
msgstr "顯示並編輯帳號"
msgstr "選項"
#: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "於聯絡人清單內尋找(_L)"
+
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "加入喜好(_F)"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "管理喜好"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "正常大小(_O)"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "新增通話(_C)…"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "正常大小與大頭貼(_A)"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "偏好設定(_R)"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "顯示協定(_R)"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "根據名稱排序(_N)"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "根據狀態排序(_S)"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "帳號(_A)"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "精簡大小(_C)"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "偵錯(_D)"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "檔案傳輸(_F)"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
msgstr "加入(_J)…"
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "新增談話(_N)…"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "離線聯絡人(_O)"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "個人資料(_P)"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "聊天室(_R)"
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
msgid "Chat Room"
msgstr "聊天室"
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
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:607
+#: ../src/empathy-new-chatroom-dialog.c:634
#, c-format
msgid ""
"%s\n"
"需要密碼：%s\n"
"成員：%s"
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
msgid "Could not start room listing"
msgstr "無法開始列出聊天室清單"
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
msgid "Could not stop room listing"
msgstr "無法停止列出聊天室清單"
msgid "_Room:"
msgstr "聊天室(_R)："
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
msgid "Message received"
msgstr "訊息已收到"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
msgstr "訊息已送出"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr "新增談話"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr "聯絡人上線"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr "聯絡人離線"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr "帳號已連線"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr "帳號已斷線"
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "語言"
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
msgid "Preferences"
msgstr "偏好設定"
msgid "_Reduce location accuracy"
msgstr "降低位置準確度(_R)"
-#: ../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 "狀態"
msgid "Invite"
msgstr "邀請"
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
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 的帳號，就不要顯示任何對話窗"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "不要顯示任何對話窗，除非只有「附近的人」帳號"
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "初始選取所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Empathy 帳號"
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Empathy 帳號"
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Empathy 除錯程式"
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy 聊天用戶端"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "回應"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "拒絕"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "接聽"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "拒絕"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "接受"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "已接收檔案的雜湊值與送出的不符"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "加入新的預先設定(_N)"
+
+#~ msgid "Saved Presets"
+#~ msgstr "已儲存的預先設定"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "來自 %s 的訂閱要求"
+
#~ msgid "Empathy has asked about importing accounts"
#~ msgstr "Empathy 已詢問匯入帳號"
msgstr ""
"Project-Id-Version: empathy 2.91.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-13 15:39+0800\n"
-"PO-Revision-Date: 2010-09-23 20:50+0800\n"
+"POT-Creation-Date: 2010-12-09 19:53+0800\n"
+"PO-Revision-Date: 2010-12-04 18:14+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
"Language: zh_TW\n"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
-msgstr "Empathy 可以發佈使用者的位置"
+msgstr "Empathy 可以發布使用者的位置"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 可以利用行動電話網路基地台來推測位置"
+msgstr "Empathy 可以利用行動電話網路基地臺來推測位置"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy 是否要將使用者的位置發佈給他的連絡人。"
+msgstr "Empathy 是否要將使用者的位置發布給他的連絡人。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
-#: ../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:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr "檔案傳輸完畢，但是檔案已損毀"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1121
msgid "File transfer not supported by remote contact"
msgstr "遠端連絡人不支援檔案傳輸"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1177
msgid "The selected file is not a regular file"
msgstr "選取的檔案不是正規的檔案"
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1186
msgid "The selected file is empty"
msgstr "選取的檔案是空白的"
msgid "Offline"
msgstr "離線"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "不明"
#: ../libempathy/empathy-utils.c:577
msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgid "in the future"
msgstr "未來"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:670
+#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:671
msgid "Password"
msgstr "密碼"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:672
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "伺服器"
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:673
#: ../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
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
#, c-format
msgid "%s:"
msgstr "%s："
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1127
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "%s 帳號已透過我的網路帳號修改。"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1133
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "%s 帳號無法於 Empathy 內修改。"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1153
+msgid "Launch My Web Accounts"
+msgstr "啟動我的網路帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1465
msgid "Username:"
msgstr "使用者名稱："
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "A_pply"
msgstr "套用(_A)"
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "L_og in"
msgstr "登入(_O)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1399
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../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:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1913
msgid "_Enabled"
msgstr "已啟用(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1978
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1981
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2095
msgid "Ca_ncel"
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:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2392
#, 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:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2418
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2422
msgid "New account"
msgstr "新增帳號"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
-msgstr "發佈的名稱(_P)："
+msgstr "發布的名稱(_P)："
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
msgid "<b>Example:</b> user@my.sip.server"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
-msgstr "聊天室清單地區(_R)："
+msgstr "聊天室清單地區資訊(_R)："
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "無法轉換圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "您的系統上沒有支援已接受的圖片格式"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "選擇您的大頭貼圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "沒有圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "所有檔案"
msgid "Click to enlarge"
msgstr "請按這裡放大"
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "開啟私人對話失敗"
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "您不被允許變更這個主題"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: 清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>：設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>：加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>：加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>：開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <暱稱>：變更在目前伺服器上的您的暱稱"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:851
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 "
"/say <訊息>：送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來"
"說：「/say /join 是用來加入新的聊天室」"
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
"/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用"
"法。"
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "用法：%s"
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令；請參見 /help 以取得可用的指令"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "無效的連絡人"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤；%s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "主題："
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(沒有建議)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1818
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "加入「%s」至辭典"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1855
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "加入「%s」至 %s 辭典"
+
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
msgid "_Send"
msgstr "傳送(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "無法取得最近的日誌"
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
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:2071
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
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:2082
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經加入此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "已斷線"
-#: ../libempathy-gtk/empathy-chat.c:2910
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "密碼錯誤；請再試一次："
-#: ../libempathy-gtk/empathy-chat.c:2911
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:2916
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護："
-#: ../libempathy-gtk/empathy-chat.c:2917
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3110
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "談話"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "複製連結位址(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "開啟連結(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "編輯連絡人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "個人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
-#: ../libempathy-gtk/empathy-individual-dialogs.c:111
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "新增連絡人"
msgid "Favorite People"
msgstr "喜好的人"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, 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:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
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:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "移除(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
#, 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:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
msgid "Removing contact"
msgstr "正在移除連絡人"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "新增聯絡人(_A)…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
#: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-contact-menu.c:261
#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-contact-menu.c:292
#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "視訊通話(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-contact-menu.c:333
#: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-contact-menu.c:355
#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "傳送檔案"
-#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-contact-menu.c:378
#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "分享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:414
-#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1290
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
msgid "Favorite"
msgstr "喜好"
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:447
#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "資訊(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:489
+#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:543
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:917
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr "邀請您到這個聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:574
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
msgid "Select a contact"
msgstr "選擇連絡人"
-#: ../libempathy-gtk/empathy-contact-widget.c:225
-#: ../libempathy-gtk/empathy-individual-widget.c:147
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "全名："
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "電話號碼："
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "電子信箱位址："
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "網站："
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "生日："
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Country ISO Code:"
msgstr "國家 ISO 碼："
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "Country:"
msgstr "國家："
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "State:"
msgstr "州："
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "City:"
msgstr "市："
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Area:"
msgstr "區域："
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Postal Code:"
msgstr "郵遞區號："
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Street:"
msgstr "街："
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Building:"
msgstr "建築："
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Floor:"
msgstr "樓層："
-#: ../libempathy-gtk/empathy-contact-widget.c:626
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Room:"
msgstr "室："
-#: ../libempathy-gtk/empathy-contact-widget.c:628
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Text:"
msgstr "文字："
-#: ../libempathy-gtk/empathy-contact-widget.c:630
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Description:"
msgstr "描述："
-#: ../libempathy-gtk/empathy-contact-widget.c:632
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "URI:"
msgstr "URI："
-#: ../libempathy-gtk/empathy-contact-widget.c:634
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Accuracy Level:"
msgstr "準確度等級："
-#: ../libempathy-gtk/empathy-contact-widget.c:636
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Error:"
msgstr "錯誤："
-#: ../libempathy-gtk/empathy-contact-widget.c:638
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (公尺)："
-#: ../libempathy-gtk/empathy-contact-widget.c:640
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (公尺)："
-#: ../libempathy-gtk/empathy-contact-widget.c:642
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Speed:"
msgstr "速度："
-#: ../libempathy-gtk/empathy-contact-widget.c:644
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "Bearing:"
msgstr "方位："
-#: ../libempathy-gtk/empathy-contact-widget.c:646
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Climb Speed:"
msgstr "爬升速度："
-#: ../libempathy-gtk/empathy-contact-widget.c:648
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Last Updated on:"
msgstr "上次更新於："
-#: ../libempathy-gtk/empathy-contact-widget.c:650
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Longitude:"
msgstr "經度："
-#: ../libempathy-gtk/empathy-contact-widget.c:652
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Latitude:"
msgstr "緯度："
-#: ../libempathy-gtk/empathy-contact-widget.c:654
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Altitude:"
msgstr "緯度："
-#: ../libempathy-gtk/empathy-contact-widget.c:717
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:621
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:623
#, c-format
msgid "%s, %s"
msgstr "%s、%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:672
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-individual-widget.c:840
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:921
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:979
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1226
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
msgid "Alias:"
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:1429
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "識別身分："
msgstr "加入群組(_G)"
#: ../libempathy-gtk/empathy-groups-widget.c:398
-#, fuzzy
-#| msgid "Select"
msgctxt "verb in a column header displaying group names"
msgid "Select"
-msgstr "選擇"
+msgstr "選取"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1250
+#: ../src/empathy-main-window.c:1276
msgid "Group"
msgstr "群組"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:836
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "連結聯絡人(_L)…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1567
+#: ../libempathy-gtk/empathy-individual-widget.c:1649
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
msgid "<b>Location</b> at (date)"
msgstr "<b>位置</b> 於 (日期)"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "從手機或行動裝置上線"
+
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
msgstr "新增網路"
msgstr "選擇 IRC 網路"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
-#, fuzzy
-#| msgid "Select"
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
-msgstr "選擇"
+msgstr "選取"
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgid "_Unlink"
msgstr "取消連結(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgstr "日期"
msgstr "連絡人 ID："
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "聊天(_C)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "新增談話"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "傳送視訊(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "通話(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "新增通話"
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr ""
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
msgstr "自訂訊息…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
msgstr "編輯自訂訊息…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
msgstr "按這裡將這個狀態從喜好中移除"
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
msgid "Click to make this status a favorite"
msgstr "按這裡將這個狀態設為喜好"
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
msgid "Set status"
msgstr "設定狀態"
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
msgid "Set your presence and current status"
msgstr "設定您的上線與目前的狀態"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
msgstr "自訂訊息…"
msgid "Phrase not found"
msgstr "找不到詞彙"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "收到即時訊息"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "傳送即時訊息"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "收到聊天要求"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "連絡人已連線"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "連絡人已斷線"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "連接到伺服器"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "與伺服器斷線"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "收到語音通話"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "播出語音通話"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "語音通話結束"
msgstr "編輯自訂訊息"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "å\8a å\85¥æ\96°ç\9a\84é \90å\85\88è¨å®\9a(_N)"
+msgid "Save _New Status Message"
+msgstr "å\84²å\98æ\96°ç\9a\84ç\8b\80æ\85\8bè¨\8aæ\81¯(_N)"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "å·²å\84²å\98ç\9a\84é \90å\85\88è¨å®\9a"
+msgid "Saved Status Messages"
+msgstr "å\84²å\98ç\9a\84ç\8b\80æ\85\8bè¨\8aæ\81¯"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
msgstr "藍色"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-#, fuzzy
-#| msgid "The identity provided by the chat server cannot be verified.\n"
msgid "The identity provided by the chat server cannot be verified."
-msgstr "對話伺服器所提供的識別身分無法通過驗證。\n"
+msgstr "對話伺服器所提供的識別身分無法通過驗證。"
#: ../libempathy-gtk/empathy-tls-dialog.c:157
-#, fuzzy
-#| msgid "The certificate is not signed by a Certification Authority"
msgid "The certificate is not signed by a Certification Authority."
-msgstr "該憑證並非由憑證授權中心所簽署"
+msgstr "該憑證並非由憑證授權中心所簽署。"
#: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
-#| msgid "The certificate has expired"
msgid "The certificate has expired."
-msgstr "憑證已逾期"
+msgstr "憑證已逾期。"
#: ../libempathy-gtk/empathy-tls-dialog.c:164
-#, fuzzy
-#| msgid "The certificate hasn't yet been activated"
msgid "The certificate hasn't yet been activated."
-msgstr "憑證尚未啟用"
+msgstr "憑證尚未啟用。"
#: ../libempathy-gtk/empathy-tls-dialog.c:167
-#, fuzzy
-#| msgid "The certificate does not have the expected fingerprint"
msgid "The certificate does not have the expected fingerprint."
-msgstr "憑證並未擁有預期的指紋"
+msgstr "憑證並未擁有預期的指紋。"
#: ../libempathy-gtk/empathy-tls-dialog.c:170
-#, fuzzy
-#| msgid ""
-#| "The hostname verified by the certificate doesn't match the server name"
msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "憑證所驗證的主機名稱與伺服器名稱不符"
+msgstr "憑證所驗證的主機名稱與伺服器名稱不符。"
#: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "The certificate is self-signed"
msgid "The certificate is self-signed."
-msgstr "憑證為自我簽署"
+msgstr "憑證為自我簽署。"
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-#, fuzzy
-#| msgid ""
-#| "The certificate has been revoked by the issuing Certification Authority"
msgid ""
"The certificate has been revoked by the issuing Certification Authority."
-msgstr "憑證已被原本發出的憑證授權機構撤銷"
+msgstr "憑證已被原本發出的憑證授權機構撤銷。"
#: ../libempathy-gtk/empathy-tls-dialog.c:181
-#, fuzzy
-#| msgid "The certificate is cryptographically weak"
msgid "The certificate is cryptographically weak."
-msgstr "憑證於密碼防護上較弱"
+msgstr "憑證於密碼防護上較弱。"
#: ../libempathy-gtk/empathy-tls-dialog.c:184
-#, fuzzy
-#| msgid "The certificate length exceeds verifiable limits"
msgid "The certificate length exceeds verifiable limits."
-msgstr "憑證長度超出可驗證的範圍"
+msgstr "憑證長度超出可驗證的範圍。"
#: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
-#| msgid "The certificate is malformed"
msgid "The certificate is malformed."
-msgstr "憑證格式不良"
+msgstr "憑證格式不良。"
#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Certificate Details"
msgstr "憑證詳細資料"
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
msgid "Unable to open URI"
msgstr "無法開啓 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "Select a file"
msgstr "選擇一個檔案"
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
#, c-format
msgid "Incoming file from %s"
msgstr "收到來自 %s 的檔案"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
-msgstr "目前的地區設定"
+msgstr "ç\9b®å\89\8dç\9a\84å\9c°å\8d\80è³\87è¨\8aè¨å®\9a"
#: ../libempathy-gtk/totem-subtitle-encoding.c:161
#: ../libempathy-gtk/totem-subtitle-encoding.c:163
#: ../libempathy-gtk/totem-subtitle-encoding.c:208
msgid "Croatian"
-msgstr "克羅埃西亞語"
+msgstr "克羅埃西亞文"
#: ../libempathy-gtk/totem-subtitle-encoding.c:211
#: ../libempathy-gtk/totem-subtitle-encoding.c:213
#: ../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"
msgid "Instant Message (Empathy)"
msgstr "即時通訊 (Empathy)"
-#: ../src/empathy.c:414
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "啟動時不要自動連線"
-#: ../src/empathy.c:418
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "啟動時不顯示連絡人清單或任何其他對話窗"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy 即時通用戶端"
+#: ../src/empathy.c:500
+msgid "Error contacting the Account Manager"
+msgstr "聯絡帳號管理程式時發生錯誤"
+
+#: ../src/empathy.c:502
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"嘗試連接至 Telepathy 帳號管理程式時發生錯誤。錯誤為：\n"
+"\n"
+"%s"
+
#: ../src/empathy-about-dialog.c:81
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
"version."
msgstr ""
"Empathy 是自由軟體，您可以遵照自由軟體基金會 (Free Software Foundation) 出版"
-"的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈"
+"的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發布"
"這一程式，或者自由選擇使用任何更新的版本。"
#: ../src/empathy-about-dialog.c:85
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
"details."
msgstr ""
-"發佈 Empathy 的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的"
+"發布 Empathy 的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的"
"擔保。更詳細的情況請參閱 GNU 通用公共許可證。"
#: ../src/empathy-about-dialog.c:89
msgstr "選擇要匯入的帳號："
#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "Yes"
msgstr "是"
msgid "Your new account has not been saved yet."
msgstr "尚未儲存您的新帳號。"
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "連線中…"
msgid "_Import…"
msgstr "匯入(_I)…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr "- Empathy 認證用戶端"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Empathy 認證用戶端"
msgid "People nearby"
msgstr "附近的人"
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy 音訊視訊用戶端"
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
msgid "Empathy Audio/Video Client"
msgstr "Empathy 音訊視訊用戶端"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "對比"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "側邊欄(_S)"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "音效輸入"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "視訊輸入"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "播號盤"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
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:1266
+#: ../src/empathy-call-window.c:1270
#, 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:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "通話"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "機器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "網際網路上的伺服器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "其他端看見的點的 IP 位址"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "中繼伺服器的 IP 位址"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
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:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已連線 — %d:%02dm"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "技術細節"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, 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:2358
+#: ../src/empathy-call-window.c:2365
#, 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:2364
+#: ../src/empathy-call-window.c:2371
#, 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 建立連線。您們其中之一可能在一個不允許直接連線的網路之上。"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "這個網路上有錯誤發生"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">回報這個錯誤</a>並附上"
"從求助選單內的「除錯」視窗中所收集的紀錄。"
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "通話引擎內有錯誤發生"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "已達串流末端"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "無法建立音訊串流"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "無法建立視訊串流"
msgid "_Call"
msgstr "通話(_C)"
-#: ../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:28
msgid "_View"
msgstr "檢視(_V)"
-#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 個未讀)"
-#: ../src/empathy-chat-window.c:478
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (與 %u 其他的)"
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (來自其他人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:503
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (來自所有人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr "正在輸入訊息。"
msgid "Notify for All Messages"
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:17
msgid "_Contents"
msgstr "內容(_C)"
msgid "_Detach Tab"
msgstr "分離分頁(_D)"
-#: ../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:19
msgid "_Edit"
msgstr "編輯(_E)"
msgid "_Favorite Chat Room"
msgstr "喜好的聊天室(_F)"
-#: ../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:21
msgid "_Help"
msgstr "求助(_H)"
msgid "Manage Favorite Rooms"
msgstr "管理喜好的聊天室"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming video call"
msgstr "傳入的視訊通話"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming call"
msgstr "來電"
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s 要與您進行視訊通話。您是否要接聽？"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:477
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 要與您進行通話。您是否要接聽？"
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的來電"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:505
msgid "_Reject"
msgstr "拒絕(_R)"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511
msgid "_Answer"
msgstr "接聽(_A)"
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming video call from %s"
msgstr "來自 %s 的視訊電話"
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:702
msgid "Room invitation"
msgstr "聊天邀請"
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "Invitation to join %s"
msgstr "邀請加入 %s"
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:711
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正在邀請您加入 %s"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:719
msgid "_Decline"
msgstr "拒絕(_D)"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:724
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:751
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 曾邀請您加入 %s"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:757
#, c-format
msgid "You have been invited to join %s"
msgstr "您被邀請加入 %s"
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:807
#, c-format
msgid "Incoming file transfer from %s"
msgstr "收到來自 %s 的檔案傳輸"
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1018
#, c-format
-msgid "Subscription requested by %s"
-msgstr "來自 %s 的訂閱要求"
+msgid "%s would like permission to see when you are available"
+msgstr "%s 想要在您有空時得到查看的許可"
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1022
#, c-format
msgid ""
"\n"
"\n"
"訊息：%s"
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1066
#, c-format
msgid "%s is now offline."
msgstr "%s 現在離線。"
-#: ../src/empathy-event-manager.c:1072
+#: ../src/empathy-event-manager.c:1087
#, c-format
msgid "%s is now online."
msgstr "%s 現在上線。"
msgid "Source"
msgstr "來源"
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:385
msgid "No match found"
msgstr "找不到符合項目"
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:540
msgid "Reconnect"
msgstr "重新連接"
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:546
msgid "Edit Account"
msgstr "編輯帳號"
-#: ../src/empathy-main-window.c:550
+#: ../src/empathy-main-window.c:552
msgid "Close"
msgstr "關閉"
-#: ../src/empathy-main-window.c:1232
+#: ../src/empathy-main-window.c:1258
msgid "Contact"
msgstr "連絡人"
-#: ../src/empathy-main-window.c:1557
+#: ../src/empathy-main-window.c:1585
msgid "Contact List"
msgstr "連絡人清單"
-#: ../src/empathy-main-window.c:1666
+#: ../src/empathy-main-window.c:1695
msgid "Show and edit accounts"
msgstr "顯示並編輯帳號"
msgstr "選項"
#: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "於連絡人清單內尋找(_L)"
+
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "加入喜好(_F)"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "管理喜好"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "正常大小(_O)"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "新增通話(_C)…"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "正常大小與大頭貼(_A)"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "偏好設定(_R)"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "顯示協定(_R)"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "依名稱排序(_N)"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "依狀態排序(_S)"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "帳號(_A)"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "精簡大小(_C)"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "偵錯(_D)"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "檔案傳輸(_F)"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
msgstr "加入(_J)…"
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "新增談話(_N)…"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "離線連絡人(_O)"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "個人資訊(_P)"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "聊天室(_R)"
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
msgid "Chat Room"
msgstr "聊天室"
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
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:607
+#: ../src/empathy-new-chatroom-dialog.c:634
#, c-format
msgid ""
"%s\n"
"需要密碼：%s\n"
"成員：%s"
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
msgid "Could not start room listing"
msgstr "無法開始列出聊天室清單"
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
msgid "Could not stop room listing"
msgstr "無法停止列出聊天室清單"
msgid "_Room:"
msgstr "聊天室(_R)："
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
msgid "Message received"
msgstr "訊息已收到"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
msgstr "訊息已送出"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr "新增談話"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr "連絡人上線"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr "連絡人離線"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr "帳號已連線"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr "帳號已斷線"
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "語言"
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
msgid "Preferences"
msgstr "偏好設定"
msgid "_Reduce location accuracy"
msgstr "降低位置準確度(_R)"
-#: ../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 "狀態"
msgid "Invite"
msgstr "邀請"
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
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 的帳號，就不要顯示任何對話窗"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "不要顯示任何對話窗，除非只有「附近的人」帳號"
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "初始選取所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Empathy 帳號"
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Empathy 帳號"
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Empathy 除錯程式"
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy 聊天用戶端"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "回應"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "拒絕"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "接聽"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "拒絕"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "接受"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "已接收檔案的雜湊值與送出的不符"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "加入新的預先設定(_N)"
+
+#~ msgid "Saved Presets"
+#~ msgstr "已儲存的預先設定"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "來自 %s 的訂閱要求"
+
#~ msgid "Empathy has asked about importing accounts"
#~ msgstr "Empathy 已詢問匯入帳號"
def send_email(self):
notes = self.get_release_notes()
+ print notes
cmd = 'xdg-email ' \
' --cc telepathy@lists.freedesktop.org' \
' --subject "ANNOUNCE: Empathy %s"' \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(top_builddir)/libempathy/libempathy.la \
$(top_builddir)/extensions/libemp-extensions.la \
+ $(GCR_LIBS) \
$(EMPATHY_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
$(WEBKIT_LIBS)
if (accounts_dialog_get_settings_iter (dialog, settings, &iter))
gtk_tree_selection_select_iter (selection, &iter);
}
+
+static void
+accounts_dialog_treeview_enabled_cb (GtkMenuItem *item,
+ TpAccount *account)
+{
+ gboolean enabled;
+
+ enabled = tp_account_is_enabled (account);
+ tp_account_set_enabled_async (account, !enabled, NULL, NULL);
+}
+
+static gboolean
+accounts_dialog_treeview_button_press_event_cb (GtkTreeView *view,
+ GdkEventButton *event,
+ EmpathyAccountsDialog *dialog)
+{
+ EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+ TpAccount *account = NULL;
+ GtkTreeModel *model = NULL;
+ GtkTreePath *path = NULL;
+ GtkTreeIter iter;
+ GtkWidget *menu;
+ GtkWidget *item_enable, *item_disable;
+ GtkWidget *image_enable, *image_disable;
+
+ /* ignore multiple clicks */
+ if (event->type != GDK_BUTTON_PRESS)
+ return TRUE;
+
+ if (event->button != 3)
+ goto finally;
+
+ /* Selection is not yet set, so we have to get account from event position */
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+ if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->treeview),
+ event->x, event->y, &path, NULL, NULL, NULL))
+ goto finally;
+
+ if (!gtk_tree_model_get_iter (model, &iter, path))
+ goto finally;
+
+ gtk_tree_model_get (model, &iter, COL_ACCOUNT, &account, -1);
+
+ /* Create the menu */
+ menu = gtk_menu_new ();
+
+ /* Get images for menu items */
+ image_enable = gtk_image_new_from_icon_name (empathy_icon_name_for_presence (
+ tp_account_manager_get_most_available_presence (
+ priv->account_manager, NULL, NULL)),
+ GTK_ICON_SIZE_MENU);
+ image_disable = gtk_image_new_from_icon_name (
+ empathy_icon_name_for_presence (TP_CONNECTION_PRESENCE_TYPE_OFFLINE),
+ GTK_ICON_SIZE_MENU);
+
+ /* Menu items: to enabled/disable the account */
+ item_enable = gtk_image_menu_item_new_with_mnemonic (_("_Enable"));
+ item_disable = gtk_image_menu_item_new_with_mnemonic (_("_Disable"));
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_enable),
+ image_enable);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_disable),
+ image_disable);
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item_enable);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item_disable);
+
+ if (tp_account_is_enabled (account))
+ {
+ tp_g_signal_connect_object (item_disable, "activate",
+ G_CALLBACK (accounts_dialog_treeview_enabled_cb), account, 0);
+ gtk_widget_set_sensitive (item_enable, FALSE);
+ }
+ else
+ {
+ tp_g_signal_connect_object (item_enable, "activate",
+ G_CALLBACK (accounts_dialog_treeview_enabled_cb), account, 0);
+ gtk_widget_set_sensitive (item_disable, FALSE);
+ }
+
+ gtk_widget_show (item_enable);
+ gtk_widget_show (item_disable);
+
+ /* FIXME: Add here presence items, to be able to set per-account presence */
+
+ /* Popup menu */
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+ event->button, event->time);
+
+finally:
+ tp_clear_object (&account);
+ gtk_tree_path_free (path);
+
+ return FALSE;
+}
+
static void
accounts_dialog_add (EmpathyAccountsDialog *dialog,
EmpathyAccountSettings *settings)
"button_add", "clicked", accounts_dialog_button_add_clicked_cb,
"button_remove", "clicked", accounts_dialog_button_remove_clicked_cb,
"button_import", "clicked", accounts_dialog_button_import_clicked_cb,
+ "treeview", "button-press-event",
+ accounts_dialog_treeview_button_press_event_cb,
NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gboolean hidden)
{
GError *error = NULL;
- const gchar *argv[4] = { NULL, };
- gint i = 0;
- gchar *account_option = NULL;
+ GString *cmd;
gchar *path;
+ GAppInfo *app_info;
+ GdkAppLaunchContext *context = NULL;
g_return_if_fail (GDK_IS_SCREEN (screen));
g_return_if_fail (!selected_account || TP_IS_ACCOUNT (selected_account));
path = g_build_filename (BIN_DIR, "empathy-accounts", NULL);
}
- argv[i++] = path;
+ cmd = g_string_new (path);
+ g_free (path);
if (selected_account != NULL)
{
- const gchar *account_path;
-
- account_path = tp_proxy_get_object_path (TP_PROXY (selected_account));
- account_option = g_strdup_printf ("--select-account=%s",
- &account_path[strlen (TP_ACCOUNT_OBJECT_PATH_BASE)]);
-
- argv[i++] = account_option;
+ g_string_append_printf (cmd, " --select-account=%s",
+ tp_account_get_path_suffix (selected_account));
}
if (if_needed)
- argv[i++] = "--if-needed";
+ g_string_append_printf (cmd, " --if-needed");
if (hidden)
- argv[i++] = "--hidden";
+ g_string_append_printf (cmd, " --hidden");
DEBUG ("Launching empathy-accounts (if_needed: %d, hidden: %d, account: %s)",
if_needed, hidden,
selected_account == NULL ? "<none selected>" :
tp_proxy_get_object_path (TP_PROXY (selected_account)));
- gdk_spawn_on_screen (screen, NULL, (gchar**) argv, NULL, G_SPAWN_SEARCH_PATH,
- NULL, NULL, NULL, &error);
- if (error != NULL)
+ app_info = g_app_info_create_from_commandline (cmd->str, NULL, 0, &error);
+ if (app_info == NULL)
+ {
+ DEBUG ("Failed to create app info: %s", error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ context = gdk_app_launch_context_new ();
+ gdk_app_launch_context_set_display (context, gdk_screen_get_display (screen));
+
+ if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
+ &error))
{
g_warning ("Failed to open accounts dialog: %s", error->message);
g_error_free (error);
}
- g_free (account_option);
- g_free (path);
+out:
+ tp_clear_object (&app_info);
+ tp_clear_object (&context);
+ g_string_free (cmd, TRUE);
}
gboolean
gpointer user_data)
{
TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
- const gchar *account_id = (const gchar*) user_data;
GError *error = NULL;
if (!tp_account_manager_prepare_finish (manager, result, &error))
return;
}
- if (account_id != NULL)
+ account_manager_prepared = TRUE;
+
+ if (selected_account_name != NULL)
{
gchar *account_path;
TpAccount *account = NULL;
/* create and prep the corresponding TpAccount so it's fully ready by the
* time we try to select it in the accounts dialog */
account_path = g_strdup_printf ("%s%s", TP_ACCOUNT_OBJECT_PATH_BASE,
- account_id);
+ selected_account_name);
bus = tp_dbus_daemon_dup (NULL);
if ((account = tp_account_new (bus, account_path, &error)))
{
DEBUG ("Failed to find account with path %s: %s", account_path,
error->message);
g_clear_error (&error);
+
+ maybe_show_accounts_ui (manager);
}
g_object_unref (bus);
else
{
maybe_show_accounts_ui (manager);
- account_manager_prepared = TRUE;
}
}
app_command_line_cb (GApplication *app,
GApplicationCommandLine *cmdline)
{
- gchar **argv;
- gint argc;
-
g_application_hold (app);
- argv = g_application_command_line_get_arguments (cmdline, &argc);
-
/* if the window is ready, present it; otherwise, it will be presented when
* the accounts manager is prepared */
if (account_manager_prepared)
g_object_unref (account_manager);
}
- g_strfreev (argv);
-
return 0;
}
account_manager = tp_account_manager_dup ();
tp_account_manager_prepare_async (account_manager, NULL,
- account_manager_ready_for_accounts_cb, selected_account_name);
+ account_manager_ready_for_accounts_cb, NULL);
g_signal_connect (app, "command-line", G_CALLBACK (app_command_line_cb),
NULL);
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
#include <libempathy/empathy-debug.h>
#include <libempathy/empathy-auth-factory.h>
+#include <libempathy/empathy-server-sasl-handler.h>
#include <libempathy/empathy-server-tls-handler.h>
#include <libempathy/empathy-tls-verifier.h>
+#include <libempathy/empathy-utils.h>
+#include <libempathy-gtk/empathy-password-dialog.h>
#include <libempathy-gtk/empathy-tls-dialog.h>
#include <libempathy-gtk/empathy-ui-utils.h>
GHashTable *details = NULL;
EmpathyTLSDialog *tls_dialog = EMPATHY_TLS_DIALOG (dialog);
gboolean remember = FALSE;
+ EmpathyTLSVerifier *verifier = EMPATHY_TLS_VERIFIER (user_data);
DEBUG ("Response %d", response_id);
}
if (remember)
- empathy_tls_certificate_store_ca (certificate);
+ empathy_tls_verifier_store_exception (verifier);
g_object_unref (certificate);
g_hash_table_unref (details);
static void
display_interactive_dialog (EmpathyTLSCertificate *certificate,
+ EmpathyTLSVerifier *verifier,
EmpTLSCertificateRejectReason reason,
GHashTable *details)
{
stop_timer ();
tls_dialog = empathy_tls_dialog_new (certificate, reason, details);
- g_signal_connect (tls_dialog, "response",
- G_CALLBACK (tls_dialog_response_cb), NULL);
+ g_signal_connect_data (tls_dialog, "response",
+ G_CALLBACK (tls_dialog_response_cb), g_object_ref (verifier),
+ (GClosureNotify)g_object_unref, 0);
gtk_widget_show (tls_dialog);
}
GError *error = NULL;
EmpathyTLSCertificate *certificate = NULL;
GHashTable *details = NULL;
+ gchar *hostname = NULL;
g_object_get (source,
"certificate", &certificate,
if (error != NULL)
{
DEBUG ("Error: %s", error->message);
- display_interactive_dialog (certificate, reason, details);
+ display_interactive_dialog (certificate, EMPATHY_TLS_VERIFIER (source),
+ reason, details);
g_error_free (error);
}
empathy_tls_certificate_accept_async (certificate, NULL, NULL);
}
+ g_free (hostname);
g_object_unref (certificate);
}
static void
-auth_factory_new_handler_cb (EmpathyAuthFactory *factory,
+auth_factory_new_tls_handler_cb (EmpathyAuthFactory *factory,
EmpathyServerTLSHandler *handler,
gpointer user_data)
{
g_free (hostname);
}
+static void
+auth_factory_new_sasl_handler_cb (EmpathyAuthFactory *factory,
+ EmpathyServerSASLHandler *handler,
+ gpointer user_data)
+{
+ GtkWidget *dialog;
+
+ DEBUG ("New SASL server handler received from the factory");
+
+ /* If the handler has the password it will deal with it itself. */
+ if (!empathy_server_sasl_handler_has_password (handler))
+ {
+ dialog = empathy_password_dialog_new (handler);
+ gtk_widget_show (dialog);
+ }
+}
+
int
main (int argc,
char **argv)
factory = empathy_auth_factory_dup_singleton ();
g_signal_connect (factory, "new-server-tls-handler",
- G_CALLBACK (auth_factory_new_handler_cb), NULL);
+ G_CALLBACK (auth_factory_new_tls_handler_cb), NULL);
+
+ g_signal_connect (factory, "new-server-sasl-handler",
+ G_CALLBACK (auth_factory_new_sasl_handler_cb), NULL);
if (!empathy_auth_factory_register (factory, &error))
{
typedef struct {
EmpathyChat *current_chat;
GList *chats;
- GList *chats_new_msg;
- GList *chats_composing;
gboolean page_added;
gboolean dnd_same_window;
EmpathyChatroomManager *chatroom_manager;
if (orig_submenu == NULL || !gtk_widget_get_visible (orig_submenu)) {
submenu = empathy_chat_get_contact_menu (priv->current_chat);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
- gtk_widget_show (menu);
+ if (submenu != NULL) {
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
+ gtk_widget_show (menu);
+ gtk_widget_set_sensitive (menu, TRUE);
+ }
+ else {
+ gtk_widget_set_sensitive (menu, FALSE);
+ }
} else {
tp_g_signal_connect_object (orig_submenu,
"notify::visible",
GList *l;
guint nb = 0;
- for (l = priv->chats_new_msg; l != NULL; l = g_list_next (l)) {
- EmpathyChat *chat = l->data;
-
- nb += empathy_chat_get_nb_unread_messages (chat);
- }
+ for (l = priv->chats; l != NULL; l = g_list_next (l))
+ nb += empathy_chat_get_nb_unread_messages (EMPATHY_CHAT (l->data));
return nb;
}
}
static void
-chat_window_icon_update (EmpathyChatWindowPriv *priv)
+chat_window_icon_update (EmpathyChatWindowPriv *priv, gboolean new_messages)
{
GdkPixbuf *icon;
EmpathyContact *remote_contact;
n_chats = g_list_length (priv->chats);
/* Update window icon */
- if (priv->chats_new_msg) {
+ if (new_messages) {
gtk_window_set_icon_name (GTK_WINDOW (priv->dialog),
EMPATHY_IMAGE_MESSAGE);
} else {
chat_window_title_update (priv);
- chat_window_icon_update (priv);
+ chat_window_icon_update (priv, get_all_unread_messages (priv) > 0);
chat_window_close_button_update (priv,
num_pages);
/* No TpChat, we are disconnected */
icon_name = NULL;
}
- else if (g_list_find (priv->chats_new_msg, chat)) {
+ else if (empathy_chat_get_nb_unread_messages (chat) > 0) {
icon_name = EMPATHY_IMAGE_MESSAGE;
}
- else if (g_list_find (priv->chats_composing, chat)) {
+ else if (empathy_chat_is_composing (chat)) {
icon_name = EMPATHY_IMAGE_TYPING;
}
else if (remote_contact) {
_("Topic:"), subject);
}
- if (g_list_find (priv->chats_composing, chat)) {
+ if (empathy_chat_is_composing (chat)) {
append_markup_printf (tooltip, "\n%s", _("Typing a message."));
}
gboolean is_composing,
EmpathyChatWindow *window)
{
- EmpathyChatWindowPriv *priv;
-
- priv = GET_PRIV (window);
-
- if (is_composing && !g_list_find (priv->chats_composing, chat)) {
- priv->chats_composing = g_list_prepend (priv->chats_composing, chat);
- } else {
- priv->chats_composing = g_list_remove (priv->chats_composing, chat);
- }
-
chat_window_update_chat_tab (chat);
}
}
static void
-chat_window_set_highlight_room_tab_label (EmpathyChat *chat)
+chat_window_set_highlight_room_labels (EmpathyChat *chat)
{
gchar *markup;
GtkWidget *widget;
widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
gtk_label_set_markup (GTK_LABEL (widget), markup);
+
+ widget = g_object_get_data (G_OBJECT (chat), "chat-window-menu-label");
+ gtk_label_set_markup (GTK_LABEL (widget), markup);
+
g_free (markup);
}
return;
}
- if (!g_list_find (priv->chats_new_msg, chat)) {
- priv->chats_new_msg = g_list_prepend (priv->chats_new_msg, chat);
+ /* Update the chat tab if this is the first unread message */
+ if (empathy_chat_get_nb_unread_messages (chat) == 1) {
chat_window_update_chat_tab (chat);
}
if (needs_urgency) {
if (!has_focus) {
chat_window_set_urgency_hint (window, TRUE);
- chat_window_set_highlight_room_tab_label (chat);
+ chat_window_set_highlight_room_labels (chat);
}
empathy_sound_manager_play (priv->sound_mgr, GTK_WIDGET (priv->dialog),
/* update the number of unread messages and the window icon */
chat_window_title_update (priv);
- chat_window_icon_update (priv);
+ chat_window_icon_update (priv, TRUE);
}
static GtkNotebook *
}
priv->current_chat = chat;
- priv->chats_new_msg = g_list_remove (priv->chats_new_msg, chat);
empathy_chat_messages_read (chat);
chat_window_update_chat_tab (chat);
/* Keep list of chats up to date */
priv->chats = g_list_remove (priv->chats, chat);
- priv->chats_new_msg = g_list_remove (priv->chats_new_msg, chat);
empathy_chat_messages_read (chat);
- priv->chats_composing = g_list_remove (priv->chats_composing, chat);
if (priv->chats == NULL) {
g_object_unref (window);
priv = GET_PRIV (window);
- priv->chats_new_msg = g_list_remove (priv->chats_new_msg, priv->current_chat);
empathy_chat_messages_read (priv->current_chat);
chat_window_set_urgency_hint (window, FALSE);
/* Set up private details */
priv->chats = NULL;
- priv->chats_new_msg = NULL;
- priv->chats_composing = NULL;
priv->current_chat = NULL;
priv->notification = NULL;
typedef struct {
TpBaseClient *approver;
+ TpBaseClient *auth_approver;
EmpathyContactManager *contact_manager;
GSList *events;
/* Ongoing approvals */
if (event->autoremove_timeout_id != 0)
g_source_remove (event->autoremove_timeout_id);
- if (event->public.contact)
- {
- g_object_unref (event->public.contact);
- }
+ tp_clear_object (&(event->public.contact));
+ tp_clear_object (&(event->public.account));
g_slice_free (EventPriv, event);
}
static void
event_manager_add (EmpathyEventManager *manager,
+ TpAccount *account,
EmpathyContact *contact,
EmpathyEventType type,
const gchar *icon_name,
EventPriv *event;
event = g_slice_new0 (EventPriv);
+ event->public.account = account != NULL ? g_object_ref (account) : NULL;
event->public.contact = contact ? g_object_ref (contact) : NULL;
event->public.type = type;
event->public.icon_name = g_strdup (icon_name);
g_object_unref (user_data);
}
+static void
+reject_auth_channel_claim_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
+ GError *error = NULL;
+
+ if (!tp_channel_dispatch_operation_claim_finish (cdo, result, &error))
+ {
+ DEBUG ("Failed to claim channel: %s", error->message);
+
+ g_error_free (error);
+ return;
+ }
+
+ tp_cli_channel_call_close (TP_CHANNEL (user_data), -1,
+ NULL, NULL, NULL, NULL);
+}
+
static void
reject_approval (EventManagerApproval *approval)
{
/* We have to claim the channel before closing it */
- tp_channel_dispatch_operation_claim_async (approval->operation,
- reject_channel_claim_cb, g_object_ref (approval->handler_instance));
+
+ /* Unfortunately, we need to special case the auth channels for the
+ * time being as they don't have a wrapper object handler in
+ * approval->handler_instance as they're not actually handled by
+ * this process, so we can just use a noddy callback to call Close()
+ * directly. */
+ if (approval->handler_instance != NULL)
+ {
+ tp_channel_dispatch_operation_claim_async (approval->operation,
+ reject_channel_claim_cb, g_object_ref (approval->handler_instance));
+ }
+ else if (tp_channel_get_channel_type_id (approval->main_channel)
+ == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
+ {
+ tp_channel_dispatch_operation_claim_async (approval->operation,
+ reject_auth_channel_claim_cb, approval->main_channel);
+ }
}
static void
event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE, header,
msg);
else
- event_manager_add (approval->manager, sender, EMPATHY_EVENT_TYPE_CHAT,
- EMPATHY_IMAGE_NEW_MESSAGE, header, msg, approval,
- event_text_channel_process_func, NULL);
+ event_manager_add (approval->manager, NULL, sender,
+ EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE, header, msg,
+ approval, event_text_channel_process_func, NULL);
empathy_sound_manager_play (priv->sound_mgr, window,
EMPATHY_SOUND_CONVERSATION_NEW);
video ? _("Incoming video call from %s") :_("Incoming call from %s"),
empathy_contact_get_alias (approval->contact));
- event_manager_add (approval->manager, approval->contact,
- EMPATHY_EVENT_TYPE_VOIP,
+ event_manager_add (approval->manager, NULL,
+ approval->contact, EMPATHY_EVENT_TYPE_VOIP,
video ? EMPATHY_IMAGE_VIDEO_CALL : EMPATHY_IMAGE_VOIP,
header, NULL, approval,
event_channel_process_voip_func, NULL);
tp_channel_get_identifier (approval->main_channel));
}
- event_manager_add (approval->manager, approval->contact,
- EMPATHY_EVENT_TYPE_INVITATION, EMPATHY_IMAGE_GROUP_MESSAGE, msg,
- invite_msg, approval, event_room_channel_process_func, NULL);
+ event_manager_add (approval->manager, NULL,
+ approval->contact, EMPATHY_EVENT_TYPE_INVITATION,
+ EMPATHY_IMAGE_GROUP_MESSAGE, msg, invite_msg, approval,
+ event_room_channel_process_func, NULL);
empathy_sound_manager_play (priv->sound_mgr, window,
EMPATHY_SOUND_CONVERSATION_NEW);
header = g_strdup_printf (_("Incoming file transfer from %s"),
empathy_contact_get_alias (approval->contact));
- event_manager_add (approval->manager, approval->contact,
- EMPATHY_EVENT_TYPE_TRANSFER, EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL,
+ event_manager_add (approval->manager, NULL,
+ approval->contact, EMPATHY_EVENT_TYPE_TRANSFER,
+ EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL,
approval, event_channel_process_func, NULL);
/* FIXME better sound for incoming file transfers ?*/
g_object_unref (window);
}
-/* If there is a file-transfer or media channel consider it as the
- * main one. */
+static void
+event_manager_auth_process_func (EventPriv *event)
+{
+ empathy_event_approve ((EmpathyEvent *) event);
+}
+
+/* If there is a file-transfer, media, or auth channel consider it as
+ * the main one. */
static TpChannel *
find_main_channel (GList *channels)
{
channel_type = tp_channel_get_channel_type_id (channel);
if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA ||
- channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
+ channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER ||
+ channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
return channel;
else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_TEXT)
empathy_tp_contact_factory_get_from_handle (connection, handle,
event_manager_ft_got_contact_cb, approval, NULL, G_OBJECT (self));
}
+ else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
+ {
+ event_manager_add (approval->manager, account, NULL, EMPATHY_EVENT_TYPE_AUTH,
+ GTK_STOCK_DIALOG_AUTHENTICATION, tp_account_get_display_name (account),
+ _("Password required"), approval,
+ event_manager_auth_process_func, NULL);
+ }
else
{
GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
else
event_msg = NULL;
- event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_SUBSCRIPTION,
+ event_manager_add (manager, NULL, contact, EMPATHY_EVENT_TYPE_SUBSCRIPTION,
GTK_STOCK_DIALOG_QUESTION, header, event_msg, NULL,
event_pending_subscribe_func, NULL);
header = g_strdup_printf (_("%s is now offline."),
empathy_contact_get_alias (contact));
- event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE,
+ event_manager_add (manager, NULL, contact, EMPATHY_EVENT_TYPE_PRESENCE,
EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL);
}
}
header = g_strdup_printf (_("%s is now online."),
empathy_contact_get_alias (contact));
- event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE,
+ event_manager_add (manager, NULL, contact, EMPATHY_EVENT_TYPE_PRESENCE,
EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL);
}
}
g_slist_free (priv->approvals);
g_object_unref (priv->contact_manager);
g_object_unref (priv->approver);
+ g_object_unref (priv->auth_approver);
g_object_unref (priv->gsettings_notif);
g_object_unref (priv->gsettings_ui);
g_object_unref (priv->sound_mgr);
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
-
g_type_class_add_private (object_class, sizeof (EmpathyEventManagerPriv));
}
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
NULL));
+ /* I don't feel good about doing this, and I'm sorry, but the
+ * capabilities connection feature is added earlier because it's
+ * needed for EmpathyTpChat. If the capabilities feature is required
+ * then preparing an auth channel (which of course appears in the
+ * CONNECTING state) will never be prepared. So the options are
+ * either to create another approver like I've done, or to port
+ * EmpathyTpChat and its users to not depend on the connection being
+ * prepared with capabilities. I chose the former, obviously. :-) */
+
+ priv->auth_approver = tp_simple_approver_new (dbus,
+ "Empathy.AuthEventManager", FALSE, approve_channels, manager,
+ NULL);
+
+ /* SASL auth channels */
+ tp_base_client_take_approver_filter (priv->auth_approver,
+ tp_asv_new (
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+ TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
+ TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION_AUTHENTICATION_METHOD,
+ G_TYPE_STRING,
+ TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
+ NULL));
+
if (!tp_base_client_register (priv->approver, &error))
{
DEBUG ("Failed to register Approver: %s", error->message);
g_error_free (error);
}
+ if (!tp_base_client_register (priv->auth_approver, &error))
+ {
+ DEBUG ("Failed to register auth Approver: %s", error->message);
+ g_error_free (error);
+ }
+
g_object_unref (dbus);
}
EMPATHY_EVENT_TYPE_SUBSCRIPTION,
EMPATHY_EVENT_TYPE_PRESENCE,
EMPATHY_EVENT_TYPE_INVITATION,
+ EMPATHY_EVENT_TYPE_AUTH,
} EmpathyEventType;
typedef struct {
+ TpAccount *account;
EmpathyContact *contact;
EmpathyEventType type;
gchar *icon_name;
GtkWidget *presence_toolbar;
GtkWidget *presence_chooser;
GtkWidget *errors_vbox;
+ GtkWidget *auth_vbox;
GtkWidget *search_bar;
GtkWidget *notebook;
GtkWidget *no_entry_label;
GtkWidget *edit_context_separator;
guint size_timeout_id;
+
+ /* reffed TpAccount* => visible GtkInfoBar* */
GHashTable *errors;
+ /* EmpathyEvent* => visible GtkInfoBar* */
+ GHashTable *auths;
+
/* stores a mapping from TpAccount to Handler ID to prevent
* to listen more than once to the status-changed signal */
GHashTable *status_changed_handlers;
main_window_flash_cb (window);
}
+static void
+main_window_remove_auth (EmpathyMainWindow *window,
+ EmpathyEvent *event)
+{
+ EmpathyMainWindowPriv *priv = GET_PRIV (window);
+ GtkWidget *error_widget;
+
+ error_widget = g_hash_table_lookup (priv->auths, event);
+ if (error_widget != NULL) {
+ gtk_widget_destroy (error_widget);
+ g_hash_table_remove (priv->auths, event);
+ }
+}
+
+static void
+main_window_auth_add_clicked_cb (GtkButton *button,
+ EmpathyMainWindow *window)
+{
+ EmpathyEvent *event;
+
+ event = g_object_get_data (G_OBJECT (button), "event");
+
+ empathy_event_approve (event);
+
+ main_window_remove_auth (window, event);
+}
+
+static void
+main_window_auth_close_clicked_cb (GtkButton *button,
+ EmpathyMainWindow *window)
+{
+ EmpathyEvent *event;
+
+ event = g_object_get_data (G_OBJECT (button), "event");
+
+ empathy_event_decline (event);
+ main_window_remove_auth (window, event);
+}
+
+static void
+main_window_auth_display (EmpathyMainWindow *window,
+ EmpathyEvent *event)
+{
+ EmpathyMainWindowPriv *priv = GET_PRIV (window);
+ TpAccount *account = event->account;
+ GtkWidget *info_bar;
+ GtkWidget *content_area;
+ GtkWidget *image;
+ GtkWidget *label;
+ GtkWidget *add_button;
+ GtkWidget *close_button;
+ GtkWidget *action_area;
+ GtkWidget *action_table;
+ const gchar *icon_name;
+ gchar *str;
+
+ if (g_hash_table_lookup (priv->auths, event) != NULL) {
+ return;
+ }
+
+ info_bar = gtk_info_bar_new ();
+ gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_QUESTION);
+
+ gtk_widget_set_no_show_all (info_bar, TRUE);
+ gtk_box_pack_start (GTK_BOX (priv->auth_vbox), info_bar, FALSE, TRUE, 0);
+ gtk_widget_show (info_bar);
+
+ icon_name = tp_account_get_icon_name (account);
+ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ gtk_widget_show (image);
+
+ str = g_markup_printf_escaped ("<b>%s</b>\n%s",
+ tp_account_get_display_name (account),
+ _("Password required"));
+
+ label = gtk_label_new (str);
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_show (label);
+
+ g_free (str);
+
+ content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar));
+ gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0);
+
+ image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
+ add_button = gtk_button_new ();
+ gtk_button_set_image (GTK_BUTTON (add_button), image);
+ gtk_widget_set_tooltip_text (add_button, _("Provide Password"));
+ gtk_widget_show (add_button);
+
+ image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON);
+ close_button = gtk_button_new ();
+ gtk_button_set_image (GTK_BUTTON (close_button), image);
+ gtk_widget_set_tooltip_text (close_button, _("Disconnect"));
+ gtk_widget_show (close_button);
+
+ action_table = gtk_table_new (1, 2, FALSE);
+ gtk_table_set_col_spacings (GTK_TABLE (action_table), 6);
+ gtk_widget_show (action_table);
+
+ action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar));
+ gtk_box_pack_start (GTK_BOX (action_area), action_table, FALSE, FALSE, 0);
+
+ gtk_table_attach (GTK_TABLE (action_table), add_button, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_SHRINK),
+ (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+ gtk_table_attach (GTK_TABLE (action_table), close_button, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_SHRINK),
+ (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+
+ g_object_set_data_full (G_OBJECT (info_bar),
+ "event", event, NULL);
+ g_object_set_data_full (G_OBJECT (add_button),
+ "event", event, NULL);
+ g_object_set_data_full (G_OBJECT (close_button),
+ "event", event, NULL);
+
+ g_signal_connect (add_button, "clicked",
+ G_CALLBACK (main_window_auth_add_clicked_cb),
+ window);
+ g_signal_connect (close_button, "clicked",
+ G_CALLBACK (main_window_auth_close_clicked_cb),
+ window);
+
+ gtk_widget_show (priv->auth_vbox);
+
+ g_hash_table_insert (priv->auths, event, info_bar);
+}
+
static void
main_window_event_added_cb (EmpathyEventManager *manager,
EmpathyEvent *event,
{
if (event->contact) {
main_window_flash_start (window);
+ } else if (event->type == EMPATHY_EVENT_TYPE_AUTH) {
+ main_window_auth_display (window, event);
}
}
EmpathyMainWindowPriv *priv = GET_PRIV (window);
FlashForeachData data;
+ if (event->type == EMPATHY_EVENT_TYPE_AUTH) {
+ main_window_remove_auth (window, event);
+ return;
+ }
+
if (!event->contact) {
return;
}
G_CALLBACK (main_window_error_retry_clicked_cb),
window);
+ gtk_widget_set_tooltip_text (priv->errors_vbox, error_message);
gtk_widget_show (priv->errors_vbox);
g_hash_table_insert (priv->errors, g_object_ref (account), info_bar);
g_object_unref (priv->contact_manager);
g_object_unref (priv->sound_mgr);
g_hash_table_destroy (priv->errors);
+ g_hash_table_destroy (priv->auths);
/* disconnect all handlers of status-changed signal */
g_hash_table_iter_init (&iter, priv->status_changed_handlers);
{
GdkScreen *screen = gdk_screen_get_default ();
GError *error = NULL;
- gchar *argv[2] = { NULL, };
- gint i = 0;
gchar *path;
+ GAppInfo *app_info;
+ GdkAppLaunchContext *context = NULL;
g_return_if_fail (GDK_IS_SCREEN (screen));
path = g_build_filename (BIN_DIR, "empathy-debugger", NULL);
}
- argv[i++] = path;
+ app_info = g_app_info_create_from_commandline (path, NULL, 0, &error);
+ if (app_info == NULL) {
+ DEBUG ("Failed to create app info: %s", error->message);
+ g_error_free (error);
+ goto out;
+ }
- gdk_spawn_on_screen (screen, NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH,
- NULL, NULL, NULL, &error);
+ context = gdk_app_launch_context_new ();
+ gdk_app_launch_context_set_display (context, gdk_screen_get_display (screen));
- if (error) {
+ if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
+ &error)) {
g_warning ("Failed to open debug window: %s", error->message);
g_error_free (error);
+ goto out;
}
+out:
+ tp_clear_object (&app_info);
+ tp_clear_object (&context);
g_free (path);
}
gui = empathy_builder_get_file (filename,
"main_vbox", &priv->main_vbox,
"errors_vbox", &priv->errors_vbox,
+ "auth_vbox", &priv->auth_vbox,
"ui_manager", &priv->ui_manager,
"view_show_offline", &show_offline_widget,
"view_show_protocols", &priv->show_protocols,
g_object_unref,
NULL);
+ priv->auths = g_hash_table_new (NULL, NULL);
+
priv->status_changed_handlers = g_hash_table_new_full (g_direct_hash,
g_direct_equal,
NULL,
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkVBox" id="auth_vbox">
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
</child>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
if (self->priv->event != NULL)
return;
+ if (event->type == EMPATHY_EVENT_TYPE_AUTH)
+ return;
+
self->priv->event = event;
+
update_notification (self);
}
if (event != self->priv->event)
return;
+ if (event->type == EMPATHY_EVENT_TYPE_AUTH)
+ return;
+
self->priv->event = empathy_event_manager_get_top_event (
self->priv->event_mgr);
if (event != self->priv->event)
return;
+ if (event->type == EMPATHY_EVENT_TYPE_AUTH)
+ return;
+
if (empathy_notify_manager_notification_is_enabled (self->priv->notify_mgr))
update_notification (self);
}
DEBUG ("New event %p", event);
priv->event = event;
- if (event->must_ack) {
+ if (event->must_ack || event->type == EMPATHY_EVENT_TYPE_AUTH) {
priv->showing_event_icon = TRUE;
status_icon_update_icon (icon);
status_icon_update_tooltip (icon);
empathy-chatroom-manager-test
empathy-parser-test
empathy-live-search-test
+empathy-tls-test
test-report.xml
$(ERROR_CFLAGS) \
-I$(top_srcdir) \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
+ -DGCR_API_SUBJECT_TO_CHANGE \
$(EMPATHY_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
empathy-chatroom-test \
empathy-chatroom-manager-test \
empathy-parser-test \
- empathy-live-search-test
+ empathy-live-search-test \
+ empathy-tls-test
empathy_utils_test_SOURCES = empathy-utils-test.c \
test-helper.c test-helper.h
+empathy_tls_test_SOURCES = empathy-tls-test.c \
+ test-helper.c test-helper.h
+
empathy_irc_server_test_SOURCES = empathy-irc-server-test.c \
test-helper.c test-helper.h \
test-irc-helper.h test-irc-helper.c
--- /dev/null
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <libempathy/empathy-tls-certificate.h>
+#include <libempathy/empathy-tls-verifier.h>
+#include "test-helper.h"
+
+#include <gcr/gcr.h>
+
+#include <gnutls/gnutls.h>
+
+#include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/enums.h>
+#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/svc-tls.h>
+#include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/telepathy-glib.h>
+
+#define MOCK_TLS_CERTIFICATE_PATH "/mock/certificate"
+
+/* Forward decl */
+GType mock_tls_certificate_get_type (void);
+
+#define MOCK_TLS_CERTIFICATE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), mock_tls_certificate_get_type (), \
+ MockTLSCertificate))
+
+typedef struct _MockTLSCertificate {
+ GObject parent;
+ guint state;
+ GPtrArray *rejections;
+ gchar *cert_type;
+ GPtrArray *cert_data;
+} MockTLSCertificate;
+
+typedef struct _MockTLSCertificateClass {
+ GObjectClass parent;
+ TpDBusPropertiesMixinClass dbus_props_class;
+} MockTLSCertificateClass;
+
+enum {
+ PROP_0,
+ PROP_STATE,
+ PROP_REJECTIONS,
+ PROP_CERTIFICATE_TYPE,
+ PROP_CERTIFICATE_CHAIN_DATA
+};
+
+static void mock_tls_certificate_iface_init (gpointer, gpointer);
+
+G_DEFINE_TYPE_WITH_CODE(MockTLSCertificate, mock_tls_certificate, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_AUTHENTICATION_TLS_CERTIFICATE,
+ mock_tls_certificate_iface_init)
+ G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
+ tp_dbus_properties_mixin_iface_init)
+)
+
+static void
+mock_tls_certificate_init (MockTLSCertificate *self)
+{
+ self->state = TP_TLS_CERTIFICATE_STATE_PENDING;
+ self->cert_type = g_strdup ("x509");
+ self->cert_data = g_ptr_array_new_with_free_func((GDestroyNotify) g_array_unref);
+ self->rejections = g_ptr_array_new ();
+}
+
+static void
+mock_tls_certificate_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ MockTLSCertificate *self = MOCK_TLS_CERTIFICATE (object);
+
+ switch (property_id)
+ {
+ case PROP_STATE:
+ g_value_set_uint (value, self->state);
+ break;
+ case PROP_REJECTIONS:
+ g_value_set_boxed (value, self->rejections);
+ break;
+ case PROP_CERTIFICATE_TYPE:
+ g_value_set_string (value, self->cert_type);
+ break;
+ case PROP_CERTIFICATE_CHAIN_DATA:
+ g_value_set_boxed (value, self->cert_data);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+mock_tls_certificate_finalize (GObject *object)
+{
+ MockTLSCertificate *self = MOCK_TLS_CERTIFICATE (object);
+
+ tp_clear_boxed (TP_ARRAY_TYPE_TLS_CERTIFICATE_REJECTION_LIST,
+ &self->rejections);
+ g_free (self->cert_type);
+ self->cert_type = NULL;
+ g_ptr_array_free (self->cert_data, TRUE);
+ self->cert_data = NULL;
+
+ G_OBJECT_CLASS (mock_tls_certificate_parent_class)->finalize (object);
+}
+
+static void
+mock_tls_certificate_class_init (MockTLSCertificateClass *klass)
+{
+ GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ GParamSpec *pspec;
+
+ static TpDBusPropertiesMixinPropImpl object_props[] = {
+ { "State", "state", NULL },
+ { "Rejections", "rejections", NULL },
+ { "CertificateType", "certificate-type", NULL },
+ { "CertificateChainData", "certificate-chain-data", NULL },
+ { NULL }
+ };
+
+ static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
+ { TP_IFACE_AUTHENTICATION_TLS_CERTIFICATE,
+ tp_dbus_properties_mixin_getter_gobject_properties,
+ NULL,
+ object_props,
+ },
+ { NULL }
+ };
+
+ oclass->get_property = mock_tls_certificate_get_property;
+ oclass->finalize = mock_tls_certificate_finalize;
+
+ pspec = g_param_spec_uint ("state",
+ "State of this certificate",
+ "The state of this TLS certificate.",
+ 0, NUM_TP_TLS_CERTIFICATE_STATES - 1,
+ TP_TLS_CERTIFICATE_STATE_PENDING,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (oclass, PROP_STATE, pspec);
+
+ pspec = g_param_spec_boxed ("rejections",
+ "The reject reasons",
+ "The reasons why this TLS certificate has been rejected",
+ TP_ARRAY_TYPE_TLS_CERTIFICATE_REJECTION_LIST,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (oclass, PROP_REJECTIONS, pspec);
+
+ pspec = g_param_spec_string ("certificate-type",
+ "The certificate type",
+ "The type of this certificate.",
+ NULL,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (oclass, PROP_CERTIFICATE_TYPE, pspec);
+
+ pspec = g_param_spec_boxed ("certificate-chain-data",
+ "The certificate chain data",
+ "The raw PEM-encoded trust chain of this certificate.",
+ TP_ARRAY_TYPE_UCHAR_ARRAY_LIST,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (oclass, PROP_CERTIFICATE_CHAIN_DATA, pspec);
+
+ klass->dbus_props_class.interfaces = prop_interfaces;
+ tp_dbus_properties_mixin_class_init (oclass,
+ G_STRUCT_OFFSET (MockTLSCertificateClass, dbus_props_class));
+}
+
+static void
+mock_tls_certificate_accept (TpSvcAuthenticationTLSCertificate *base,
+ DBusGMethodInvocation *context)
+{
+ MockTLSCertificate *self = MOCK_TLS_CERTIFICATE (base);
+ self->state = TP_TLS_CERTIFICATE_STATE_ACCEPTED;
+ tp_svc_authentication_tls_certificate_emit_accepted (self);
+ tp_svc_authentication_tls_certificate_return_from_accept (context);
+}
+
+static void
+mock_tls_certificate_reject (TpSvcAuthenticationTLSCertificate *base,
+ const GPtrArray *in_Rejections,
+ DBusGMethodInvocation *context)
+{
+ MockTLSCertificate *self = MOCK_TLS_CERTIFICATE (base);
+ self->state = TP_TLS_CERTIFICATE_STATE_REJECTED;
+ tp_svc_authentication_tls_certificate_emit_rejected (self, in_Rejections);
+ tp_svc_authentication_tls_certificate_return_from_reject (context);
+}
+
+static void
+mock_tls_certificate_iface_init (gpointer g_iface,
+ gpointer iface_data)
+{
+ TpSvcAuthenticationTLSCertificateClass *klass =
+ (TpSvcAuthenticationTLSCertificateClass*)g_iface;
+
+ tp_svc_authentication_tls_certificate_implement_accept (klass,
+ mock_tls_certificate_accept);
+ tp_svc_authentication_tls_certificate_implement_reject (klass,
+ mock_tls_certificate_reject);
+}
+
+#if 0
+static void
+mock_tls_certificate_assert_rejected (MockTLSCertificate *self,
+ EmpTLSCertificateRejectReason reason)
+{
+ GValueArray *rejection;
+ EmpTLSCertificateRejectReason rejection_reason;
+ gchar *rejection_error;
+ GHashTable *rejection_details;
+ guint i;
+
+ g_assert (self->state == TP_TLS_CERTIFICATE_STATE_REJECTED);
+ g_assert (self->rejections);
+ g_assert (self->rejections->len > 0);
+
+ for (i = 0; i < self->rejections->len; ++i)
+ {
+ rejection = g_ptr_array_index (self->rejections, i);
+ tp_value_array_unpack (rejection, 3,
+ G_TYPE_UINT, &rejection_reason,
+ G_TYPE_STRING, &rejection_error,
+ TP_HASH_TYPE_STRING_VARIANT_MAP, &rejection_details,
+ NULL);
+ g_free (rejection_error);
+ g_hash_table_destroy (rejection_details);
+
+ if (rejection_reason == reason)
+ return;
+ }
+
+ g_assert ("Certificate was not rejected for right reason" && 0);
+}
+#endif
+
+static MockTLSCertificate*
+mock_tls_certificate_new_and_register (TpDBusDaemon *dbus,
+ const gchar *path,
+ ...)
+{
+ MockTLSCertificate *cert;
+ GError *error = NULL;
+ gchar *filename, *contents;
+ GArray *der;
+ gsize length;
+ va_list va;
+
+ cert = g_object_new (mock_tls_certificate_get_type (), NULL);
+
+ va_start (va, path);
+ while (path != NULL) {
+ filename = g_build_filename (g_getenv ("EMPATHY_SRCDIR"),
+ "tests", "certificates", path, NULL);
+ g_file_get_contents (filename, &contents, &length, &error);
+ g_assert_no_error (error);
+
+ der = g_array_sized_new (TRUE, TRUE, sizeof (guchar), length);
+ g_array_append_vals (der, contents, length);
+ g_ptr_array_add (cert->cert_data, der);
+
+ g_free (contents);
+ g_free (filename);
+
+ path = va_arg (va, gchar*);
+ }
+ va_end (va);
+
+ tp_dbus_daemon_register_object (dbus, MOCK_TLS_CERTIFICATE_PATH, cert);
+ return cert;
+}
+
+/* ----------------------------------------------------------------------------
+ * TESTS
+ */
+
+typedef struct {
+ GMainLoop *loop;
+ TpDBusDaemon *dbus;
+ const gchar *dbus_name;
+ MockTLSCertificate *mock;
+ EmpathyTLSCertificate *cert;
+ GAsyncResult *result;
+} Test;
+
+static void
+setup (Test *test, gconstpointer data)
+{
+ GError *error = NULL;
+ test->loop = g_main_loop_new (NULL, FALSE);
+
+ test->dbus = tp_dbus_daemon_dup (&error);
+ g_assert_no_error (error);
+
+ test->dbus_name = tp_dbus_daemon_get_unique_name (test->dbus);
+
+ test->result = NULL;
+ test->cert = NULL;
+
+ /* No PKCS#11 modules by default, tests add them */
+ gcr_pkcs11_set_modules (NULL);
+}
+
+static void
+teardown (Test *test, gconstpointer data)
+{
+ test->dbus_name = NULL;
+
+ if (test->mock)
+ {
+ tp_dbus_daemon_unregister_object (test->dbus, test->mock);
+ g_object_unref (test->mock);
+ test->mock = NULL;
+ }
+
+ if (test->result)
+ g_object_unref (test->result);
+ test->result = NULL;
+
+ if (test->cert)
+ g_object_unref (test->cert);
+ test->cert = NULL;
+
+ g_main_loop_unref (test->loop);
+ test->loop = NULL;
+
+ g_object_unref (test->dbus);
+ test->dbus = NULL;
+}
+
+static void
+add_pkcs11_module_for_testing (Test *test,
+ const gchar *filename,
+ const gchar *subdir)
+{
+ GError *error = NULL;
+ gchar *args, *path, *directory;
+ gchar *standalone, *error_output;
+ gint exit_status;
+
+ directory = g_build_filename (g_getenv ("EMPATHY_SRCDIR"),
+ "tests", "certificates", subdir, NULL);
+
+ /*
+ * Lookup the directory for standalone pkcs11 modules installed by
+ * gnome-keyring. We use these for testing our implementation.
+ */
+ g_spawn_command_line_sync ("pkg-config --variable=pkcs11standalonedir gcr-3",
+ &standalone, &error_output, &exit_status, &error);
+ g_assert_no_error (error);
+ if (exit_status != 0)
+ {
+ g_warning ("couldn't determine standalone pkcs11 module directory: %d: %s",
+ exit_status, error_output);
+ g_assert_not_reached ();
+ }
+
+ g_strstrip (standalone);
+ args = g_strdup_printf ("directory=\"%s\"", directory);
+ path = g_build_filename (standalone, filename, NULL);
+ gcr_pkcs11_add_module_from_file (path, args, &error);
+ g_assert_no_error (error);
+
+ g_free (directory);
+ g_free (standalone);
+ g_free (error_output);
+ g_free (args);
+ g_free (path);
+}
+
+static void
+fetch_callback_result (GObject *object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ Test *test = user_data;
+ g_assert (!test->result);
+ test->result = g_object_ref (res);
+ g_main_loop_quit (test->loop);
+}
+
+static void
+ensure_certificate_proxy (Test *test)
+{
+ GError *error = NULL;
+
+ if (test->cert)
+ return;
+
+ /* Create and prepare a certificate */
+ test->cert = empathy_tls_certificate_new (test->dbus, test->dbus_name,
+ MOCK_TLS_CERTIFICATE_PATH, &error);
+ g_assert_no_error (error);
+ empathy_tls_certificate_prepare_async (test->cert, fetch_callback_result, test);
+ g_main_loop_run (test->loop);
+ empathy_tls_certificate_prepare_finish (test->cert, test->result, &error);
+ g_assert_no_error (error);
+
+ /* Clear for any future async stuff */
+ g_object_unref (test->result);
+ test->result = NULL;
+}
+
+/* A simple test to make sure the test infrastructure is working */
+static void
+test_certificate_mock_basics (Test *test,
+ gconstpointer data G_GNUC_UNUSED)
+{
+ GError *error = NULL;
+
+ test->mock = mock_tls_certificate_new_and_register (test->dbus,
+ "dhansak-collabora.cer", NULL);
+
+ ensure_certificate_proxy (test);
+
+ empathy_tls_certificate_accept_async (test->cert, fetch_callback_result, test);
+ g_main_loop_run (test->loop);
+ empathy_tls_certificate_accept_finish (test->cert, test->result, &error);
+ g_assert_no_error (error);
+
+ g_assert (test->mock->state == TP_TLS_CERTIFICATE_STATE_ACCEPTED);
+}
+
+static void
+test_certificate_verify_success_with_pkcs11_lookup (Test *test,
+ gconstpointer data G_GNUC_UNUSED)
+{
+ EmpTLSCertificateRejectReason reason = 0;
+ GError *error = NULL;
+ EmpathyTLSVerifier *verifier;
+
+ /*
+ * In this test the mock TLS connection only has one certificate
+ * not a full certificat echain. The root anchor certificate is
+ * retrieved from PKCS#11 storage.
+ */
+
+ test->mock = mock_tls_certificate_new_and_register (test->dbus,
+ "dhansak-collabora.cer", NULL);
+
+ /* We add teh collabora directory with the collabora root */
+ add_pkcs11_module_for_testing (test, "gkm-roots-store-standalone.so",
+ "collabora-ca");
+
+ ensure_certificate_proxy (test);
+
+ verifier = empathy_tls_verifier_new (test->cert, "www.collabora.co.uk");
+ empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
+ g_main_loop_run (test->loop);
+ if (!empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+ NULL, &error))
+ g_assert_not_reached ();
+
+ /* Yay the verification was a success! */
+
+ g_clear_error (&error);
+ g_object_unref (verifier);
+}
+
+static void
+test_certificate_verify_success_with_full_chain (Test *test,
+ gconstpointer data G_GNUC_UNUSED)
+{
+ EmpTLSCertificateRejectReason reason = 0;
+ GError *error = NULL;
+ EmpathyTLSVerifier *verifier;
+
+ /*
+ * In this test the mock TLS connection has a full certificate
+ * chain. We look for an anchor certificate in the chain.
+ */
+
+ test->mock = mock_tls_certificate_new_and_register (test->dbus,
+ "dhansak-collabora.cer", "collabora-ca/collabora-ca.cer", NULL);
+
+ /* We add teh collabora directory with the collabora root */
+ add_pkcs11_module_for_testing (test, "gkm-roots-store-standalone.so",
+ "collabora-ca");
+
+ ensure_certificate_proxy (test);
+
+ verifier = empathy_tls_verifier_new (test->cert, "www.collabora.co.uk");
+ empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
+ g_main_loop_run (test->loop);
+ if (!empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+ NULL, &error))
+ g_assert_not_reached ();
+
+ /* Yay the verification was a success! */
+
+ g_clear_error (&error);
+ g_object_unref (verifier);
+}
+
+static void
+test_certificate_verify_root_not_found (Test *test,
+ gconstpointer data G_GNUC_UNUSED)
+{
+ EmpTLSCertificateRejectReason reason = 0;
+ GError *error = NULL;
+ EmpathyTLSVerifier *verifier;
+
+ test->mock = mock_tls_certificate_new_and_register (test->dbus,
+ "dhansak-collabora.cer", NULL);
+
+ /* Note that we're not adding any place to find root certs */
+
+ ensure_certificate_proxy (test);
+
+ verifier = empathy_tls_verifier_new (test->cert, "www.collabora.co.uk");
+ empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
+ g_main_loop_run (test->loop);
+
+ if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+ NULL, &error))
+ g_assert_not_reached ();
+
+ /* And it should say we're self-signed (oddly enough) */
+ g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED);
+
+ g_clear_error (&error);
+ g_object_unref (verifier);
+}
+
+static void
+test_certificate_verify_root_not_anchored (Test *test,
+ gconstpointer data G_GNUC_UNUSED)
+{
+ EmpTLSCertificateRejectReason reason = 0;
+ GError *error = NULL;
+ EmpathyTLSVerifier *verifier;
+
+ test->mock = mock_tls_certificate_new_and_register (test->dbus,
+ "dhansak-collabora.cer", "collabora-ca/collabora-ca.cer", NULL);
+
+ /* Note that we're not adding any place to find root certs */
+
+ ensure_certificate_proxy (test);
+
+ verifier = empathy_tls_verifier_new (test->cert, "www.collabora.co.uk");
+ empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
+ g_main_loop_run (test->loop);
+
+ if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+ NULL, &error))
+ g_assert_not_reached ();
+
+ /* And it should say we're self-signed (oddly enough) */
+ g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED);
+
+ g_clear_error (&error);
+ g_object_unref (verifier);
+}
+
+static void
+test_certificate_verify_hostname_invalid (Test *test,
+ gconstpointer data G_GNUC_UNUSED)
+{
+ EmpTLSCertificateRejectReason reason = 0;
+ GError *error = NULL;
+ EmpathyTLSVerifier *verifier;
+
+ test->mock = mock_tls_certificate_new_and_register (test->dbus,
+ "dhansak-collabora.cer", "collabora-ca/collabora-ca.cer", NULL);
+
+ /* We add teh collabora directory with the collabora root */
+ add_pkcs11_module_for_testing (test, "gkm-roots-store-standalone.so",
+ "collabora-ca");
+
+ ensure_certificate_proxy (test);
+
+ verifier = empathy_tls_verifier_new (test->cert, "invalid.host.name");
+ empathy_tls_verifier_verify_async (verifier, fetch_callback_result, test);
+ g_main_loop_run (test->loop);
+
+ if (empathy_tls_verifier_verify_finish (verifier, test->result, &reason,
+ NULL, &error))
+ g_assert_not_reached ();
+
+ /* And it should say we're self-signed (oddly enough) */
+ g_assert_cmpuint (reason, ==, EMP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH);
+
+ g_clear_error (&error);
+ g_object_unref (verifier);
+}
+
+int
+main (int argc,
+ char **argv)
+{
+ int result;
+
+ test_init (argc, argv);
+ gnutls_global_init ();
+
+ g_test_add ("/tls/certificate_basics", Test, NULL,
+ setup, test_certificate_mock_basics, teardown);
+ g_test_add ("/tls/certificate_verify_success_with_pkcs11_lookup", Test, NULL,
+ setup, test_certificate_verify_success_with_pkcs11_lookup, teardown);
+ g_test_add ("/tls/certificate_verify_success_with_full_chain", Test, NULL,
+ setup, test_certificate_verify_success_with_full_chain, teardown);
+ g_test_add ("/tls/certificate_verify_root_not_found", Test, NULL,
+ setup, test_certificate_verify_root_not_found, teardown);
+ g_test_add ("/tls/certificate_verify_root_not_anchored", Test, NULL,
+ setup, test_certificate_verify_root_not_anchored, teardown);
+ g_test_add ("/tls/certificate_verify_hostname_invalid", Test, NULL,
+ setup, test_certificate_verify_hostname_invalid, teardown);
+
+ result = g_test_run ();
+ test_deinit ();
+ return result;
+}
projects / empathy.git / commitdiff