diff options
46 files changed, 4132 insertions, 5340 deletions
diff --git a/configure.ac b/configure.ac index 83c98b381..9aab250b6 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ dnl If not 1, append datestamp to the version number m4_define(empathy_released, 0) m4_define([empathy_major_version], [3]) -m4_define([empathy_minor_version], [4]) -m4_define([empathy_micro_version], [1]) +m4_define([empathy_minor_version], [5]) +m4_define([empathy_micro_version], [0]) m4_define([empathy_nano_version], [0]) dnl Display the nano_version only if it's not '0' @@ -37,9 +37,9 @@ AC_COPYRIGHT([ FOLKS_REQUIRED=0.6.6 GNUTLS_REQUIRED=2.8.5 -GLIB_REQUIRED=2.30.0 +GLIB_REQUIRED=2.32.0 AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations]) -AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs]) +AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_32, [Prevent post 2.32 APIs]) GTK_REQUIRED=3.3.6 AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations]) @@ -58,7 +58,7 @@ GCR_REQUIRED=2.91.4 LIBCANBERRA_GTK_REQUIRED=0.25 LIBNOTIFY_REQUIRED=0.7.0 TELEPATHY_FARSTREAM_REQUIRED=0.2.1 -TELEPATHY_GLIB_REQUIRED=0.17.5 +TELEPATHY_GLIB_REQUIRED=0.17.6 TELEPATHY_LOGGER=0.2.13 WEBKIT_REQUIRED=1.3.13 GOA_REQUIRED=3.3.0 @@ -266,58 +266,6 @@ AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name]) # ----------------------------------------------------------- -# Connectivity integration -# ----------------------------------------------------------- -AC_ARG_WITH(connectivity, - AS_HELP_STRING([--with-connectivity=@<:@nm/connman/auto/no@:>@], - [build with connectivity support]), , - with_connectivity=auto) - -if test "x$with_connectivity" = "xno"; then - have_nm=no - have_connman=no - -elif test "x$with_connectivity" = "xconnman"; then - have_nm=no - - PKG_CHECK_MODULES(CONNMAN, - [ - dbus-glib-1 - ], have_connman="yes", have_connman="no") - - if test "x$have_connman" = "xyes"; then - AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies]) - fi - -else - have_connman=no - - PKG_CHECK_MODULES(NETWORK_MANAGER, - [ - libnm-glib >= $NETWORK_MANAGER_REQUIRED - ], have_nm="yes", have_nm="no") - - if test "x$have_nm" = "xyes"; then - AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib]) - fi -fi - -if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then - AC_MSG_ERROR([Couldn't find connman dependencies: - -$CONNMAN_PKG_ERRORS]) -fi - -if test "x$with_connectivity" = "xnm" -a "x$have_nm" != "xyes"; then - AC_MSG_ERROR([Couldn't find Network Manager dependencies: - -$NETWORK_MANAGER_PKG_ERRORS]) -fi - -AM_CONDITIONAL(HAVE_NM, test "x$have_nm" = "xyes") -AM_CONDITIONAL(HAVE_CONNMAN, test "x$have_connman" = "xyes") - -# ----------------------------------------------------------- # gudev # ----------------------------------------------------------- AC_ARG_ENABLE(gudev, @@ -479,38 +427,6 @@ AC_SUBST(GEOCODE_CFLAGS) AC_SUBST(GEOCODE_LIBS) # ----------------------------------------------------------- -# meego widgets support -# ----------------------------------------------------------- -AC_ARG_ENABLE(meego, - AS_HELP_STRING([--enable-meego=@<:@no/yes@:>@], - [Enable meego widgets]), , - enable_meego=no) - -if test "x$enable_meego" != "xno"; then - PKG_CHECK_MODULES(MEEGO, - [ - mx-gtk-1.0 - gio-unix-2.0 - ], have_meego="yes", have_meego="no") - - if test "x$have_meego" = "xyes"; then - AC_DEFINE(HAVE_MEEGO, 1, [Define if you have meego]) - fi -else - have_meego="no" -fi - -if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then - AC_MSG_ERROR([Could not find meego dependencies: - -$MEEGO_PKG_ERRORS]) -fi - -AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes") -AC_SUBST(MEEGO_CFLAGS) -AC_SUBST(MEEGO_LIBS) - -# ----------------------------------------------------------- # nautilus-sendto # ----------------------------------------------------------- AC_ARG_ENABLE(nautilus-sendto, @@ -640,14 +556,9 @@ Configure summary: Display maps (libchamplain).: ${have_libchamplain} Location awareness (Geoclue): ${have_geoclue} Geocode support (Geocode)...: ${have_geocode} - Meego widgets...............: ${have_meego} Cheese webcam support ......: ${have_cheese} Camera monitoring...........: ${have_gudev} - Connectivity: - NetworkManager integration..: ${have_nm} - ConnMan integration.........: ${have_connman} - Extras: Nautilus-sendto plugin......: ${have_nst} GOA MC plugin...............: ${have_goa} diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c index 05be1b874..ed2f44529 100644 --- a/libempathy-gtk/empathy-account-widget-sip.c +++ b/libempathy-gtk/empathy-account-widget-sip.c @@ -174,6 +174,8 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self, "checkbutton_discover-binding", "discover-binding", "spinbutton_keepalive-interval", "keepalive-interval", "checkbutton_ignore-tls-errors", "ignore-tls-errors", + "entry_local-ip-address", "local-ip-address", + "spinbutton_local-port", "local-port", NULL); account_widget_sip_discover_stun_toggled_cb ( diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui index e86e58850..4104572d1 100644 --- a/libempathy-gtk/empathy-account-widget-sip.ui +++ b/libempathy-gtk/empathy-account-widget-sip.ui @@ -16,6 +16,11 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> + <object class="GtkAdjustment" id="adjustment4"> + <property name="upper">65535</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> <object class="GtkVBox" id="vbox_sip_settings"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -205,6 +210,16 @@ </packing> </child> <child> + <object class="GtkEntry" id="entry_local-ip-address"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">14</property> + </packing> + </child> + <child> <object class="GtkLabel" id="label_nat_traversal"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -515,6 +530,50 @@ <property name="top_attach">5</property> </packing> </child> + <child> + <object class="GtkAlignment" id="alignment16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkLabel" id="label_local-ip-address"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Local IP Address:</property> + <property name="mnemonic_widget">entry_local-ip-address</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">14</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_local-port"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Port:</property> + <property name="mnemonic_widget">spinbutton_local-port</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">14</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spinbutton_local-port"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment4</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">14</property> + </packing> + </child> </object> </child> </object> diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 7530914fc..7494fa0a0 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -1782,8 +1782,6 @@ out: { #cm, #proto, "empathy-account-widget-"#proto".ui", \ account_widget_build_##proto } -#ifndef HAVE_MEEGO -/* Meego doesn't support registration */ static void add_register_buttons (EmpathyAccountWidget *self, TpAccount *account) @@ -1823,7 +1821,6 @@ add_register_buttons (EmpathyAccountWidget *self, gtk_widget_show (self->priv->radiobutton_reuse); gtk_widget_show (radiobutton_register); } -#endif /* HAVE_MEEGO */ static void remember_password_toggled_cb (GtkToggleButton *button, @@ -2017,9 +2014,7 @@ do_constructed (GObject *obj) else account_widget_set_control_buttons_sensitivity (self, FALSE); -#ifndef HAVE_MEEGO add_register_buttons (self, account); -#endif /* HAVE_MEEGO */ /* hook up to widget destruction to unref ourselves */ g_signal_connect (self->ui_details->widget, "destroy", diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 14404bfe3..4067a3e4f 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -39,7 +39,6 @@ #include <telepathy-glib/account-manager.h> #include <telepathy-glib/util.h> #include <telepathy-logger/telepathy-logger.h> -#include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-keyring.h> #include <libempathy/empathy-utils.h> @@ -2012,7 +2011,7 @@ chat_input_key_press_event_cb (GtkWidget *widget, } is_start_of_buffer = gtk_text_iter_is_start (&start); - list = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (priv->tp_chat)); + list = empathy_tp_chat_get_members (priv->tp_chat); g_completion_add_items (priv->completion, list); nick = gtk_text_buffer_get_text (buffer, &start, ¤t, FALSE); diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 5691891a2..ba735f675 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -37,7 +37,6 @@ #include <telepathy-glib/interfaces.h> #include <libempathy/empathy-tp-contact-factory.h> -#include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-location.h> #include <libempathy/empathy-time.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 22d314882..7f65735b8 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -38,7 +38,6 @@ #include <libempathy/empathy-individual-manager.h> #include <libempathy/empathy-chatroom-manager.h> #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-pkg-kit.h> #include "empathy-account-selector-dialog.h" @@ -1560,8 +1559,7 @@ room_sub_menu_activate_cb (GtkWidget *item, g_return_if_fail (EMPATHY_IS_CONTACT (contact)); /* send invitation */ - empathy_contact_list_add (EMPATHY_CONTACT_LIST (chat), - contact, _("Inviting you to this room")); + empathy_tp_chat_add (chat, contact, _("Inviting you to this room")); out: g_object_unref (contact); diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c index 73d31466a..1bd4d8ecf 100644 --- a/libempathy-gtk/empathy-plist.c +++ b/libempathy-gtk/empathy-plist.c @@ -169,34 +169,6 @@ empathy_plist_parse_dict (xmlNode *a_node) return tp_g_value_slice_new_take_boxed (G_TYPE_HASH_TABLE, dict); } -static GValue * -empathy_plist_parse_array (xmlNode *a_node) -{ - xmlNode *cur_node = a_node->children; - GValueArray *array; - - array = g_value_array_new (4); - - while (cur_node) { - GValue *cur_value; - - cur_value = empathy_plist_parse_node (cur_node); - if (cur_value) { - g_value_array_append (array, cur_value); - tp_g_value_slice_free (cur_value); - } - - /* When an array contains an element enclosed in "unknown" tags (ie - * non-type ones), we silently skip them since early - * SysInfoExtended files used to have <key> values enclosed within - * <array> tags. - */ - cur_node = cur_node->next; - } - - return tp_g_value_slice_new_take_boxed (G_TYPE_VALUE_ARRAY, array); -} - typedef GValue *(*ParseCallback) (xmlNode *); struct Parser { @@ -211,7 +183,6 @@ static const struct Parser parsers[] = { {"integer", empathy_plist_parse_integer {"false", empathy_plist_parse_boolean}, {"data", empathy_plist_parse_data}, {"dict", empathy_plist_parse_dict}, - {"array", empathy_plist_parse_array}, {NULL, NULL} }; static ParseCallback diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index 948a0a7bd..33637d483 100644 --- a/libempathy-gtk/empathy-presence-chooser.c +++ b/libempathy-gtk/empathy-presence-chooser.c @@ -36,7 +36,6 @@ #include <telepathy-glib/account-manager.h> #include <telepathy-glib/util.h> -#include <libempathy/empathy-connectivity.h> #include <libempathy/empathy-presence-manager.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-status-presets.h> @@ -97,7 +96,7 @@ typedef enum { typedef struct { EmpathyPresenceManager *presence_mgr; - EmpathyConnectivity *connectivity; + GNetworkMonitor *connectivity; gboolean editing_status; int block_set_editing; @@ -378,8 +377,17 @@ presence_chooser_set_status_editing (EmpathyPresenceChooser *self, entry = gtk_bin_get_child (GTK_BIN (self)); if (editing) { + gchar *tooltip_text; + gchar *status; + priv->editing_status = TRUE; + get_state_and_status (self, &status); + /* Translators: %s is a status message like 'At the pub' for example */ + tooltip_text = g_strdup_printf (_("<b>Current message: %s</b>\n" + "<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"), + status); + gtk_widget_set_tooltip_markup (entry, tooltip_text); gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_OK); @@ -389,6 +397,8 @@ presence_chooser_set_status_editing (EmpathyPresenceChooser *self, gtk_entry_set_icon_sensitive (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, FALSE); + g_free (status); + g_free (tooltip_text); } else { GtkWidget *window; @@ -764,7 +774,7 @@ update_sensitivity_am_prepared_cb (GObject *source_object, g_list_free (accounts); - if (!empathy_connectivity_is_online (priv->connectivity)) + if (!g_network_monitor_get_network_available (priv->connectivity)) sensitive = FALSE; gtk_widget_set_sensitive (GTK_WIDGET (chooser), sensitive); @@ -802,7 +812,7 @@ presence_chooser_account_manager_account_changed_cb ( } static void -presence_chooser_connectivity_state_change (EmpathyConnectivity *connectivity, +presence_chooser_network_change (GNetworkMonitor *connectivity, gboolean new_online, EmpathyPresenceChooser *chooser) { @@ -945,10 +955,12 @@ presence_chooser_constructed (GObject *object) status_tooltip = gtk_entry_get_text (GTK_ENTRY (entry)); gtk_widget_set_tooltip_text (GTK_WIDGET (chooser), status_tooltip); - priv->connectivity = empathy_connectivity_dup_singleton (); + priv->connectivity = g_network_monitor_get_default (); + g_object_ref (priv->connectivity); + tp_g_signal_connect_object (priv->connectivity, - "state-change", - G_CALLBACK (presence_chooser_connectivity_state_change), + "network-changed", + G_CALLBACK (presence_chooser_network_change), chooser, 0); presence_chooser_update_sensitivity (chooser); diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 3d7e5fca7..abe2eebfd 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -34,10 +34,8 @@ libempathy_headers = \ empathy-chatroom.h \ empathy-client-factory.h \ empathy-connection-managers.h \ - empathy-connectivity.h \ empathy-connection-aggregator.h \ empathy-contact-groups.h \ - empathy-contact-list.h \ empathy-contact.h \ empathy-debug.h \ empathy-ft-factory.h \ @@ -76,10 +74,8 @@ libempathy_handwritten_source = \ empathy-chatroom.c \ empathy-client-factory.c \ empathy-connection-managers.c \ - empathy-connectivity.c \ empathy-connection-aggregator.c \ empathy-contact-groups.c \ - empathy-contact-list.c \ empathy-contact.c \ empathy-debug.c \ empathy-ft-factory.c \ diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c deleted file mode 100644 index f84505f9b..000000000 --- a/libempathy/empathy-connectivity.c +++ /dev/null @@ -1,435 +0,0 @@ -/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ -/* - * Copyright (C) 2009 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Jonny Lamb <jonny.lamb@collabora.co.uk> - */ - -#include "config.h" -#include "empathy-connectivity.h" - -#ifdef HAVE_NM -#include <nm-client.h> -#endif - -#ifdef HAVE_CONNMAN -#include <dbus/dbus-glib.h> -#endif - -#include <telepathy-glib/util.h> - -#include "empathy-utils.h" - -#define DEBUG_FLAG EMPATHY_DEBUG_CONNECTIVITY -#include "empathy-debug.h" - -#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyConnectivity) - -typedef struct { -#ifdef HAVE_NM - NMClient *nm_client; - gulong state_change_signal_id; -#endif - -#ifdef HAVE_CONNMAN - DBusGProxy *proxy; -#endif - - gboolean connected; - gboolean use_conn; -} EmpathyConnectivityPriv; - -enum { - STATE_CHANGE, - LAST_SIGNAL -}; - -enum { - PROP_0, - PROP_USE_CONN, -}; - -static guint signals[LAST_SIGNAL]; -static EmpathyConnectivity *connectivity_singleton = NULL; - -G_DEFINE_TYPE (EmpathyConnectivity, empathy_connectivity, G_TYPE_OBJECT); - -static void -connectivity_change_state (EmpathyConnectivity *connectivity, - gboolean new_state) -{ - EmpathyConnectivityPriv *priv; - - priv = GET_PRIV (connectivity); - - if (priv->connected == new_state) - return; - - priv->connected = new_state; - - g_signal_emit (connectivity, signals[STATE_CHANGE], 0, - priv->connected); -} - -#ifdef HAVE_NM - -#if !defined(NM_CHECK_VERSION) -#define NM_CHECK_VERSION(x,y,z) 0 -#endif - -static void -connectivity_nm_state_change_cb (NMClient *client, - const GParamSpec *pspec, - EmpathyConnectivity *connectivity) -{ - EmpathyConnectivityPriv *priv; - gboolean new_nm_connected; - NMState state; - - priv = GET_PRIV (connectivity); - - if (!priv->use_conn) - return; - - state = nm_client_get_state (priv->nm_client); - new_nm_connected = !(state == NM_STATE_CONNECTING -#if NM_CHECK_VERSION(0,8,992) - || state == NM_STATE_DISCONNECTING -#endif - || state == NM_STATE_ASLEEP - || state == NM_STATE_DISCONNECTED); - - DEBUG ("New NetworkManager network state %d (connected: %s)", state, - new_nm_connected ? "true" : "false"); - - connectivity_change_state (connectivity, new_nm_connected); -} -#endif - -#ifdef HAVE_CONNMAN -static void -connectivity_connman_state_changed_cb (DBusGProxy *proxy, - const gchar *new_state, - EmpathyConnectivity *connectivity) -{ - EmpathyConnectivityPriv *priv; - gboolean new_connected; - - priv = GET_PRIV (connectivity); - - if (!priv->use_conn) - return; - - new_connected = !tp_strdiff (new_state, "online"); - - DEBUG ("New ConnMan network state %s", new_state); - - connectivity_change_state (connectivity, new_connected); -} - -static void -connectivity_connman_check_state_cb (DBusGProxy *proxy, - DBusGProxyCall *call_id, - gpointer user_data) -{ - EmpathyConnectivity *connectivity = (EmpathyConnectivity *) user_data; - GError *error = NULL; - gchar *state; - - if (dbus_g_proxy_end_call (proxy, call_id, &error, - G_TYPE_STRING, &state, G_TYPE_INVALID)) - { - connectivity_connman_state_changed_cb (proxy, state, - connectivity); - g_free (state); - } - else - { - DEBUG ("Failed to call GetState: %s", error->message); - connectivity_connman_state_changed_cb (proxy, "offline", - connectivity); - } -} - -static void -connectivity_connman_check_state (EmpathyConnectivity *connectivity) -{ - EmpathyConnectivityPriv *priv; - - priv = GET_PRIV (connectivity); - - dbus_g_proxy_begin_call (priv->proxy, "GetState", - connectivity_connman_check_state_cb, connectivity, NULL, - G_TYPE_INVALID); -} -#endif - -static void -empathy_connectivity_init (EmpathyConnectivity *connectivity) -{ - EmpathyConnectivityPriv *priv; -#ifdef HAVE_CONNMAN - DBusGConnection *connection; - GError *error = NULL; -#endif - - priv = G_TYPE_INSTANCE_GET_PRIVATE (connectivity, - EMPATHY_TYPE_CONNECTIVITY, EmpathyConnectivityPriv); - - connectivity->priv = priv; - - priv->use_conn = TRUE; - -#ifdef HAVE_NM - priv->nm_client = nm_client_new (); - if (priv->nm_client != NULL) - { - priv->state_change_signal_id = g_signal_connect (priv->nm_client, - "notify::" NM_CLIENT_STATE, - G_CALLBACK (connectivity_nm_state_change_cb), connectivity); - - connectivity_nm_state_change_cb (priv->nm_client, NULL, connectivity); - } - else - { - DEBUG ("Failed to get NetworkManager proxy"); - } -#endif - -#ifdef HAVE_CONNMAN - connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - if (connection != NULL) - { - priv->proxy = dbus_g_proxy_new_for_name (connection, - "net.connman", "/", - "net.connman.Manager"); - - dbus_g_object_register_marshaller ( - g_cclosure_marshal_generic, - G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INVALID); - - dbus_g_proxy_add_signal (priv->proxy, "StateChanged", - G_TYPE_STRING, G_TYPE_INVALID); - - dbus_g_proxy_connect_signal (priv->proxy, "StateChanged", - G_CALLBACK (connectivity_connman_state_changed_cb), - connectivity, NULL); - - connectivity_connman_check_state (connectivity); - } - else - { - DEBUG ("Failed to get system bus connection: %s", error->message); - g_error_free (error); - } -#endif - -#if !defined(HAVE_NM) && !defined(HAVE_CONNMAN) - priv->connected = TRUE; -#endif -} - -static void -connectivity_finalize (GObject *object) -{ -#ifdef HAVE_NM - EmpathyConnectivity *connectivity = EMPATHY_CONNECTIVITY (object); - EmpathyConnectivityPriv *priv = GET_PRIV (connectivity); - - if (priv->nm_client != NULL) - { - g_signal_handler_disconnect (priv->nm_client, - priv->state_change_signal_id); - priv->state_change_signal_id = 0; - g_object_unref (priv->nm_client); - priv->nm_client = NULL; - } -#endif - -#ifdef HAVE_CONNMAN - EmpathyConnectivity *connectivity = EMPATHY_CONNECTIVITY (object); - EmpathyConnectivityPriv *priv = GET_PRIV (connectivity); - - if (priv->proxy != NULL) - { - dbus_g_proxy_disconnect_signal (priv->proxy, "StateChanged", - G_CALLBACK (connectivity_connman_state_changed_cb), connectivity); - - g_object_unref (priv->proxy); - priv->proxy = NULL; - } -#endif - - G_OBJECT_CLASS (empathy_connectivity_parent_class)->finalize (object); -} - -static void -connectivity_dispose (GObject *object) -{ - G_OBJECT_CLASS (empathy_connectivity_parent_class)->dispose (object); -} - -static GObject * -connectivity_constructor (GType type, - guint n_construct_params, - GObjectConstructParam *construct_params) -{ - GObject *retval; - - if (!connectivity_singleton) - { - retval = G_OBJECT_CLASS (empathy_connectivity_parent_class)->constructor - (type, n_construct_params, construct_params); - - connectivity_singleton = EMPATHY_CONNECTIVITY (retval); - g_object_add_weak_pointer (retval, (gpointer) &connectivity_singleton); - } - else - { - retval = g_object_ref (connectivity_singleton); - } - - return retval; -} - -static void -connectivity_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - EmpathyConnectivity *connectivity = EMPATHY_CONNECTIVITY (object); - - switch (param_id) - { - case PROP_USE_CONN: - g_value_set_boolean (value, empathy_connectivity_get_use_conn ( - connectivity)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - }; -} - -static void -connectivity_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - EmpathyConnectivity *connectivity = EMPATHY_CONNECTIVITY (object); - - switch (param_id) - { - case PROP_USE_CONN: - empathy_connectivity_set_use_conn (connectivity, - g_value_get_boolean (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - }; -} - -static void -empathy_connectivity_class_init (EmpathyConnectivityClass *klass) -{ - GObjectClass *oclass = G_OBJECT_CLASS (klass); - - oclass->finalize = connectivity_finalize; - oclass->dispose = connectivity_dispose; - oclass->constructor = connectivity_constructor; - oclass->get_property = connectivity_get_property; - oclass->set_property = connectivity_set_property; - - signals[STATE_CHANGE] = - g_signal_new ("state-change", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 1, G_TYPE_BOOLEAN, NULL); - - g_object_class_install_property (oclass, - PROP_USE_CONN, - g_param_spec_boolean ("use-conn", - "Use connectivity managers", - "Set presence according to connectivity managers", - TRUE, - G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); - - g_type_class_add_private (oclass, sizeof (EmpathyConnectivityPriv)); -} - -/* public methods */ - -EmpathyConnectivity * -empathy_connectivity_dup_singleton (void) -{ - return g_object_new (EMPATHY_TYPE_CONNECTIVITY, NULL); -} - -gboolean -empathy_connectivity_is_online (EmpathyConnectivity *connectivity) -{ - EmpathyConnectivityPriv *priv = GET_PRIV (connectivity); - - return priv->connected; -} - -gboolean -empathy_connectivity_get_use_conn (EmpathyConnectivity *connectivity) -{ - EmpathyConnectivityPriv *priv = GET_PRIV (connectivity); - - return priv->use_conn; -} - -void -empathy_connectivity_set_use_conn (EmpathyConnectivity *connectivity, - gboolean use_conn) -{ - EmpathyConnectivityPriv *priv = GET_PRIV (connectivity); - - if (use_conn == priv->use_conn) - return; - - DEBUG ("use_conn GSetting key changed; new value = %s", - use_conn ? "true" : "false"); - - priv->use_conn = use_conn; - -#if defined(HAVE_NM) || defined(HAVE_CONNMAN) - if (use_conn) - { -#if defined(HAVE_NM) - connectivity_nm_state_change_cb (priv->nm_client, NULL, connectivity); -#elif defined(HAVE_CONNMAN) - connectivity_connman_check_state (connectivity); -#endif - } - else -#endif - { - connectivity_change_state (connectivity, TRUE); - } - - g_object_notify (G_OBJECT (connectivity), "use-conn"); -} diff --git a/libempathy/empathy-connectivity.h b/libempathy/empathy-connectivity.h deleted file mode 100644 index ca507e910..000000000 --- a/libempathy/empathy-connectivity.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ -/* - * Copyright (C) 2009 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Jonny Lamb <jonny.lamb@collabora.co.uk> - */ - -#ifndef __EMPATHY_CONNECTIVITY_H__ -#define __EMPATHY_CONNECTIVITY_H__ - -#include <glib-object.h> - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_CONNECTIVITY (empathy_connectivity_get_type ()) -#define EMPATHY_CONNECTIVITY(o) \ - (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CONNECTIVITY, \ - EmpathyConnectivity)) -#define EMPATHY_CONNECTIVITY_CLASS(k) \ - (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_CONNECTIVITY, \ - EmpathyConnectivityClass)) -#define EMPATHY_IS_CONNECTIVITY(o) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONNECTIVITY)) -#define EMPATHY_IS_CONNECTIVITY_CLASS(k) \ - (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CONNECTIVITY)) -#define EMPATHY_CONNECTIVITY_GET_CLASS(o) \ - (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CONNECTIVITY, \ - EmpathyConnectivityClass)) - -typedef struct _EmpathyConnectivity EmpathyConnectivity; -typedef struct _EmpathyConnectivityClass EmpathyConnectivityClass; - -struct _EmpathyConnectivity { - GObject parent; - gpointer priv; -}; - -struct _EmpathyConnectivityClass { - GObjectClass parent_class; -}; - -GType empathy_connectivity_get_type (void); - -/* public methods */ - -EmpathyConnectivity * empathy_connectivity_dup_singleton (void); - -gboolean empathy_connectivity_is_online (EmpathyConnectivity *connectivity); - -gboolean empathy_connectivity_get_use_conn (EmpathyConnectivity *connectivity); -void empathy_connectivity_set_use_conn (EmpathyConnectivity *connectivity, - gboolean use_conn); - -G_END_DECLS - -#endif /* __EMPATHY_CONNECTIVITY_H__ */ - diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c deleted file mode 100644 index b80071c53..000000000 --- a/libempathy/empathy-contact-list.c +++ /dev/null @@ -1,214 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2007-2008 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens <xclaesse@gmail.com> - */ - -#include "config.h" - -#include "empathy-contact-list.h" - -static void contact_list_base_init (gpointer klass); - -GType -empathy_contact_list_get_type (void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo type_info = { - sizeof (EmpathyContactListIface), - contact_list_base_init, - NULL, - }; - - type = g_type_register_static (G_TYPE_INTERFACE, - "EmpathyContactList", - &type_info, 0); - - g_type_interface_add_prerequisite (type, G_TYPE_OBJECT); - } - - return type; -} - -static void -contact_list_base_init (gpointer klass) -{ - static gboolean initialized = FALSE; - - if (!initialized) { - g_signal_new ("member-renamed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING); - - g_signal_new ("members-changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, - G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN); - - g_signal_new ("pendings-changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, - G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN); - - g_signal_new ("groups-changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_BOOLEAN); - - initialized = TRUE; - } -} - -void -empathy_contact_list_add (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *message) -{ - g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list)); - g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - - if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->add) { - EMPATHY_CONTACT_LIST_GET_IFACE (list)->add (list, contact, message); - } -} - -void -empathy_contact_list_remove (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *message) -{ - g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list)); - g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - - if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove) { - EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove (list, contact, message); - } -} - -GList * -empathy_contact_list_get_members (EmpathyContactList *list) -{ - g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL); - - if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_members) { - return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_members (list); - } - - return NULL; -} - -GList * -empathy_contact_list_get_pendings (EmpathyContactList *list) -{ - g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL); - - if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_pendings) { - return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_pendings (list); - } - - return NULL; -} - -GList * -empathy_contact_list_get_groups (EmpathyContactList *list, - EmpathyContact *contact) -{ - g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL); - g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL); - - if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_groups) { - return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_groups (list, contact); - } - - return NULL; -} - -void -empathy_contact_list_add_to_group (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *group) -{ - g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list)); - g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - g_return_if_fail (group != NULL); - - if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_to_group) { - EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_to_group (list, contact, group); - } -} - -void -empathy_contact_list_remove_from_group (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *group) -{ - g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list)); - g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - g_return_if_fail (group != NULL); - - if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_from_group) { - EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_from_group (list, contact, group); - } -} - -void -empathy_contact_list_rename_group (EmpathyContactList *list, - const gchar *old_group, - const gchar *new_group) -{ - g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list)); - g_return_if_fail (old_group != NULL); - g_return_if_fail (new_group != NULL); - - if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->rename_group) { - EMPATHY_CONTACT_LIST_GET_IFACE (list)->rename_group (list, old_group, new_group); - } -} - -void -empathy_contact_list_remove_group (EmpathyContactList *list, - const gchar *group) -{ - g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list)); - g_return_if_fail (group != NULL); - - if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_group) { - EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_group (list, group); - } -} diff --git a/libempathy/empathy-contact-list.h b/libempathy/empathy-contact-list.h deleted file mode 100644 index a9149369b..000000000 --- a/libempathy/empathy-contact-list.h +++ /dev/null @@ -1,92 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright (C) 2007-2008 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens <xclaesse@gmail.com> - */ - -#ifndef __EMPATHY_CONTACT_LIST_H__ -#define __EMPATHY_CONTACT_LIST_H__ - -#include <glib-object.h> - -#include "empathy-types.h" -#include "empathy-contact.h" - -G_BEGIN_DECLS - -#define EMPATHY_TYPE_CONTACT_LIST (empathy_contact_list_get_type ()) -#define EMPATHY_CONTACT_LIST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CONTACT_LIST, EmpathyContactList)) -#define EMPATHY_IS_CONTACT_LIST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONTACT_LIST)) -#define EMPATHY_CONTACT_LIST_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), EMPATHY_TYPE_CONTACT_LIST, EmpathyContactListIface)) - -typedef struct _EmpathyContactListIface EmpathyContactListIface; - -struct _EmpathyContactListIface { - GTypeInterface base_iface; - - /* VTabled */ - void (*add) (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *message); - void (*remove) (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *message); - GList * (*get_members) (EmpathyContactList *list); - GList * (*get_pendings) (EmpathyContactList *list); - GList * (*get_groups) (EmpathyContactList *list, - EmpathyContact *contact); - void (*add_to_group) (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *group); - void (*remove_from_group) (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *group); - void (*rename_group) (EmpathyContactList *list, - const gchar *old_group, - const gchar *new_group); - void (*remove_group) (EmpathyContactList *list, - const gchar *group); -}; - -GType empathy_contact_list_get_type (void) G_GNUC_CONST; -void empathy_contact_list_add (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *message); -void empathy_contact_list_remove (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *message); -GList * empathy_contact_list_get_members (EmpathyContactList *list); -GList * empathy_contact_list_get_pendings (EmpathyContactList *list); -GList * empathy_contact_list_get_groups (EmpathyContactList *list, - EmpathyContact *contact); -void empathy_contact_list_add_to_group (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *group); -void empathy_contact_list_remove_from_group (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *group); -void empathy_contact_list_rename_group (EmpathyContactList *list, - const gchar *old_group, - const gchar *new_group); -void empathy_contact_list_remove_group (EmpathyContactList *list, - const gchar *group); - -G_END_DECLS - -#endif /* __EMPATHY_CONTACT_LIST_H__ */ - diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 0c4ef755f..704a64f97 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -1701,6 +1701,23 @@ tp_caps_to_capabilities (TpCapabilities *caps) guint i; GPtrArray *classes; + if (tp_capabilities_supports_file_transfer (caps)) + capabilities |= EMPATHY_CAPABILITIES_FT; + + if (tp_capabilities_supports_stream_tubes (caps, TP_HANDLE_TYPE_CONTACT, + "rfb")) + capabilities |= EMPATHY_CAPABILITIES_RFB_STREAM_TUBE; + + if (tp_capabilities_supports_audio_video_call (caps, TP_HANDLE_TYPE_CONTACT)) + { + capabilities |= EMPATHY_CAPABILITIES_AUDIO; + capabilities |= EMPATHY_CAPABILITIES_VIDEO; + } + else if (tp_capabilities_supports_audio_call (caps, TP_HANDLE_TYPE_CONTACT)) + { + capabilities |= EMPATHY_CAPABILITIES_AUDIO; + } + classes = tp_capabilities_get_channel_classes (caps); for (i = 0; i < classes->len; i++) @@ -1724,69 +1741,12 @@ tp_caps_to_capabilities (TpCapabilities *caps) chan_type = tp_asv_get_string (fixed_prop, TP_PROP_CHANNEL_CHANNEL_TYPE); - if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) - { - capabilities |= EMPATHY_CAPABILITIES_FT; - } - else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE)) - { - const gchar *service; - - service = tp_asv_get_string (fixed_prop, - TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE); - - if (!tp_strdiff (service, "rfb")) - capabilities |= EMPATHY_CAPABILITIES_RFB_STREAM_TUBE; - } - else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) - { - guint j; - - for (j = 0; allowed_prop[j] != NULL; j++) - { - if (!tp_strdiff (allowed_prop[j], - TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO)) - capabilities |= EMPATHY_CAPABILITIES_AUDIO; - else if (!tp_strdiff (allowed_prop[j], - TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO)) - capabilities |= EMPATHY_CAPABILITIES_VIDEO; - } - - if (tp_asv_get_boolean (fixed_prop, - TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO, NULL)) - capabilities |= EMPATHY_CAPABILITIES_AUDIO; - if (tp_asv_get_boolean (fixed_prop, - TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, NULL)) - capabilities |= EMPATHY_CAPABILITIES_VIDEO; - } - else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_TEXT)) + if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_TEXT)) { if (tp_asv_get_boolean (fixed_prop, TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL, NULL)) capabilities |= EMPATHY_CAPABILITIES_SMS; } - else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_CALL)) - { - guint j; - - if (tp_asv_get_boolean (fixed_prop, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL)) - capabilities |= EMPATHY_CAPABILITIES_AUDIO; - - if (tp_asv_get_boolean (fixed_prop, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL)) - capabilities |= EMPATHY_CAPABILITIES_VIDEO; - - for (j = 0; allowed_prop[j] != NULL; j++) - { - if (!tp_strdiff (allowed_prop[j], - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO)) - capabilities |= EMPATHY_CAPABILITIES_AUDIO; - else if (!tp_strdiff (allowed_prop[j], - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO)) - capabilities |= EMPATHY_CAPABILITIES_VIDEO; - } - } } return capabilities; diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index 68b094ef1..28f35df2d 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -687,75 +687,6 @@ empathy_individual_manager_remove_group (EmpathyIndividualManager *manager, (gpointer) group); } -static void -link_personas_cb (FolksIndividualAggregator *aggregator, - GAsyncResult *async_result, - gpointer user_data) -{ - GError *error = NULL; - - folks_individual_aggregator_link_personas_finish (aggregator, async_result, - &error); - - if (error != NULL) - { - g_warning ("Failed to link personas: %s", error->message); - g_clear_error (&error); - } -} - -void -empathy_individual_manager_link_personas (EmpathyIndividualManager *self, - GeeSet *personas) -{ - EmpathyIndividualManagerPriv *priv; - - g_return_if_fail (EMPATHY_IS_INDIVIDUAL_MANAGER (self)); - g_return_if_fail (personas != NULL); - - priv = GET_PRIV (self); - - DEBUG ("Linking %u personas", - gee_collection_get_size (GEE_COLLECTION (personas))); - - folks_individual_aggregator_link_personas (priv->aggregator, personas, - (GAsyncReadyCallback) link_personas_cb, NULL); -} - -static void -unlink_individual_cb (FolksIndividualAggregator *aggregator, - GAsyncResult *async_result, - gpointer user_data) -{ - GError *error = NULL; - - folks_individual_aggregator_unlink_individual_finish (aggregator, - async_result, &error); - - if (error != NULL) - { - g_warning ("Failed to unlink individual: %s", error->message); - g_clear_error (&error); - } -} - -void -empathy_individual_manager_unlink_individual (EmpathyIndividualManager *self, - FolksIndividual *individual) -{ - EmpathyIndividualManagerPriv *priv; - - g_return_if_fail (EMPATHY_IS_INDIVIDUAL_MANAGER (self)); - g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual)); - - priv = GET_PRIV (self); - - DEBUG ("Unlinking individual '%s'", folks_individual_get_id (individual)); - - folks_individual_aggregator_unlink_individual (priv->aggregator, individual, - (GAsyncReadyCallback) unlink_individual_cb, NULL); -} - gboolean empathy_individual_manager_get_contacts_loaded (EmpathyIndividualManager *self) { @@ -763,55 +694,3 @@ empathy_individual_manager_get_contacts_loaded (EmpathyIndividualManager *self) return priv->contacts_loaded; } - -static gboolean -individual_has_contact (FolksIndividual *individual, - TpContact *contact) -{ - GeeSet *personas; - GeeIterator *iter; - gboolean found = FALSE; - - personas = folks_individual_get_personas (individual); - iter = gee_iterable_iterator (GEE_ITERABLE (personas)); - - while (!found && gee_iterator_next (iter)) - { - TpfPersona *persona = gee_iterator_get (iter); - - if (TPF_IS_PERSONA (persona)) - { - TpContact *c = tpf_persona_get_contact (persona); - - if (c == contact) - found = TRUE; - } - - g_clear_object (&persona); - } - - g_clear_object (&iter); - - return found; -} - -/* Try finding a FolksIndividual containing @contact as one of his persona */ -FolksIndividual * -empathy_individual_manager_lookup_by_contact (EmpathyIndividualManager *self, - TpContact *contact) -{ - EmpathyIndividualManagerPriv *priv = GET_PRIV (self); - GHashTableIter iter; - gpointer value; - - g_hash_table_iter_init (&iter, priv->individuals); - while (g_hash_table_iter_next (&iter, NULL, &value)) - { - FolksIndividual *individual = value; - - if (individual_has_contact (individual, contact)) - return individual; - } - - return NULL; -} diff --git a/libempathy/empathy-individual-manager.h b/libempathy/empathy-individual-manager.h index 08a1faade..3e17bbd85 100644 --- a/libempathy/empathy-individual-manager.h +++ b/libempathy/empathy-individual-manager.h @@ -74,13 +74,6 @@ void empathy_individual_manager_remove (EmpathyIndividualManager *manager, void empathy_individual_manager_remove_group (EmpathyIndividualManager *manager, const gchar *group); -void empathy_individual_manager_link_personas (EmpathyIndividualManager *self, - GeeSet *personas); - -void empathy_individual_manager_unlink_individual ( - EmpathyIndividualManager *self, - FolksIndividual *individual); - gboolean empathy_individual_manager_supports_blocking ( EmpathyIndividualManager *self, FolksIndividual *individual); @@ -93,9 +86,5 @@ void empathy_individual_manager_set_blocked (EmpathyIndividualManager *self, gboolean empathy_individual_manager_get_contacts_loaded ( EmpathyIndividualManager *self); -FolksIndividual * empathy_individual_manager_lookup_by_contact ( - EmpathyIndividualManager *self, - TpContact *contact); - G_END_DECLS #endif /* __EMPATHY_INDIVIDUAL_MANAGER_H__ */ diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 4e26a769b..4daac8c53 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -1,6 +1,5 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Copyright (C) 2007-2008 Collabora Ltd. + * Copyright (C) 2007-2012 Collabora Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,7 +28,6 @@ #include "empathy-tp-chat.h" #include "empathy-tp-contact-factory.h" -#include "empathy-contact-list.h" #include "empathy-request-util.h" #include "empathy-time.h" #include "empathy-utils.h" @@ -37,1380 +35,1366 @@ #define DEBUG_FLAG EMPATHY_DEBUG_TP | EMPATHY_DEBUG_CHAT #include "empathy-debug.h" -struct _EmpathyTpChatPrivate { - TpAccount *account; - EmpathyContact *user; - EmpathyContact *remote_contact; - GList *members; - /* Queue of messages not signalled yet */ - GQueue *messages_queue; - /* Queue of messages signalled but not acked yet */ - GQueue *pending_messages_queue; +struct _EmpathyTpChatPrivate +{ + TpAccount *account; + EmpathyContact *user; + EmpathyContact *remote_contact; + GList *members; + /* Queue of messages not signalled yet */ + GQueue *messages_queue; + /* Queue of messages signalled but not acked yet */ + GQueue *pending_messages_queue; - /* Subject */ - gboolean supports_subject; - gboolean can_set_subject; - gchar *subject; - gchar *subject_actor; + /* Subject */ + gboolean supports_subject; + gboolean can_set_subject; + gchar *subject; + gchar *subject_actor; - /* Room config (for now, we only track the title and don't support - * setting it) */ - gchar *title; + /* Room config (for now, we only track the title and don't support + * setting it) */ + gchar *title; - gboolean can_upgrade_to_muc; + gboolean can_upgrade_to_muc; - GHashTable *messages_being_sent; + GHashTable *messages_being_sent; - /* GSimpleAsyncResult used when preparing EMPATHY_TP_CHAT_FEATURE_CORE */ - GSimpleAsyncResult *ready_result; + /* GSimpleAsyncResult used when preparing EMPATHY_TP_CHAT_FEATURE_CORE */ + GSimpleAsyncResult *ready_result; }; -static void tp_chat_iface_init (EmpathyContactListIface *iface); - -enum { - PROP_0, - PROP_ACCOUNT, - PROP_SELF_CONTACT, - PROP_REMOTE_CONTACT, - PROP_N_MESSAGES_SENDING, - PROP_TITLE, - PROP_SUBJECT, +enum +{ + PROP_0, + PROP_ACCOUNT, + PROP_SELF_CONTACT, + PROP_REMOTE_CONTACT, + PROP_N_MESSAGES_SENDING, + PROP_TITLE, + PROP_SUBJECT, }; -enum { - MESSAGE_RECEIVED, - SEND_ERROR, - CHAT_STATE_CHANGED, - MESSAGE_ACKNOWLEDGED, - LAST_SIGNAL +enum +{ + MESSAGE_RECEIVED, + SEND_ERROR, + CHAT_STATE_CHANGED, + MESSAGE_ACKNOWLEDGED, + LAST_SIGNAL }; static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE_WITH_CODE (EmpathyTpChat, empathy_tp_chat, TP_TYPE_TEXT_CHANNEL, - G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CONTACT_LIST, - tp_chat_iface_init)); +G_DEFINE_TYPE (EmpathyTpChat, empathy_tp_chat, TP_TYPE_TEXT_CHANNEL) static void -tp_chat_set_delivery_status (EmpathyTpChat *self, - const gchar *token, - EmpathyDeliveryStatus delivery_status) -{ - TpDeliveryReportingSupportFlags flags = - tp_text_channel_get_delivery_reporting_support ( - TP_TEXT_CHANNEL (self)); - - /* channel must support receiving failures and successes */ - if (!tp_str_empty (token) && - flags & TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES && - flags & TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES) { - - DEBUG ("Delivery status (%s) = %u", token, delivery_status); - - switch (delivery_status) { - case EMPATHY_DELIVERY_STATUS_NONE: - g_hash_table_remove (self->priv->messages_being_sent, - token); - break; - - default: - g_hash_table_insert (self->priv->messages_being_sent, - g_strdup (token), - GUINT_TO_POINTER (delivery_status)); - break; - } - - g_object_notify (G_OBJECT (self), "n-messages-sending"); - } +tp_chat_set_delivery_status (EmpathyTpChat *self, + const gchar *token, + EmpathyDeliveryStatus delivery_status) +{ + TpDeliveryReportingSupportFlags flags = + tp_text_channel_get_delivery_reporting_support ( + TP_TEXT_CHANNEL (self)); + + /* channel must support receiving failures and successes */ + if (!tp_str_empty (token) && + flags & TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES && + flags & TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES) + { + DEBUG ("Delivery status (%s) = %u", token, delivery_status); + + switch (delivery_status) + { + case EMPATHY_DELIVERY_STATUS_NONE: + g_hash_table_remove (self->priv->messages_being_sent, + token); + break; + + default: + g_hash_table_insert (self->priv->messages_being_sent, + g_strdup (token), + GUINT_TO_POINTER (delivery_status)); + break; + } + + g_object_notify (G_OBJECT (self), "n-messages-sending"); + } } static void tp_chat_prepare_ready_async (TpProxy *proxy, - const TpProxyFeature *feature, - GAsyncReadyCallback callback, - gpointer user_data); + const TpProxyFeature *feature, + GAsyncReadyCallback callback, + gpointer user_data); static void tp_chat_async_cb (TpChannel *proxy, - const GError *error, - gpointer user_data, - GObject *weak_object) + const GError *error, + gpointer user_data, + GObject *weak_object) { - if (error) { - DEBUG ("Error %s: %s", (gchar *) user_data, error->message); - } + if (error != NULL) + DEBUG ("Error %s: %s", (gchar *) user_data, error->message); } static void create_conference_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { - GError *error = NULL; + GError *error = NULL; - if (!tp_account_channel_request_create_channel_finish ( - TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error)) { - DEBUG ("Failed to create conference channel: %s", error->message); - g_error_free (error); - } + if (!tp_account_channel_request_create_channel_finish ( + TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error)) + { + DEBUG ("Failed to create conference channel: %s", error->message); + g_error_free (error); + } } -static void -tp_chat_add (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *message) -{ - EmpathyTpChat *self = (EmpathyTpChat *) list; - TpChannel *channel = (TpChannel *) self; - - if (tp_proxy_has_interface_by_id (self, - TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) { - TpHandle handle; - GArray handles = {(gchar *) &handle, 1}; - - g_return_if_fail (EMPATHY_IS_TP_CHAT (list)); - g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - - handle = empathy_contact_get_handle (contact); - tp_cli_channel_interface_group_call_add_members (channel, - -1, &handles, NULL, NULL, NULL, NULL, NULL); - } else if (self->priv->can_upgrade_to_muc) { - TpAccountChannelRequest *req; - GHashTable *props; - const char *object_path; - GPtrArray channels = { (gpointer *) &object_path, 1 }; - const char *invitees[2] = { NULL, }; - - invitees[0] = empathy_contact_get_id (contact); - object_path = tp_proxy_get_object_path (self); - - props = tp_asv_new ( - TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, - TP_IFACE_CHANNEL_TYPE_TEXT, - TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, - TP_HANDLE_TYPE_NONE, - TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS, - TP_ARRAY_TYPE_OBJECT_PATH_LIST, &channels, - TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_IDS, - G_TYPE_STRV, invitees, - /* FIXME: InvitationMessage ? */ - NULL); - - req = tp_account_channel_request_new (self->priv->account, props, - TP_USER_ACTION_TIME_NOT_USER_ACTION); - - /* Although this is a MUC, it's anonymous, so CreateChannel is - * valid. */ - tp_account_channel_request_create_channel_async (req, EMPATHY_CHAT_BUS_NAME, - NULL, create_conference_cb, NULL); - - g_object_unref (req); - g_hash_table_unref (props); - } else { - g_warning ("Cannot add to this channel"); - } -} - -static void -tp_chat_remove (EmpathyContactList *list, - EmpathyContact *contact, - const gchar *message) -{ - EmpathyTpChat *self = (EmpathyTpChat *) list; - TpHandle handle; - GArray handles = {(gchar *) &handle, 1}; - - g_return_if_fail (EMPATHY_IS_TP_CHAT (list)); - g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - - handle = empathy_contact_get_handle (contact); - tp_cli_channel_interface_group_call_remove_members ((TpChannel *) self, -1, - &handles, NULL, - NULL, NULL, NULL, - NULL); -} - -static GList * -tp_chat_get_members (EmpathyContactList *list) -{ - EmpathyTpChat *self = (EmpathyTpChat *) list; - GList *members = NULL; - - g_return_val_if_fail (EMPATHY_IS_TP_CHAT (list), NULL); - - if (self->priv->members) { - members = g_list_copy (self->priv->members); - g_list_foreach (members, (GFunc) g_object_ref, NULL); - } else { - members = g_list_prepend (members, g_object_ref (self->priv->user)); - if (self->priv->remote_contact != NULL) - members = g_list_prepend (members, g_object_ref (self->priv->remote_contact)); - } - - return members; +void +empathy_tp_chat_add (EmpathyTpChat *self, + EmpathyContact *contact, + const gchar *message) +{ + TpChannel *channel = (TpChannel *) self; + + if (tp_proxy_has_interface_by_id (self, + TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) + { + TpHandle handle; + GArray handles = {(gchar *) &handle, 1}; + + g_return_if_fail (EMPATHY_IS_CONTACT (contact)); + + handle = empathy_contact_get_handle (contact); + tp_cli_channel_interface_group_call_add_members (channel, + -1, &handles, NULL, NULL, NULL, NULL, NULL); + } + else if (self->priv->can_upgrade_to_muc) + { + TpAccountChannelRequest *req; + GHashTable *props; + const char *object_path; + GPtrArray channels = { (gpointer *) &object_path, 1 }; + const char *invitees[2] = { NULL, }; + + invitees[0] = empathy_contact_get_id (contact); + object_path = tp_proxy_get_object_path (self); + + props = tp_asv_new ( + TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, + TP_IFACE_CHANNEL_TYPE_TEXT, + TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, + TP_HANDLE_TYPE_NONE, + TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS, + TP_ARRAY_TYPE_OBJECT_PATH_LIST, &channels, + TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_IDS, + G_TYPE_STRV, invitees, + /* FIXME: InvitationMessage ? */ + NULL); + + req = tp_account_channel_request_new (self->priv->account, props, + TP_USER_ACTION_TIME_NOT_USER_ACTION); + + /* Although this is a MUC, it's anonymous, so CreateChannel is + * valid. */ + tp_account_channel_request_create_channel_async (req, + EMPATHY_CHAT_BUS_NAME, NULL, create_conference_cb, NULL); + + g_object_unref (req); + g_hash_table_unref (props); + } + else + { + g_warning ("Cannot add to this channel"); + } +} + +GList * +empathy_tp_chat_get_members (EmpathyTpChat *self) +{ + GList *members = NULL; + + if (self->priv->members) + { + members = g_list_copy (self->priv->members); + g_list_foreach (members, (GFunc) g_object_ref, NULL); + } + else + { + members = g_list_prepend (members, g_object_ref (self->priv->user)); + + if (self->priv->remote_contact != NULL) + members = g_list_prepend (members, + g_object_ref (self->priv->remote_contact)); + } + + return members; } static void check_ready (EmpathyTpChat *self) { - if (self->priv->ready_result == NULL) - return; + if (self->priv->ready_result == NULL) + return; - if (g_queue_get_length (self->priv->messages_queue) > 0) - return; + if (g_queue_get_length (self->priv->messages_queue) > 0) + return; - DEBUG ("Ready"); + DEBUG ("Ready"); - g_simple_async_result_complete (self->priv->ready_result); - tp_clear_object (&self->priv->ready_result); + g_simple_async_result_complete (self->priv->ready_result); + tp_clear_object (&self->priv->ready_result); } static void tp_chat_emit_queued_messages (EmpathyTpChat *self) { - EmpathyMessage *message; + EmpathyMessage *message; - /* Check if we can now emit some queued messages */ - while ((message = g_queue_peek_head (self->priv->messages_queue)) != NULL) { - if (empathy_message_get_sender (message) == NULL) { - break; - } + /* Check if we can now emit some queued messages */ + while ((message = g_queue_peek_head (self->priv->messages_queue)) != NULL) + { + if (empathy_message_get_sender (message) == NULL) + break; - DEBUG ("Queued message ready"); - g_queue_pop_head (self->priv->messages_queue); - g_queue_push_tail (self->priv->pending_messages_queue, message); - g_signal_emit (self, signals[MESSAGE_RECEIVED], 0, message); - } + DEBUG ("Queued message ready"); + g_queue_pop_head (self->priv->messages_queue); + g_queue_push_tail (self->priv->pending_messages_queue, message); + g_signal_emit (self, signals[MESSAGE_RECEIVED], 0, message); + } - check_ready (self); + check_ready (self); } static void -tp_chat_got_sender_cb (TpConnection *connection, - EmpathyContact *contact, - const GError *error, - gpointer message, - GObject *chat) +tp_chat_got_sender_cb (TpConnection *connection, + EmpathyContact *contact, + const GError *error, + gpointer message, + GObject *chat) { - EmpathyTpChat *self = (EmpathyTpChat *) chat; + EmpathyTpChat *self = (EmpathyTpChat *) chat; - if (error) { - DEBUG ("Error: %s", error->message); - /* Do not block the message queue, just drop this message */ - g_queue_remove (self->priv->messages_queue, message); - } else { - empathy_message_set_sender (message, contact); - } + if (error) + { + DEBUG ("Error: %s", error->message); + /* Do not block the message queue, just drop this message */ + g_queue_remove (self->priv->messages_queue, message); + } + else + { + empathy_message_set_sender (message, contact); + } - tp_chat_emit_queued_messages (EMPATHY_TP_CHAT (self)); + tp_chat_emit_queued_messages (EMPATHY_TP_CHAT (self)); } static void tp_chat_build_message (EmpathyTpChat *self, - TpMessage *msg, - gboolean incoming) + TpMessage *msg, + gboolean incoming) { - EmpathyMessage *message; - TpContact *sender; + EmpathyMessage *message; + TpContact *sender; - message = empathy_message_new_from_tp_message (msg, incoming); - /* FIXME: this is actually a lie for incoming messages. */ - empathy_message_set_receiver (message, self->priv->user); + message = empathy_message_new_from_tp_message (msg, incoming); + /* FIXME: this is actually a lie for incoming messages. */ + empathy_message_set_receiver (message, self->priv->user); - g_queue_push_tail (self->priv->messages_queue, message); + g_queue_push_tail (self->priv->messages_queue, message); - sender = tp_signalled_message_get_sender (msg); - g_assert (sender != NULL); + sender = tp_signalled_message_get_sender (msg); + g_assert (sender != NULL); - if (tp_contact_get_handle (sender) == 0) { - empathy_message_set_sender (message, self->priv->user); - tp_chat_emit_queued_messages (self); - } else { - TpConnection *connection = tp_channel_borrow_connection ( - (TpChannel *) self); + if (tp_contact_get_handle (sender) == 0) + { + empathy_message_set_sender (message, self->priv->user); + tp_chat_emit_queued_messages (self); + } + else + { + TpConnection *connection = tp_channel_borrow_connection ( + (TpChannel *) self); - empathy_tp_contact_factory_get_from_handle (connection, - tp_contact_get_handle (sender), - tp_chat_got_sender_cb, - message, NULL, G_OBJECT (self)); - } + empathy_tp_contact_factory_get_from_handle (connection, + tp_contact_get_handle (sender), + tp_chat_got_sender_cb, + message, NULL, G_OBJECT (self)); + } } static void handle_delivery_report (EmpathyTpChat *self, - TpMessage *message) -{ - TpDeliveryStatus delivery_status; - const GHashTable *header; - TpChannelTextSendError delivery_error; - gboolean valid; - GPtrArray *echo; - const gchar *message_body = NULL; - const gchar *delivery_dbus_error; - const gchar *delivery_token = NULL; - - header = tp_message_peek (message, 0); - if (header == NULL) - goto out; - - delivery_token = tp_asv_get_string (header, "delivery-token"); - delivery_status = tp_asv_get_uint32 (header, "delivery-status", &valid); - - if (!valid) { - goto out; - } else if (delivery_status == TP_DELIVERY_STATUS_ACCEPTED) { - DEBUG ("Accepted %s", delivery_token); - tp_chat_set_delivery_status (self, delivery_token, - EMPATHY_DELIVERY_STATUS_ACCEPTED); - goto out; - } else if (delivery_status == TP_DELIVERY_STATUS_DELIVERED) { - DEBUG ("Delivered %s", delivery_token); - tp_chat_set_delivery_status (self, delivery_token, - EMPATHY_DELIVERY_STATUS_NONE); - goto out; - } else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED && - delivery_status != TP_DELIVERY_STATUS_TEMPORARILY_FAILED) { - goto out; - } - - delivery_error = tp_asv_get_uint32 (header, "delivery-error", &valid); - if (!valid) - delivery_error = TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN; - - delivery_dbus_error = tp_asv_get_string (header, "delivery-dbus-error"); - - /* TODO: ideally we should use tp-glib API giving us the echoed message as a - * TpMessage. (fdo #35884) */ - echo = tp_asv_get_boxed (header, "delivery-echo", - TP_ARRAY_TYPE_MESSAGE_PART_LIST); - if (echo != NULL && echo->len >= 2) { - const GHashTable *echo_body; - - echo_body = g_ptr_array_index (echo, 1); - if (echo_body != NULL) - message_body = tp_asv_get_string (echo_body, "content"); - } - - tp_chat_set_delivery_status (self, delivery_token, - EMPATHY_DELIVERY_STATUS_NONE); - g_signal_emit (self, signals[SEND_ERROR], 0, message_body, - delivery_error, delivery_dbus_error); + TpMessage *message) +{ + TpDeliveryStatus delivery_status; + const GHashTable *header; + TpChannelTextSendError delivery_error; + gboolean valid; + GPtrArray *echo; + const gchar *message_body = NULL; + const gchar *delivery_dbus_error; + const gchar *delivery_token = NULL; + + header = tp_message_peek (message, 0); + if (header == NULL) + goto out; + + delivery_token = tp_asv_get_string (header, "delivery-token"); + delivery_status = tp_asv_get_uint32 (header, "delivery-status", &valid); + + if (!valid) + { + goto out; + } + else if (delivery_status == TP_DELIVERY_STATUS_ACCEPTED) + { + DEBUG ("Accepted %s", delivery_token); + tp_chat_set_delivery_status (self, delivery_token, + EMPATHY_DELIVERY_STATUS_ACCEPTED); + goto out; + } + else if (delivery_status == TP_DELIVERY_STATUS_DELIVERED) + { + DEBUG ("Delivered %s", delivery_token); + tp_chat_set_delivery_status (self, delivery_token, + EMPATHY_DELIVERY_STATUS_NONE); + goto out; + } + else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED && + delivery_status != TP_DELIVERY_STATUS_TEMPORARILY_FAILED) + { + goto out; + } + + delivery_error = tp_asv_get_uint32 (header, "delivery-error", &valid); + if (!valid) + delivery_error = TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN; + + delivery_dbus_error = tp_asv_get_string (header, "delivery-dbus-error"); + + /* TODO: ideally we should use tp-glib API giving us the echoed message as a + * TpMessage. (fdo #35884) */ + echo = tp_asv_get_boxed (header, "delivery-echo", + TP_ARRAY_TYPE_MESSAGE_PART_LIST); + if (echo != NULL && echo->len >= 2) + { + const GHashTable *echo_body; + + echo_body = g_ptr_array_index (echo, 1); + if (echo_body != NULL) + message_body = tp_asv_get_string (echo_body, "content"); + } + + tp_chat_set_delivery_status (self, delivery_token, + EMPATHY_DELIVERY_STATUS_NONE); + g_signal_emit (self, signals[SEND_ERROR], 0, message_body, + delivery_error, delivery_dbus_error); out: - tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (self), - message, NULL, NULL); + tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (self), + message, NULL, NULL); } static void handle_incoming_message (EmpathyTpChat *self, - TpMessage *message, - gboolean pending) + TpMessage *message, + gboolean pending) { - gchar *message_body; + gchar *message_body; - if (tp_message_is_delivery_report (message)) { - handle_delivery_report (self, message); - return; - } + if (tp_message_is_delivery_report (message)) + { + handle_delivery_report (self, message); + return; + } - message_body = tp_message_to_text (message, NULL); + message_body = tp_message_to_text (message, NULL); - DEBUG ("Message %s (channel %s): %s", - pending ? "pending" : "received", - tp_proxy_get_object_path (self), message_body); + DEBUG ("Message %s (channel %s): %s", + pending ? "pending" : "received", + tp_proxy_get_object_path (self), message_body); - if (message_body == NULL) { - DEBUG ("Empty message with NonTextContent, ignoring and acking."); + if (message_body == NULL) + { + DEBUG ("Empty message with NonTextContent, ignoring and acking."); - tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (self), - message, NULL, NULL); - return; - } + tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (self), + message, NULL, NULL); + return; + } - tp_chat_build_message (self, message, TRUE); + tp_chat_build_message (self, message, TRUE); - g_free (message_body); + g_free (message_body); } static void -message_received_cb (TpTextChannel *channel, - TpMessage *message, - EmpathyTpChat *self) +message_received_cb (TpTextChannel *channel, + TpMessage *message, + EmpathyTpChat *self) { - handle_incoming_message (self, message, FALSE); + handle_incoming_message (self, message, FALSE); } static gboolean find_pending_message_func (gconstpointer a, - gconstpointer b) + gconstpointer b) { - EmpathyMessage *msg = (EmpathyMessage *) a; - TpMessage *message = (TpMessage *) b; + EmpathyMessage *msg = (EmpathyMessage *) a; + TpMessage *message = (TpMessage *) b; - if (empathy_message_get_tp_message (msg) == message) - return 0; + if (empathy_message_get_tp_message (msg) == message) + return 0; - return -1; + return -1; } static void pending_message_removed_cb (TpTextChannel *channel, - TpMessage *message, - EmpathyTpChat *self) + TpMessage *message, + EmpathyTpChat *self) { - GList *m; + GList *m; - m = g_queue_find_custom (self->priv->pending_messages_queue, message, - find_pending_message_func); + m = g_queue_find_custom (self->priv->pending_messages_queue, message, + find_pending_message_func); - if (m == NULL) - return; + if (m == NULL) + return; - g_signal_emit (self, signals[MESSAGE_ACKNOWLEDGED], 0, m->data); + g_signal_emit (self, signals[MESSAGE_ACKNOWLEDGED], 0, m->data); - g_object_unref (m->data); - g_queue_delete_link (self->priv->pending_messages_queue, m); + g_object_unref (m->data); + g_queue_delete_link (self->priv->pending_messages_queue, m); } static void -message_sent_cb (TpTextChannel *channel, - TpMessage *message, - TpMessageSendingFlags flags, - gchar *token, - EmpathyTpChat *self) +message_sent_cb (TpTextChannel *channel, + TpMessage *message, + TpMessageSendingFlags flags, + gchar *token, + EmpathyTpChat *self) { - gchar *message_body; + gchar *message_body; - message_body = tp_message_to_text (message, NULL); + message_body = tp_message_to_text (message, NULL); - DEBUG ("Message sent: %s", message_body); + DEBUG ("Message sent: %s", message_body); - tp_chat_build_message (self, message, FALSE); + tp_chat_build_message (self, message, FALSE); - g_free (message_body); + g_free (message_body); } static TpChannelTextSendError error_to_text_send_error (GError *error) { - if (error->domain != TP_ERRORS) - return TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN; + if (error->domain != TP_ERRORS) + return TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN; - switch (error->code) { - case TP_ERROR_OFFLINE: - return TP_CHANNEL_TEXT_SEND_ERROR_OFFLINE; - case TP_ERROR_INVALID_HANDLE: - return TP_CHANNEL_TEXT_SEND_ERROR_INVALID_CONTACT; - case TP_ERROR_PERMISSION_DENIED: - return TP_CHANNEL_TEXT_SEND_ERROR_PERMISSION_DENIED; - case TP_ERROR_NOT_IMPLEMENTED: - return TP_CHANNEL_TEXT_SEND_ERROR_NOT_IMPLEMENTED; - } + switch (error->code) + { + case TP_ERROR_OFFLINE: + return TP_CHANNEL_TEXT_SEND_ERROR_OFFLINE; + case TP_ERROR_INVALID_HANDLE: + return TP_CHANNEL_TEXT_SEND_ERROR_INVALID_CONTACT; + case TP_ERROR_PERMISSION_DENIED: + return TP_CHANNEL_TEXT_SEND_ERROR_PERMISSION_DENIED; + case TP_ERROR_NOT_IMPLEMENTED: + return TP_CHANNEL_TEXT_SEND_ERROR_NOT_IMPLEMENTED; + } - return TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN; + return TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN; } static void message_send_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { - EmpathyTpChat *self = user_data; - TpTextChannel *channel = (TpTextChannel *) source; - gchar *token = NULL; - GError *error = NULL; + EmpathyTpChat *self = user_data; + TpTextChannel *channel = (TpTextChannel *) source; + gchar *token = NULL; + GError *error = NULL; - if (!tp_text_channel_send_message_finish (channel, result, &token, &error)) { - DEBUG ("Error: %s", error->message); + if (!tp_text_channel_send_message_finish (channel, result, &token, &error)) + { + DEBUG ("Error: %s", error->message); - /* FIXME: we should use the body of the message as first argument of the - * signal but can't easily get it as we just get a user_data pointer. Once - * we'll have rebased EmpathyTpChat on top of TpTextChannel we'll be able - * to use the user_data pointer to pass the message and fix this. */ - g_signal_emit (self, signals[SEND_ERROR], 0, - NULL, error_to_text_send_error (error), NULL); + /* FIXME: we should use the body of the message as first argument of the + * signal but can't easily get it as we just get a user_data pointer. Once + * we'll have rebased EmpathyTpChat on top of TpTextChannel we'll be able + * to use the user_data pointer to pass the message and fix this. */ + g_signal_emit (self, signals[SEND_ERROR], 0, + NULL, error_to_text_send_error (error), NULL); - g_error_free (error); - } + g_error_free (error); + } - tp_chat_set_delivery_status (self, token, - EMPATHY_DELIVERY_STATUS_SENDING); - g_free (token); + tp_chat_set_delivery_status (self, token, + EMPATHY_DELIVERY_STATUS_SENDING); + g_free (token); } typedef struct { - EmpathyTpChat *chat; - TpChannelChatState state; + EmpathyTpChat *chat; + TpChannelChatState state; } StateChangedData; static void -tp_chat_state_changed_got_contact_cb (TpConnection *connection, - EmpathyContact *contact, - const GError *error, - gpointer user_data, - GObject *chat) +tp_chat_state_changed_got_contact_cb (TpConnection *connection, + EmpathyContact *contact, + const GError *error, + gpointer user_data, + GObject *chat) { - TpChannelChatState state; + TpChannelChatState state; - if (error) { - DEBUG ("Error: %s", error->message); - return; - } + if (error != NULL) + { + DEBUG ("Error: %s", error->message); + return; + } - state = GPOINTER_TO_UINT (user_data); - DEBUG ("Chat state changed for %s (%d): %d", - empathy_contact_get_alias (contact), - empathy_contact_get_handle (contact), state); + state = GPOINTER_TO_UINT (user_data); + DEBUG ("Chat state changed for %s (%d): %d", + empathy_contact_get_alias (contact), + empathy_contact_get_handle (contact), state); - g_signal_emit (chat, signals[CHAT_STATE_CHANGED], 0, contact, state); + g_signal_emit (chat, signals[CHAT_STATE_CHANGED], 0, contact, state); } static void tp_chat_state_changed_cb (TpChannel *channel, - TpHandle handle, - TpChannelChatState state, - EmpathyTpChat *self) + TpHandle handle, + TpChannelChatState state, + EmpathyTpChat *self) { - TpConnection *connection = tp_channel_borrow_connection ( - (TpChannel *) self); + TpConnection *connection = tp_channel_borrow_connection ( + (TpChannel *) self); - empathy_tp_contact_factory_get_from_handle (connection, handle, - tp_chat_state_changed_got_contact_cb, GUINT_TO_POINTER (state), - NULL, G_OBJECT (self)); + empathy_tp_contact_factory_get_from_handle (connection, handle, + tp_chat_state_changed_got_contact_cb, GUINT_TO_POINTER (state), + NULL, G_OBJECT (self)); } static void list_pending_messages (EmpathyTpChat *self) { - GList *messages, *l; + GList *messages, *l; - messages = tp_text_channel_get_pending_messages ( - TP_TEXT_CHANNEL (self)); + messages = tp_text_channel_get_pending_messages (TP_TEXT_CHANNEL (self)); - for (l = messages; l != NULL; l = g_list_next (l)) { - TpMessage *message = l->data; + for (l = messages; l != NULL; l = g_list_next (l)) + { + TpMessage *message = l->data; - handle_incoming_message (self, message, FALSE); - } + handle_incoming_message (self, message, FALSE); + } - g_list_free (messages); + g_list_free (messages); } static void update_subject (EmpathyTpChat *self, - GHashTable *properties) + GHashTable *properties) { - EmpathyTpChatPrivate *priv = self->priv; - gboolean can_set, valid; - const gchar *subject; + gboolean can_set, valid; + const gchar *subject; - can_set = tp_asv_get_boolean (properties, "CanSet", &valid); - if (valid) { - priv->can_set_subject = can_set; - } + can_set = tp_asv_get_boolean (properties, "CanSet", &valid); + if (valid) + self->priv->can_set_subject = can_set; - subject = tp_asv_get_string (properties, "Subject"); - if (subject != NULL) { - const gchar *actor; + subject = tp_asv_get_string (properties, "Subject"); + if (subject != NULL) + { + const gchar *actor; - g_free (priv->subject); - priv->subject = g_strdup (subject); + g_free (self->priv->subject); + self->priv->subject = g_strdup (subject); - /* If the actor is included with this update, use it; - * otherwise, clear it to avoid showing stale information. - * Why might it not be included? When you join an IRC channel, - * you get a pair of messages: first, the current topic; next, - * who set it, and when. Idle reports these in two separate - * signals. - */ - actor = tp_asv_get_string (properties, "Actor"); - g_free (priv->subject_actor); - priv->subject_actor = g_strdup (actor); + /* If the actor is included with this update, use it; + * otherwise, clear it to avoid showing stale information. + * Why might it not be included? When you join an IRC channel, + * you get a pair of messages: first, the current topic; next, + * who set it, and when. Idle reports these in two separate + * signals. + */ + actor = tp_asv_get_string (properties, "Actor"); + g_free (self->priv->subject_actor); + self->priv->subject_actor = g_strdup (actor); - g_object_notify (G_OBJECT (self), "subject"); - } + g_object_notify (G_OBJECT (self), "subject"); + } - /* TODO: track Timestamp. */ + /* TODO: track Timestamp. */ } static void -tp_chat_get_all_subject_cb (TpProxy *proxy, - GHashTable *properties, - const GError *error, - gpointer user_data G_GNUC_UNUSED, - GObject *chat) +tp_chat_get_all_subject_cb (TpProxy *proxy, + GHashTable *properties, + const GError *error, + gpointer user_data G_GNUC_UNUSED, + GObject *chat) { - EmpathyTpChat *self = EMPATHY_TP_CHAT (chat); - EmpathyTpChatPrivate *priv = self->priv; + EmpathyTpChat *self = EMPATHY_TP_CHAT (chat); - if (error) { - DEBUG ("Error fetching subject: %s", error->message); - return; - } + if (error != NULL) + { + DEBUG ("Error fetching subject: %s", error->message); + return; + } - priv->supports_subject = TRUE; - update_subject (self, properties); + self->priv->supports_subject = TRUE; + update_subject (self, properties); } static void update_title (EmpathyTpChat *self, - GHashTable *properties) + GHashTable *properties) { - EmpathyTpChatPrivate *priv = self->priv; - const gchar *title = tp_asv_get_string (properties, "Title"); + const gchar *title = tp_asv_get_string (properties, "Title"); - if (title != NULL) { - if (tp_str_empty (title)) { - title = NULL; - } + if (title != NULL) + { + if (tp_str_empty (title)) + title = NULL; - g_free (priv->title); - priv->title = g_strdup (title); - g_object_notify (G_OBJECT (self), "title"); - } + g_free (self->priv->title); + self->priv->title = g_strdup (title); + g_object_notify (G_OBJECT (self), "title"); + } } static void -tp_chat_get_all_room_config_cb (TpProxy *proxy, - GHashTable *properties, - const GError *error, - gpointer user_data G_GNUC_UNUSED, - GObject *chat) +tp_chat_get_all_room_config_cb (TpProxy *proxy, + GHashTable *properties, + const GError *error, + gpointer user_data G_GNUC_UNUSED, + GObject *chat) { - EmpathyTpChat *self = EMPATHY_TP_CHAT (chat); + EmpathyTpChat *self = EMPATHY_TP_CHAT (chat); - if (error) { - DEBUG ("Error fetching room config: %s", error->message); - return; - } + if (error) + { + DEBUG ("Error fetching room config: %s", error->message); + return; + } - update_title (self, properties); + update_title (self, properties); } static void tp_chat_dbus_properties_changed_cb (TpProxy *proxy, - const gchar *interface_name, - GHashTable *changed, - const gchar **invalidated, - gpointer user_data, - GObject *chat) + const gchar *interface_name, + GHashTable *changed, + const gchar **invalidated, + gpointer user_data, + GObject *chat) { - EmpathyTpChat *self = EMPATHY_TP_CHAT (chat); + EmpathyTpChat *self = EMPATHY_TP_CHAT (chat); - if (!tp_strdiff (interface_name, TP_IFACE_CHANNEL_INTERFACE_SUBJECT)) { - update_subject (self, changed); - } + if (!tp_strdiff (interface_name, TP_IFACE_CHANNEL_INTERFACE_SUBJECT)) + update_subject (self, changed); - if (!tp_strdiff (interface_name, TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG)) { - update_title (self, changed); - } + if (!tp_strdiff (interface_name, TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG)) + update_title (self, changed); } void empathy_tp_chat_set_subject (EmpathyTpChat *self, - const gchar *subject) + const gchar *subject) { - tp_cli_channel_interface_subject_call_set_subject (TP_CHANNEL (self), -1, - subject, - tp_chat_async_cb, - "while setting subject", NULL, - G_OBJECT (self)); + tp_cli_channel_interface_subject_call_set_subject (TP_CHANNEL (self), -1, + subject, tp_chat_async_cb, "while setting subject", NULL, + G_OBJECT (self)); } const gchar * empathy_tp_chat_get_title (EmpathyTpChat *self) { - EmpathyTpChatPrivate *priv = self->priv; - - return priv->title; + return self->priv->title; } gboolean empathy_tp_chat_supports_subject (EmpathyTpChat *self) { - EmpathyTpChatPrivate *priv = self->priv; - - return priv->supports_subject; + return self->priv->supports_subject; } gboolean empathy_tp_chat_can_set_subject (EmpathyTpChat *self) { - EmpathyTpChatPrivate *priv = self->priv; - - return priv->can_set_subject; + return self->priv->can_set_subject; } const gchar * empathy_tp_chat_get_subject (EmpathyTpChat *self) { - EmpathyTpChatPrivate *priv = self->priv; - - return priv->subject; + return self->priv->subject; } const gchar * empathy_tp_chat_get_subject_actor (EmpathyTpChat *self) { - EmpathyTpChatPrivate *priv = self->priv; - - return priv->subject_actor; + return self->priv->subject_actor; } static void tp_chat_dispose (GObject *object) { - EmpathyTpChat *self = EMPATHY_TP_CHAT (object); + EmpathyTpChat *self = EMPATHY_TP_CHAT (object); - tp_clear_object (&self->priv->account); - tp_clear_object (&self->priv->remote_contact); - tp_clear_object (&self->priv->user); + tp_clear_object (&self->priv->account); + tp_clear_object (&self->priv->remote_contact); + tp_clear_object (&self->priv->user); - g_queue_foreach (self->priv->messages_queue, (GFunc) g_object_unref, NULL); - g_queue_clear (self->priv->messages_queue); + g_queue_foreach (self->priv->messages_queue, (GFunc) g_object_unref, NULL); + g_queue_clear (self->priv->messages_queue); - g_queue_foreach (self->priv->pending_messages_queue, - (GFunc) g_object_unref, NULL); - g_queue_clear (self->priv->pending_messages_queue); + g_queue_foreach (self->priv->pending_messages_queue, + (GFunc) g_object_unref, NULL); + g_queue_clear (self->priv->pending_messages_queue); - tp_clear_object (&self->priv->ready_result); + tp_clear_object (&self->priv->ready_result); - if (G_OBJECT_CLASS (empathy_tp_chat_parent_class)->dispose) - G_OBJECT_CLASS (empathy_tp_chat_parent_class)->dispose (object); + if (G_OBJECT_CLASS (empathy_tp_chat_parent_class)->dispose) + G_OBJECT_CLASS (empathy_tp_chat_parent_class)->dispose (object); } static void tp_chat_finalize (GObject *object) { - EmpathyTpChat *self = (EmpathyTpChat *) object; + EmpathyTpChat *self = (EmpathyTpChat *) object; - DEBUG ("Finalize: %p", object); + DEBUG ("Finalize: %p", object); - g_queue_free (self->priv->messages_queue); - g_queue_free (self->priv->pending_messages_queue); - g_hash_table_unref (self->priv->messages_being_sent); + g_queue_free (self->priv->messages_queue); + g_queue_free (self->priv->pending_messages_queue); + g_hash_table_unref (self->priv->messages_being_sent); - g_free (self->priv->title); - g_free (self->priv->subject); - g_free (self->priv->subject_actor); + g_free (self->priv->title); + g_free (self->priv->subject); + g_free (self->priv->subject_actor); - G_OBJECT_CLASS (empathy_tp_chat_parent_class)->finalize (object); + G_OBJECT_CLASS (empathy_tp_chat_parent_class)->finalize (object); } static void check_almost_ready (EmpathyTpChat *self) { - TpChannel *channel = (TpChannel *) self; + TpChannel *channel = (TpChannel *) self; - if (self->priv->ready_result == NULL) - return; + if (self->priv->ready_result == NULL) + return; - if (self->priv->user == NULL) - return; + if (self->priv->user == NULL) + return; - /* We need either the members (room) or the remote contact (private chat). - * If the chat is protected by a password we can't get these information so - * consider the chat as ready so it can be presented to the user. */ - if (!tp_channel_password_needed (channel) && self->priv->members == NULL && - self->priv->remote_contact == NULL) - return; + /* We need either the members (room) or the remote contact (private chat). + * If the chat is protected by a password we can't get these information so + * consider the chat as ready so it can be presented to the user. */ + if (!tp_channel_password_needed (channel) && self->priv->members == NULL && + self->priv->remote_contact == NULL) + return; - g_assert (tp_proxy_is_prepared (self, - TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES)); + g_assert (tp_proxy_is_prepared (self, + TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES)); - tp_g_signal_connect_object (self, "message-received", - G_CALLBACK (message_received_cb), self, 0); - tp_g_signal_connect_object (self, "pending-message-removed", - G_CALLBACK (pending_message_removed_cb), self, 0); + tp_g_signal_connect_object (self, "message-received", + G_CALLBACK (message_received_cb), self, 0); + tp_g_signal_connect_object (self, "pending-message-removed", + G_CALLBACK (pending_message_removed_cb), self, 0); - list_pending_messages (self); + list_pending_messages (self); - tp_g_signal_connect_object (self, "message-sent", - G_CALLBACK (message_sent_cb), self, 0); + tp_g_signal_connect_object (self, "message-sent", + G_CALLBACK (message_sent_cb), self, 0); - tp_g_signal_connect_object (self, "chat-state-changed", - G_CALLBACK (tp_chat_state_changed_cb), self, 0); + tp_g_signal_connect_object (self, "chat-state-changed", + G_CALLBACK (tp_chat_state_changed_cb), self, 0); - check_ready (self); + check_ready (self); } static void -tp_chat_got_added_contacts_cb (TpConnection *connection, - guint n_contacts, - EmpathyContact * const * contacts, - guint n_failed, - const TpHandle *failed, - const GError *error, - gpointer user_data, - GObject *chat) -{ - EmpathyTpChat *self = (EmpathyTpChat *) chat; - guint i; - const TpIntSet *members; - TpHandle handle; - EmpathyContact *contact; - - if (error) { - DEBUG ("Error: %s", error->message); - return; - } - - members = tp_channel_group_get_members ((TpChannel *) self); - for (i = 0; i < n_contacts; i++) { - contact = contacts[i]; - handle = empathy_contact_get_handle (contact); - - /* Make sure the contact is still member */ - if (tp_intset_is_member (members, handle)) { - self->priv->members = g_list_prepend (self->priv->members, - g_object_ref (contact)); - g_signal_emit_by_name (chat, "members-changed", - contact, NULL, 0, NULL, TRUE); - } - } - - check_almost_ready (EMPATHY_TP_CHAT (chat)); +tp_chat_got_added_contacts_cb (TpConnection *connection, + guint n_contacts, + EmpathyContact * const * contacts, + guint n_failed, + const TpHandle *failed, + const GError *error, + gpointer user_data, + GObject *chat) +{ + EmpathyTpChat *self = (EmpathyTpChat *) chat; + guint i; + const TpIntSet *members; + TpHandle handle; + EmpathyContact *contact; + + if (error) + { + DEBUG ("Error: %s", error->message); + return; + } + + members = tp_channel_group_get_members ((TpChannel *) self); + for (i = 0; i < n_contacts; i++) + { + contact = contacts[i]; + handle = empathy_contact_get_handle (contact); + + /* Make sure the contact is still member */ + if (tp_intset_is_member (members, handle)) + { + self->priv->members = g_list_prepend (self->priv->members, + g_object_ref (contact)); + g_signal_emit_by_name (chat, "members-changed", + contact, NULL, 0, NULL, TRUE); + } + } + + check_almost_ready (EMPATHY_TP_CHAT (chat)); } static EmpathyContact * chat_lookup_contact (EmpathyTpChat *self, - TpHandle handle, - gboolean remove_) + TpHandle handle, + gboolean remove_) { - GList *l; + GList *l; - for (l = self->priv->members; l; l = l->next) { - EmpathyContact *c = l->data; + for (l = self->priv->members; l; l = l->next) + { + EmpathyContact *c = l->data; - if (empathy_contact_get_handle (c) != handle) { - continue; - } + if (empathy_contact_get_handle (c) != handle) + continue; - if (remove_) { - /* Caller takes the reference. */ - self->priv->members = g_list_delete_link (self->priv->members, l); - } else { - g_object_ref (c); - } + if (remove_) + { + /* Caller takes the reference. */ + self->priv->members = g_list_delete_link (self->priv->members, l); + } + else + { + g_object_ref (c); + } - return c; - } + return c; + } - return NULL; + return NULL; } typedef struct { - TpHandle old_handle; - guint reason; - gchar *message; + TpHandle old_handle; + guint reason; + gchar *message; } ContactRenameData; static ContactRenameData * contact_rename_data_new (TpHandle handle, - guint reason, - const gchar* message) + guint reason, + const gchar* message) { - ContactRenameData *data = g_new (ContactRenameData, 1); - data->old_handle = handle; - data->reason = reason; - data->message = g_strdup (message); + ContactRenameData *data = g_new (ContactRenameData, 1); + data->old_handle = handle; + data->reason = reason; + data->message = g_strdup (message); - return data; + return data; } static void contact_rename_data_free (ContactRenameData* data) { - g_free (data->message); - g_free (data); + g_free (data->message); + g_free (data); } static void -tp_chat_got_renamed_contacts_cb (TpConnection *connection, - guint n_contacts, - EmpathyContact * const * contacts, - guint n_failed, - const TpHandle *failed, - const GError *error, - gpointer user_data, - GObject *chat) -{ - EmpathyTpChat *self = (EmpathyTpChat *) chat; - const TpIntSet *members; - TpHandle handle; - EmpathyContact *old = NULL, *new = NULL; - ContactRenameData *rename_data = (ContactRenameData *) user_data; - - if (error) { - DEBUG ("Error: %s", error->message); - return; - } - - /* renamed members can only be delivered one at a time */ - g_warn_if_fail (n_contacts == 1); - - new = contacts[0]; - - members = tp_channel_group_get_members ((TpChannel *) self); - handle = empathy_contact_get_handle (new); - - old = chat_lookup_contact (self, rename_data->old_handle, TRUE); - - /* Make sure the contact is still member */ - if (tp_intset_is_member (members, handle)) { - self->priv->members = g_list_prepend (self->priv->members, - g_object_ref (new)); - - if (old != NULL) { - g_signal_emit_by_name (self, "member-renamed", - old, new, rename_data->reason, - rename_data->message); - g_object_unref (old); - } - } - - if (self->priv->user == old) { - /* We change our nick */ - tp_clear_object (&self->priv->user); - self->priv->user = g_object_ref (new); - g_object_notify (chat, "self-contact"); - } - - check_almost_ready (self); +tp_chat_got_renamed_contacts_cb (TpConnection *connection, + guint n_contacts, + EmpathyContact * const * contacts, + guint n_failed, + const TpHandle *failed, + const GError *error, + gpointer user_data, + GObject *chat) +{ + EmpathyTpChat *self = (EmpathyTpChat *) chat; + const TpIntSet *members; + TpHandle handle; + EmpathyContact *old = NULL, *new = NULL; + ContactRenameData *rename_data = (ContactRenameData *) user_data; + + if (error) + { + DEBUG ("Error: %s", error->message); + return; + } + + /* renamed members can only be delivered one at a time */ + g_warn_if_fail (n_contacts == 1); + + new = contacts[0]; + + members = tp_channel_group_get_members ((TpChannel *) self); + handle = empathy_contact_get_handle (new); + + old = chat_lookup_contact (self, rename_data->old_handle, TRUE); + + /* Make sure the contact is still member */ + if (tp_intset_is_member (members, handle)) + { + self->priv->members = g_list_prepend (self->priv->members, + g_object_ref (new)); + + if (old != NULL) + { + g_signal_emit_by_name (self, "member-renamed", + old, new, rename_data->reason, + rename_data->message); + g_object_unref (old); + } + } + + if (self->priv->user == old) + { + /* We change our nick */ + tp_clear_object (&self->priv->user); + self->priv->user = g_object_ref (new); + g_object_notify (chat, "self-contact"); + } + + check_almost_ready (self); } static void -tp_chat_group_members_changed_cb (TpChannel *channel, - gchar *message, - GArray *added, - GArray *removed, - GArray *local_pending, - GArray *remote_pending, - guint actor, - guint reason, - EmpathyTpChat *self) -{ - EmpathyContact *contact; - EmpathyContact *actor_contact = NULL; - guint i; - ContactRenameData *rename_data; - TpHandle old_handle; - TpConnection *connection = tp_channel_borrow_connection ( - (TpChannel *) self); - - /* Contact renamed */ - if (reason == TP_CHANNEL_GROUP_CHANGE_REASON_RENAMED) { - /* there can only be a single 'added' and a single 'removed' handle */ - if (removed->len != 1 || added->len != 1) { - g_warning ("RENAMED with %u added, %u removed (expected 1, 1)", - added->len, removed->len); - return; - } - - old_handle = g_array_index (removed, guint, 0); - - rename_data = contact_rename_data_new (old_handle, reason, message); - empathy_tp_contact_factory_get_from_handles (connection, - added->len, (TpHandle *) added->data, - tp_chat_got_renamed_contacts_cb, - rename_data, (GDestroyNotify) contact_rename_data_free, - G_OBJECT (self)); - return; - } - - if (actor != 0) { - actor_contact = chat_lookup_contact (self, actor, FALSE); - if (actor_contact == NULL) { - /* FIXME: handle this a tad more gracefully: perhaps - * the actor was a server op. We could use the - * contact-ids detail of MembersChangedDetailed. - */ - DEBUG ("actor %u not a channel member", actor); - } - } - - /* Remove contacts that are not members anymore */ - for (i = 0; i < removed->len; i++) { - contact = chat_lookup_contact (self, - g_array_index (removed, TpHandle, i), TRUE); - - if (contact != NULL) { - g_signal_emit_by_name (self, "members-changed", contact, - actor_contact, reason, message, - FALSE); - g_object_unref (contact); - } - } - - /* Request added contacts */ - if (added->len > 0) { - empathy_tp_contact_factory_get_from_handles (connection, - added->len, (TpHandle *) added->data, - tp_chat_got_added_contacts_cb, NULL, NULL, - G_OBJECT (self)); - } - - if (actor_contact != NULL) { - g_object_unref (actor_contact); - } +tp_chat_group_members_changed_cb (TpChannel *channel, + gchar *message, + GArray *added, + GArray *removed, + GArray *local_pending, + GArray *remote_pending, + guint actor, + guint reason, + EmpathyTpChat *self) +{ + EmpathyContact *contact; + EmpathyContact *actor_contact = NULL; + guint i; + ContactRenameData *rename_data; + TpHandle old_handle; + TpConnection *connection = tp_channel_borrow_connection ( + (TpChannel *) self); + + /* Contact renamed */ + if (reason == TP_CHANNEL_GROUP_CHANGE_REASON_RENAMED) + { + /* there can only be a single 'added' and a single 'removed' handle */ + if (removed->len != 1 || added->len != 1) + { + g_warning ("RENAMED with %u added, %u removed (expected 1, 1)", + added->len, removed->len); + return; + } + + old_handle = g_array_index (removed, guint, 0); + + rename_data = contact_rename_data_new (old_handle, reason, message); + empathy_tp_contact_factory_get_from_handles (connection, + added->len, (TpHandle *) added->data, + tp_chat_got_renamed_contacts_cb, + rename_data, (GDestroyNotify) contact_rename_data_free, + G_OBJECT (self)); + return; + } + + if (actor != 0) + { + actor_contact = chat_lookup_contact (self, actor, FALSE); + if (actor_contact == NULL) + { + /* FIXME: handle this a tad more gracefully: perhaps + * the actor was a server op. We could use the + * contact-ids detail of MembersChangedDetailed. + */ + DEBUG ("actor %u not a channel member", actor); + } + } + + /* Remove contacts that are not members anymore */ + for (i = 0; i < removed->len; i++) + { + contact = chat_lookup_contact (self, + g_array_index (removed, TpHandle, i), TRUE); + + if (contact != NULL) + { + g_signal_emit_by_name (self, "members-changed", contact, + actor_contact, reason, message, + FALSE); + g_object_unref (contact); + } + } + + /* Request added contacts */ + if (added->len > 0) + { + empathy_tp_contact_factory_get_from_handles (connection, + added->len, (TpHandle *) added->data, + tp_chat_got_added_contacts_cb, NULL, NULL, + G_OBJECT (self)); + } + + if (actor_contact != NULL) + g_object_unref (actor_contact); } static void -tp_chat_got_remote_contact_cb (TpConnection *connection, - EmpathyContact *contact, - const GError *error, - gpointer user_data, - GObject *chat) +tp_chat_got_remote_contact_cb (TpConnection *connection, + EmpathyContact *contact, + const GError *error, + gpointer user_data, + GObject *chat) { - EmpathyTpChat *self = (EmpathyTpChat *) chat; + EmpathyTpChat *self = (EmpathyTpChat *) chat; - if (error) { - DEBUG ("Error: %s", error->message); - empathy_tp_chat_leave (self, ""); - return; - } + if (error != NULL) + { + DEBUG ("Error: %s", error->message); + empathy_tp_chat_leave (self, ""); + return; + } - self->priv->remote_contact = g_object_ref (contact); - g_object_notify (chat, "remote-contact"); + self->priv->remote_contact = g_object_ref (contact); + g_object_notify (chat, "remote-contact"); - check_almost_ready (self); + check_almost_ready (self); } static void -tp_chat_got_self_contact_cb (TpConnection *connection, - EmpathyContact *contact, - const GError *error, - gpointer user_data, - GObject *chat) +tp_chat_got_self_contact_cb (TpConnection *connection, + EmpathyContact *contact, + const GError *error, + gpointer user_data, + GObject *chat) { - EmpathyTpChat *self = (EmpathyTpChat *) chat; + EmpathyTpChat *self = (EmpathyTpChat *) chat; - if (error) { - DEBUG ("Error: %s", error->message); - empathy_tp_chat_leave (self, ""); - return; - } + if (error != NULL) + { + DEBUG ("Error: %s", error->message); + empathy_tp_chat_leave (self, ""); + return; + } - self->priv->user = g_object_ref (contact); - empathy_contact_set_is_user (self->priv->user, TRUE); - g_object_notify (chat, "self-contact"); - check_almost_ready (self); + self->priv->user = g_object_ref (contact); + empathy_contact_set_is_user (self->priv->user, TRUE); + g_object_notify (chat, "self-contact"); + check_almost_ready (self); } static void -tp_chat_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - EmpathyTpChat *self = EMPATHY_TP_CHAT (object); - - switch (param_id) { - case PROP_ACCOUNT: - g_value_set_object (value, self->priv->account); - break; - case PROP_SELF_CONTACT: - g_value_set_object (value, self->priv->user); - break; - case PROP_REMOTE_CONTACT: - g_value_set_object (value, self->priv->remote_contact); - break; - case PROP_N_MESSAGES_SENDING: - g_value_set_uint (value, - g_hash_table_size (self->priv->messages_being_sent)); - break; - case PROP_TITLE: - g_value_set_string (value, - empathy_tp_chat_get_title (self)); - break; - case PROP_SUBJECT: - g_value_set_string (value, - empathy_tp_chat_get_subject (self)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - }; +tp_chat_get_property (GObject *object, + guint param_id, + GValue *value, + GParamSpec *pspec) +{ + EmpathyTpChat *self = EMPATHY_TP_CHAT (object); + + switch (param_id) + { + case PROP_ACCOUNT: + g_value_set_object (value, self->priv->account); + break; + case PROP_SELF_CONTACT: + g_value_set_object (value, self->priv->user); + break; + case PROP_REMOTE_CONTACT: + g_value_set_object (value, self->priv->remote_contact); + break; + case PROP_N_MESSAGES_SENDING: + g_value_set_uint (value, + g_hash_table_size (self->priv->messages_being_sent)); + break; + case PROP_TITLE: + g_value_set_string (value, + empathy_tp_chat_get_title (self)); + break; + case PROP_SUBJECT: + g_value_set_string (value, + empathy_tp_chat_get_subject (self)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); + break; + }; } static void -tp_chat_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) +tp_chat_set_property (GObject *object, + guint param_id, + const GValue *value, + GParamSpec *pspec) { - EmpathyTpChat *self = EMPATHY_TP_CHAT (object); + EmpathyTpChat *self = EMPATHY_TP_CHAT (object); - switch (param_id) { - case PROP_ACCOUNT: - self->priv->account = g_value_dup_object (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - }; + switch (param_id) + { + case PROP_ACCOUNT: + self->priv->account = g_value_dup_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); + break; + }; } enum { - FEAT_READY, - N_FEAT + FEAT_READY, + N_FEAT }; static const TpProxyFeature * tp_chat_list_features (TpProxyClass *cls G_GNUC_UNUSED) { - static TpProxyFeature features[N_FEAT + 1] = { { 0 } }; + static TpProxyFeature features[N_FEAT + 1] = { { 0 } }; static GQuark need[2] = {0, 0}; - if (G_LIKELY (features[0].name != 0)) - return features; + if (G_LIKELY (features[0].name != 0)) + return features; - features[FEAT_READY].name = EMPATHY_TP_CHAT_FEATURE_READY; - need[0] = TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES; - features[FEAT_READY].depends_on = need; - features[FEAT_READY].prepare_async = - tp_chat_prepare_ready_async; + features[FEAT_READY].name = EMPATHY_TP_CHAT_FEATURE_READY; + need[0] = TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES; + features[FEAT_READY].depends_on = need; + features[FEAT_READY].prepare_async = + tp_chat_prepare_ready_async; - /* assert that the terminator at the end is there */ - g_assert (features[N_FEAT].name == 0); + /* assert that the terminator at the end is there */ + g_assert (features[N_FEAT].name == 0); - return features; + return features; } static void empathy_tp_chat_class_init (EmpathyTpChatClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - TpProxyClass *proxy_class = TP_PROXY_CLASS (klass); - - object_class->dispose = tp_chat_dispose; - object_class->finalize = tp_chat_finalize; - object_class->get_property = tp_chat_get_property; - object_class->set_property = tp_chat_set_property; - - proxy_class->list_features = tp_chat_list_features; - - g_object_class_install_property (object_class, - PROP_ACCOUNT, - g_param_spec_object ("account", - "TpAccount", - "the account associated with the chat", - TP_TYPE_ACCOUNT, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_STRINGS)); - - /** - * EmpathyTpChat:self-contact: - * - * Not to be confused with TpChannel:group-self-contact. - */ - g_object_class_install_property (object_class, - PROP_SELF_CONTACT, - g_param_spec_object ("self-contact", - "The local contact", - "The EmpathyContact for the local user on this channel", - EMPATHY_TYPE_CONTACT, - G_PARAM_READABLE)); - - g_object_class_install_property (object_class, - PROP_REMOTE_CONTACT, - g_param_spec_object ("remote-contact", - "The remote contact", - "The remote contact if there is no group iface on the channel", - EMPATHY_TYPE_CONTACT, - G_PARAM_READABLE)); - - g_object_class_install_property (object_class, - PROP_N_MESSAGES_SENDING, - g_param_spec_uint ("n-messages-sending", - "Num Messages Sending", - "The number of messages being sent", - 0, G_MAXUINT, 0, - G_PARAM_READABLE)); - - g_object_class_install_property (object_class, - PROP_TITLE, - g_param_spec_string ("title", - "Title", - "A human-readable name for the room, if any", - NULL, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS)); - - g_object_class_install_property (object_class, - PROP_SUBJECT, - g_param_spec_string ("subject", - "Subject", - "The room's current subject, if any", - NULL, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS)); - - /* Signals */ - signals[MESSAGE_RECEIVED] = - g_signal_new ("message-received-empathy", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 1, EMPATHY_TYPE_MESSAGE); - - signals[SEND_ERROR] = - g_signal_new ("send-error", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 3, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING); - - signals[CHAT_STATE_CHANGED] = - g_signal_new ("chat-state-changed-empathy", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 2, EMPATHY_TYPE_CONTACT, G_TYPE_UINT); - - signals[MESSAGE_ACKNOWLEDGED] = - g_signal_new ("message-acknowledged", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 1, EMPATHY_TYPE_MESSAGE); - - g_type_class_add_private (object_class, sizeof (EmpathyTpChatPrivate)); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + TpProxyClass *proxy_class = TP_PROXY_CLASS (klass); + + object_class->dispose = tp_chat_dispose; + object_class->finalize = tp_chat_finalize; + object_class->get_property = tp_chat_get_property; + object_class->set_property = tp_chat_set_property; + + proxy_class->list_features = tp_chat_list_features; + + g_object_class_install_property (object_class, PROP_ACCOUNT, + g_param_spec_object ("account", "TpAccount", + "the account associated with the chat", + TP_TYPE_ACCOUNT, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + + /** + * EmpathyTpChat:self-contact: + * + * Not to be confused with TpChannel:group-self-contact. + */ + g_object_class_install_property (object_class, PROP_SELF_CONTACT, + g_param_spec_object ("self-contact", "The local contact", + "The EmpathyContact for the local user on this channel", + EMPATHY_TYPE_CONTACT, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, PROP_REMOTE_CONTACT, + g_param_spec_object ("remote-contact", "The remote contact", + "The remote contact if there is no group iface on the channel", + EMPATHY_TYPE_CONTACT, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, PROP_N_MESSAGES_SENDING, + g_param_spec_uint ("n-messages-sending", "Num Messages Sending", + "The number of messages being sent", + 0, G_MAXUINT, 0, + G_PARAM_READABLE)); + + g_object_class_install_property (object_class, PROP_TITLE, + g_param_spec_string ("title", "Title", + "A human-readable name for the room, if any", + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (object_class, PROP_SUBJECT, + g_param_spec_string ("subject", "Subject", + "The room's current subject, if any", + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + + /* Signals */ + signals[MESSAGE_RECEIVED] = g_signal_new ("message-received-empathy", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 1, EMPATHY_TYPE_MESSAGE); + + signals[SEND_ERROR] = g_signal_new ("send-error", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 3, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING); + + signals[CHAT_STATE_CHANGED] = g_signal_new ("chat-state-changed-empathy", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 2, EMPATHY_TYPE_CONTACT, G_TYPE_UINT); + + signals[MESSAGE_ACKNOWLEDGED] = g_signal_new ("message-acknowledged", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 1, EMPATHY_TYPE_MESSAGE); + + g_type_class_add_private (object_class, sizeof (EmpathyTpChatPrivate)); } static void empathy_tp_chat_init (EmpathyTpChat *self) { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - EMPATHY_TYPE_TP_CHAT, EmpathyTpChatPrivate); + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_TP_CHAT, + EmpathyTpChatPrivate); - self->priv->messages_queue = g_queue_new (); - self->priv->pending_messages_queue = g_queue_new (); - self->priv->messages_being_sent = g_hash_table_new_full ( - g_str_hash, g_str_equal, g_free, NULL); + self->priv->messages_queue = g_queue_new (); + self->priv->pending_messages_queue = g_queue_new (); + self->priv->messages_being_sent = g_hash_table_new_full ( + g_str_hash, g_str_equal, g_free, NULL); } -static void -tp_chat_iface_init (EmpathyContactListIface *iface) +EmpathyTpChat * +empathy_tp_chat_new (TpSimpleClientFactory *factory, + TpAccount *account, + TpConnection *conn, + const gchar *object_path, + const GHashTable *immutable_properties) { - iface->add = tp_chat_add; - iface->remove = tp_chat_remove; - iface->get_members = tp_chat_get_members; -} + TpProxy *conn_proxy = (TpProxy *) conn; -EmpathyTpChat * -empathy_tp_chat_new ( - TpSimpleClientFactory *factory, - TpAccount *account, - TpConnection *conn, - const gchar *object_path, - const GHashTable *immutable_properties) -{ - TpProxy *conn_proxy = (TpProxy *) conn; - - g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL); - g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL); - g_return_val_if_fail (immutable_properties != NULL, NULL); - - return g_object_new (EMPATHY_TYPE_TP_CHAT, - "factory", factory, - "account", account, - "connection", conn, - "dbus-daemon", conn_proxy->dbus_daemon, - "bus-name", conn_proxy->bus_name, - "object-path", object_path, - "channel-properties", immutable_properties, - NULL); + g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL); + g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL); + g_return_val_if_fail (immutable_properties != NULL, NULL); + + return g_object_new (EMPATHY_TYPE_TP_CHAT, + "factory", factory, + "account", account, + "connection", conn, + "dbus-daemon", conn_proxy->dbus_daemon, + "bus-name", conn_proxy->bus_name, + "object-path", object_path, + "channel-properties", immutable_properties, + NULL); } const gchar * empathy_tp_chat_get_id (EmpathyTpChat *self) { - const gchar *id; + const gchar *id; - g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); + g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); - id = tp_channel_get_identifier ((TpChannel *) self); - if (!EMP_STR_EMPTY (id)) - return id; - else if (self->priv->remote_contact) - return empathy_contact_get_id (self->priv->remote_contact); - else - return NULL; + id = tp_channel_get_identifier ((TpChannel *) self); + if (!EMP_STR_EMPTY (id)) + return id; + else if (self->priv->remote_contact) + return empathy_contact_get_id (self->priv->remote_contact); + else + return NULL; } EmpathyContact * empathy_tp_chat_get_remote_contact (EmpathyTpChat *self) { - g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); + g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); - return self->priv->remote_contact; + return self->priv->remote_contact; } TpAccount * empathy_tp_chat_get_account (EmpathyTpChat *self) { - g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); + g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); - return self->priv->account; + return self->priv->account; } void empathy_tp_chat_send (EmpathyTpChat *self, - TpMessage *message) + TpMessage *message) { - gchar *message_body; + gchar *message_body; - g_return_if_fail (EMPATHY_IS_TP_CHAT (self)); - g_return_if_fail (TP_IS_CLIENT_MESSAGE (message)); + g_return_if_fail (EMPATHY_IS_TP_CHAT (self)); + g_return_if_fail (TP_IS_CLIENT_MESSAGE (message)); - message_body = tp_message_to_text (message, NULL); + message_body = tp_message_to_text (message, NULL); - DEBUG ("Sending message: %s", message_body); + DEBUG ("Sending message: %s", message_body); - tp_text_channel_send_message_async (TP_TEXT_CHANNEL (self), - message, TP_MESSAGE_SENDING_FLAG_REPORT_DELIVERY, - message_send_cb, self); + tp_text_channel_send_message_async (TP_TEXT_CHANNEL (self), + message, TP_MESSAGE_SENDING_FLAG_REPORT_DELIVERY, + message_send_cb, self); - g_free (message_body); + g_free (message_body); } const GList * empathy_tp_chat_get_pending_messages (EmpathyTpChat *self) { - g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); + g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); - return self->priv->pending_messages_queue->head; + return self->priv->pending_messages_queue->head; } void empathy_tp_chat_acknowledge_message (EmpathyTpChat *self, - EmpathyMessage *message) { - TpMessage *tp_msg; + EmpathyMessage *message) +{ + TpMessage *tp_msg; - g_return_if_fail (EMPATHY_IS_TP_CHAT (self)); + g_return_if_fail (EMPATHY_IS_TP_CHAT (self)); - if (!empathy_message_is_incoming (message)) - return; + if (!empathy_message_is_incoming (message)) + return; - tp_msg = empathy_message_get_tp_message (message); - tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (self), - tp_msg, NULL, NULL); + tp_msg = empathy_message_get_tp_message (message); + tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (self), + tp_msg, NULL, NULL); } /** @@ -1423,11 +1407,11 @@ empathy_tp_chat_acknowledge_message (EmpathyTpChat *self, gboolean empathy_tp_chat_can_add_contact (EmpathyTpChat *self) { - g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), FALSE); + g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), FALSE); - return self->priv->can_upgrade_to_muc || - tp_proxy_has_interface_by_id (self, - TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP);; + return self->priv->can_upgrade_to_muc || + tp_proxy_has_interface_by_id (self, + TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP);; } static void @@ -1435,197 +1419,208 @@ tp_channel_leave_async_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) { - GError *error = NULL; + GError *error = NULL; - if (!tp_channel_leave_finish (TP_CHANNEL (source_object), res, &error)) { - DEBUG ("Could not leave channel properly: (%s); closing the channel", - error->message); - g_error_free (error); - } + if (!tp_channel_leave_finish (TP_CHANNEL (source_object), res, &error)) + { + DEBUG ("Could not leave channel properly: (%s); closing the channel", + error->message); + g_error_free (error); + } } void empathy_tp_chat_leave (EmpathyTpChat *self, - const gchar *message) + const gchar *message) { - TpChannel *channel = (TpChannel *) self; + TpChannel *channel = (TpChannel *) self; - DEBUG ("Leaving channel %s with message \"%s\"", - tp_channel_get_identifier (channel), message); + DEBUG ("Leaving channel %s with message \"%s\"", + tp_channel_get_identifier (channel), message); - tp_channel_leave_async (channel, TP_CHANNEL_GROUP_CHANGE_REASON_NONE, - message, tp_channel_leave_async_cb, self); + tp_channel_leave_async (channel, TP_CHANNEL_GROUP_CHANGE_REASON_NONE, + message, tp_channel_leave_async_cb, self); } static void add_members_cb (TpChannel *proxy, - const GError *error, - gpointer user_data, - GObject *weak_object) + const GError *error, + gpointer user_data, + GObject *weak_object) { - EmpathyTpChat *self = (EmpathyTpChat *) weak_object; + EmpathyTpChat *self = (EmpathyTpChat *) weak_object; - if (error != NULL) { - DEBUG ("Failed to join chat (%s): %s", - tp_channel_get_identifier ((TpChannel *) self), error->message); - } + if (error != NULL) + { + DEBUG ("Failed to join chat (%s): %s", + tp_channel_get_identifier ((TpChannel *) self), error->message); + } } void empathy_tp_chat_join (EmpathyTpChat *self) { - TpHandle self_handle; - GArray *members; + TpHandle self_handle; + GArray *members; - self_handle = tp_channel_group_get_self_handle ((TpChannel *) self); + self_handle = tp_channel_group_get_self_handle ((TpChannel *) self); - members = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1); - g_array_append_val (members, self_handle); + members = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1); + g_array_append_val (members, self_handle); - tp_cli_channel_interface_group_call_add_members ((TpChannel *) self, -1, members, - "", add_members_cb, NULL, NULL, G_OBJECT (self)); + tp_cli_channel_interface_group_call_add_members ((TpChannel *) self, -1, + members, "", add_members_cb, NULL, NULL, G_OBJECT (self)); - g_array_unref (members); + g_array_unref (members); } gboolean empathy_tp_chat_is_invited (EmpathyTpChat *self, - TpHandle *inviter) + TpHandle *inviter) { - TpHandle self_handle; + TpHandle self_handle; - if (!tp_proxy_has_interface (self, TP_IFACE_CHANNEL_INTERFACE_GROUP)) - return FALSE; + if (!tp_proxy_has_interface (self, TP_IFACE_CHANNEL_INTERFACE_GROUP)) + return FALSE; - self_handle = tp_channel_group_get_self_handle ((TpChannel *) self); - if (self_handle == 0) - return FALSE; + self_handle = tp_channel_group_get_self_handle ((TpChannel *) self); + if (self_handle == 0) + return FALSE; - return tp_channel_group_get_local_pending_info ((TpChannel *) self, self_handle, - inviter, NULL, NULL); + return tp_channel_group_get_local_pending_info ((TpChannel *) self, + self_handle, inviter, NULL, NULL); } TpChannelChatState empathy_tp_chat_get_chat_state (EmpathyTpChat *self, - EmpathyContact *contact) + EmpathyContact *contact) { - return tp_channel_get_chat_state ((TpChannel *) self, - empathy_contact_get_handle (contact)); + return tp_channel_get_chat_state ((TpChannel *) self, + empathy_contact_get_handle (contact)); } EmpathyContact * empathy_tp_chat_get_self_contact (EmpathyTpChat *self) { - g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); + g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL); - return self->priv->user; + return self->priv->user; } GQuark empathy_tp_chat_get_feature_ready (void) { - return g_quark_from_static_string ("empathy-tp-chat-feature-ready"); + return g_quark_from_static_string ("empathy-tp-chat-feature-ready"); } static void tp_chat_prepare_ready_async (TpProxy *proxy, - const TpProxyFeature *feature, - GAsyncReadyCallback callback, - gpointer user_data) -{ - EmpathyTpChat *self = (EmpathyTpChat *) proxy; - TpChannel *channel = (TpChannel *) proxy; - TpConnection *connection; - gboolean listen_for_dbus_properties_changed = FALSE; - - g_assert (self->priv->ready_result == NULL); - self->priv->ready_result = g_simple_async_result_new (G_OBJECT (self), - callback, user_data, tp_chat_prepare_ready_async); - - connection = tp_channel_borrow_connection (channel); - - if (tp_proxy_has_interface_by_id (self, - TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) { - const TpIntSet *members; - GArray *handles; - TpHandle handle; - - /* Get self contact from the group's self handle */ - handle = tp_channel_group_get_self_handle (channel); - empathy_tp_contact_factory_get_from_handle (connection, - handle, tp_chat_got_self_contact_cb, - NULL, NULL, G_OBJECT (self)); - - /* Get initial member contacts */ - members = tp_channel_group_get_members (channel); - handles = tp_intset_to_array (members); - empathy_tp_contact_factory_get_from_handles (connection, - handles->len, (TpHandle *) handles->data, - tp_chat_got_added_contacts_cb, NULL, NULL, G_OBJECT (self)); - - self->priv->can_upgrade_to_muc = FALSE; - - tp_g_signal_connect_object (self, "group-members-changed", - G_CALLBACK (tp_chat_group_members_changed_cb), self, 0); - } else { - TpCapabilities *caps; - GPtrArray *classes; - guint i; - TpHandle handle; - - /* Get the self contact from the connection's self handle */ - handle = tp_connection_get_self_handle (connection); - empathy_tp_contact_factory_get_from_handle (connection, - handle, tp_chat_got_self_contact_cb, - NULL, NULL, G_OBJECT (self)); - - /* Get the remote contact */ - handle = tp_channel_get_handle (channel, NULL); - empathy_tp_contact_factory_get_from_handle (connection, - handle, tp_chat_got_remote_contact_cb, - NULL, NULL, G_OBJECT (self)); - - caps = tp_connection_get_capabilities (connection); - g_assert (caps != NULL); - - classes = tp_capabilities_get_channel_classes (caps); - - for (i = 0; i < classes->len; i++) { - GValueArray *array = g_ptr_array_index (classes, i); - const char **oprops = g_value_get_boxed ( - g_value_array_get_nth (array, 1)); - - if (tp_strv_contains (oprops, TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS)) { - self->priv->can_upgrade_to_muc = TRUE; - break; - } - } - } - - if (tp_proxy_has_interface_by_id (self, - TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT)) { - tp_cli_dbus_properties_call_get_all (channel, -1, - TP_IFACE_CHANNEL_INTERFACE_SUBJECT, - tp_chat_get_all_subject_cb, - NULL, NULL, - G_OBJECT (self)); - listen_for_dbus_properties_changed = TRUE; - } - - if (tp_proxy_has_interface_by_id (self, - TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG)) { - tp_cli_dbus_properties_call_get_all (channel, -1, - TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG, - tp_chat_get_all_room_config_cb, - NULL, NULL, - G_OBJECT (self)); - listen_for_dbus_properties_changed = TRUE; - } - - if (listen_for_dbus_properties_changed) { - tp_cli_dbus_properties_connect_to_properties_changed (channel, - tp_chat_dbus_properties_changed_cb, - NULL, NULL, - G_OBJECT (self), NULL); - } + const TpProxyFeature *feature, + GAsyncReadyCallback callback, + gpointer user_data) +{ + EmpathyTpChat *self = (EmpathyTpChat *) proxy; + TpChannel *channel = (TpChannel *) proxy; + TpConnection *connection; + gboolean listen_for_dbus_properties_changed = FALSE; + + g_assert (self->priv->ready_result == NULL); + self->priv->ready_result = g_simple_async_result_new (G_OBJECT (self), + callback, user_data, tp_chat_prepare_ready_async); + + connection = tp_channel_borrow_connection (channel); + + if (tp_proxy_has_interface_by_id (self, + TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) + { + const TpIntSet *members; + GArray *handles; + TpHandle handle; + + /* Get self contact from the group's self handle */ + handle = tp_channel_group_get_self_handle (channel); + empathy_tp_contact_factory_get_from_handle (connection, + handle, tp_chat_got_self_contact_cb, + NULL, NULL, G_OBJECT (self)); + + /* Get initial member contacts */ + members = tp_channel_group_get_members (channel); + handles = tp_intset_to_array (members); + empathy_tp_contact_factory_get_from_handles (connection, + handles->len, (TpHandle *) handles->data, + tp_chat_got_added_contacts_cb, NULL, NULL, G_OBJECT (self)); + + self->priv->can_upgrade_to_muc = FALSE; + + tp_g_signal_connect_object (self, "group-members-changed", + G_CALLBACK (tp_chat_group_members_changed_cb), self, 0); + } + else + { + TpCapabilities *caps; + GPtrArray *classes; + guint i; + TpHandle handle; + + /* Get the self contact from the connection's self handle */ + handle = tp_connection_get_self_handle (connection); + empathy_tp_contact_factory_get_from_handle (connection, + handle, tp_chat_got_self_contact_cb, + NULL, NULL, G_OBJECT (self)); + + /* Get the remote contact */ + handle = tp_channel_get_handle (channel, NULL); + empathy_tp_contact_factory_get_from_handle (connection, + handle, tp_chat_got_remote_contact_cb, + NULL, NULL, G_OBJECT (self)); + + caps = tp_connection_get_capabilities (connection); + g_assert (caps != NULL); + + classes = tp_capabilities_get_channel_classes (caps); + + for (i = 0; i < classes->len; i++) + { + GValueArray *array = g_ptr_array_index (classes, i); + const char **oprops = g_value_get_boxed ( + g_value_array_get_nth (array, 1)); + + if (tp_strv_contains (oprops, + TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS)) + { + self->priv->can_upgrade_to_muc = TRUE; + break; + } + } + } + + if (tp_proxy_has_interface_by_id (self, + TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT)) + { + tp_cli_dbus_properties_call_get_all (channel, -1, + TP_IFACE_CHANNEL_INTERFACE_SUBJECT, + tp_chat_get_all_subject_cb, + NULL, NULL, + G_OBJECT (self)); + listen_for_dbus_properties_changed = TRUE; + } + + if (tp_proxy_has_interface_by_id (self, + TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG)) + { + tp_cli_dbus_properties_call_get_all (channel, -1, + TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG, + tp_chat_get_all_room_config_cb, + NULL, NULL, + G_OBJECT (self)); + listen_for_dbus_properties_changed = TRUE; + } + + if (listen_for_dbus_properties_changed) + { + tp_cli_dbus_properties_connect_to_properties_changed (channel, + tp_chat_dbus_properties_changed_cb, + NULL, NULL, + G_OBJECT (self), NULL); + } } diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index 885479cb3..5aa949ba2 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -1,6 +1,5 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Copyright (C) 2007-2008 Collabora Ltd. + * Copyright (C) 2007-2012 Collabora Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,80 +29,85 @@ #include "empathy-message.h" #include "empathy-contact.h" - G_BEGIN_DECLS -#define EMPATHY_TYPE_TP_CHAT (empathy_tp_chat_get_type ()) -#define EMPATHY_TP_CHAT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_TP_CHAT, EmpathyTpChat)) -#define EMPATHY_TP_CHAT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_TP_CHAT, EmpathyTpChatClass)) -#define EMPATHY_IS_TP_CHAT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_TP_CHAT)) -#define EMPATHY_IS_TP_CHAT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_TP_CHAT)) +#define EMPATHY_TYPE_TP_CHAT (empathy_tp_chat_get_type ()) +#define EMPATHY_TP_CHAT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_TP_CHAT, EmpathyTpChat)) +#define EMPATHY_TP_CHAT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_TP_CHAT, EmpathyTpChatClass)) +#define EMPATHY_IS_TP_CHAT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_TP_CHAT)) +#define EMPATHY_IS_TP_CHAT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_TP_CHAT)) #define EMPATHY_TP_CHAT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_TP_CHAT, EmpathyTpChatClass)) -typedef struct _EmpathyTpChat EmpathyTpChat; +typedef struct _EmpathyTpChat EmpathyTpChat; typedef struct _EmpathyTpChatClass EmpathyTpChatClass; typedef struct _EmpathyTpChatPrivate EmpathyTpChatPrivate; -struct _EmpathyTpChat { - TpTextChannel parent; - EmpathyTpChatPrivate *priv; +struct _EmpathyTpChat +{ + TpTextChannel parent; + EmpathyTpChatPrivate *priv; }; -struct _EmpathyTpChatClass { - TpTextChannelClass parent_class; +struct _EmpathyTpChatClass +{ + TpTextChannelClass parent_class; }; typedef enum { - EMPATHY_DELIVERY_STATUS_NONE, - EMPATHY_DELIVERY_STATUS_SENDING, - EMPATHY_DELIVERY_STATUS_ACCEPTED + EMPATHY_DELIVERY_STATUS_NONE, + EMPATHY_DELIVERY_STATUS_SENDING, + EMPATHY_DELIVERY_STATUS_ACCEPTED } EmpathyDeliveryStatus; #define EMPATHY_TP_CHAT_FEATURE_READY empathy_tp_chat_get_feature_ready () GQuark empathy_tp_chat_get_feature_ready (void) G_GNUC_CONST; -GType empathy_tp_chat_get_type (void) G_GNUC_CONST; +GType empathy_tp_chat_get_type (void) G_GNUC_CONST; -EmpathyTpChat *empathy_tp_chat_new ( - TpSimpleClientFactory *factory, - TpAccount *account, - TpConnection *connection, - const gchar *object_path, - const GHashTable *immutable_properties); +EmpathyTpChat * empathy_tp_chat_new (TpSimpleClientFactory *factory, + TpAccount *account, + TpConnection *connection, + const gchar *object_path, + const GHashTable *immutable_properties); -const gchar * empathy_tp_chat_get_id (EmpathyTpChat *chat); -EmpathyContact *empathy_tp_chat_get_remote_contact (EmpathyTpChat *chat); -TpAccount * empathy_tp_chat_get_account (EmpathyTpChat *chat); -void empathy_tp_chat_send (EmpathyTpChat *chat, - TpMessage *message); +const gchar * empathy_tp_chat_get_id (EmpathyTpChat *chat); +EmpathyContact * empathy_tp_chat_get_remote_contact (EmpathyTpChat *chat); +TpAccount * empathy_tp_chat_get_account (EmpathyTpChat *chat); +void empathy_tp_chat_send (EmpathyTpChat *chat, + TpMessage *message); -const gchar * empathy_tp_chat_get_title (EmpathyTpChat *self); +const gchar * empathy_tp_chat_get_title (EmpathyTpChat *self); -gboolean empathy_tp_chat_supports_subject (EmpathyTpChat *self); -const gchar * empathy_tp_chat_get_subject (EmpathyTpChat *self); -const gchar * empathy_tp_chat_get_subject_actor (EmpathyTpChat *self); -gboolean empathy_tp_chat_can_set_subject (EmpathyTpChat *self); -void empathy_tp_chat_set_subject (EmpathyTpChat *self, - const gchar *subject); +gboolean empathy_tp_chat_supports_subject (EmpathyTpChat *self); +const gchar * empathy_tp_chat_get_subject (EmpathyTpChat *self); +const gchar * empathy_tp_chat_get_subject_actor (EmpathyTpChat *self); +gboolean empathy_tp_chat_can_set_subject (EmpathyTpChat *self); +void empathy_tp_chat_set_subject (EmpathyTpChat *self, + const gchar *subject); /* Returns a read-only list of pending messages (should be a copy maybe ?) */ const GList * empathy_tp_chat_get_pending_messages (EmpathyTpChat *chat); -void empathy_tp_chat_acknowledge_message (EmpathyTpChat *chat, - EmpathyMessage *message); +void empathy_tp_chat_acknowledge_message (EmpathyTpChat *chat, + EmpathyMessage *message); + +gboolean empathy_tp_chat_can_add_contact (EmpathyTpChat *self); + +void empathy_tp_chat_leave (EmpathyTpChat *chat, + const gchar *message); +void empathy_tp_chat_join (EmpathyTpChat *chat); -gboolean empathy_tp_chat_can_add_contact (EmpathyTpChat *self); +gboolean empathy_tp_chat_is_invited (EmpathyTpChat *chat, + TpHandle *inviter); +TpChannelChatState empathy_tp_chat_get_chat_state (EmpathyTpChat *chat, + EmpathyContact *contact); -void empathy_tp_chat_leave (EmpathyTpChat *chat, - const gchar *message); -void empathy_tp_chat_join (EmpathyTpChat *chat); +EmpathyContact * empathy_tp_chat_get_self_contact (EmpathyTpChat *self); -gboolean empathy_tp_chat_is_invited (EmpathyTpChat *chat, - TpHandle *inviter); -TpChannelChatState - empathy_tp_chat_get_chat_state (EmpathyTpChat *chat, - EmpathyContact *contact); +void empathy_tp_chat_add (EmpathyTpChat *self, + EmpathyContact *contact, + const gchar *message); -EmpathyContact * empathy_tp_chat_get_self_contact (EmpathyTpChat *self); +GList * empathy_tp_chat_get_members (EmpathyTpChat *self); G_END_DECLS diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 2f4c9edde..62c654428 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -1167,10 +1167,28 @@ empathy_sasl_channel_supports_mechanism (TpChannel *channel, return tp_strv_contains (available_mechanisms, mechanism); } +static FolksIndividual * +create_individual_from_persona (FolksPersona *persona) +{ + GeeSet *personas; + FolksIndividual *individual; + + personas = GEE_SET ( + gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref, + g_direct_hash, g_direct_equal)); + + gee_collection_add (GEE_COLLECTION (personas), persona); + + individual = folks_individual_new (personas); + + g_clear_object (&personas); + + return individual; +} + FolksIndividual * empathy_create_individual_from_tp_contact (TpContact *contact) { - GeeSet *personas; TpfPersona *persona; FolksIndividual *individual; @@ -1182,17 +1200,9 @@ empathy_create_individual_from_tp_contact (TpContact *contact) return NULL; } - personas = GEE_SET ( - gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref, - g_direct_hash, g_direct_equal)); - - gee_collection_add (GEE_COLLECTION (personas), persona); - - individual = folks_individual_new (personas); - - g_clear_object (&persona); - g_clear_object (&personas); + individual = create_individual_from_persona (FOLKS_PERSONA (persona)); + g_object_unref (persona); return individual; } @@ -1201,17 +1211,24 @@ empathy_create_individual_from_tp_contact (TpContact *contact) FolksIndividual * empathy_ensure_individual_from_tp_contact (TpContact *contact) { - EmpathyIndividualManager *mgr; + TpfPersona *persona; FolksIndividual *individual; - mgr = empathy_individual_manager_dup_singleton (); - individual = empathy_individual_manager_lookup_by_contact (mgr, contact); + persona = tpf_persona_dup_for_contact (contact); + if (persona == NULL) + { + DEBUG ("Failed to get a persona for %s", + tp_contact_get_identifier (contact)); + return NULL; + } + + individual = folks_persona_get_individual (FOLKS_PERSONA (persona)); if (individual != NULL) g_object_ref (individual); else - individual = empathy_create_individual_from_tp_contact (contact); + individual = create_individual_from_persona (FOLKS_PERSONA (persona)); - g_object_unref (mgr); + g_object_unref (persona); return individual; } diff --git a/po/ca@valencia.po b/po/ca@valencia.po index 49ddd0e5b..549ce2d70 100644 --- a/po/ca@valencia.po +++ b/po/ca@valencia.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-10 23:31+0200\n" +"POT-Creation-Date: 2012-04-10 23:32+0200\n" "PO-Revision-Date: 2012-03-17 00:05+0100\n" "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n" "Language-Team: català; valencià <tradgnome@softcatala.org>\n" @@ -39,7 +39,7 @@ msgstr "" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 -#: ../src/empathy-accounts-dialog.c:2552 +#: ../src/empathy-accounts-dialog.c:2527 msgid "Messaging and VoIP Accounts" msgstr "Comptes de missatgeria i VoIP" @@ -887,11 +887,11 @@ msgstr "_Aplica" msgid "L_og in" msgstr "_Entra" -#: ../libempathy-gtk/empathy-account-widget.c:1812 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "Ja existeix este compte al servidor" -#: ../libempathy-gtk/empathy-account-widget.c:1816 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "Crea un compte nou al servidor" @@ -900,19 +900,19 @@ msgstr "Crea un compte nou al servidor" #. * 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:2241 +#: ../libempathy-gtk/empathy-account-widget.c:2236 #, c-format msgid "%1$s on %2$s" msgstr "%1$s a %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:2267 +#: ../libempathy-gtk/empathy-account-widget.c:2262 #, c-format msgid "%s Account" msgstr "Compte %s" -#: ../libempathy-gtk/empathy-account-widget.c:2271 +#: ../libempathy-gtk/empathy-account-widget.c:2266 msgid "New account" msgstr "Compte nou" @@ -972,7 +972,7 @@ msgstr "_Servidor:" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 msgid "Advanced" msgstr "Avançat" @@ -990,7 +990,7 @@ msgstr "Quina és la vostra contrasenya de l'AIM?" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 msgid "Remember Password" msgstr "Recorda la contrasenya?" @@ -1034,32 +1034,32 @@ msgstr "Quin és el vostre UIN de l'ICQ?" msgid "What is your ICQ password?" msgstr "Quina és la vostra contrasenya de l'ICQ?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:205 -#: ../libempathy-gtk/empathy-account-widget-sip.c:238 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 +#: ../libempathy-gtk/empathy-account-widget-sip.c:240 msgid "Auto" msgstr "Automàtic" -#: ../libempathy-gtk/empathy-account-widget-sip.c:208 +#: ../libempathy-gtk/empathy-account-widget-sip.c:210 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:211 +#: ../libempathy-gtk/empathy-account-widget-sip.c:213 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:214 +#: ../libempathy-gtk/empathy-account-widget-sip.c:216 msgid "TLS" msgstr "TLS" -#: ../libempathy-gtk/empathy-account-widget-sip.c:243 +#: ../libempathy-gtk/empathy-account-widget-sip.c:245 msgid "Register" msgstr "Registre" -#: ../libempathy-gtk/empathy-account-widget-sip.c:248 +#: ../libempathy-gtk/empathy-account-widget-sip.c:250 msgid "Options" msgstr "Opcions" -#: ../libempathy-gtk/empathy-account-widget-sip.c:251 +#: ../libempathy-gtk/empathy-account-widget-sip.c:253 msgid "None" msgstr "Cap" @@ -1320,11 +1320,16 @@ msgstr "Ignora els errors de la TLS" msgid "Port:" msgstr "Port:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#, fuzzy +msgid "Local IP Address:" +msgstr "_Adreça electrònica:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Quin és el vostre identificador d'entrada de SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "What is your SIP account password?" msgstr "Quina és la vostra contrasenya del compte de SIP?" @@ -1410,40 +1415,40 @@ msgstr "Este protocol no permet fer trucades d'emergència" msgid "You don't have enough credit in order to place this call" msgstr "No teniu prou saldo per fer esta trucada" -#: ../libempathy-gtk/empathy-chat.c:728 +#: ../libempathy-gtk/empathy-chat.c:727 msgid "Failed to open private chat" msgstr "No s'ha pogut obrir un xat privat" -#: ../libempathy-gtk/empathy-chat.c:786 +#: ../libempathy-gtk/empathy-chat.c:785 msgid "Topic not supported on this conversation" msgstr "No es pot establir el tema en esta conversa" -#: ../libempathy-gtk/empathy-chat.c:792 +#: ../libempathy-gtk/empathy-chat.c:791 msgid "You are not allowed to change the topic" msgstr "No podeu canviar el tema" -#: ../libempathy-gtk/empathy-chat.c:991 +#: ../libempathy-gtk/empathy-chat.c:990 #, c-format msgid "“%s” is not a valid contact ID" msgstr "«%s» no és un identificador de contacte vàlid" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: neteja tots els missatges de la conversa actual" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <tema>: estableix el tema de la conversa actual" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <ID sala de xat>: entra a una sala de xat nova" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <ID sala de xat>: entra a una sala de xat nova" -#: ../libempathy-gtk/empathy-chat.c:1099 +#: ../libempathy-gtk/empathy-chat.c:1098 msgid "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" @@ -1451,23 +1456,23 @@ msgstr "" "/part [<identificador de la sala de xat>] [<motiu>]: eixiu de la sala de " "xat, si no s'indica el contrari, l'actual" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <ID d'un contacte> [missatge]: obri un xat privat" -#: ../libempathy-gtk/empathy-chat.c:1106 +#: ../libempathy-gtk/empathy-chat.c:1105 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <ID d'un contacte> <missatge>: obri un xat privat" -#: ../libempathy-gtk/empathy-chat.c:1109 +#: ../libempathy-gtk/empathy-chat.c:1108 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <sobrenom>: canvieu el vostre sobrenom en el servidor actual" -#: ../libempathy-gtk/empathy-chat.c:1112 +#: ../libempathy-gtk/empathy-chat.c:1111 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <missatge>: envia un missatge d'ACCIÓ a la conversa actual" -#: ../libempathy-gtk/empathy-chat.c:1115 +#: ../libempathy-gtk/empathy-chat.c:1114 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 " @@ -1477,12 +1482,12 @@ msgstr "" "enviar un missatge que comence per «/». Per exemple: «/say /join s'utilitza " "per entrar a una sala de xat nova»" -#: ../libempathy-gtk/empathy-chat.c:1120 +#: ../libempathy-gtk/empathy-chat.c:1119 msgid "/whois <contact ID>: display information about a contact" msgstr "" "/whois <identificador del contacte>: mostra informació sobre el contacte" -#: ../libempathy-gtk/empathy-chat.c:1123 +#: ../libempathy-gtk/empathy-chat.c:1122 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1490,127 +1495,127 @@ msgstr "" "/help [<orde>]: mostra totes les ordes possibles. Si s'indica una <orde> es " "mostra com s'ha d'utilitzar." -#: ../libempathy-gtk/empathy-chat.c:1142 +#: ../libempathy-gtk/empathy-chat.c:1141 #, c-format msgid "Usage: %s" msgstr "Forma d'ús: %s" -#: ../libempathy-gtk/empathy-chat.c:1187 +#: ../libempathy-gtk/empathy-chat.c:1186 msgid "Unknown command" msgstr "Orde desconeguda" -#: ../libempathy-gtk/empathy-chat.c:1313 +#: ../libempathy-gtk/empathy-chat.c:1312 msgid "Unknown command; see /help for the available commands" msgstr "Orde desconeguda, vegeu /help per a la llista d'ordes disponibles" -#: ../libempathy-gtk/empathy-chat.c:1564 +#: ../libempathy-gtk/empathy-chat.c:1563 msgid "insufficient balance to send message" msgstr "no hi ha prou saldo per enviar el missatge" -#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582 -#: ../libempathy-gtk/empathy-chat.c:1645 +#: ../libempathy-gtk/empathy-chat.c:1567 ../libempathy-gtk/empathy-chat.c:1581 +#: ../libempathy-gtk/empathy-chat.c:1644 #, c-format msgid "Error sending message '%s': %s" msgstr "S'ha produït un error en enviar el missatge «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587 -#: ../libempathy-gtk/empathy-chat.c:1649 +#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1586 +#: ../libempathy-gtk/empathy-chat.c:1648 #, c-format msgid "Error sending message: %s" msgstr "S'ha produït un error en enviar el missatge: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1576 +#: ../libempathy-gtk/empathy-chat.c:1575 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "" "no hi ha prou saldo per enviar el missatge. <a href='%s'>Recarrega</a>." -#: ../libempathy-gtk/empathy-chat.c:1616 +#: ../libempathy-gtk/empathy-chat.c:1615 msgid "not capable" msgstr "no es pot realitzar" -#: ../libempathy-gtk/empathy-chat.c:1623 +#: ../libempathy-gtk/empathy-chat.c:1622 msgid "offline" msgstr "desconnectat" -#: ../libempathy-gtk/empathy-chat.c:1626 +#: ../libempathy-gtk/empathy-chat.c:1625 msgid "invalid contact" msgstr "contacte no vàlid" -#: ../libempathy-gtk/empathy-chat.c:1629 +#: ../libempathy-gtk/empathy-chat.c:1628 msgid "permission denied" msgstr "s'ha denegat el permís" -#: ../libempathy-gtk/empathy-chat.c:1632 +#: ../libempathy-gtk/empathy-chat.c:1631 msgid "too long message" msgstr "el missatge és massa llarg" -#: ../libempathy-gtk/empathy-chat.c:1635 +#: ../libempathy-gtk/empathy-chat.c:1634 msgid "not implemented" msgstr "no implementat" -#: ../libempathy-gtk/empathy-chat.c:1639 +#: ../libempathy-gtk/empathy-chat.c:1638 msgid "unknown" msgstr "desconegut" -#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920 +#: ../libempathy-gtk/empathy-chat.c:1705 ../src/empathy-chat-window.c:919 msgid "Topic:" msgstr "Tema:" -#: ../libempathy-gtk/empathy-chat.c:1721 +#: ../libempathy-gtk/empathy-chat.c:1720 #, c-format msgid "Topic set to: %s" msgstr "Tema establit a: %s" -#: ../libempathy-gtk/empathy-chat.c:1723 +#: ../libempathy-gtk/empathy-chat.c:1722 #, c-format msgid "Topic set by %s to: %s" msgstr "Tema establit per %s a: %s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1728 +#: ../libempathy-gtk/empathy-chat.c:1727 msgid "No topic defined" msgstr "No s'ha definit cap tema" -#: ../libempathy-gtk/empathy-chat.c:2244 +#: ../libempathy-gtk/empathy-chat.c:2243 msgid "(No Suggestions)" msgstr "(Cap suggeriment)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2312 +#: ../libempathy-gtk/empathy-chat.c:2311 #, c-format msgid "Add '%s' to Dictionary" msgstr "Afig «%s» al diccionari" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2349 +#: ../libempathy-gtk/empathy-chat.c:2348 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Afig «%s» al diccionari %s" -#: ../libempathy-gtk/empathy-chat.c:2419 +#: ../libempathy-gtk/empathy-chat.c:2418 msgid "Insert Smiley" msgstr "Insereix una emoticona" #. send button -#: ../libempathy-gtk/empathy-chat.c:2437 +#: ../libempathy-gtk/empathy-chat.c:2436 #: ../libempathy-gtk/empathy-ui-utils.c:1880 msgid "_Send" msgstr "_Envia" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2494 +#: ../libempathy-gtk/empathy-chat.c:2493 msgid "_Spelling Suggestions" msgstr "_Suggeriments d'ortografia" -#: ../libempathy-gtk/empathy-chat.c:2583 +#: ../libempathy-gtk/empathy-chat.c:2582 msgid "Failed to retrieve recent logs" msgstr "No s'han pogut recuperar els registres recents" -#: ../libempathy-gtk/empathy-chat.c:2722 +#: ../libempathy-gtk/empathy-chat.c:2721 #, c-format msgid "%s has disconnected" msgstr "En/na %s s'ha desconnectat" @@ -1618,12 +1623,12 @@ msgstr "En/na %s s'ha desconnectat" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2729 +#: ../libempathy-gtk/empathy-chat.c:2728 #, c-format msgid "%1$s was kicked by %2$s" msgstr "En/na %2$s ha expulsat en/na %1$s" -#: ../libempathy-gtk/empathy-chat.c:2732 +#: ../libempathy-gtk/empathy-chat.c:2731 #, c-format msgid "%s was kicked" msgstr "S'ha expulsat en/na %s" @@ -1631,17 +1636,17 @@ msgstr "S'ha expulsat en/na %s" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2740 +#: ../libempathy-gtk/empathy-chat.c:2739 #, c-format msgid "%1$s was banned by %2$s" msgstr "En/na %2$s ha bandejat en/na %1$s" -#: ../libempathy-gtk/empathy-chat.c:2743 +#: ../libempathy-gtk/empathy-chat.c:2742 #, c-format msgid "%s was banned" msgstr "s'ha bandejat en/na %s" -#: ../libempathy-gtk/empathy-chat.c:2747 +#: ../libempathy-gtk/empathy-chat.c:2746 #, c-format msgid "%s has left the room" msgstr "En/na %s ha eixit de la sala" @@ -1651,17 +1656,17 @@ msgstr "En/na %s ha eixit de la sala" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2756 +#: ../libempathy-gtk/empathy-chat.c:2755 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2781 +#: ../libempathy-gtk/empathy-chat.c:2780 #, c-format msgid "%s has joined the room" msgstr "En/na %s ha entrat a la sala" -#: ../libempathy-gtk/empathy-chat.c:2806 +#: ../libempathy-gtk/empathy-chat.c:2805 #, c-format msgid "%s is now known as %s" msgstr "En/na %s ara es diu %s" @@ -1669,7 +1674,7 @@ msgstr "En/na %s ara es diu %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2993 +#: ../libempathy-gtk/empathy-chat.c:2992 #: ../src/empathy-streamed-media-window.c:1888 #: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1466 #: ../src/empathy-call-window.c:1516 ../src/empathy-call-window.c:2562 @@ -1677,47 +1682,47 @@ msgid "Disconnected" msgstr "Fora de línia" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3657 +#: ../libempathy-gtk/empathy-chat.c:3656 msgid "Would you like to store this password?" msgstr "Voleu emmagatzemar esta contrasenya?" -#: ../libempathy-gtk/empathy-chat.c:3663 +#: ../libempathy-gtk/empathy-chat.c:3662 msgid "Remember" msgstr "Recorda-la" -#: ../libempathy-gtk/empathy-chat.c:3673 +#: ../libempathy-gtk/empathy-chat.c:3672 msgid "Not now" msgstr "Ara no" -#: ../libempathy-gtk/empathy-chat.c:3717 +#: ../libempathy-gtk/empathy-chat.c:3716 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Torna-ho a intentar" -#: ../libempathy-gtk/empathy-chat.c:3721 +#: ../libempathy-gtk/empathy-chat.c:3720 msgid "Wrong password; please try again:" msgstr "Contrasenya errònia, torneu-ho a intentar:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3851 +#: ../libempathy-gtk/empathy-chat.c:3850 msgid "This room is protected by a password:" msgstr "Esta sala és protegida per una contrasenya:" -#: ../libempathy-gtk/empathy-chat.c:3878 +#: ../libempathy-gtk/empathy-chat.c:3877 msgid "Join" msgstr "Uneix-m'hi" -#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300 +#: ../libempathy-gtk/empathy-chat.c:4069 ../src/empathy-event-manager.c:1300 msgid "Connected" msgstr "Connectat" -#: ../libempathy-gtk/empathy-chat.c:4125 +#: ../libempathy-gtk/empathy-chat.c:4124 msgid "Conversation" msgstr "Conversa" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4130 +#: ../libempathy-gtk/empathy-chat.c:4129 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" @@ -1844,133 +1849,133 @@ msgstr "El vostre missatge d'introducció:" msgid "Please let me see when you're online. Thanks!" msgstr "Permeta'm veure quan estàs en línia. Gràcies." -#: ../libempathy-gtk/empathy-contact-widget.c:567 +#: ../libempathy-gtk/empathy-contact-widget.c:566 #: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Canals:" -#: ../libempathy-gtk/empathy-contact-widget.c:747 +#: ../libempathy-gtk/empathy-contact-widget.c:746 #: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "Codi ISO del país:" -#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-contact-widget.c:748 #: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "País:" -#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-contact-widget.c:750 #: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Estat:" -#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-contact-widget.c:752 #: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Ciutat:" -#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-contact-widget.c:754 #: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Àrea:" -#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-contact-widget.c:756 #: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Codi postal:" -#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-contact-widget.c:758 #: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Carrer:" -#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-contact-widget.c:760 #: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Edifici:" -#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-contact-widget.c:762 #: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Planta:" -#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-contact-widget.c:764 #: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Habitació:" -#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-contact-widget.c:766 #: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Text:" -#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-contact-widget.c:768 #: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Descripció:" -#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-contact-widget.c:770 #: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-contact-widget.c:772 #: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Nivell de precisió:" -#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-contact-widget.c:774 #: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Error:" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:776 #: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Error vertical (metres):" -#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-contact-widget.c:778 #: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Error horitzontal (metres):" -#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-contact-widget.c:780 #: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Velocitat:" -#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-contact-widget.c:782 #: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Direcció:" -#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-contact-widget.c:784 #: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Velocitat de pujada:" -#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-contact-widget.c:786 #: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Última actualització a:" -#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-contact-widget.c:788 #: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Longitud:" -#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-contact-widget.c:790 #: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Latitud:" -#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-contact-widget.c:792 #: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Altitud:" -#: ../libempathy-gtk/empathy-contact-widget.c:846 -#: ../libempathy-gtk/empathy-contact-widget.c:861 +#: ../libempathy-gtk/empathy-contact-widget.c:845 +#: ../libempathy-gtk/empathy-contact-widget.c:860 #: ../libempathy-gtk/empathy-individual-widget.c:593 #: ../libempathy-gtk/empathy-individual-widget.c:608 #: ../src/empathy-preferences.ui.h:35 @@ -1978,32 +1983,32 @@ msgid "Location" msgstr "Ubicació" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-contact-widget.c:862 #: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s el %s" -#: ../libempathy-gtk/empathy-contact-widget.c:915 +#: ../libempathy-gtk/empathy-contact-widget.c:914 #: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%e de %B de %Y a les %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:997 +#: ../libempathy-gtk/empathy-contact-widget.c:996 #: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Alça l'avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:1053 +#: ../libempathy-gtk/empathy-contact-widget.c:1052 #: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "No s'ha pogut alçar l'avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:1455 +#: ../libempathy-gtk/empathy-contact-widget.c:1454 msgid "Personal Details" msgstr "Dades personals" -#: ../libempathy-gtk/empathy-contact-widget.c:1458 +#: ../libempathy-gtk/empathy-contact-widget.c:1457 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" @@ -2134,7 +2139,7 @@ msgid "Select" msgstr "Seleccioneu" #: ../libempathy-gtk/empathy-groups-widget.c:403 -#: ../src/empathy-roster-window.c:1970 +#: ../src/empathy-roster-window.c:1969 msgid "Group" msgstr "Grup" @@ -2162,109 +2167,110 @@ msgstr "Metacontactes" #. 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:173 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:345 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Seleccioneu el compte amb el que voleu fer la trucada" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:349 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-streamed-media-window.c:1290 #: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "Trucada" -#: ../libempathy-gtk/empathy-individual-menu.c:414 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Mòbil" -#: ../libempathy-gtk/empathy-individual-menu.c:416 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Faena" -#: ../libempathy-gtk/empathy-individual-menu.c:418 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "Casa" -#: ../libempathy-gtk/empathy-individual-menu.c:659 +#: ../libempathy-gtk/empathy-individual-menu.c:658 msgid "_Block Contact" msgstr "_Bloca el contacte" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1018 +#: ../libempathy-gtk/empathy-individual-menu.c:1017 #: ../libempathy-gtk/empathy-new-message-dialog.c:319 #: ../src/empathy-roster-window-menubar.ui.h:1 msgid "_Chat" msgstr "_Xat" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1053 +#: ../libempathy-gtk/empathy-individual-menu.c:1052 #: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1086 +#: ../libempathy-gtk/empathy-individual-menu.c:1085 msgctxt "menu item" msgid "_Audio Call" msgstr "Trucada de _veu" -#: ../libempathy-gtk/empathy-individual-menu.c:1119 +#: ../libempathy-gtk/empathy-individual-menu.c:1118 msgctxt "menu item" msgid "_Video Call" msgstr "_Trucada de vídeo" -#: ../libempathy-gtk/empathy-individual-menu.c:1160 +#: ../libempathy-gtk/empathy-individual-menu.c:1159 #: ../src/empathy-roster-window-menubar.ui.h:4 msgid "_Previous Conversations" msgstr "Converses _anteriors" -#: ../libempathy-gtk/empathy-individual-menu.c:1189 +#: ../libempathy-gtk/empathy-individual-menu.c:1188 msgid "Send File" msgstr "Envia un fitxer" -#: ../libempathy-gtk/empathy-individual-menu.c:1219 +#: ../libempathy-gtk/empathy-individual-menu.c:1218 msgid "Share My Desktop" msgstr "Comparteix el meu escriptori" -#: ../libempathy-gtk/empathy-individual-menu.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1244 #: ../libempathy-gtk/empathy-individual-widget.c:1357 msgid "Favorite" msgstr "Preferit" -#: ../libempathy-gtk/empathy-individual-menu.c:1264 +#: ../libempathy-gtk/empathy-individual-menu.c:1263 msgid "gnome-contacts not installed" msgstr "El Contactes del GNOME no està instal·lat" -#: ../libempathy-gtk/empathy-individual-menu.c:1267 +#: ../libempathy-gtk/empathy-individual-menu.c:1266 msgid "Please install gnome-contacts to access contacts details." msgstr "" "Instal·leu el Contactes del GNOME per accedir a les dades dels contactes." -#: ../libempathy-gtk/empathy-individual-menu.c:1398 +#: ../libempathy-gtk/empathy-individual-menu.c:1397 msgid "Infor_mation" msgstr "Infor_mació" -#: ../libempathy-gtk/empathy-individual-menu.c:1447 +#: ../libempathy-gtk/empathy-individual-menu.c:1446 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Edita" -#: ../libempathy-gtk/empathy-individual-menu.c:1564 -#: ../src/empathy-chat-window.c:1192 +#. send invitation +#: ../libempathy-gtk/empathy-individual-menu.c:1562 +#: ../src/empathy-chat-window.c:1190 msgid "Inviting you to this room" msgstr "Se vos està convidant a esta sala" -#: ../libempathy-gtk/empathy-individual-menu.c:1610 +#: ../libempathy-gtk/empathy-individual-menu.c:1608 msgid "_Invite to Chat Room" msgstr "_Convida a la sala de xat" -#: ../libempathy-gtk/empathy-individual-menu.c:1806 +#: ../libempathy-gtk/empathy-individual-menu.c:1804 #: ../src/empathy-roster-window-menubar.ui.h:5 msgid "_Add Contact…" msgstr "_Afig un contacte…" @@ -2606,30 +2612,38 @@ msgstr "" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:167 -#: ../libempathy-gtk/empathy-presence-chooser.c:203 +#: ../libempathy-gtk/empathy-presence-chooser.c:166 +#: ../libempathy-gtk/empathy-presence-chooser.c:202 msgid "Custom Message…" msgstr "Missatge personalitzat…" -#: ../libempathy-gtk/empathy-presence-chooser.c:220 -#: ../libempathy-gtk/empathy-presence-chooser.c:222 +#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:221 msgid "Edit Custom Messages…" msgstr "Edita els missatges personalitzats…" -#: ../libempathy-gtk/empathy-presence-chooser.c:345 +#: ../libempathy-gtk/empathy-presence-chooser.c:344 msgid "Click to remove this status as a favorite" msgstr "Feu clic per suprimir este estat com a preferit" -#: ../libempathy-gtk/empathy-presence-chooser.c:354 +#: ../libempathy-gtk/empathy-presence-chooser.c:353 msgid "Click to make this status a favorite" msgstr "Feu clic per fer que este estat siga un preferit" -#: ../libempathy-gtk/empathy-presence-chooser.c:388 +#. Translators: %s is a status message like 'At the pub' for example +#: ../libempathy-gtk/empathy-presence-chooser.c:387 +#, c-format +msgid "" +"<b>Current message: %s</b>\n" +"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>" +msgstr "" + +#: ../libempathy-gtk/empathy-presence-chooser.c:396 msgid "Set status" msgstr "Estableix l'estat" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1135 +#: ../libempathy-gtk/empathy-presence-chooser.c:1147 msgid "Custom messages…" msgstr "Missatges personalitzats…" @@ -3018,23 +3032,23 @@ msgstr "No hi ha missatge d'error" msgid "Instant Message (Empathy)" msgstr "Missatgeria instantània (Empathy)" -#: ../src/empathy.c:435 +#: ../src/empathy.c:432 msgid "Don't connect on startup" msgstr "No connectes en iniciar" -#: ../src/empathy.c:439 +#: ../src/empathy.c:436 msgid "Don't display the contact list or any other dialogs on startup" msgstr "No mostres la llista de contactes ni cap altre diàleg en iniciar" -#: ../src/empathy.c:454 +#: ../src/empathy.c:451 msgid "- Empathy IM Client" msgstr "- Client de missatgeria instantània Empathy" -#: ../src/empathy.c:641 +#: ../src/empathy.c:627 msgid "Error contacting the Account Manager" msgstr "S'ha produït un error en contactar amb el gestor de comptes" -#: ../src/empathy.c:643 +#: ../src/empathy.c:629 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3094,14 +3108,14 @@ msgstr "" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:72 +#: ../src/empathy-accounts-dialog.c:71 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Hi ha modificacions no alçades en el compte %s." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:76 +#: ../src/empathy-accounts-dialog.c:75 msgid "Your new account has not been saved yet." msgstr "Encara no heu alçat el vostre compte nou." @@ -3168,7 +3182,7 @@ msgstr "Voleu suprimir %s de l'ordinador?" msgid "This will not remove your account on the server." msgstr "Amb això no se suprimirà el vostre compte del servidor." -#: ../src/empathy-accounts-dialog.c:1602 +#: ../src/empathy-accounts-dialog.c:1571 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3176,24 +3190,25 @@ msgstr "" "Esteu a punt de seleccionar un altre compte i perdreu els\n" "canvis fets fins ara. Segur que voleu continuar?" -#. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1779 -msgid "_Enable" -msgstr "_Habilita" +#. Menu item: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1762 +msgid "_Enabled" +msgstr "_Habilitat" -#: ../src/empathy-accounts-dialog.c:1780 -msgid "_Disable" -msgstr "_Inhabilita" +#. Menu item: Rename +#: ../src/empathy-accounts-dialog.c:1785 +msgid "Rename" +msgstr "Reanomena" -#: ../src/empathy-accounts-dialog.c:2221 +#: ../src/empathy-accounts-dialog.c:2201 msgid "_Skip" msgstr "_Omet" -#: ../src/empathy-accounts-dialog.c:2225 +#: ../src/empathy-accounts-dialog.c:2205 msgid "_Connect" msgstr "_Connecta" -#: ../src/empathy-accounts-dialog.c:2404 +#: ../src/empathy-accounts-dialog.c:2384 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3221,19 +3236,19 @@ msgstr "" msgid "No protocol backends installed" msgstr "No hi ha cap protocol de rerefons instal·lat" -#: ../src/empathy-auth-client.c:288 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr " - Client d'autenticació de l'Empathy" -#: ../src/empathy-auth-client.c:304 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "Client d'autenticació de l'Empathy" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:201 +#: ../src/empathy-av.c:115 ../src/empathy-call.c:198 msgid "- Empathy Audio/Video Client" msgstr "- Client d'àudio/vídeo de l'Empathy" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:223 +#: ../src/empathy-av.c:131 ../src/empathy-call.c:220 msgid "Empathy Audio/Video Client" msgstr "Client d'àudio/vídeo de l'Empathy" @@ -3542,11 +3557,11 @@ msgstr "Candidat local:" msgid "Audio" msgstr "Àudio" -#: ../src/empathy-chat-window.c:289 +#: ../src/empathy-chat-window.c:288 msgid "Close this window?" msgstr "Voleu tancar esta finestra?" -#: ../src/empathy-chat-window.c:294 +#: ../src/empathy-chat-window.c:293 #, c-format msgid "" "Closing this window will leave %s. You will not receive any further messages " @@ -3555,7 +3570,7 @@ msgstr "" "Si tanqueu la finestra eixireu de %s. No rebreu cap més missatge fins que no " "hi torneu a entrar." -#: ../src/empathy-chat-window.c:305 +#: ../src/empathy-chat-window.c:304 #, c-format msgid "" "Closing this window will leave a chat room. You will not receive any further " @@ -3570,12 +3585,12 @@ msgstr[1] "" "Si tanqueu la finestra eixireu de %u sales de xat. No rebreu més missatges " "fins que no hi torneu a entrar." -#: ../src/empathy-chat-window.c:314 +#: ../src/empathy-chat-window.c:313 #, c-format msgid "Leave %s?" msgstr "Voleu eixir de %s?" -#: ../src/empathy-chat-window.c:315 +#: ../src/empathy-chat-window.c:314 msgid "" "You will not receive any further messages from this chat room until you " "rejoin it." @@ -3583,54 +3598,54 @@ msgstr "" "No rebreu cap més missatge d'esta sala de xat fins que no hi torneu a entrar-" "hi." -#: ../src/empathy-chat-window.c:334 +#: ../src/empathy-chat-window.c:333 msgid "Close window" msgstr "Tanca la finestra" -#: ../src/empathy-chat-window.c:334 +#: ../src/empathy-chat-window.c:333 msgid "Leave room" msgstr "Ix de la sala" -#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660 +#: ../src/empathy-chat-window.c:639 ../src/empathy-chat-window.c:659 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d sense llegir)" msgstr[1] "%s (%d sense llegir)" -#: ../src/empathy-chat-window.c:652 +#: ../src/empathy-chat-window.c:651 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (i %u altre)" msgstr[1] "%s (i %u altres)" -#: ../src/empathy-chat-window.c:668 +#: ../src/empathy-chat-window.c:667 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d sense llegir d'altres)" msgstr[1] "%s (%d sense llegir d'altres)" -#: ../src/empathy-chat-window.c:677 +#: ../src/empathy-chat-window.c:676 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d sense llegir de tots)" msgstr[1] "%s (%d sense llegir de tots)" -#: ../src/empathy-chat-window.c:892 +#: ../src/empathy-chat-window.c:891 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:902 +#: ../src/empathy-chat-window.c:901 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "S'està enviant %d missatge" msgstr[1] "S'estan enviant %d missatges" -#: ../src/empathy-chat-window.c:924 +#: ../src/empathy-chat-window.c:923 msgid "Typing a message." msgstr "S'està escrivint un missatge." @@ -3790,7 +3805,7 @@ msgstr "Vos han convidat a entrar a %s" msgid "Incoming file transfer from %s" msgstr "Transferència de fitxers entrant d'en/na %s" -#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374 +#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:373 msgid "Password required" msgstr "Cal la contrasenya" @@ -3950,76 +3965,76 @@ msgstr "Protocol" msgid "Source" msgstr "Font" -#: ../src/empathy-roster-window.c:391 +#: ../src/empathy-roster-window.c:390 msgid "Provide Password" msgstr "Introduïu la contrasenya" -#: ../src/empathy-roster-window.c:397 +#: ../src/empathy-roster-window.c:396 msgid "Disconnect" msgstr "Desconnecta" -#: ../src/empathy-roster-window.c:657 +#: ../src/empathy-roster-window.c:656 msgid "You need to setup an account to see contacts here." msgstr "Heu de configurar un compte per veure'n els contactes ací." -#: ../src/empathy-roster-window.c:673 +#: ../src/empathy-roster-window.c:672 msgid "No match found" msgstr "No s'ha trobat cap coincidència" -#: ../src/empathy-roster-window.c:783 +#: ../src/empathy-roster-window.c:782 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" "No podeu utilitzar els comptes de %s fins que no actualitzeu el programari " "de %s." -#: ../src/empathy-roster-window.c:849 +#: ../src/empathy-roster-window.c:848 msgid "Update software..." msgstr "Actualitza el programari..." -#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972 +#: ../src/empathy-roster-window.c:854 ../src/empathy-roster-window.c:971 msgid "Close" msgstr "Tanca" -#: ../src/empathy-roster-window.c:960 +#: ../src/empathy-roster-window.c:959 msgid "Reconnect" msgstr "Torna a connectar" -#: ../src/empathy-roster-window.c:966 +#: ../src/empathy-roster-window.c:965 msgid "Edit Account" msgstr "Edita el compte" #. Translators: this string will be something like: #. * Top up My Account ($1.23)..." -#: ../src/empathy-roster-window.c:1110 +#: ../src/empathy-roster-window.c:1109 #, c-format msgid "Top up %s (%s)..." msgstr "Recarrega %s (%s)..." -#: ../src/empathy-roster-window.c:1156 +#: ../src/empathy-roster-window.c:1155 msgid "Top up account credit" msgstr "Recarrega el saldo del compte" #. top up button -#: ../src/empathy-roster-window.c:1228 +#: ../src/empathy-roster-window.c:1227 msgid "Top Up..." msgstr "Recarrega..." -#: ../src/empathy-roster-window.c:1952 +#: ../src/empathy-roster-window.c:1951 msgid "Contact" msgstr "Contacte" -#: ../src/empathy-roster-window.c:2150 +#: ../src/empathy-roster-window.c:2149 msgid "You need to enable one of your accounts to see contacts here." msgstr "Heu d'habilitar com a mínim un compte per veure contactes ací." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:2158 +#: ../src/empathy-roster-window.c:2157 #, c-format msgid "You need to enable %s to see contacts here." msgstr "Heu d'habilitar %s per veure contactes ací." -#: ../src/empathy-roster-window.c:2460 +#: ../src/empathy-roster-window.c:2459 msgid "Contact List" msgstr "Llista de contactes" @@ -4570,16 +4585,16 @@ msgstr "" "El gestor de connexions seleccionat no permet utilitzar l'extensió de " "depuració remota." -#: ../src/empathy-invite-participant-dialog.c:202 -#: ../src/empathy-invite-participant-dialog.c:230 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Convida un participant" -#: ../src/empathy-invite-participant-dialog.c:203 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Seleccioneu un contacte per convidar-lo a la conversa:" -#: ../src/empathy-invite-participant-dialog.c:226 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Convida" @@ -4606,7 +4621,7 @@ msgstr "<identificador-del-compte>" msgid "- Empathy Accounts" msgstr "- Comptes de l'Empathy" -#: ../src/empathy-accounts.c:231 +#: ../src/empathy-accounts.c:230 msgid "Empathy Accounts" msgstr "Comptes de l'Empathy" @@ -4618,11 +4633,11 @@ msgstr "Mostra un servei en concret" msgid "- Empathy Debugger" msgstr "- Depurador de l'Empathy" -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:112 msgid "Empathy Debugger" msgstr "Depurador de l'Empathy" -#: ../src/empathy-chat.c:109 +#: ../src/empathy-chat.c:106 msgid "- Empathy Chat Client" msgstr "- Client de xat Empathy" @@ -4739,6 +4754,12 @@ msgstr "" "seleccioneu <span style=\"italic\">Edita → Comptes</span> a la llista de " "contactes." +#~ msgid "_Enable" +#~ msgstr "_Habilita" + +#~ msgid "_Disable" +#~ msgstr "_Inhabilita" + #~ msgid "%s" #~ msgstr "%s" @@ -5012,9 +5033,6 @@ msgstr "" #~ msgid "All" #~ msgstr "Tots" -#~ msgid "_Enabled" -#~ msgstr "_Habilitat" - #~ msgid "Date" #~ msgstr "Data" @@ -5650,9 +5668,6 @@ msgstr "" #~ msgid "Re_name" #~ msgstr "Rea_nomena" -#~ msgid "Rename" -#~ msgstr "Reanomena" - #~ msgid "Edit the groups and name for this contact" #~ msgstr "Edita els grups i nom per a aquest contacte" diff --git a/po/en_CA.po b/po/en_CA.po index 2d3d810d5..ee8da8ca3 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -7,17 +7,18 @@ msgid "" msgstr "" "Project-Id-Version: Empathy\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2012-02-08 15:44+0000\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath" +"y&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2012-04-02 17:52+0000\n" "PO-Revision-Date: 2012-02-08 19:16-0500\n" "Last-Translator: Tiffany Antopolski <tiffany.antopolski@gmail.com>\n" "Language-Team: Canadian English\n" +"Language: en_CA\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_CA\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-DamnedLies-Scope: partial\n" #: ../data/empathy.desktop.in.in.h:1 msgid "Empathy" @@ -35,6 +36,16 @@ msgstr "Empathy Internet Messaging" msgid "Chat on Google Talk, Facebook, MSN and many other chat services" msgstr "Chat on Google Talk, Facebook, MSN and many other chat services" +#. Tweak the dialog +#: ../data/empathy-accounts.desktop.in.in.h:1 +#: ../src/empathy-accounts-dialog.c:2550 +msgid "Messaging and VoIP Accounts" +msgstr "Messaging and VoIP Accounts" + +#: ../data/empathy-accounts.desktop.in.in.h:2 +msgid "Manage Messaging and VoIP accounts" +msgstr "Manage Messaging and VoIP accounts" + #: ../data/org.gnome.Empathy.gschema.xml.in.h:1 msgid "Connection managers should be used" msgstr "Connection managers should be used" @@ -74,77 +85,77 @@ msgstr "Empathy default download folder" 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:9 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Show offline contacts" msgstr "Show offline contacts" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 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:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Show avatars" msgstr "Show avatars" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 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:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Show protocols" msgstr "Show protocols" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 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:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Show Balance in contact list" msgstr "Show Balance in contact list" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Whether to show account balances in the contact list." msgstr "Whether to show account balances in the contact list." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Compact contact list" msgstr "Compact contact list" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 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:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Hide main window" msgstr "Hide main window" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Hide the main window." msgstr "Hide the main window." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Default directory to select an avatar image from" msgstr "Default directory to select an avatar image from" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 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:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Open new chats in separate windows" msgstr "Open new chats in separate windows" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Always open a separate chat window for new chats." msgstr "Always open a separate chat window for new chats." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Display incoming events in the status area" msgstr "Display incoming events in the status area" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "" "Display incoming events in the status area. If false, present them to the " "user immediately." @@ -152,19 +163,31 @@ msgstr "" "Display incoming events in the status area. If false, present them to the " "user immediately." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 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:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 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:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#, fuzzy +#| msgid "Show contact list in rooms" +msgid "Show contact groups" +msgstr "Show contact list in rooms" + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#, fuzzy +#| msgid "Whether to show account balances in the contact list." +msgid "Whether to show groups in the contact list." +msgstr "Whether to show account balances in the contact list." + +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Contact list sort criterion" msgstr "Contact list sort criterion" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's state with the value \"state\". A value of \"name\" will sort " @@ -174,102 +197,102 @@ msgstr "" "the contact's state with the value \"state\". A value of \"name\" will sort " "the contact list by name." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Use notification sounds" msgstr "Use notification sounds" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 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:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Disable sounds when away" msgstr "Disable sounds when away" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 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:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for incoming messages" msgstr "Play a sound for incoming messages" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 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:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound for outgoing messages" msgstr "Play a sound for outgoing messages" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 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:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound for new conversations" msgstr "Play a sound for new conversations" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 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:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 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:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 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:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 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:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 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:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Play a sound when we log in" msgstr "Play a sound when we log in" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 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:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Play a sound when we log out" msgstr "Play a sound when we log out" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 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:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Enable popup notifications for new messages" msgstr "Enable popup notifications for new messages" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 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:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "Disable popup notifications when away" msgstr "Disable popup notifications when away" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 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:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 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:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." @@ -277,107 +300,107 @@ msgstr "" "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:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 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:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 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:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 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:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 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:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use graphical smileys" msgstr "Use graphical smileys" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 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:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Show contact list in rooms" msgstr "Show contact list in rooms" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 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:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Chat window theme" msgstr "Chat window theme" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 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:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "Chat window theme variant" msgstr "Chat window theme variant" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "" "The theme variant that is used to display the conversation in chat windows." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "Path of the Adium theme to use" msgstr "Path of the Adium theme to use" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 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:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "Enable WebKit Developer Tools" msgstr "Enable WebKit Developer Tools" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 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:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Use theme for chat rooms" msgstr "Use theme for chat rooms" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 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:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Spell checking languages" msgstr "Spell checking languages" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Enable spell checker" msgstr "Enable spell checker" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 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:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Nick completed character" msgstr "Nick completed character" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." @@ -385,53 +408,53 @@ msgstr "" "Character to add after nickname when using nick completion (tab) in group " "chat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 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:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 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:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Last account selected in Join Room dialog" msgstr "Last account selected in Join Room dialog" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "D-Bus object path of the last account selected to join a room." msgstr "D-Bus object path of the last account selected to join a room." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Camera device" msgstr "Camera device" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "Default camera device to use in video calls, e.g. /dev/video0." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "Camera position" msgstr "Camera position" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Position the camera preview should be during a call." msgstr "Position the camera preview should be during a call." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Echo cancellation support" -msgstr "Echo cancellllation support" +msgstr "Echo cancellation support" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to enable Pulseaudio's echo cancellation filter." -msgstr "Whether to enable Pulseaudio's echo cancellllation filter." +msgstr "Whether to enable Pulseaudio's echo cancellation filter." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Show hint about closing the main window" msgstr "Show hint about closing the main window" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." @@ -439,103 +462,93 @@ msgstr "" "Whether to show the message dialog 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:98 msgid "Empathy can publish the user's location" msgstr "Empathy can publish the user's location" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 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:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "Empathy can use the network to guess the location" msgstr "Empathy can use the network to guess the location" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 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:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 msgid "Empathy can use the cellular network to guess the location" msgstr "Empathy can use the cellular network to guess the location" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "Whether Empathy can use the cellular network to guess the location." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy can use the GPS to guess the location" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:105 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:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:106 msgid "Empathy should reduce the location's accuracy" msgstr "Empathy should reduce the location's accuracy" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:107 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" "Whether Empathy should reduce the location's accuracy for privacy reasons." -#. Tweak the dialog -#: ../data/empathy-accounts.desktop.in.in.h:1 -#: ../src/empathy-accounts-dialog.c:2327 -msgid "Messaging and VoIP Accounts" -msgstr "Messaging and VoIP Accounts" - -#: ../data/empathy-accounts.desktop.in.in.h:2 -msgid "Manage Messaging and VoIP accounts" -msgstr "Manage Messaging and VoIP accounts" - -#: ../libempathy/empathy-ft-handler.c:736 +#: ../libempathy/empathy-ft-handler.c:738 msgid "No reason was specified" msgstr "No reason was specified" -#: ../libempathy/empathy-ft-handler.c:739 +#: ../libempathy/empathy-ft-handler.c:741 msgid "The change in state was requested" msgstr "The change in state was requested" -#: ../libempathy/empathy-ft-handler.c:742 +#: ../libempathy/empathy-ft-handler.c:744 msgid "You canceled the file transfer" -msgstr "You cancellled the file transfer" +msgstr "You cancelled the file transfer" -#: ../libempathy/empathy-ft-handler.c:745 +#: ../libempathy/empathy-ft-handler.c:747 msgid "The other participant canceled the file transfer" -msgstr "The other participant cancellled the file transfer" +msgstr "The other participant cancelled the file transfer" -#: ../libempathy/empathy-ft-handler.c:748 +#: ../libempathy/empathy-ft-handler.c:750 msgid "Error while trying to transfer the file" msgstr "Error while trying to transfer the file" -#: ../libempathy/empathy-ft-handler.c:751 +#: ../libempathy/empathy-ft-handler.c:753 msgid "The other participant is unable to transfer the file" msgstr "The other participant is unable to transfer the file" -#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313 +#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313 msgid "Unknown reason" msgstr "Unknown reason" -#: ../libempathy/empathy-ft-handler.c:917 +#: ../libempathy/empathy-ft-handler.c:919 msgid "File transfer completed, but the file was corrupted" msgstr "File transfer completed, but the file was corrupted" -#: ../libempathy/empathy-ft-handler.c:1203 +#: ../libempathy/empathy-ft-handler.c:1205 msgid "File transfer not supported by remote contact" msgstr "File transfer not supported by remote contact" -#: ../libempathy/empathy-ft-handler.c:1259 +#: ../libempathy/empathy-ft-handler.c:1261 msgid "The selected file is not a regular file" msgstr "The selected file is not a regular file" -#: ../libempathy/empathy-ft-handler.c:1268 +#: ../libempathy/empathy-ft-handler.c:1270 msgid "The selected file is empty" msgstr "The selected file is empty" -#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131 +#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129 #, c-format msgid "Missed call from %s" msgstr "Missed call from %s" @@ -586,7 +599,7 @@ msgid "Status is set to offline" msgstr "Status is set to offline" #: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323 -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:47 #: ../libempathy-gtk/empathy-new-message-dialog.c:81 msgid "Network error" msgstr "Network error" @@ -761,12 +774,28 @@ msgstr[1] "%d months ago" msgid "in the future" msgstr "in the future" +#: ../libempathy/empathy-keyring.c:75 +#, fuzzy +#| msgid "Phrase not found" +msgid "Password not found" +msgstr "Phrase not found" + +#: ../libempathy/empathy-keyring.c:218 +#, c-format +msgid "IM account password for %s (%s)" +msgstr "" + +#: ../libempathy/empathy-keyring.c:253 +#, c-format +msgid "Password for chatroom '%s' on account %s (%s)" +msgstr "" + #: ../libempathy-gtk/empathy-account-chooser.c:692 msgid "All accounts" msgstr "All accounts" #: ../libempathy-gtk/empathy-account-widget.c:682 -#: ../src/empathy-import-widget.c:335 +#: ../src/empathy-import-widget.c:323 msgid "Account" msgstr "Account" @@ -775,12 +804,12 @@ msgid "Password" msgstr "Password" #: ../libempathy-gtk/empathy-account-widget.c:684 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:507 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:511 msgid "Server" msgstr "Server" #: ../libempathy-gtk/empathy-account-widget.c:685 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:522 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:529 msgid "Port" msgstr "Port" @@ -791,7 +820,7 @@ msgid "%s:" msgstr "%s:" #: ../libempathy-gtk/empathy-account-widget.c:1398 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16 msgid "Username:" msgstr "Username:" @@ -884,7 +913,7 @@ msgstr "_Server:" #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 @@ -950,36 +979,32 @@ msgstr "What is your ICQ UIN?" msgid "What is your ICQ password?" msgstr "What is your ICQ password?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:206 -#: ../libempathy-gtk/empathy-account-widget-sip.c:239 +#: ../libempathy-gtk/empathy-account-widget-sip.c:205 +#: ../libempathy-gtk/empathy-account-widget-sip.c:238 msgid "Auto" msgstr "Auto" -#: ../libempathy-gtk/empathy-account-widget-sip.c:209 +#: ../libempathy-gtk/empathy-account-widget-sip.c:208 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:212 +#: ../libempathy-gtk/empathy-account-widget-sip.c:211 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:215 +#: ../libempathy-gtk/empathy-account-widget-sip.c:214 msgid "TLS" msgstr "TLS" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:244 +#: ../libempathy-gtk/empathy-account-widget-sip.c:243 msgid "Register" msgstr "Register" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:249 +#: ../libempathy-gtk/empathy-account-widget-sip.c:248 msgid "Options" msgstr "Options" -#: ../libempathy-gtk/empathy-account-widget-sip.c:252 +#: ../libempathy-gtk/empathy-account-widget-sip.c:251 msgid "None" msgstr "None" @@ -996,10 +1021,35 @@ msgid "Character set:" msgstr "Character set:" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +#: ../src/empathy-accounts-dialog.ui.h:1 +msgid "Add…" +msgstr "Add…" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 +#: ../src/empathy-accounts-dialog.ui.h:2 +#: ../src/empathy-chatrooms-window.ui.h:3 +msgid "Remove" +msgstr "Remove" + +#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 +msgid "Up" +msgstr "" + +#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +#, fuzzy +#| msgid "Domain" +msgid "Down" +msgstr "Domain" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Servers" msgstr "Servers" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." @@ -1007,27 +1057,27 @@ msgstr "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Nickname:" msgstr "Nickname:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Password:" msgstr "Password:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14 msgid "Quit message:" msgstr "Quit message:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15 msgid "Real name:" msgstr "Real name:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18 msgid "Which IRC network?" msgstr "Which IRC network?" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19 msgid "What is your IRC nickname?" msgstr "What is your IRC nickname?" @@ -1282,65 +1332,65 @@ msgstr "All Files" msgid "Click to enlarge" msgstr "Click to enlarge" -#: ../libempathy-gtk/empathy-call-utils.c:44 -#: ../libempathy-gtk/empathy-call-utils.c:62 +#: ../libempathy-gtk/empathy-call-utils.c:42 +#: ../libempathy-gtk/empathy-call-utils.c:60 msgid "There was an error starting the call" msgstr "There was an error starting the call" -#: ../libempathy-gtk/empathy-call-utils.c:51 +#: ../libempathy-gtk/empathy-call-utils.c:49 msgid "The specified contact doesn't support calls" msgstr "The specified contact doesn't support calls" -#: ../libempathy-gtk/empathy-call-utils.c:53 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "The specified contact is offline" msgstr "The specified contact is offline" -#: ../libempathy-gtk/empathy-call-utils.c:55 +#: ../libempathy-gtk/empathy-call-utils.c:53 msgid "The specified contact is not valid" msgstr "The specified contact is not valid" -#: ../libempathy-gtk/empathy-call-utils.c:57 +#: ../libempathy-gtk/empathy-call-utils.c:55 msgid "Emergency calls are not supported on this protocol" msgstr "Emergency calls are not supported on this protocol" -#: ../libempathy-gtk/empathy-call-utils.c:59 +#: ../libempathy-gtk/empathy-call-utils.c:57 msgid "You don't have enough credit in order to place this call" msgstr "You don't have enough credit in order to place this call" -#: ../libempathy-gtk/empathy-chat.c:710 +#: ../libempathy-gtk/empathy-chat.c:729 msgid "Failed to open private chat" msgstr "Failed to open private chat" -#: ../libempathy-gtk/empathy-chat.c:768 +#: ../libempathy-gtk/empathy-chat.c:787 msgid "Topic not supported on this conversation" msgstr "Topic not supported on this conversation" -#: ../libempathy-gtk/empathy-chat.c:774 +#: ../libempathy-gtk/empathy-chat.c:793 msgid "You are not allowed to change the topic" msgstr "You are not allowed to change the topic" -#: ../libempathy-gtk/empathy-chat.c:973 +#: ../libempathy-gtk/empathy-chat.c:992 #, c-format msgid "“%s” is not a valid contact ID" msgstr "“%s” is not a valid contact ID" -#: ../libempathy-gtk/empathy-chat.c:1068 +#: ../libempathy-gtk/empathy-chat.c:1087 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: clear all messages from the current conversation" -#: ../libempathy-gtk/empathy-chat.c:1071 +#: ../libempathy-gtk/empathy-chat.c:1090 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:1074 +#: ../libempathy-gtk/empathy-chat.c:1093 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:1077 +#: ../libempathy-gtk/empathy-chat.c:1096 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:1081 +#: ../libempathy-gtk/empathy-chat.c:1100 msgid "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" @@ -1348,23 +1398,23 @@ msgstr "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" -#: ../libempathy-gtk/empathy-chat.c:1085 +#: ../libempathy-gtk/empathy-chat.c:1104 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <contact ID> [<message>]: open a private chat" -#: ../libempathy-gtk/empathy-chat.c:1088 +#: ../libempathy-gtk/empathy-chat.c:1107 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <contact ID> <message>: open a private chat" -#: ../libempathy-gtk/empathy-chat.c:1091 +#: ../libempathy-gtk/empathy-chat.c:1110 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:1094 +#: ../libempathy-gtk/empathy-chat.c:1113 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:1097 +#: ../libempathy-gtk/empathy-chat.c:1116 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 " @@ -1374,11 +1424,11 @@ msgstr "" "send a message starting with a '/'. For example: \"/say /join is used to " "join a new chat room\"" -#: ../libempathy-gtk/empathy-chat.c:1102 +#: ../libempathy-gtk/empathy-chat.c:1121 msgid "/whois <contact ID>: display information about a contact" msgstr "/whois <contact ID>: display information about a contact" -#: ../libempathy-gtk/empathy-chat.c:1105 +#: ../libempathy-gtk/empathy-chat.c:1124 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1386,126 +1436,126 @@ msgstr "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." -#: ../libempathy-gtk/empathy-chat.c:1124 +#: ../libempathy-gtk/empathy-chat.c:1143 #, c-format msgid "Usage: %s" msgstr "Usage: %s" -#: ../libempathy-gtk/empathy-chat.c:1169 +#: ../libempathy-gtk/empathy-chat.c:1188 msgid "Unknown command" msgstr "Unknown command" -#: ../libempathy-gtk/empathy-chat.c:1295 +#: ../libempathy-gtk/empathy-chat.c:1314 msgid "Unknown command; see /help for the available commands" msgstr "Unknown command; see /help for the available commands" -#: ../libempathy-gtk/empathy-chat.c:1541 +#: ../libempathy-gtk/empathy-chat.c:1565 msgid "insufficient balance to send message" msgstr "insufficient balance to send message" -#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559 -#: ../libempathy-gtk/empathy-chat.c:1622 +#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583 +#: ../libempathy-gtk/empathy-chat.c:1646 #, c-format msgid "Error sending message '%s': %s" msgstr "Error sending message '%s': %s" -#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564 -#: ../libempathy-gtk/empathy-chat.c:1626 +#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588 +#: ../libempathy-gtk/empathy-chat.c:1650 #, c-format msgid "Error sending message: %s" msgstr "Error sending message: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1553 +#: ../libempathy-gtk/empathy-chat.c:1577 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "insufficient balance to send message. <a href='%s'>Top up</a>." -#: ../libempathy-gtk/empathy-chat.c:1593 +#: ../libempathy-gtk/empathy-chat.c:1617 msgid "not capable" msgstr "not capable" -#: ../libempathy-gtk/empathy-chat.c:1600 +#: ../libempathy-gtk/empathy-chat.c:1624 msgid "offline" msgstr "offline" -#: ../libempathy-gtk/empathy-chat.c:1603 +#: ../libempathy-gtk/empathy-chat.c:1627 msgid "invalid contact" msgstr "invalid contact" -#: ../libempathy-gtk/empathy-chat.c:1606 +#: ../libempathy-gtk/empathy-chat.c:1630 msgid "permission denied" msgstr "permission denied" -#: ../libempathy-gtk/empathy-chat.c:1609 +#: ../libempathy-gtk/empathy-chat.c:1633 msgid "too long message" msgstr "too long message" -#: ../libempathy-gtk/empathy-chat.c:1612 +#: ../libempathy-gtk/empathy-chat.c:1636 msgid "not implemented" msgstr "not implemented" -#: ../libempathy-gtk/empathy-chat.c:1616 +#: ../libempathy-gtk/empathy-chat.c:1640 msgid "unknown" msgstr "unknown" -#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916 +#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920 msgid "Topic:" msgstr "Topic:" -#: ../libempathy-gtk/empathy-chat.c:1698 +#: ../libempathy-gtk/empathy-chat.c:1722 #, c-format msgid "Topic set to: %s" msgstr "Topic set to: %s" -#: ../libempathy-gtk/empathy-chat.c:1700 +#: ../libempathy-gtk/empathy-chat.c:1724 #, c-format msgid "Topic set by %s to: %s" msgstr "Topic set by %s to: %s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1705 +#: ../libempathy-gtk/empathy-chat.c:1729 msgid "No topic defined" msgstr "No topic defined" -#: ../libempathy-gtk/empathy-chat.c:2221 +#: ../libempathy-gtk/empathy-chat.c:2245 msgid "(No Suggestions)" msgstr "(No Suggestions)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2289 +#: ../libempathy-gtk/empathy-chat.c:2313 #, 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:2326 +#: ../libempathy-gtk/empathy-chat.c:2350 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Add '%s' to %s Dictionary" -#: ../libempathy-gtk/empathy-chat.c:2396 +#: ../libempathy-gtk/empathy-chat.c:2420 msgid "Insert Smiley" msgstr "Insert Smiley" #. send button -#: ../libempathy-gtk/empathy-chat.c:2414 -#: ../libempathy-gtk/empathy-ui-utils.c:1867 +#: ../libempathy-gtk/empathy-chat.c:2438 +#: ../libempathy-gtk/empathy-ui-utils.c:1880 msgid "_Send" msgstr "_Send" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2471 +#: ../libempathy-gtk/empathy-chat.c:2495 msgid "_Spelling Suggestions" msgstr "_Spelling Suggestions" -#: ../libempathy-gtk/empathy-chat.c:2560 +#: ../libempathy-gtk/empathy-chat.c:2584 msgid "Failed to retrieve recent logs" msgstr "Failed to retrieve recent logs" -#: ../libempathy-gtk/empathy-chat.c:2699 +#: ../libempathy-gtk/empathy-chat.c:2723 #, c-format msgid "%s has disconnected" msgstr "%s has disconnected" @@ -1513,12 +1563,12 @@ 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:2706 +#: ../libempathy-gtk/empathy-chat.c:2730 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s was kicked by %2$s" -#: ../libempathy-gtk/empathy-chat.c:2709 +#: ../libempathy-gtk/empathy-chat.c:2733 #, c-format msgid "%s was kicked" msgstr "%s was kicked" @@ -1526,17 +1576,17 @@ 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:2717 +#: ../libempathy-gtk/empathy-chat.c:2741 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s was banned by %2$s" -#: ../libempathy-gtk/empathy-chat.c:2720 +#: ../libempathy-gtk/empathy-chat.c:2744 #, c-format msgid "%s was banned" msgstr "%s was banned" -#: ../libempathy-gtk/empathy-chat.c:2724 +#: ../libempathy-gtk/empathy-chat.c:2748 #, c-format msgid "%s has left the room" msgstr "%s has left the room" @@ -1546,17 +1596,17 @@ 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:2733 +#: ../libempathy-gtk/empathy-chat.c:2757 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2758 +#: ../libempathy-gtk/empathy-chat.c:2782 #, c-format msgid "%s has joined the room" msgstr "%s has joined the room" -#: ../libempathy-gtk/empathy-chat.c:2783 +#: ../libempathy-gtk/empathy-chat.c:2807 #, c-format msgid "%s is now known as %s" msgstr "%s is now known as %s" @@ -1564,86 +1614,86 @@ msgstr "%s is now known as %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2970 -#: ../src/empathy-streamed-media-window.c:1889 -#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538 -#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631 +#: ../libempathy-gtk/empathy-chat.c:2994 +#: ../src/empathy-streamed-media-window.c:1888 +#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1466 +#: ../src/empathy-call-window.c:1516 ../src/empathy-call-window.c:2562 msgid "Disconnected" msgstr "Disconnected" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3634 +#: ../libempathy-gtk/empathy-chat.c:3658 msgid "Would you like to store this password?" msgstr "Would you like to store this password?" -#: ../libempathy-gtk/empathy-chat.c:3640 +#: ../libempathy-gtk/empathy-chat.c:3664 msgid "Remember" msgstr "Remember" -#: ../libempathy-gtk/empathy-chat.c:3650 +#: ../libempathy-gtk/empathy-chat.c:3674 msgid "Not now" msgstr "Not now" -#: ../libempathy-gtk/empathy-chat.c:3694 +#: ../libempathy-gtk/empathy-chat.c:3718 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Retry" -#: ../libempathy-gtk/empathy-chat.c:3698 +#: ../libempathy-gtk/empathy-chat.c:3722 msgid "Wrong password; please try again:" msgstr "Wrong password; please try again:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3828 +#: ../libempathy-gtk/empathy-chat.c:3852 msgid "This room is protected by a password:" msgstr "This room is protected by a password:" -#: ../libempathy-gtk/empathy-chat.c:3855 +#: ../libempathy-gtk/empathy-chat.c:3879 msgid "Join" msgstr "Join" -#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301 +#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300 msgid "Connected" msgstr "Connected" -#: ../libempathy-gtk/empathy-chat.c:4102 +#: ../libempathy-gtk/empathy-chat.c:4126 msgid "Conversation" msgstr "Conversation" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4107 +#: ../libempathy-gtk/empathy-chat.c:4131 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262 msgid "Unknown or invalid identifier" msgstr "Unknown or invalid identifier" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 msgid "Contact blocking temporarily unavailable" msgstr "Contact blocking temporarily unavailable" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 msgid "Contact blocking unavailable" msgstr "Contact blocking unavailable" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 msgid "Permission Denied" msgstr "Permission Denied" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272 msgid "Could not block contact" msgstr "Could not block contact" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610 msgid "Edit Blocked Contacts" msgstr "Edit Blocked Contacts" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:503 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 #: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:2 @@ -1655,13 +1705,6 @@ msgstr "Account:" msgid "Blocked Contacts" msgstr "Blocked Contacts" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3 -#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 -#: ../src/empathy-accounts-dialog.ui.h:2 -#: ../src/empathy-chatrooms-window.ui.h:3 -msgid "Remove" -msgstr "Remove" - #. Copy Link Address menu item #: ../libempathy-gtk/empathy-chat-text-view.c:322 #: ../libempathy-gtk/empathy-webkit-utils.c:277 @@ -1722,157 +1765,157 @@ msgid "Decide _Later" msgstr "Decide _Later" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:496 msgid "Search contacts" msgstr "Search contacts" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:526 msgid "Search: " msgstr "Search: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:584 msgid "_Add Contact" msgstr "_Add Contact" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:602 msgid "No contacts found" msgstr "No contacts found" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:618 msgid "Your message introducing yourself:" msgstr "Your message introducing yourself:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:626 msgid "Please let me see when you're online. Thanks!" msgstr "Please let me see when you're online. Thanks!" -#: ../libempathy-gtk/empathy-contact-widget.c:569 +#: ../libempathy-gtk/empathy-contact-widget.c:567 #: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Channels:" -#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-contact-widget.c:747 #: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "Country ISO Code:" -#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-contact-widget.c:749 #: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Country:" -#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-contact-widget.c:751 #: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "State:" -#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-contact-widget.c:753 #: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "City:" -#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-contact-widget.c:755 #: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Area:" -#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-contact-widget.c:757 #: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "Postal Code:" -#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-contact-widget.c:759 #: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Street:" -#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-contact-widget.c:761 #: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Building:" -#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-contact-widget.c:763 #: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Floor:" -#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-contact-widget.c:765 #: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Room:" -#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-contact-widget.c:767 #: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Text:" -#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-contact-widget.c:769 #: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Description:" -#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-contact-widget.c:771 #: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-contact-widget.c:773 #: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Accuracy Level:" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:775 #: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Error:" -#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-contact-widget.c:777 #: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Vertical Error (metres):" -#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-contact-widget.c:779 #: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Horizontal Error (metres):" -#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-contact-widget.c:781 #: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Speed:" -#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-contact-widget.c:783 #: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Bearing:" -#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-contact-widget.c:785 #: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Climb Speed:" -#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-contact-widget.c:787 #: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Last Updated on:" -#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-contact-widget.c:789 #: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Longitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-contact-widget.c:791 #: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Latitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:795 +#: ../libempathy-gtk/empathy-contact-widget.c:793 #: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Altitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:848 -#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-contact-widget.c:846 +#: ../libempathy-gtk/empathy-contact-widget.c:861 #: ../libempathy-gtk/empathy-individual-widget.c:593 #: ../libempathy-gtk/empathy-individual-widget.c:608 #: ../src/empathy-preferences.ui.h:35 @@ -1880,32 +1923,32 @@ msgid "Location" msgstr "Location" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:865 +#: ../libempathy-gtk/empathy-contact-widget.c:863 #: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:917 +#: ../libempathy-gtk/empathy-contact-widget.c:915 #: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y at %I:%M %p UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:999 +#: ../libempathy-gtk/empathy-contact-widget.c:997 #: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Save Avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:1055 +#: ../libempathy-gtk/empathy-contact-widget.c:1053 #: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Unable to save avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:1446 +#: ../libempathy-gtk/empathy-contact-widget.c:1455 msgid "Personal Details" msgstr "Personal Details" -#: ../libempathy-gtk/empathy-contact-widget.c:1449 +#: ../libempathy-gtk/empathy-contact-widget.c:1458 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" @@ -2014,11 +2057,11 @@ msgstr "Version:" msgid "Client:" msgstr "Client:" -#: ../libempathy-gtk/empathy-groups-widget.c:331 +#: ../libempathy-gtk/empathy-groups-widget.c:327 msgid "Groups" msgstr "Groups" -#: ../libempathy-gtk/empathy-groups-widget.c:343 +#: ../libempathy-gtk/empathy-groups-widget.c:339 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2026,17 +2069,17 @@ msgstr "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." -#: ../libempathy-gtk/empathy-groups-widget.c:362 +#: ../libempathy-gtk/empathy-groups-widget.c:358 msgid "_Add Group" msgstr "_Add Group" -#: ../libempathy-gtk/empathy-groups-widget.c:397 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Select" -#: ../libempathy-gtk/empathy-groups-widget.c:407 -#: ../src/empathy-roster-window.c:1951 +#: ../libempathy-gtk/empathy-groups-widget.c:403 +#: ../src/empathy-roster-window.c:1970 msgid "Group" msgstr "Group" @@ -2056,140 +2099,147 @@ msgstr[1] "The following identities can not be blocked:" msgid "Edit Contact Information" msgstr "Edit Contact Information" +#. Translators: the heading at the top of the Information dialogue +#: ../libempathy-gtk/empathy-individual-information-dialog.c:288 +#, fuzzy +#| msgid "Blocked Contacts" +msgid "Linked Contacts" +msgstr "Blocked Contacts" + #. 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:172 +#: ../libempathy-gtk/empathy-individual-menu.c:173 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:344 +#: ../libempathy-gtk/empathy-individual-menu.c:345 msgid "Select account to use to place the call" msgstr "Select account to use to place the call" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:348 +#: ../libempathy-gtk/empathy-individual-menu.c:349 #: ../libempathy-gtk/empathy-log-window.ui.h:6 -#: ../src/empathy-streamed-media-window.c:1288 +#: ../src/empathy-streamed-media-window.c:1290 #: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "Call" -#: ../libempathy-gtk/empathy-individual-menu.c:413 +#: ../libempathy-gtk/empathy-individual-menu.c:414 msgid "Mobile" msgstr "Mobile" -#: ../libempathy-gtk/empathy-individual-menu.c:415 +#: ../libempathy-gtk/empathy-individual-menu.c:416 msgid "Work" msgstr "Work" -#: ../libempathy-gtk/empathy-individual-menu.c:417 +#: ../libempathy-gtk/empathy-individual-menu.c:418 msgid "HOME" msgstr "HOME" -#: ../libempathy-gtk/empathy-individual-menu.c:658 +#: ../libempathy-gtk/empathy-individual-menu.c:659 msgid "_Block Contact" msgstr "_Block Contact" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1017 +#: ../libempathy-gtk/empathy-individual-menu.c:1018 #: ../libempathy-gtk/empathy-new-message-dialog.c:319 #: ../src/empathy-roster-window-menubar.ui.h:1 msgid "_Chat" msgstr "_Chat" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1052 +#: ../libempathy-gtk/empathy-individual-menu.c:1053 #: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1085 +#: ../libempathy-gtk/empathy-individual-menu.c:1086 msgctxt "menu item" msgid "_Audio Call" msgstr "_Audio Call" -#: ../libempathy-gtk/empathy-individual-menu.c:1118 +#: ../libempathy-gtk/empathy-individual-menu.c:1119 msgctxt "menu item" msgid "_Video Call" msgstr "_Video Call" -#: ../libempathy-gtk/empathy-individual-menu.c:1159 +#: ../libempathy-gtk/empathy-individual-menu.c:1160 #: ../src/empathy-roster-window-menubar.ui.h:4 msgid "_Previous Conversations" msgstr "_Previous Conversations" -#: ../libempathy-gtk/empathy-individual-menu.c:1188 +#: ../libempathy-gtk/empathy-individual-menu.c:1189 msgid "Send File" msgstr "Send File" -#: ../libempathy-gtk/empathy-individual-menu.c:1218 +#: ../libempathy-gtk/empathy-individual-menu.c:1219 msgid "Share My Desktop" msgstr "Share My Desktop" -#: ../libempathy-gtk/empathy-individual-menu.c:1244 +#: ../libempathy-gtk/empathy-individual-menu.c:1245 #: ../libempathy-gtk/empathy-individual-widget.c:1357 msgid "Favorite" msgstr "Favourite" -#: ../libempathy-gtk/empathy-individual-menu.c:1263 +#: ../libempathy-gtk/empathy-individual-menu.c:1264 msgid "gnome-contacts not installed" msgstr "gnome-contacts not installed" -#: ../libempathy-gtk/empathy-individual-menu.c:1266 +#: ../libempathy-gtk/empathy-individual-menu.c:1267 msgid "Please install gnome-contacts to access contacts details." msgstr "Please install gnome-contacts to access contacts details." -#: ../libempathy-gtk/empathy-individual-menu.c:1377 +#: ../libempathy-gtk/empathy-individual-menu.c:1398 msgid "Infor_mation" msgstr "Infor_mation" -#: ../libempathy-gtk/empathy-individual-menu.c:1426 +#: ../libempathy-gtk/empathy-individual-menu.c:1447 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Edit" -#: ../libempathy-gtk/empathy-individual-menu.c:1543 -#: ../src/empathy-chat-window.c:1166 +#: ../libempathy-gtk/empathy-individual-menu.c:1564 +#: ../src/empathy-chat-window.c:1192 msgid "Inviting you to this room" msgstr "Inviting you to this room" -#: ../libempathy-gtk/empathy-individual-menu.c:1589 +#: ../libempathy-gtk/empathy-individual-menu.c:1610 msgid "_Invite to Chat Room" msgstr "_Invite to Chat Room" -#: ../libempathy-gtk/empathy-individual-menu.c:1785 +#: ../libempathy-gtk/empathy-individual-menu.c:1806 #: ../src/empathy-roster-window-menubar.ui.h:5 msgid "_Add Contact…" msgstr "_Add Contact…" -#: ../libempathy-gtk/empathy-individual-view.c:2306 +#: ../libempathy-gtk/empathy-individual-view.c:2304 msgid "Delete and _Block" msgstr "Delete and _Block" -#: ../libempathy-gtk/empathy-individual-view.c:2341 +#: ../libempathy-gtk/empathy-individual-view.c:2339 #, 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-individual-view.c:2344 +#: ../libempathy-gtk/empathy-individual-view.c:2342 msgid "Removing group" msgstr "Removing group" #. Remove -#: ../libempathy-gtk/empathy-individual-view.c:2399 -#: ../libempathy-gtk/empathy-individual-view.c:2603 +#: ../libempathy-gtk/empathy-individual-view.c:2397 +#: ../libempathy-gtk/empathy-individual-view.c:2601 msgid "_Remove" msgstr "_Remove" -#: ../libempathy-gtk/empathy-individual-view.c:2476 +#: ../libempathy-gtk/empathy-individual-view.c:2474 #, 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-individual-view.c:2485 +#: ../libempathy-gtk/empathy-individual-view.c:2483 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2198,7 +2248,7 @@ msgstr "" "Do you really want to remove the linked contact '%s'? Note that this will " "remove all the contacts which make up this linked contact." -#: ../libempathy-gtk/empathy-individual-view.c:2497 +#: ../libempathy-gtk/empathy-individual-view.c:2495 msgid "Removing contact" msgstr "Removing contact" @@ -2238,139 +2288,139 @@ msgstr "Select" msgid "new server" msgstr "new server" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:535 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:539 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:622 +#: ../libempathy-gtk/empathy-log-window.c:620 msgid "History" msgstr "History" -#: ../libempathy-gtk/empathy-log-window.c:677 +#: ../libempathy-gtk/empathy-log-window.c:675 msgid "Show" msgstr "Show" -#: ../libempathy-gtk/empathy-log-window.c:699 +#: ../libempathy-gtk/empathy-log-window.c:697 msgid "Search" msgstr "Search" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1148 #, c-format msgid "Chat in %s" msgstr "Chat in %s" -#: ../libempathy-gtk/empathy-log-window.c:1152 +#: ../libempathy-gtk/empathy-log-window.c:1150 #, c-format msgid "Chat with %s" msgstr "Chat with %s" -#: ../libempathy-gtk/empathy-log-window.c:1202 -#: ../libempathy-gtk/empathy-log-window.c:1349 +#: ../libempathy-gtk/empathy-log-window.c:1200 +#: ../libempathy-gtk/empathy-log-window.c:1347 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e %B %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1291 +#: ../libempathy-gtk/empathy-log-window.c:1289 #, c-format msgid "<i>* %s %s</i>" msgstr "<i>* %s %s</i>" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1297 +#: ../libempathy-gtk/empathy-log-window.c:1295 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1373 +#: ../libempathy-gtk/empathy-log-window.c:1371 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s second" msgstr[1] "%s seconds" -#: ../libempathy-gtk/empathy-log-window.c:1380 +#: ../libempathy-gtk/empathy-log-window.c:1378 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s minute" msgstr[1] "%s minutes" -#: ../libempathy-gtk/empathy-log-window.c:1388 +#: ../libempathy-gtk/empathy-log-window.c:1386 #, c-format msgid "Call took %s, ended at %s" msgstr "Call took %s, ended at %s" -#: ../libempathy-gtk/empathy-log-window.c:1722 +#: ../libempathy-gtk/empathy-log-window.c:1720 msgid "Today" msgstr "Today" -#: ../libempathy-gtk/empathy-log-window.c:1726 +#: ../libempathy-gtk/empathy-log-window.c:1724 msgid "Yesterday" msgstr "Yesterday" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1741 +#: ../libempathy-gtk/empathy-log-window.c:1739 msgid "%e %B %Y" msgstr "%e %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1829 -#: ../libempathy-gtk/empathy-log-window.c:3489 +#: ../libempathy-gtk/empathy-log-window.c:1843 +#: ../libempathy-gtk/empathy-log-window.c:3471 msgid "Anytime" msgstr "Anytime" -#: ../libempathy-gtk/empathy-log-window.c:1918 -#: ../libempathy-gtk/empathy-log-window.c:2402 +#: ../libempathy-gtk/empathy-log-window.c:1942 +#: ../libempathy-gtk/empathy-log-window.c:2401 msgid "Anyone" msgstr "Anyone" -#: ../libempathy-gtk/empathy-log-window.c:2715 +#: ../libempathy-gtk/empathy-log-window.c:2714 msgid "Who" msgstr "Who" -#: ../libempathy-gtk/empathy-log-window.c:2924 +#: ../libempathy-gtk/empathy-log-window.c:2923 msgid "When" msgstr "When" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3039 msgid "Anything" msgstr "Anything" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3041 msgid "Text chats" msgstr "Text chats" -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3043 #: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "Calls" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3048 msgid "Incoming calls" msgstr "Incoming calls" -#: ../libempathy-gtk/empathy-log-window.c:3050 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Outgoing calls" msgstr "Outgoing calls" -#: ../libempathy-gtk/empathy-log-window.c:3051 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Missed calls" msgstr "Missed calls" -#: ../libempathy-gtk/empathy-log-window.c:3073 +#: ../libempathy-gtk/empathy-log-window.c:3072 msgid "What" msgstr "What" -#: ../libempathy-gtk/empathy-log-window.c:3782 +#: ../libempathy-gtk/empathy-log-window.c:3764 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Are you sure you want to delete all logs of previous conversations?" -#: ../libempathy-gtk/empathy-log-window.c:3786 +#: ../libempathy-gtk/empathy-log-window.c:3768 msgid "Clear All" msgstr "Clear All" -#: ../libempathy-gtk/empathy-log-window.c:3793 +#: ../libempathy-gtk/empathy-log-window.c:3775 msgid "Delete from:" msgstr "Delete from:" @@ -2456,7 +2506,7 @@ msgid "There was an error starting the conversation" msgstr "There was an error starting the conversation" #: ../libempathy-gtk/empathy-new-message-dialog.c:290 -#: ../libempathy-gtk/empathy-new-call-dialog.c:202 +#: ../libempathy-gtk/empathy-new-call-dialog.c:200 msgid "Enter a contact identifier or phone number:" msgstr "Enter a contact identifier or phone number:" @@ -2466,17 +2516,17 @@ msgid "New Conversation" msgstr "New Conversation" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:225 +#: ../libempathy-gtk/empathy-new-call-dialog.c:223 msgid "_Video Call" msgstr "_Video Call" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:235 +#: ../libempathy-gtk/empathy-new-call-dialog.c:233 msgid "_Audio Call" msgstr "_Audio Call" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:245 +#: ../libempathy-gtk/empathy-new-call-dialog.c:243 msgid "New Call" msgstr "New Call" @@ -2532,7 +2582,7 @@ msgstr "Custom messages…" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../libempathy-gtk/empathy-protocol-chooser.c:584 +#: ../libempathy-gtk/empathy-protocol-chooser.c:588 #, c-format msgid "New %s account" msgstr "New %s account" @@ -2684,7 +2734,9 @@ msgid "Certificate hostname: %s" msgstr "Certificate hostname: %s" #: ../libempathy-gtk/empathy-tls-dialog.c:281 -msgid "Continue" +#, fuzzy +#| msgid "Continue" +msgid "C_ontinue" msgstr "Continue" #: ../libempathy-gtk/empathy-tls-dialog.c:287 @@ -2703,19 +2755,19 @@ msgstr "Remember this choice for future connections" msgid "Certificate Details" msgstr "Certificate Details" -#: ../libempathy-gtk/empathy-ui-utils.c:1741 +#: ../libempathy-gtk/empathy-ui-utils.c:1754 msgid "Unable to open URI" msgstr "Unable to open URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1859 +#: ../libempathy-gtk/empathy-ui-utils.c:1872 msgid "Select a file" msgstr "Select a file" -#: ../libempathy-gtk/empathy-ui-utils.c:1934 +#: ../libempathy-gtk/empathy-ui-utils.c:1947 msgid "Insufficient free space to save file" msgstr "Insufficient free space to save file" -#: ../libempathy-gtk/empathy-ui-utils.c:1942 +#: ../libempathy-gtk/empathy-ui-utils.c:1955 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2724,7 +2776,7 @@ msgstr "" "%s of free space are required to save this file, but only %s is available. " "Please choose another location." -#: ../libempathy-gtk/empathy-ui-utils.c:1986 +#: ../libempathy-gtk/empathy-ui-utils.c:1999 #, c-format msgid "Incoming file from %s" msgstr "Incoming file from %s" @@ -2896,31 +2948,45 @@ msgstr "Western" msgid "Vietnamese" msgstr "Vietnamese" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 +#: ../libempathy-gtk/empathy-calendar-button.c:66 +#, fuzzy +#| msgctxt "verb in a column header displaying group names" +#| msgid "Select" +msgid "Select..." +msgstr "Select" + +#: ../libempathy-gtk/empathy-calendar-button.c:154 +#, fuzzy +#| msgctxt "verb in a column header displaying group names" +#| msgid "Select" +msgid "_Select" +msgstr "Select" + +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201 msgid "No error message" msgstr "No error message" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274 msgid "Instant Message (Empathy)" msgstr "Instant Message (Empathy)" -#: ../src/empathy.c:437 +#: ../src/empathy.c:435 msgid "Don't connect on startup" msgstr "Don't connect on startup" -#: ../src/empathy.c:441 +#: ../src/empathy.c:439 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Don't display the contact list or any other dialogs on startup" -#: ../src/empathy.c:456 +#: ../src/empathy.c:454 msgid "- Empathy IM Client" msgstr "- Empathy IM Client" -#: ../src/empathy.c:643 +#: ../src/empathy.c:641 msgid "Error contacting the Account Manager" msgstr "Error contacting the Account Manager" -#: ../src/empathy.c:645 +#: ../src/empathy.c:643 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -2977,231 +3043,80 @@ msgstr "" "Adam Weinberger\n" "Tiffany Antopolski" -#: ../src/empathy-account-assistant.c:167 -msgid "There was an error while importing the accounts." -msgstr "There was an error while importing the accounts." - -#: ../src/empathy-account-assistant.c:170 -msgid "There was an error while parsing the account details." -msgstr "There was an error while parsing the account details." - -#: ../src/empathy-account-assistant.c:173 -msgid "There was an error while creating the account." -msgstr "There was an error while creating the account." - -#: ../src/empathy-account-assistant.c:175 -msgid "There was an error." -msgstr "There was an error." - -#: ../src/empathy-account-assistant.c:179 -#, c-format -msgid "The error message was: %s" -msgstr "The error message was: %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 "" -"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." - -#: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1276 -msgid "An error occurred" -msgstr "An error occurred" - -#: ../src/empathy-account-assistant.c:469 -#: ../libempathy-gtk/empathy-new-account-dialog.c:144 -msgid "What kind of chat account do you have?" -msgstr "What kind of chat account do you have?" - -#: ../src/empathy-account-assistant.c:475 -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:481 -msgid "Enter your account details" -msgstr "Enter your account details" - -#: ../src/empathy-account-assistant.c:486 -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:492 -msgid "Do you want to create other chat accounts?" -msgstr "Do you want to create other chat accounts?" - -#: ../src/empathy-account-assistant.c:499 -msgid "Enter the details for the new account" -msgstr "Enter the details for the new account" - -#: ../src/empathy-account-assistant.c:614 -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 "" -"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:631 -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:655 -msgid "Yes, import my account details from " -msgstr "Yes, import my account details from " - -#: ../src/empathy-account-assistant.c:676 -msgid "Yes, I'll enter my account details now" -msgstr "Yes, I'll enter my account details now" - -#: ../src/empathy-account-assistant.c:698 -msgid "No, I want a new account" -msgstr "No, I want a new account" - -#: ../src/empathy-account-assistant.c:708 -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:729 -msgid "Select the accounts you want to import:" -msgstr "Select the accounts you want to import:" - -#: ../src/empathy-account-assistant.c:816 -#: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 -msgid "Yes" -msgstr "Yes" - -#: ../src/empathy-account-assistant.c:823 -msgid "No, that's all for now" -msgstr "No, that's all for now" - -#: ../src/empathy-account-assistant.c:1088 -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 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" - -#: ../src/empathy-account-assistant.c:1094 -#: ../src/empathy-account-assistant.c:1152 -msgid "Edit->Accounts" -msgstr "Edit->Accounts" - -#: ../src/empathy-account-assistant.c:1110 -msgid "I do _not want to enable this feature for now" -msgstr "I do _not want to enable this feature for now" - -#: ../src/empathy-account-assistant.c:1148 -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 "" -"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" - -#: ../src/empathy-account-assistant.c:1154 -msgid "telepathy-salut not installed" -msgstr "telepathy-salut not installed" - -#: ../src/empathy-account-assistant.c:1200 -msgid "Messaging and VoIP Accounts Assistant" -msgstr "Messaging and VoIP Accounts Assistant" - -#: ../src/empathy-account-assistant.c:1234 -msgid "Welcome to Empathy" -msgstr "Welcome to Empathy" - -#: ../src/empathy-account-assistant.c:1243 -msgid "Import your existing accounts" -msgstr "Import your existing accounts" - -#: ../src/empathy-account-assistant.c:1261 -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:69 +#: ../src/empathy-accounts-dialog.c:72 #, 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:73 +#: ../src/empathy-accounts-dialog.c:76 msgid "Your new account has not been saved yet." msgstr "Your new account has not been saved yet." -#: ../src/empathy-accounts-dialog.c:344 -#: ../src/empathy-streamed-media-window.c:757 -#: ../src/empathy-call-window.c:1325 +#: ../src/empathy-accounts-dialog.c:404 +#: ../src/empathy-streamed-media-window.c:759 +#: ../src/empathy-call-window.c:1267 msgid "Connecting…" msgstr "Connecting…" -#: ../src/empathy-accounts-dialog.c:385 +#: ../src/empathy-accounts-dialog.c:445 #, c-format msgid "Offline — %s" msgstr "Offline — %s" -#: ../src/empathy-accounts-dialog.c:397 +#: ../src/empathy-accounts-dialog.c:457 #, c-format msgid "Disconnected — %s" msgstr "Disconnected — %s" -#: ../src/empathy-accounts-dialog.c:408 +#: ../src/empathy-accounts-dialog.c:468 msgid "Offline — No Network Connection" msgstr "Offline — No Network Connection" -#: ../src/empathy-accounts-dialog.c:415 +#: ../src/empathy-accounts-dialog.c:475 msgid "Unknown Status" msgstr "Unknown Status" -#: ../src/empathy-accounts-dialog.c:427 +#: ../src/empathy-accounts-dialog.c:492 +msgid "" +"This account has been disabled because it relies on an old, unsupported " +"backend. Please install telepathy-haze and restart your session to migrate " +"the account." +msgstr "" + +#: ../src/empathy-accounts-dialog.c:502 msgid "Offline — Account Disabled" msgstr "Offline — Account Disabled" -#: ../src/empathy-accounts-dialog.c:530 +#: ../src/empathy-accounts-dialog.c:608 msgid "Edit Connection Parameters" -msgstr "Edit Connection Parametres" +msgstr "Edit Connection Parameters" -#: ../src/empathy-accounts-dialog.c:693 +#: ../src/empathy-accounts-dialog.c:773 msgid "Failed to retrieve your personal information from the server." msgstr "Failed to retrieve your personal information from the server." -#: ../src/empathy-accounts-dialog.c:699 +#: ../src/empathy-accounts-dialog.c:779 msgid "Go online to edit your personal information." msgstr "Go online to edit your personal information." -#: ../src/empathy-accounts-dialog.c:784 +#: ../src/empathy-accounts-dialog.c:866 msgid "_Edit Connection Parameters..." -msgstr "_Edit Connection Parametres..." +msgstr "_Edit Connection Parameters..." -#: ../src/empathy-accounts-dialog.c:1289 +#: ../src/empathy-accounts-dialog.c:1362 #, 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:1293 +#: ../src/empathy-accounts-dialog.c:1366 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:1529 +#: ../src/empathy-accounts-dialog.c:1602 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3210,15 +3125,25 @@ msgstr "" "your changes. Are you sure you want to proceed?" #. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1705 +#: ../src/empathy-accounts-dialog.c:1779 msgid "_Enable" msgstr "_Enable" -#: ../src/empathy-accounts-dialog.c:1706 +#: ../src/empathy-accounts-dialog.c:1780 msgid "_Disable" msgstr "_Disable" -#: ../src/empathy-accounts-dialog.c:2176 +#: ../src/empathy-accounts-dialog.c:2221 +msgid "_Skip" +msgstr "" + +#: ../src/empathy-accounts-dialog.c:2225 +#, fuzzy +#| msgid "Connected" +msgid "_Connect" +msgstr "Connected" + +#: ../src/empathy-accounts-dialog.c:2402 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3226,17 +3151,13 @@ msgstr "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" -#: ../src/empathy-accounts-dialog.ui.h:1 -msgid "Add…" -msgstr "Add…" - #: ../src/empathy-accounts-dialog.ui.h:3 msgid "_Import…" msgstr "_Import…" #: ../src/empathy-accounts-dialog.ui.h:4 -msgid "Protocol:" -msgstr "Protocol:" +msgid "Loading account information" +msgstr "Loading account information" #: ../src/empathy-accounts-dialog.ui.h:5 msgid "" @@ -3247,123 +3168,117 @@ msgstr "" "you want to use." #: ../src/empathy-accounts-dialog.ui.h:6 -msgid "No protocol installed" +#, fuzzy +#| msgid "No protocol installed" +msgid "No protocol backends installed" msgstr "No protocol installed" -#: ../src/empathy-accounts-dialog.ui.h:7 -msgid "Loading account information" -msgstr "Loading account information" - -#: ../src/empathy-auth-client.c:286 +#: ../src/empathy-auth-client.c:288 msgid " - Empathy authentication client" msgstr " - Empathy authentication client" -#: ../src/empathy-auth-client.c:302 +#: ../src/empathy-auth-client.c:304 msgid "Empathy authentication client" msgstr "Empathy authentication client" -#: ../src/empathy-auto-salut-account-helper.c:83 -msgid "People nearby" -msgstr "People nearby" - -#: ../src/empathy-av.c:118 ../src/empathy-call.c:193 +#: ../src/empathy-av.c:118 ../src/empathy-call.c:201 msgid "- Empathy Audio/Video Client" msgstr "- Empathy Audio/Video Client" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:218 +#: ../src/empathy-av.c:134 ../src/empathy-call.c:223 msgid "Empathy Audio/Video Client" msgstr "Empathy Audio/Video Client" -#: ../src/empathy-streamed-media-window.c:433 +#: ../src/empathy-streamed-media-window.c:434 msgid "Contrast" msgstr "Contrast" -#: ../src/empathy-streamed-media-window.c:436 +#: ../src/empathy-streamed-media-window.c:437 msgid "Brightness" msgstr "Brightness" -#: ../src/empathy-streamed-media-window.c:439 +#: ../src/empathy-streamed-media-window.c:440 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-streamed-media-window.c:545 +#: ../src/empathy-streamed-media-window.c:547 msgid "Volume" msgstr "Volume" -#: ../src/empathy-streamed-media-window.c:1097 +#: ../src/empathy-streamed-media-window.c:1099 msgid "_Sidebar" msgstr "_Sidebar" -#: ../src/empathy-streamed-media-window.c:1117 +#: ../src/empathy-streamed-media-window.c:1119 msgid "Audio input" msgstr "Audio input" -#: ../src/empathy-streamed-media-window.c:1121 +#: ../src/empathy-streamed-media-window.c:1123 msgid "Video input" msgstr "Video input" -#: ../src/empathy-streamed-media-window.c:1129 +#: ../src/empathy-streamed-media-window.c:1131 msgid "Dialpad" msgstr "Dialpad" -#: ../src/empathy-streamed-media-window.c:1140 +#: ../src/empathy-streamed-media-window.c:1142 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-streamed-media-window.c:1209 -#: ../src/empathy-call-window.c:1927 +#: ../src/empathy-streamed-media-window.c:1211 +#: ../src/empathy-call-window.c:1861 #, c-format msgid "Call with %s" msgstr "Call with %s" -#: ../src/empathy-streamed-media-window.c:1442 -#: ../src/empathy-call-window.c:2171 +#: ../src/empathy-streamed-media-window.c:1444 +#: ../src/empathy-call-window.c:2105 msgid "The IP address as seen by the machine" msgstr "The IP address as seen by the machine" -#: ../src/empathy-streamed-media-window.c:1444 -#: ../src/empathy-call-window.c:2173 +#: ../src/empathy-streamed-media-window.c:1446 +#: ../src/empathy-call-window.c:2107 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-streamed-media-window.c:1446 -#: ../src/empathy-call-window.c:2175 +#: ../src/empathy-streamed-media-window.c:1448 +#: ../src/empathy-call-window.c:2109 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-streamed-media-window.c:1448 -#: ../src/empathy-call-window.c:2177 +#: ../src/empathy-streamed-media-window.c:1450 +#: ../src/empathy-call-window.c:2111 msgid "The IP address of a relay server" msgstr "The IP address of a relay server" -#: ../src/empathy-streamed-media-window.c:1450 -#: ../src/empathy-call-window.c:2179 +#: ../src/empathy-streamed-media-window.c:1452 +#: ../src/empathy-call-window.c:2113 msgid "The IP address of the multicast group" msgstr "The IP address of the multicast group" -#: ../src/empathy-streamed-media-window.c:1838 -#: ../src/empathy-streamed-media-window.c:1841 -#: ../src/empathy-streamed-media-window.c:1844 -#: ../src/empathy-streamed-media-window.c:1847 +#: ../src/empathy-streamed-media-window.c:1837 +#: ../src/empathy-streamed-media-window.c:1840 +#: ../src/empathy-streamed-media-window.c:1843 +#: ../src/empathy-streamed-media-window.c:1846 msgctxt "codec" msgid "Unknown" msgstr "Unknown" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2139 +#: ../src/empathy-streamed-media-window.c:2138 #, c-format msgid "Connected — %d:%02dm" msgstr "Connected — %d:%02dm" -#: ../src/empathy-streamed-media-window.c:2200 -#: ../src/empathy-call-window.c:3033 +#: ../src/empathy-streamed-media-window.c:2199 +#: ../src/empathy-call-window.c:2964 msgid "Technical Details" msgstr "Technical Details" -#: ../src/empathy-streamed-media-window.c:2238 -#: ../src/empathy-call-window.c:3072 +#: ../src/empathy-streamed-media-window.c:2237 +#: ../src/empathy-call-window.c:3003 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3372,8 +3287,8 @@ msgstr "" "%s's software does not understand any of the audio formats supported by your " "computer" -#: ../src/empathy-streamed-media-window.c:2243 -#: ../src/empathy-call-window.c:3077 +#: ../src/empathy-streamed-media-window.c:2242 +#: ../src/empathy-call-window.c:3008 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3382,8 +3297,8 @@ msgstr "" "%s's software does not understand any of the video formats supported by your " "computer" -#: ../src/empathy-streamed-media-window.c:2249 -#: ../src/empathy-call-window.c:3083 +#: ../src/empathy-streamed-media-window.c:2248 +#: ../src/empathy-call-window.c:3014 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3392,27 +3307,27 @@ msgstr "" "Can't establish a connection to %s. One of you might be on a network that " "does not allow direct connections." -#: ../src/empathy-streamed-media-window.c:2255 -#: ../src/empathy-call-window.c:3089 +#: ../src/empathy-streamed-media-window.c:2254 +#: ../src/empathy-call-window.c:3020 msgid "There was a failure on the network" msgstr "There was a failure on the network" -#: ../src/empathy-streamed-media-window.c:2259 -#: ../src/empathy-call-window.c:3093 +#: ../src/empathy-streamed-media-window.c:2258 +#: ../src/empathy-call-window.c:3024 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-streamed-media-window.c:2262 -#: ../src/empathy-call-window.c:3096 +#: ../src/empathy-streamed-media-window.c:2261 +#: ../src/empathy-call-window.c:3027 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-streamed-media-window.c:2272 -#: ../src/empathy-call-window.c:3108 +#: ../src/empathy-streamed-media-window.c:2271 +#: ../src/empathy-call-window.c:3039 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3423,23 +3338,23 @@ msgstr "" "\">report this bug</a> and attach logs gathered from the 'Debug' window in " "the Help menu." -#: ../src/empathy-streamed-media-window.c:2280 -#: ../src/empathy-call-window.c:3117 +#: ../src/empathy-streamed-media-window.c:2279 +#: ../src/empathy-call-window.c:3048 msgid "There was a failure in the call engine" msgstr "There was a failure in the call engine" -#: ../src/empathy-streamed-media-window.c:2283 -#: ../src/empathy-call-window.c:3120 +#: ../src/empathy-streamed-media-window.c:2282 +#: ../src/empathy-call-window.c:3051 msgid "The end of the stream was reached" msgstr "The end of the stream was reached" -#: ../src/empathy-streamed-media-window.c:2323 -#: ../src/empathy-call-window.c:3160 +#: ../src/empathy-streamed-media-window.c:2322 +#: ../src/empathy-call-window.c:3091 msgid "Can't establish audio stream" msgstr "Can't establish audio stream" -#: ../src/empathy-streamed-media-window.c:2333 -#: ../src/empathy-call-window.c:3170 +#: ../src/empathy-streamed-media-window.c:2332 +#: ../src/empathy-call-window.c:3101 msgid "Can't establish video stream" msgstr "Can't establish video stream" @@ -3552,8 +3467,8 @@ msgstr "Encoding Codec:" #: ../src/empathy-call-window.ui.h:28 #: ../src/empathy-streamed-media-window.ui.h:21 -#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581 -#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583 +#: ../src/empathy-call-window.c:2514 ../src/empathy-call-window.c:2515 +#: ../src/empathy-call-window.c:2516 ../src/empathy-call-window.c:2517 msgid "Unknown" msgstr "Unknown" @@ -3577,11 +3492,11 @@ msgstr "Local Candidate:" msgid "Audio" msgstr "Audio" -#: ../src/empathy-chat-window.c:285 +#: ../src/empathy-chat-window.c:289 msgid "Close this window?" msgstr "Close this window?" -#: ../src/empathy-chat-window.c:290 +#: ../src/empathy-chat-window.c:294 #, c-format msgid "" "Closing this window will leave %s. You will not receive any further messages " @@ -3590,7 +3505,7 @@ msgstr "" "Closing this window will leave %s. You will not receive any further messages " "until you rejoin it." -#: ../src/empathy-chat-window.c:301 +#: ../src/empathy-chat-window.c:305 #, c-format msgid "" "Closing this window will leave a chat room. You will not receive any further " @@ -3605,12 +3520,12 @@ msgstr[1] "" "Closing this window will leave %u chat rooms. You will not receive any " "further messages until you rejoin them." -#: ../src/empathy-chat-window.c:310 +#: ../src/empathy-chat-window.c:314 #, c-format msgid "Leave %s?" msgstr "Leave %s?" -#: ../src/empathy-chat-window.c:311 +#: ../src/empathy-chat-window.c:315 msgid "" "You will not receive any further messages from this chat room until you " "rejoin it." @@ -3618,54 +3533,54 @@ msgstr "" "You will not receive any further messages from this chat room until you " "rejoin it." -#: ../src/empathy-chat-window.c:330 +#: ../src/empathy-chat-window.c:334 msgid "Close window" msgstr "Close window" -#: ../src/empathy-chat-window.c:330 +#: ../src/empathy-chat-window.c:334 msgid "Leave room" msgstr "Leave room" -#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656 +#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660 #, 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:648 +#: ../src/empathy-chat-window.c:652 #, 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:664 +#: ../src/empathy-chat-window.c:668 #, 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:673 +#: ../src/empathy-chat-window.c:677 #, 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:888 +#: ../src/empathy-chat-window.c:892 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:898 +#: ../src/empathy-chat-window.c:902 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "Sending %d message" msgstr[1] "Sending %d messages" -#: ../src/empathy-chat-window.c:920 +#: ../src/empathy-chat-window.c:924 msgid "Typing a message." msgstr "Typing a message." @@ -3745,96 +3660,96 @@ msgstr "Auto-Connect" msgid "Manage Favorite Rooms" msgstr "Manage Favourite Rooms" -#: ../src/empathy-event-manager.c:523 +#: ../src/empathy-event-manager.c:522 msgid "Incoming video call" msgstr "Incoming video call" -#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555 +#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1483 msgid "Incoming call" msgstr "Incoming call" -#: ../src/empathy-event-manager.c:527 +#: ../src/empathy-event-manager.c:526 #, 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:528 +#: ../src/empathy-event-manager.c:527 #, 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:531 ../src/empathy-event-manager.c:732 -#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561 +#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731 +#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming call from %s" msgstr "Incoming call from %s" -#: ../src/empathy-event-manager.c:556 +#: ../src/empathy-event-manager.c:555 msgid "_Reject" msgstr "_Reject" -#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572 +#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571 msgid "_Answer" msgstr "_Answer" -#: ../src/empathy-event-manager.c:572 +#: ../src/empathy-event-manager.c:571 msgid "_Answer with video" msgstr "_Answer with video" -#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765 -#: ../src/empathy-call-window.c:1561 +#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764 +#: ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming video call from %s" msgstr "Incoming video call from %s" -#: ../src/empathy-event-manager.c:838 +#: ../src/empathy-event-manager.c:837 msgid "Room invitation" msgstr "Room invitation" -#: ../src/empathy-event-manager.c:840 +#: ../src/empathy-event-manager.c:839 #, c-format msgid "Invitation to join %s" msgstr "Invitation to join %s" -#: ../src/empathy-event-manager.c:847 +#: ../src/empathy-event-manager.c:846 #, c-format msgid "%s is inviting you to join %s" msgstr "%s is inviting you to join %s" -#: ../src/empathy-event-manager.c:855 +#: ../src/empathy-event-manager.c:854 msgid "_Decline" msgstr "_Decline" -#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-event-manager.c:859 #: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "_Join" msgstr "_Join" -#: ../src/empathy-event-manager.c:887 +#: ../src/empathy-event-manager.c:886 #, c-format msgid "%s invited you to join %s" msgstr "%s invited you to join %s" -#: ../src/empathy-event-manager.c:893 +#: ../src/empathy-event-manager.c:892 #, c-format msgid "You have been invited to join %s" msgstr "You have been invited to join %s" -#: ../src/empathy-event-manager.c:944 +#: ../src/empathy-event-manager.c:943 #, c-format msgid "Incoming file transfer from %s" msgstr "Incoming file transfer from %s" -#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372 +#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374 msgid "Password required" msgstr "Password required" -#: ../src/empathy-event-manager.c:1217 +#: ../src/empathy-event-manager.c:1216 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s would like permission to see when you are online" -#: ../src/empathy-event-manager.c:1223 +#: ../src/empathy-event-manager.c:1222 #, c-format msgid "" "\n" @@ -3952,9 +3867,15 @@ msgstr "File Transfers" #: ../src/empathy-ft-manager.ui.h:2 msgid "Remove completed, canceled and failed file transfers from the list" -msgstr "Remove completed, cancellled and failed file transfers from the list" +msgstr "Remove completed, cancelled and failed file transfers from the list" + +#: ../src/empathy-import-dialog.c:76 +#, fuzzy +#| msgid "Import" +msgid "_Import" +msgstr "Import" -#: ../src/empathy-import-dialog.c:84 +#: ../src/empathy-import-dialog.c:88 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -3962,91 +3883,91 @@ msgstr "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." -#: ../src/empathy-import-dialog.c:199 +#: ../src/empathy-import-dialog.c:209 msgid "Import Accounts" msgstr "Import Accounts" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:315 +#: ../src/empathy-import-widget.c:303 msgid "Import" msgstr "Import" -#: ../src/empathy-import-widget.c:324 +#: ../src/empathy-import-widget.c:312 msgid "Protocol" msgstr "Protocol" -#: ../src/empathy-import-widget.c:348 +#: ../src/empathy-import-widget.c:336 msgid "Source" msgstr "Source" -#: ../src/empathy-roster-window.c:389 +#: ../src/empathy-roster-window.c:391 msgid "Provide Password" msgstr "Provide Password" -#: ../src/empathy-roster-window.c:395 +#: ../src/empathy-roster-window.c:397 msgid "Disconnect" msgstr "Disconnect" -#: ../src/empathy-roster-window.c:644 +#: ../src/empathy-roster-window.c:657 msgid "You need to setup an account to see contacts here." msgstr "You need to setup an account to see contacts here." -#: ../src/empathy-roster-window.c:660 +#: ../src/empathy-roster-window.c:673 msgid "No match found" msgstr "No match found" -#: ../src/empathy-roster-window.c:765 +#: ../src/empathy-roster-window.c:783 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "Sorry, %s accounts can’t be used until your %s software is updated." -#: ../src/empathy-roster-window.c:831 +#: ../src/empathy-roster-window.c:849 msgid "Update software..." msgstr "Update software..." -#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954 +#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972 msgid "Close" msgstr "Close" -#: ../src/empathy-roster-window.c:942 +#: ../src/empathy-roster-window.c:960 msgid "Reconnect" msgstr "Reconnect" -#: ../src/empathy-roster-window.c:948 +#: ../src/empathy-roster-window.c:966 msgid "Edit Account" msgstr "Edit Account" #. Translators: this string will be something like: #. * Top up My Account ($1.23)..." -#: ../src/empathy-roster-window.c:1092 +#: ../src/empathy-roster-window.c:1110 #, c-format msgid "Top up %s (%s)..." msgstr "Top up %s (%s)..." -#: ../src/empathy-roster-window.c:1138 +#: ../src/empathy-roster-window.c:1156 msgid "Top up account credit" msgstr "Top up account credit" #. top up button -#: ../src/empathy-roster-window.c:1210 +#: ../src/empathy-roster-window.c:1228 msgid "Top Up..." msgstr "Top Up..." -#: ../src/empathy-roster-window.c:1933 +#: ../src/empathy-roster-window.c:1952 msgid "Contact" msgstr "Contact" -#: ../src/empathy-roster-window.c:2131 +#: ../src/empathy-roster-window.c:2150 msgid "You need to enable one of your accounts to see contacts here." msgstr "You need to enable one of your accounts to see contacts here." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:2139 +#: ../src/empathy-roster-window.c:2158 #, c-format msgid "You need to enable %s to see contacts here." msgstr "You need to enable %s to see contacts here." -#: ../src/empathy-roster-window.c:2419 +#: ../src/empathy-roster-window.c:2460 msgid "Contact List" msgstr "Contact List" @@ -4150,7 +4071,7 @@ 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:637 +#: ../src/empathy-new-chatroom-dialog.c:636 #, c-format msgid "" "%s\n" @@ -4163,16 +4084,21 @@ msgstr "" "Password required: %s\n" "Members: %s" +#: ../src/empathy-new-chatroom-dialog.c:638 +#: ../src/empathy-new-chatroom-dialog.c:639 +msgid "Yes" +msgstr "Yes" + +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "No" -#: ../src/empathy-new-chatroom-dialog.c:668 +#: ../src/empathy-new-chatroom-dialog.c:666 msgid "Could not start room listing" msgstr "Could not start room listing" -#: ../src/empathy-new-chatroom-dialog.c:678 +#: ../src/empathy-new-chatroom-dialog.c:676 msgid "Could not stop room listing" msgstr "Could not stop room listing" @@ -4239,46 +4165,46 @@ msgid "Language" msgstr "Language" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:726 +#: ../src/empathy-preferences.c:724 msgid "Juliet" msgstr "Juliet" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:733 +#: ../src/empathy-preferences.c:731 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:739 +#: ../src/empathy-preferences.c:737 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "O Romeo, Romeo, wherefore art thou Romeo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:743 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "Deny thy father and refuse thy name;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:746 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "Or if thou wilt not, be but sworn my love" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:749 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "And I'll no longer be a Capulet." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:752 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "Shall I hear more, or shall I speak at this?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:755 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "Juliet has disconnected" -#: ../src/empathy-preferences.c:1159 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "Preferences" @@ -4368,7 +4294,7 @@ msgstr "Sounds" #: ../src/empathy-preferences.ui.h:22 msgid "Use _echo cancellation to improve call quality" -msgstr "Use _echo cancellllation to improve call quality" +msgstr "Use _echo cancellation to improve call quality" #: ../src/empathy-preferences.ui.h:23 msgid "" @@ -4377,10 +4303,10 @@ msgid "" "hear strange noises or glitches during calls, try turning echo cancellation " "off and restarting the call." msgstr "" -"Echo cancellllation helps to make your voice sound clearer to the other " +"Echo cancellation helps to make your voice sound clearer to the other " "person, but may cause problems on some computers. If you or the other person " "hear strange noises or glitches during calls, try turning echo " -"cancellllation off and restarting the call." +"cancellation off and restarting the call." #: ../src/empathy-preferences.ui.h:26 msgid "_Publish location to my contacts" @@ -4509,63 +4435,79 @@ msgstr "Enable camera and send video" msgid "Contact Map View" msgstr "Contact Map View" -#: ../src/empathy-debug-window.c:1228 +#: ../src/empathy-debug-window.c:1607 msgid "Save" msgstr "Save" -#: ../src/empathy-debug-window.c:1435 +#: ../src/empathy-debug-window.c:1667 +msgid "Pastebin link" +msgstr "" + +#: ../src/empathy-debug-window.c:1676 +msgid "Pastebin response" +msgstr "" + +#: ../src/empathy-debug-window.c:1683 +msgid "Data too large for a single paste. Please save logs to file." +msgstr "" + +#: ../src/empathy-debug-window.c:1912 msgid "Debug Window" msgstr "Debug Window" -#: ../src/empathy-debug-window.c:1517 +#: ../src/empathy-debug-window.c:1970 +msgid "Send to pastebin" +msgstr "" + +#: ../src/empathy-debug-window.c:2009 msgid "Pause" msgstr "Pause" -#: ../src/empathy-debug-window.c:1529 +#: ../src/empathy-debug-window.c:2021 msgid "Level " msgstr "Level " -#: ../src/empathy-debug-window.c:1549 +#: ../src/empathy-debug-window.c:2040 msgid "Debug" msgstr "Debug" -#: ../src/empathy-debug-window.c:1555 +#: ../src/empathy-debug-window.c:2045 msgid "Info" msgstr "Info" -#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610 +#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096 msgid "Message" msgstr "Message" -#: ../src/empathy-debug-window.c:1567 +#: ../src/empathy-debug-window.c:2055 msgid "Warning" msgstr "Warning" -#: ../src/empathy-debug-window.c:1573 +#: ../src/empathy-debug-window.c:2060 msgid "Critical" msgstr "Critical" -#: ../src/empathy-debug-window.c:1579 +#: ../src/empathy-debug-window.c:2065 msgid "Error" msgstr "Error" -#: ../src/empathy-debug-window.c:1598 +#: ../src/empathy-debug-window.c:2084 msgid "Time" msgstr "Time" -#: ../src/empathy-debug-window.c:1601 +#: ../src/empathy-debug-window.c:2087 msgid "Domain" msgstr "Domain" -#: ../src/empathy-debug-window.c:1603 +#: ../src/empathy-debug-window.c:2089 msgid "Category" msgstr "Category" -#: ../src/empathy-debug-window.c:1605 +#: ../src/empathy-debug-window.c:2091 msgid "Level" msgstr "Level" -#: ../src/empathy-debug-window.c:1642 +#: ../src/empathy-debug-window.c:2114 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -4573,47 +4515,43 @@ msgstr "" "The selected connection manager does not support the remote debugging " "extension." -#: ../src/empathy-invite-participant-dialog.c:200 -#: ../src/empathy-invite-participant-dialog.c:228 +#: ../src/empathy-invite-participant-dialog.c:202 +#: ../src/empathy-invite-participant-dialog.c:230 msgid "Invite Participant" msgstr "Invite Participant" -#: ../src/empathy-invite-participant-dialog.c:201 +#: ../src/empathy-invite-participant-dialog.c:203 msgid "Choose a contact to invite into the conversation:" msgstr "Choose a contact to invite into the conversation:" -#: ../src/empathy-invite-participant-dialog.c:224 +#: ../src/empathy-invite-participant-dialog.c:226 msgid "Invite" msgstr "Invite" -#: ../src/empathy-accounts.c:183 +#: ../src/empathy-accounts.c:180 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "Don't display any dialogs; do any work (eg, importing) and exit" -#: ../src/empathy-accounts.c:187 +#: ../src/empathy-accounts.c:184 msgid "" "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "" "Don't display any dialogs unless there are only \"People Nearby\" accounts" -#: ../src/empathy-accounts.c:191 +#: ../src/empathy-accounts.c:188 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:193 +#: ../src/empathy-accounts.c:190 msgid "<account-id>" msgstr "<account-id>" -#: ../src/empathy-accounts.c:196 -msgid "Show account assistant" -msgstr "Show account assistant" - -#: ../src/empathy-accounts.c:202 +#: ../src/empathy-accounts.c:195 msgid "- Empathy Accounts" msgstr "- Empathy Accounts" -#: ../src/empathy-accounts.c:238 +#: ../src/empathy-accounts.c:231 msgid "Empathy Accounts" msgstr "Empathy Accounts" @@ -4629,7 +4567,7 @@ msgstr "- Empathy Debugger" msgid "Empathy Debugger" msgstr "Empathy Debugger" -#: ../src/empathy-chat.c:107 +#: ../src/empathy-chat.c:109 msgid "- Empathy Chat Client" msgstr "- Empathy Chat Client" @@ -4638,13 +4576,13 @@ msgid "Respond" msgstr "Respond" #: ../src/empathy-notifications-approver.c:204 -#: ../src/empathy-call-window.c:1565 +#: ../src/empathy-call-window.c:1493 msgid "Reject" msgstr "Reject" #: ../src/empathy-notifications-approver.c:209 #: ../src/empathy-notifications-approver.c:214 -#: ../src/empathy-call-window.c:1566 +#: ../src/empathy-call-window.c:1494 msgid "Answer" msgstr "Answer" @@ -4669,45 +4607,45 @@ msgstr "Accept" msgid "Provide" msgstr "Provide" -#: ../src/empathy-call-observer.c:134 +#: ../src/empathy-call-observer.c:132 #, c-format msgid "%s just tried to call you, but you were in another call." msgstr "%s just tried to call you, but you were in another call." #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195 +#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140 msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2929 +#: ../src/empathy-call-window.c:2860 msgid "On hold" msgstr "On hold" -#: ../src/empathy-call-window.c:2932 +#: ../src/empathy-call-window.c:2863 msgid "Mute" msgstr "Mute" -#: ../src/empathy-call-window.c:2934 +#: ../src/empathy-call-window.c:2865 msgid "Duration" msgstr "Duration" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2937 +#: ../src/empathy-call-window.c:2868 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:3207 +#: ../src/empathy-call-window.c:3138 #, c-format msgid "Your current balance is %s." msgstr "Your current balance is %s." -#: ../src/empathy-call-window.c:3211 +#: ../src/empathy-call-window.c:3142 msgid "Sorry, you don’t have enough credit for that call." msgstr "Sorry, you don’t have enough credit for that call." -#: ../src/empathy-call-window.c:3213 +#: ../src/empathy-call-window.c:3144 msgid "Top Up" msgstr "Top Up" @@ -4715,6 +4653,147 @@ msgstr "Top Up" msgid "_Match case" msgstr "_Match case" +#: ../libempathy-gtk/empathy-new-account-dialog.c:144 +msgid "What kind of chat account do you have?" +msgstr "What kind of chat account do you have?" + #: ../libempathy-gtk/empathy-new-account-dialog.c:166 msgid "Adding new account" msgstr "Adding new account" + +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77 +msgid "People nearby" +msgstr "People nearby" + +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150 +#, fuzzy +#| 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" +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." +msgstr "" +"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" + +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183 +msgid "" +"You can change these details later or disable this feature by choosing <span " +"style=\"italic\">Edit → Accounts</span> in the Contact List." +msgstr "" + +#~ msgid "There was an error while importing the accounts." +#~ msgstr "There was an error while importing the accounts." + +#~ msgid "There was an error while parsing the account details." +#~ msgstr "There was an error while parsing the account details." + +#~ msgid "There was an error while creating the account." +#~ msgstr "There was an error while creating the account." + +#~ msgid "There was an error." +#~ msgstr "There was an error." + +#~ msgid "The error message was: %s" +#~ msgstr "The error message was: %s" + +#~ 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 "" +#~ "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." + +#~ msgid "An error occurred" +#~ msgstr "An error occurred" + +#~ 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?" + +#~ msgid "Enter your account details" +#~ msgstr "Enter your account details" + +#~ msgid "What kind of chat account do you want to create?" +#~ msgstr "What kind of chat account do you want to create?" + +#~ msgid "Do you want to create other chat accounts?" +#~ msgstr "Do you want to create other chat accounts?" + +#~ msgid "Enter the details for the new account" +#~ msgstr "Enter the details for the new account" + +#~ 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 "" +#~ "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." + +#~ 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?" + +#~ msgid "Yes, import my account details from " +#~ msgstr "Yes, import my account details from " + +#~ msgid "Yes, I'll enter my account details now" +#~ msgstr "Yes, I'll enter my account details now" + +#~ msgid "No, I want a new account" +#~ msgstr "No, I want a new account" + +#~ msgid "No, I just want to see people online nearby for now" +#~ msgstr "No, I just want to see people online nearby for now" + +#~ msgid "Select the accounts you want to import:" +#~ msgstr "Select the accounts you want to import:" + +#~ msgid "No, that's all for now" +#~ msgstr "No, that's all for now" + +#~ msgid "Edit->Accounts" +#~ msgstr "Edit->Accounts" + +#~ msgid "I do _not want to enable this feature for now" +#~ msgstr "I do _not want to enable this feature for now" + +#~ 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 "" +#~ "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" + +#~ msgid "telepathy-salut not installed" +#~ msgstr "telepathy-salut not installed" + +#~ msgid "Messaging and VoIP Accounts Assistant" +#~ msgstr "Messaging and VoIP Accounts Assistant" + +#~ msgid "Welcome to Empathy" +#~ msgstr "Welcome to Empathy" + +#~ msgid "Import your existing accounts" +#~ msgstr "Import your existing accounts" + +#~ msgid "Please enter personal details" +#~ msgstr "Please enter personal details" + +#~ msgid "Protocol:" +#~ msgstr "Protocol:" + +#~ msgid "Show account assistant" +#~ msgstr "Show account assistant" @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: empathy.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2012-03-16 10:47+0000\n" -"PO-Revision-Date: 2012-03-16 14:13+0100\n" +"POT-Creation-Date: 2012-04-03 09:30+0000\n" +"PO-Revision-Date: 2012-04-08 13:02+0200\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" @@ -37,7 +37,7 @@ msgstr "Chatee en Google Talk, Facebook, MSN y muchos otros servicios de chat" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 -#: ../src/empathy-accounts-dialog.c:2512 +#: ../src/empathy-accounts-dialog.c:2563 msgid "Messaging and VoIP Accounts" msgstr "Cuentas de mensajería y Voz IP" @@ -86,12 +86,13 @@ msgstr "Carpeta de descargas predeterminada de Epiphany" msgid "The default folder to save file transfers in." msgstr "La carpeta predeterminada donde guardar los archivos transferidos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once. +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Magic number used to check if sanity cleaning tasks should be run" msgstr "" "Número mágico usado para comprobar si se deben ejecutar tareas de limpieza" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 msgid "" "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks " "should be executed or not. Users should not change this key manually." @@ -100,82 +101,82 @@ msgstr "" "ejecutar o no las tareas de limpieza. Los usuarios no deben cambiar esta " "clave manualmente." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Show offline contacts" msgstr "Mostrar contactos no conectados" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Whether to show contacts that are offline in the contact list." msgstr "" "Indica si se debe mostrar los contactos que están desconectados en la lista " "de contactos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Show avatars" msgstr "Mostrar avatares" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "" "Indica si se deben mostrar los avatares para los contactos en la lista de " "contactos y ventanas de chat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Show protocols" msgstr "Mostrar protocolos" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "Whether to show protocols for contacts in the contact list." msgstr "" "Indica si se deben mostrar los protocolos para los contactos en la lista de " "contactos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Show Balance in contact list" msgstr "Mostrar crédito en la lista de contactos" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Whether to show account balances in the contact list." msgstr "Indica si se debe mostrar el crédito en la lista de contactos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Compact contact list" msgstr "Lista compacta de contactos" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Whether to show the contact list in compact mode." msgstr "Indica si se debe mostrar la lista de contactos en modo compacto." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Hide main window" msgstr "Ocultar la ventana principal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Hide the main window." msgstr "Ocultar la ventana principal." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Default directory to select an avatar image from" msgstr "Carpeta predeterminada para seleccionar un avatar" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "The last directory that an avatar image was chosen from." msgstr "Última carpeta de la que se eligió un avatar." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Open new chats in separate windows" msgstr "Abrir chats nuevos en ventanas separadas" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Always open a separate chat window for new chats." msgstr "Siempre abrir una ventana de chat separada para chats nuevos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Display incoming events in the status area" msgstr "Mostrar los eventos entrantes en el área de estado" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "" "Display incoming events in the status area. If false, present them to the " "user immediately." @@ -183,29 +184,29 @@ msgstr "" "Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos " "directamente al usuario." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "The position for the chat window side pane" msgstr "La posición para el panel lateral de la ventana de charla" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "The stored position (in pixels) of the chat window side pane." msgstr "" "La posición almacenada (en píxeles) del panel lateral de la ventana de " "charla." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Show contact groups" msgstr "Mostrar grupos de contactos" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Whether to show groups in the contact list." msgstr "Indica si se deben mostrar los grupos en la lista de contactos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Contact list sort criterion" msgstr "Criterio de ordenación de la lista de contactos" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's state with the value \"state\". A value of \"name\" will sort " @@ -215,114 +216,114 @@ msgstr "" "ordenar por el estado del contacto con el valor «state» (estado). Un valor " "«nombre» (nombre) ordenará la lista por el nombre." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Use notification sounds" msgstr "Usar sonidos de notificación" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Whether to play a sound to notify of events." msgstr "Indica si se debe reproducir un sonido para notificar eventos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Disable sounds when away" msgstr "Desactivar los sonidos al ausentarse" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Whether to play sound notifications when away or busy." msgstr "" "Indica si se deben reproducir sonidos de notificaciones cuando se esté " "ausente u ocupado." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for incoming messages" msgstr "Reproducir un sonido cuando lleguen mensajes" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Whether to play a sound to notify of incoming messages." msgstr "" "Indica si se debe reproducir un sonido para notificar mensajes entrantes." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound for outgoing messages" msgstr "Reproducir un sonido al enviar mensajes" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Whether to play a sound to notify of outgoing messages." msgstr "" "Indica si se debe reproducir un sonido para notificar mensajes salientes." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound for new conversations" msgstr "Reproducir un sonido para conversaciones nuevas" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Whether to play a sound to notify of new conversations." msgstr "" "Indica si se debe reproducir un sonido para notificar conversaciones nuevas." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Play a sound when a contact logs in" msgstr "Reproducir un sonido cuando un contacto inicie sesión" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "" "Indica si se debe reproducir un sonido para notificar los inicios de sesión " "de los contactos en la red." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Play a sound when a contact logs out" msgstr "Reproducir un sonido cuando un contacto finalice su sesión" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "" "Indica si se debe reproducir un sonido para notificar las finalizaciones de " "sesión de los contactos en la red." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Play a sound when we log in" msgstr "Reproducir un sonido cuando inicio sesión" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Whether to play a sound when logging into a network." msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Play a sound when we log out" msgstr "Reproducir un sonido al finalizar una sesión" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Whether to play a sound when logging out of a network." msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Enable popup notifications for new messages" msgstr "Activar notificaciones emergentes para mensajes nuevos" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Whether to show a popup notification when receiving a new message." msgstr "" "Indica si se deben mostrar notificaciones emergentes al recibir un mensaje " "nuevo." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "Disable popup notifications when away" msgstr "Desactivar las notificaciones emergentes al estar ausente" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "Whether to show popup notifications when away or busy." msgstr "" "Indica si se deben mostrar las notificaciones emergentes cuando se esté " "ausente u ocupado." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "Pop up notifications if the chat isn't focused" msgstr "" "Mostrar notificaciones emergentes si la ventana de chat no tiene el foco" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." @@ -330,130 +331,130 @@ msgstr "" "Indica si de deben mostrar notificaciones emergentes al recibir un mensaje " "nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "Pop up notifications when a contact logs in" msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "Whether to show a popup notification when a contact goes online." msgstr "" "Indica si se deben mostrar las notificaciones emergentes cuando un contacto " "se conecta." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Pop up notifications when a contact logs out" msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Whether to show a popup notification when a contact goes offline." msgstr "" "Indica si se deben mostrar las notificaciones emergentes cuando un contacto " "se desconecta." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use graphical smileys" msgstr "Usar emoticonos gráficos" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether to convert smileys into graphical images in conversations." msgstr "" "Indica si se deben convertir los emoticonos en imágenes gráficas en las " "conversaciones." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Show contact list in rooms" msgstr "Mostrar lista de contactos en salas" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether to show the contact list in chat rooms." msgstr "Indica si se debe mostrar la lista de contactos en salas de chat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Chat window theme" msgstr "Tema de la ventana de charla" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "The theme that is used to display the conversation in chat windows." msgstr "" "El tema que se usará para mostrar la conversación en las ventanas de chat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "Chat window theme variant" msgstr "Variante del tema de la ventana de charla" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "" "La variante del tema que se usará para mostrar la conversación en las " "ventanas de chat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "Path of the Adium theme to use" msgstr "Ruta del tema Adium que usar" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "Enable WebKit Developer Tools" msgstr "Activar las herramientas de desarrollo de WebKit" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" "Indica si las herramientas de desarrollo de WebKit, tales como el Inspector " "web, den activarse." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Inform other users when you are typing to them" msgstr "Informar a otros usuarios de cuándo les esta escribiendo" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "" "Whether to send the 'composing' or 'paused' chat states. Does not currently " "affect the 'gone' state." msgstr "" -"Indica si enviar los estados de chat «escribiendo» o «en pausa». No afecta al " -"estado «ausente»." +"Indica si enviar los estados de chat «escribiendo» o «en pausa». No afecta " +"al estado «ausente»." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Use theme for chat rooms" msgstr "Usar tema para salas de chat" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "Whether to use the theme for chat rooms." msgstr "Indica si se debe usar el tema para salas de chat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Spell checking languages" msgstr "Idiomas para revisión ortográfica" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" "Lista separada por comas de idiomas que se usarán en la revisión ortográfica " "(ej. «es, en, fr»)." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Enable spell checker" msgstr "Activar revisor ortográfico" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "" "Whether to check words typed against the languages you want to check with." msgstr "" "Indica si se deben revisar las palabras tecleadas con respecto a los idiomas " "con los que quiere comprobarlo." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Nick completed character" msgstr "Carácter de completado de apodo" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." @@ -461,60 +462,60 @@ msgstr "" "Carácter que añadir después del apodo cuando se usa el completado de apodos " "(tab) en salas de chat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "" "Empathy debería usar el avatar del contacto como icono de la ventana de chat" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" "Indica si Empathy debería usar el avatar del contacto como el icono de la " "ventana de chat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Last account selected in Join Room dialog" msgstr "Última cuenta seleccionada en el diálogo Unirse a sala" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "D-Bus object path of the last account selected to join a room." msgstr "" "Ruta del objeto D-Bus de la última cuenta seleccionada para unirse a una " "sala." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Camera device" msgstr "Dispositivo de cámara" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "" "El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, " "ej. /dev/video0." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "Camera position" msgstr "Posición de la cámara" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Position the camera preview should be during a call." msgstr "Posición donde estar la vista previa de la cámara durante una llamada." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Echo cancellation support" msgstr "Soporte de cancelación de eco" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "" "Indica si se debe activar la el filtro de cancelación de eco de Pulseaudio." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Show hint about closing the main window" msgstr "Mostrar consejo sobre cómo cerrar la ventana principal" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." @@ -522,46 +523,46 @@ msgstr "" "Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana " "principal con el botón «x» en la barra de título." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "Empathy can publish the user's location" msgstr "Empathy puede publicar la ubicación del usuario" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "" "Indica si Empathy puede publicar la ubicación del usuario a sus contactos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "Empathy can use the network to guess the location" msgstr "Empathy puede usar la red para deducir la ubicación" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 msgid "Whether Empathy can use the network to guess the location." msgstr "Indica si Empathy puede usar la red para deducir la ubicación." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 msgid "Empathy can use the cellular network to guess the location" msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "" "Indica si Empathy puede usar la red telefónica móvil para deducir la " "ubicación." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy puede usar el GPS para deducir la ubicación" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:105 msgid "Whether Empathy can use the GPS to guess the location." msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:105 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:106 msgid "Empathy should reduce the location's accuracy" msgstr "Empathy debería reducir la precisión de la ubicación" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:106 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:107 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" @@ -612,18 +613,18 @@ msgstr "El archivo seleccionado no es un archivo regular" msgid "The selected file is empty" msgstr "El archivo seleccionado está vacío" -#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129 +#: ../libempathy/empathy-message.c:412 ../src/empathy-call-observer.c:129 #, c-format msgid "Missed call from %s" msgstr "Llamada perdida de %s" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:419 +#: ../libempathy/empathy-message.c:416 #, c-format msgid "Called %s" msgstr "Llamó %s" -#: ../libempathy/empathy-message.c:422 +#: ../libempathy/empathy-message.c:419 #, c-format msgid "Call from %s" msgstr "Llamada de %s" @@ -860,7 +861,7 @@ msgid "All accounts" msgstr "Todas las cuentas" #: ../libempathy-gtk/empathy-account-widget.c:682 -#: ../src/empathy-import-widget.c:336 +#: ../src/empathy-import-widget.c:323 msgid "Account" msgstr "Cuenta" @@ -885,7 +886,7 @@ msgid "%s:" msgstr "%s:" #: ../libempathy-gtk/empathy-account-widget.c:1398 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16 msgid "Username:" msgstr "Nombre de usuario:" @@ -978,11 +979,11 @@ msgstr "_Servidor:" #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 msgid "Advanced" msgstr "Avanzadas" @@ -1000,7 +1001,7 @@ msgstr "¿Cuál es su contraseña de AIM?" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 msgid "Remember Password" msgstr "Recordar contraseña" @@ -1044,36 +1045,32 @@ msgstr "¿Cuál es su UIN de ICQ?" msgid "What is your ICQ password?" msgstr "¿Cuál es su contraseña de ICQ?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:206 -#: ../libempathy-gtk/empathy-account-widget-sip.c:239 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 +#: ../libempathy-gtk/empathy-account-widget-sip.c:240 msgid "Auto" msgstr "Auto" -#: ../libempathy-gtk/empathy-account-widget-sip.c:209 +#: ../libempathy-gtk/empathy-account-widget-sip.c:210 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:212 +#: ../libempathy-gtk/empathy-account-widget-sip.c:213 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:215 +#: ../libempathy-gtk/empathy-account-widget-sip.c:216 msgid "TLS" msgstr "TLS" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:244 +#: ../libempathy-gtk/empathy-account-widget-sip.c:245 msgid "Register" msgstr "Registrador" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:249 +#: ../libempathy-gtk/empathy-account-widget-sip.c:250 msgid "Options" msgstr "Opciones" -#: ../libempathy-gtk/empathy-account-widget-sip.c:252 +#: ../libempathy-gtk/empathy-account-widget-sip.c:253 msgid "None" msgstr "Ninguno" @@ -1102,19 +1099,21 @@ msgstr "Añadir…" msgid "Remove" msgstr "Quitar" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 +#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Up" msgstr "Subir" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 +#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 msgid "Down" msgstr "Abajo" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Servers" msgstr "Servidores" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." @@ -1122,27 +1121,27 @@ msgstr "" "La mayoría de los servidores IRC no necesitan una contraseña, de tal forma " "que si no está seguro, no introduzca una contraseña." -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Nickname:" msgstr "Apodo:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Password:" msgstr "Contraseña:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14 msgid "Quit message:" msgstr "Mensaje de salida:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15 msgid "Real name:" msgstr "Nombre real:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18 msgid "Which IRC network?" msgstr "¿Qué red de IRC?" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19 msgid "What is your IRC nickname?" msgstr "¿Cuál es su apodo del IRC?" @@ -1332,11 +1331,16 @@ msgstr "Ignorar errores TLS" msgid "Port:" msgstr "Puerto:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#| msgid "E-_mail address:" +msgid "Local IP Address:" +msgstr "Dirección IP local:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 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:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "What is your SIP account password?" msgstr "¿Cuál es la contraseña de su cuenta SIP?" @@ -1486,8 +1490,8 @@ msgid "" "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:1121 msgid "/whois <contact ID>: display information about a contact" @@ -1683,8 +1687,8 @@ msgstr "Ahora %s se llama %s" #. * we get the new handler. #: ../libempathy-gtk/empathy-chat.c:2994 #: ../src/empathy-streamed-media-window.c:1888 -#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502 -#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590 +#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1466 +#: ../src/empathy-call-window.c:1516 ../src/empathy-call-window.c:2562 msgid "Disconnected" msgstr "Desconectado" @@ -1760,7 +1764,7 @@ msgstr "Editar contactos bloqueados" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:503 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 #: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:2 @@ -1833,27 +1837,27 @@ msgid "Decide _Later" msgstr "Decidir _luego" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:496 msgid "Search contacts" msgstr "Buscar contactos" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:526 msgid "Search: " msgstr "Buscar:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:584 msgid "_Add Contact" msgstr "_Añadir contacto" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:602 msgid "No contacts found" msgstr "No se encontraron contactos" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:618 msgid "Your message introducing yourself:" msgstr "Su mensaje de presentación:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:626 msgid "Please let me see when you're online. Thanks!" msgstr "Permítame ver cuando está en línea. Gracias." @@ -2012,11 +2016,11 @@ msgstr "Guardar avatar" msgid "Unable to save avatar" msgstr "No se pudo guardar el avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:1444 +#: ../libempathy-gtk/empathy-contact-widget.c:1455 msgid "Personal Details" msgstr "Detalles personales" -#: ../libempathy-gtk/empathy-contact-widget.c:1447 +#: ../libempathy-gtk/empathy-contact-widget.c:1458 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" @@ -2125,11 +2129,11 @@ msgstr "Versión:" msgid "Client:" msgstr "Cliente:" -#: ../libempathy-gtk/empathy-groups-widget.c:331 +#: ../libempathy-gtk/empathy-groups-widget.c:327 msgid "Groups" msgstr "Grupos" -#: ../libempathy-gtk/empathy-groups-widget.c:343 +#: ../libempathy-gtk/empathy-groups-widget.c:339 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2137,16 +2141,16 @@ msgstr "" "Seleccione los grupos en los que quiere que este contacto aparezca, Note que " "puede seleccionar más de un grupo o ningún grupo." -#: ../libempathy-gtk/empathy-groups-widget.c:362 +#: ../libempathy-gtk/empathy-groups-widget.c:358 msgid "_Add Group" msgstr "_Añadir grupo" -#: ../libempathy-gtk/empathy-groups-widget.c:397 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Seleccionar" -#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../libempathy-gtk/empathy-groups-widget.c:403 #: ../src/empathy-roster-window.c:1970 msgid "Group" msgstr "Grupo" @@ -2358,137 +2362,137 @@ msgstr "servidor nuevo" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:620 +#: ../libempathy-gtk/empathy-log-window.c:618 msgid "History" msgstr "Histórico" -#: ../libempathy-gtk/empathy-log-window.c:675 +#: ../libempathy-gtk/empathy-log-window.c:673 msgid "Show" msgstr "Mostrar" -#: ../libempathy-gtk/empathy-log-window.c:697 +#: ../libempathy-gtk/empathy-log-window.c:695 msgid "Search" msgstr "Buscar" -#: ../libempathy-gtk/empathy-log-window.c:1148 +#: ../libempathy-gtk/empathy-log-window.c:1146 #, c-format msgid "Chat in %s" msgstr "Chatee en %s" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1148 #, c-format msgid "Chat with %s" msgstr "Chat con %s" -#: ../libempathy-gtk/empathy-log-window.c:1200 -#: ../libempathy-gtk/empathy-log-window.c:1347 +#: ../libempathy-gtk/empathy-log-window.c:1198 +#: ../libempathy-gtk/empathy-log-window.c:1342 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e de %B de %Y a las %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1289 +#: ../libempathy-gtk/empathy-log-window.c:1285 #, c-format msgid "<i>* %s %s</i>" msgstr "<i>* %s %s</i>" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1295 +#: ../libempathy-gtk/empathy-log-window.c:1291 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1371 +#: ../libempathy-gtk/empathy-log-window.c:1366 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s segundo" msgstr[1] "%s segundos" -#: ../libempathy-gtk/empathy-log-window.c:1378 +#: ../libempathy-gtk/empathy-log-window.c:1373 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s minuto" msgstr[1] "%s minutos" -#: ../libempathy-gtk/empathy-log-window.c:1386 +#: ../libempathy-gtk/empathy-log-window.c:1381 #, c-format msgid "Call took %s, ended at %s" msgstr "La llamada duró %s, finalizó a las %s" -#: ../libempathy-gtk/empathy-log-window.c:1720 +#: ../libempathy-gtk/empathy-log-window.c:1712 msgid "Today" msgstr "Hoy" -#: ../libempathy-gtk/empathy-log-window.c:1724 +#: ../libempathy-gtk/empathy-log-window.c:1716 msgid "Yesterday" msgstr "Ayer" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1739 +#: ../libempathy-gtk/empathy-log-window.c:1731 msgid "%e %B %Y" msgstr "%e de %B de %Y" -#: ../libempathy-gtk/empathy-log-window.c:1827 -#: ../libempathy-gtk/empathy-log-window.c:3487 +#: ../libempathy-gtk/empathy-log-window.c:1835 +#: ../libempathy-gtk/empathy-log-window.c:3458 msgid "Anytime" msgstr "Cualquier hora" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2400 +#: ../libempathy-gtk/empathy-log-window.c:1934 +#: ../libempathy-gtk/empathy-log-window.c:2393 msgid "Anyone" msgstr "Cualquiera" -#: ../libempathy-gtk/empathy-log-window.c:2713 +#: ../libempathy-gtk/empathy-log-window.c:2706 msgid "Who" msgstr "Quién" -#: ../libempathy-gtk/empathy-log-window.c:2922 +#: ../libempathy-gtk/empathy-log-window.c:2915 msgid "When" msgstr "Cuándo" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3033 msgid "Anything" msgstr "Cualquier cosa" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3035 msgid "Text chats" msgstr "Chats de texto" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3036 #: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "Llamadas" -#: ../libempathy-gtk/empathy-log-window.c:3047 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Incoming calls" msgstr "Llamadas entrantes" -#: ../libempathy-gtk/empathy-log-window.c:3048 +#: ../libempathy-gtk/empathy-log-window.c:3041 msgid "Outgoing calls" msgstr "Llamadas salientes" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3042 msgid "Missed calls" msgstr "Llamadas perdidas" -#: ../libempathy-gtk/empathy-log-window.c:3071 +#: ../libempathy-gtk/empathy-log-window.c:3062 msgid "What" msgstr "Qué" -#: ../libempathy-gtk/empathy-log-window.c:3780 +#: ../libempathy-gtk/empathy-log-window.c:3751 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "" "¿Está seguro de que quiere eliminar todos los registros de conversaciones " "anteriores?" -#: ../libempathy-gtk/empathy-log-window.c:3784 +#: ../libempathy-gtk/empathy-log-window.c:3755 msgid "Clear All" msgstr "Limpiar todo" -#: ../libempathy-gtk/empathy-log-window.c:3791 +#: ../libempathy-gtk/empathy-log-window.c:3762 msgid "Delete from:" msgstr "Eliminar de:" @@ -2637,12 +2641,23 @@ msgstr "Pulse pare eliminar este estado de los favoritos" msgid "Click to make this status a favorite" msgstr "Pulse para hacer este estado uno favorito" +#. Translators: %s is a status message like 'At the pub' for example #: ../libempathy-gtk/empathy-presence-chooser.c:388 +#, c-format +msgid "" +"<b>Current message: %s</b>\n" +"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>" +msgstr "" +"<b>Mensaje actual: %s</b>\n" +"<small><i>Pulse Intro para establecer el mensaje nuevo o Esc para cancelar.</" +"i></small>" + +#: ../libempathy-gtk/empathy-presence-chooser.c:397 msgid "Set status" msgstr "Establecer estado" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1135 +#: ../libempathy-gtk/empathy-presence-chooser.c:1146 msgid "Custom messages…" msgstr "Mensajes personalizados…" @@ -3016,22 +3031,18 @@ msgid "Vietnamese" msgstr "Vietnamita" #: ../libempathy-gtk/empathy-calendar-button.c:66 -#| msgctxt "verb in a column header displaying group names" -#| msgid "Select" msgid "Select..." msgstr "Seleccionar…" #: ../libempathy-gtk/empathy-calendar-button.c:154 -#| msgctxt "verb in a column header displaying group names" -#| msgid "Select" msgid "_Select" msgstr "_Seleccionar" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201 msgid "No error message" msgstr "Sin mensaje de eeror" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274 msgid "Instant Message (Empathy)" msgstr "Mensaje instantáneo (Empathy)" @@ -3121,31 +3132,31 @@ msgstr "Existen modificaciones sin guardar en su cuenta %s." msgid "Your new account has not been saved yet." msgstr "Aún no se ha guardado su cuenta nueva." -#: ../src/empathy-accounts-dialog.c:381 +#: ../src/empathy-accounts-dialog.c:405 #: ../src/empathy-streamed-media-window.c:759 -#: ../src/empathy-call-window.c:1289 +#: ../src/empathy-call-window.c:1267 msgid "Connecting…" msgstr "Conectando…" -#: ../src/empathy-accounts-dialog.c:422 +#: ../src/empathy-accounts-dialog.c:446 #, c-format msgid "Offline — %s" msgstr "Desconectado: %s" -#: ../src/empathy-accounts-dialog.c:434 +#: ../src/empathy-accounts-dialog.c:458 #, c-format msgid "Disconnected — %s" msgstr "Desconectado: %s" -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:469 msgid "Offline — No Network Connection" msgstr "Desconectado: sin conexión de red" -#: ../src/empathy-accounts-dialog.c:452 +#: ../src/empathy-accounts-dialog.c:476 msgid "Unknown Status" msgstr "Estado desconocido" -#: ../src/empathy-accounts-dialog.c:469 +#: ../src/empathy-accounts-dialog.c:493 msgid "" "This account has been disabled because it relies on an old, unsupported " "backend. Please install telepathy-haze and restart your session to migrate " @@ -3155,36 +3166,36 @@ msgstr "" "soportado. Instale telepathy-haze y reinicie la sesión para migrar esta " "cuenta." -#: ../src/empathy-accounts-dialog.c:479 +#: ../src/empathy-accounts-dialog.c:503 msgid "Offline — Account Disabled" msgstr "Desconectado: cuenta desactivada" -#: ../src/empathy-accounts-dialog.c:585 +#: ../src/empathy-accounts-dialog.c:609 msgid "Edit Connection Parameters" msgstr "Editar los parámetros de la conexión" -#: ../src/empathy-accounts-dialog.c:750 +#: ../src/empathy-accounts-dialog.c:774 msgid "Failed to retrieve your personal information from the server." msgstr "Falló al recuperar su información personal del servidor." -#: ../src/empathy-accounts-dialog.c:756 +#: ../src/empathy-accounts-dialog.c:780 msgid "Go online to edit your personal information." msgstr "Conéctese para editar su información personal." -#: ../src/empathy-accounts-dialog.c:843 +#: ../src/empathy-accounts-dialog.c:867 msgid "_Edit Connection Parameters..." msgstr "_Editar los parámetros de la conexión…" -#: ../src/empathy-accounts-dialog.c:1339 +#: ../src/empathy-accounts-dialog.c:1363 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "¿Quiere quitar %s de su equipo?" -#: ../src/empathy-accounts-dialog.c:1343 +#: ../src/empathy-accounts-dialog.c:1367 msgid "This will not remove your account on the server." msgstr "Esto no quitará su cuenta del servidor." -#: ../src/empathy-accounts-dialog.c:1579 +#: ../src/empathy-accounts-dialog.c:1604 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3192,24 +3203,26 @@ msgstr "" "Va a seleccionar otra cuenta lo que descartará sus cambios.\n" "¿Seguro que quiere continuar?" -#. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1755 -msgid "_Enable" -msgstr "_Activar" +#. Menu item: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1795 +msgid "_Enabled" +msgstr "_Activada" -#: ../src/empathy-accounts-dialog.c:1756 -msgid "_Disable" -msgstr "_Desactivar" +#. Menu item: Rename +#: ../src/empathy-accounts-dialog.c:1818 +#| msgid "Real name:" +msgid "Rename" +msgstr "Renombrar" -#: ../src/empathy-accounts-dialog.c:2184 +#: ../src/empathy-accounts-dialog.c:2234 msgid "_Skip" msgstr "_Omitir" -#: ../src/empathy-accounts-dialog.c:2188 +#: ../src/empathy-accounts-dialog.c:2238 msgid "_Connect" msgstr "_Conectar" -#: ../src/empathy-accounts-dialog.c:2365 +#: ../src/empathy-accounts-dialog.c:2415 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3292,33 +3305,33 @@ msgstr "Detalles" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title #: ../src/empathy-streamed-media-window.c:1211 -#: ../src/empathy-call-window.c:1889 +#: ../src/empathy-call-window.c:1861 #, c-format msgid "Call with %s" msgstr "Llamada con %s" #: ../src/empathy-streamed-media-window.c:1444 -#: ../src/empathy-call-window.c:2133 +#: ../src/empathy-call-window.c:2105 msgid "The IP address as seen by the machine" msgstr "La dirección IP como la ve la máquina" #: ../src/empathy-streamed-media-window.c:1446 -#: ../src/empathy-call-window.c:2135 +#: ../src/empathy-call-window.c:2107 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-streamed-media-window.c:1448 -#: ../src/empathy-call-window.c:2137 +#: ../src/empathy-call-window.c:2109 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-streamed-media-window.c:1450 -#: ../src/empathy-call-window.c:2139 +#: ../src/empathy-call-window.c:2111 msgid "The IP address of a relay server" msgstr "La dirección IP de un servidor de desvío" #: ../src/empathy-streamed-media-window.c:1452 -#: ../src/empathy-call-window.c:2141 +#: ../src/empathy-call-window.c:2113 msgid "The IP address of the multicast group" msgstr "La dirección IP del grupo multicast" @@ -3337,12 +3350,12 @@ msgid "Connected — %d:%02dm" msgstr "Conectado — %d:%02dm" #: ../src/empathy-streamed-media-window.c:2199 -#: ../src/empathy-call-window.c:2992 +#: ../src/empathy-call-window.c:2964 msgid "Technical Details" msgstr "Detalles técnicos" #: ../src/empathy-streamed-media-window.c:2237 -#: ../src/empathy-call-window.c:3031 +#: ../src/empathy-call-window.c:3003 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3352,7 +3365,7 @@ msgstr "" "por su equipo" #: ../src/empathy-streamed-media-window.c:2242 -#: ../src/empathy-call-window.c:3036 +#: ../src/empathy-call-window.c:3008 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3362,7 +3375,7 @@ msgstr "" "por su equipo" #: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:3042 +#: ../src/empathy-call-window.c:3014 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3372,12 +3385,12 @@ msgstr "" "una red que no acepta conexiones directas." #: ../src/empathy-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:3048 +#: ../src/empathy-call-window.c:3020 msgid "There was a failure on the network" msgstr "Hubo un fallo en la red" #: ../src/empathy-streamed-media-window.c:2258 -#: ../src/empathy-call-window.c:3052 +#: ../src/empathy-call-window.c:3024 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" @@ -3385,7 +3398,7 @@ msgstr "" "llamada" #: ../src/empathy-streamed-media-window.c:2261 -#: ../src/empathy-call-window.c:3055 +#: ../src/empathy-call-window.c:3027 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" @@ -3393,7 +3406,7 @@ msgstr "" "llamada" #: ../src/empathy-streamed-media-window.c:2271 -#: ../src/empathy-call-window.c:3067 +#: ../src/empathy-call-window.c:3039 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3405,22 +3418,22 @@ msgstr "" "de «Depuración» en el menú de Ayuda." #: ../src/empathy-streamed-media-window.c:2279 -#: ../src/empathy-call-window.c:3076 +#: ../src/empathy-call-window.c:3048 msgid "There was a failure in the call engine" msgstr "Hubo un fallo en el motor de llamadas" #: ../src/empathy-streamed-media-window.c:2282 -#: ../src/empathy-call-window.c:3079 +#: ../src/empathy-call-window.c:3051 msgid "The end of the stream was reached" msgstr "Se llegó al final del flujo" #: ../src/empathy-streamed-media-window.c:2322 -#: ../src/empathy-call-window.c:3119 +#: ../src/empathy-call-window.c:3091 msgid "Can't establish audio stream" msgstr "No se puede establecer el flujo de voz" #: ../src/empathy-streamed-media-window.c:2332 -#: ../src/empathy-call-window.c:3129 +#: ../src/empathy-call-window.c:3101 msgid "Can't establish video stream" msgstr "No se puede establecer el flujo de vídeo" @@ -3533,8 +3546,8 @@ msgstr "Códec de codificación:" #: ../src/empathy-call-window.ui.h:28 #: ../src/empathy-streamed-media-window.ui.h:21 -#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543 -#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545 +#: ../src/empathy-call-window.c:2514 ../src/empathy-call-window.c:2515 +#: ../src/empathy-call-window.c:2516 ../src/empathy-call-window.c:2517 msgid "Unknown" msgstr "Desconocido" @@ -3728,7 +3741,7 @@ msgstr "Gestionar salas favoritas" msgid "Incoming video call" msgstr "Llamada de vídeo entrante" -#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519 +#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1483 msgid "Incoming call" msgstr "Llamada entrante" @@ -3743,7 +3756,7 @@ msgid "%s is calling you. Do you want to answer?" msgstr "%s le está llamando. ¿Quiere responder?" #: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731 -#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525 +#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming call from %s" msgstr "Llamada entrante de %s" @@ -3761,7 +3774,7 @@ msgid "_Answer with video" msgstr "_Responder con vídeo" #: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764 -#: ../src/empathy-call-window.c:1525 +#: ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming video call from %s" msgstr "Llamada de vídeo entrante de %s" @@ -3952,15 +3965,15 @@ msgid "Import Accounts" msgstr "Importar cuentas" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:316 +#: ../src/empathy-import-widget.c:303 msgid "Import" msgstr "Importar" -#: ../src/empathy-import-widget.c:325 +#: ../src/empathy-import-widget.c:312 msgid "Protocol" msgstr "Protocolo" -#: ../src/empathy-import-widget.c:349 +#: ../src/empathy-import-widget.c:336 msgid "Source" msgstr "Origen" @@ -4137,7 +4150,7 @@ msgstr "Miembros" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:637 +#: ../src/empathy-new-chatroom-dialog.c:636 #, c-format msgid "" "%s\n" @@ -4150,21 +4163,21 @@ msgstr "" "Se necesita contraseña: %s\n" "Miembros: %s" +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Sí" +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "No" -#: ../src/empathy-new-chatroom-dialog.c:668 +#: ../src/empathy-new-chatroom-dialog.c:666 msgid "Could not start room listing" msgstr "No se pudo iniciar la lista de la sala" -#: ../src/empathy-new-chatroom-dialog.c:678 +#: ../src/empathy-new-chatroom-dialog.c:676 msgid "Could not stop room listing" msgstr "No se pudo parar la lista de la sala" @@ -4232,46 +4245,46 @@ msgid "Language" msgstr "Idioma" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:726 +#: ../src/empathy-preferences.c:724 msgid "Juliet" msgstr "Julieta" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:733 +#: ../src/empathy-preferences.c:731 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:739 +#: ../src/empathy-preferences.c:737 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "¡Oh, Romeo, Romeo!, ¿dónde estás que no te veo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:743 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "Niega a tu padre y rehúsa tu nombre;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:746 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "O, si no quieres, júrame tan sólo que me amas" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:749 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "Y dejaré yo de ser una Capuleto" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:752 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "¿Debo oír más o contestar a lo dicho?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:755 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "Julieta se ha desconectado" -#: ../src/empathy-preferences.c:1159 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "Preferencias" @@ -4514,11 +4527,6 @@ msgstr "Enlace a pastebin" msgid "Pastebin response" msgstr "Respuesta de pastebin" -#: ../src/empathy-debug-window.c:1680 -#, c-format -msgid "%s" -msgstr "%s" - #: ../src/empathy-debug-window.c:1683 msgid "Data too large for a single paste. Please save logs to file." msgstr "" @@ -4646,39 +4654,39 @@ msgstr "Depurador de Empathy" msgid "- Empathy Chat Client" msgstr ": Cliente de chat Empathy" -#: ../src/empathy-notifications-approver.c:189 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Respuesta" -#: ../src/empathy-notifications-approver.c:203 -#: ../src/empathy-call-window.c:1529 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1493 msgid "Reject" msgstr "Rechazar" -#: ../src/empathy-notifications-approver.c:208 -#: ../src/empathy-notifications-approver.c:213 -#: ../src/empathy-call-window.c:1530 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1494 msgid "Answer" msgstr "Responder" -#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Responder con vídeo" -#: ../src/empathy-notifications-approver.c:221 -#: ../src/empathy-notifications-approver.c:231 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Rechazar" -#: ../src/empathy-notifications-approver.c:225 -#: ../src/empathy-notifications-approver.c:236 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Aceptar" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:246 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Proporcionar" @@ -4689,38 +4697,38 @@ msgstr "%s intentó llamarle, pero estaba en otra llamada." #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162 +#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140 msgid "i" msgstr "Información" -#: ../src/empathy-call-window.c:2888 +#: ../src/empathy-call-window.c:2860 msgid "On hold" msgstr "En espera" -#: ../src/empathy-call-window.c:2891 +#: ../src/empathy-call-window.c:2863 msgid "Mute" msgstr "Silenciar" -#: ../src/empathy-call-window.c:2893 +#: ../src/empathy-call-window.c:2865 msgid "Duration" msgstr "Duración" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2896 +#: ../src/empathy-call-window.c:2868 #, c-format msgid "%s — %d:%02dm" msgstr "%s: %d:%02dm" -#: ../src/empathy-call-window.c:3166 +#: ../src/empathy-call-window.c:3138 #, c-format msgid "Your current balance is %s." msgstr "su balance actual es %s." -#: ../src/empathy-call-window.c:3170 +#: ../src/empathy-call-window.c:3142 msgid "Sorry, you don’t have enough credit for that call." msgstr "No tiene crédito suficiente para hacer esta llamada." -#: ../src/empathy-call-window.c:3172 +#: ../src/empathy-call-window.c:3144 msgid "Top Up" msgstr "Recargar" @@ -4759,6 +4767,15 @@ msgstr "" "característica eligiendo <span style=\"italic\">Editar → Cuentas</span> en " "la lista de contactos." +#~ msgid "_Enable" +#~ msgstr "_Activar" + +#~ msgid "_Disable" +#~ msgstr "_Desactivar" + +#~ msgid "%s" +#~ msgstr "%s" + #~ msgid "There was an error while importing the accounts." #~ msgstr "Hubo un error al importar las cuentas." @@ -5058,9 +5075,6 @@ msgstr "" #~ msgid "_For:" #~ msgstr "_Para:" -#~ msgid "_Enabled" -#~ msgstr "_Activada" - #~ msgid "%s is now offline." #~ msgstr "Ahora %s está desconectado." @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy 2.28.1.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2012-03-16 10:47+0000\n" -"PO-Revision-Date: 2012-03-31 15:49+0330\n" +"POT-Creation-Date: 2012-04-02 11:48+0000\n" +"PO-Revision-Date: 2012-04-02 18:31+0330\n" "Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -39,7 +39,7 @@ msgstr "گپ در گوگل تاک، فیس بوک، اماسان، و بس #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 -#: ../src/empathy-accounts-dialog.c:2512 +#: ../src/empathy-accounts-dialog.c:2563 msgid "Messaging and VoIP Accounts" msgstr "حسابهای پیامرسانی و VoIP" @@ -79,401 +79,396 @@ msgstr "پوشهی پیشفرض بارگیری امپاتی" msgid "The default folder to save file transfers in." msgstr "پوشهی پیشفرض برای ذخیرهی پروندههای انتقالی." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once. +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Magic number used to check if sanity cleaning tasks should be run" msgstr "عدد جادویی برای بررسی وضعیت پاکسازی جهت اجرا" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually." msgstr "پرونده empathy-sanity-cleaning.c این عدد را بررسی میکند تا متوجه شود که پاکسازی باید اجرا شود یا خیر. کاربران نباید این کلید را بصورت دستی تغییر دهند." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Show offline contacts" msgstr "نمایش آشناهای برونخط" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Whether to show contacts that are offline in the contact list." msgstr "اینکه آشناهایی که برونخط هستند در فهرست آشناها دیده شوند یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Show avatars" msgstr "نشان دادن آواتارها" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "Whether to show avatars for contacts in the contact list and chat windows." msgstr "اینکه آواتار برای آشناها در فهرست آشنایان و پنجرهی گپ نشان داده شوند یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Show protocols" msgstr "نشان دادن پروتکلها" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "Whether to show protocols for contacts in the contact list." msgstr "اینکه در فهرست آشناها، پروتکلهای مورد استفاده برای آشناها هم دیده شوند یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Show Balance in contact list" msgstr "نمایش اعتبار در فهرست آشناها" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Whether to show account balances in the contact list." msgstr "اینکه در فهرست آشناها، اعتبار حسابها نمایش داده شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Compact contact list" msgstr "فهرست فشردهی آشناها" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Whether to show the contact list in compact mode." msgstr "اینکه فهرست آشناها در حالت فشرده نمایش داده شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Hide main window" msgstr "مخفی کردن پنجرهی اصلی" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Hide the main window." msgstr "مخفی کردن پنجرهی اصلی." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Default directory to select an avatar image from" msgstr "شاخهی پیشفرض برای انتخاب تصویر آواتار از آن" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "The last directory that an avatar image was chosen from." msgstr "آخرین شاخهای که یک آواتار از آن انتخاب شده بود." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Open new chats in separate windows" msgstr "گپهای جدید در پنجرهی مجزا باز شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Always open a separate chat window for new chats." msgstr "برای گپهای جدید، همیشه یک پنجرهی جدید گپ باز شود." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Display incoming events in the status area" msgstr "رویدادهای ورودی در منطقهی وضعیت نمایش داده شوند" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "Display incoming events in the status area. If false, present them to the user immediately." msgstr "رویدادهای ورودی در منطقهی وضعیت نمایش داده شوند. اگر نادرست باشد، مستقیما به کاربر نمایش داده شوند." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "The position for the chat window side pane" msgstr "مکان قاب کناری پنجرهی گپ" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "The stored position (in pixels) of the chat window side pane." msgstr "مکان ذخیره شدهی (به نقطه) قاب کناری پنجرهی گپ." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 -#| msgid "Show contact list in rooms" +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Show contact groups" msgstr "نمایش گروه آشناها" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 -#| msgid "Whether to show account balances in the contact list." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Whether to show groups in the contact list." msgstr "اینکه آیا در فهرست آشناها گروهها نمایش داده شود یا نه." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Contact list sort criterion" msgstr "معیارهای مرتبسازی فهرست آشناها" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 -#| 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." +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's state with the value \"state\". A value of \"name\" will sort the contact list by name." msgstr "کدام معیار برای مرتب کردن فهرست آشناها بکار گرفته شود. پیش فرض بر روی مرتب کردن بر اساس وضعیت آشنا با مقدار «state» است. مقدار «name» فهرست را بر اساس نام آشنا مرتب میکند." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Use notification sounds" msgstr "به کار انداختن صداهای اخطارها" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Whether to play a sound to notify of events." msgstr "اینکه برای اطلاع رویدادها صدایی پخش بشود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Disable sounds when away" msgstr "در حالت «غایب»، صداها از کار بیافتند" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Whether to play sound notifications when away or busy." msgstr "اینکه هنگام تغییر حالت به «مشغول» یا «غایب» صدایی پخش شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for incoming messages" msgstr "هنگام دریافت پیام، صدایی پخش شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Whether to play a sound to notify of incoming messages." msgstr "اینکه برای اطلاع از پیامهای ورودی صدایی پخش شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound for outgoing messages" msgstr "برای پیامهای خروجی صدایی پخش شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Whether to play a sound to notify of outgoing messages." msgstr "اینکه برای اطلاع از پیامهای خروجی صدایی پخش شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound for new conversations" msgstr "برای مکالمههای جدید صدایی پخش شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Whether to play a sound to notify of new conversations." msgstr "اینکه برای اطلاع از گفتگوهای جدید صدایی پخش شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Play a sound when a contact logs in" msgstr "وقتی آشنایی وارد میشود صدایی پخش شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "اینکه برای اطلاع دادن از ورود آشناها به شبکه، صدایی پخش شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Play a sound when a contact logs out" msgstr "وقتی کاربری خارج میشود صدایی پخش شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "Whether to play a sound to notify of contacts logging out of the network." msgstr "اینکه برای اطلاع دادن از خروج آشناها از شبکه، صدای پخش شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Play a sound when we log in" msgstr "وقتی وارد میشویم صدایی پخش شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Whether to play a sound when logging into a network." msgstr "اینکه هنگام ورود به شبکه صدایی پخش شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Play a sound when we log out" msgstr "وقتی خارج میشویم صدایی پخش شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Whether to play a sound when logging out of a network." msgstr "اینکه هنگام خروج از شبکه صدایی پخش شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Enable popup notifications for new messages" msgstr "فعالسازی اطلاعیههای واشو برای پیامهای جدید" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Whether to show a popup notification when receiving a new message." msgstr "اینکه هنگام دریافت یک پیام جدید، یک اطلاعیهی واشو نمایش داده شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "Disable popup notifications when away" msgstr "در حالت «غایب»، اطلاعیههای واشو از کار بیافتند" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "Whether to show popup notifications when away or busy." msgstr "اینکه در حالت «غایب» یا «مشغول»، اطلاعیههای واشو نمایش داده شوند یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "Pop up notifications if the chat isn't focused" msgstr "در صورتیکه پنجرهی گپ در مرکز توجه نیست، اطلاعیههای واشو انجام شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused." msgstr "اینکه هنگام دریافت پیام جدید، یک اطلاعیهی واشو نمایش داده شود، حتی اگر پنجرهی گپ پیشاپیش باز شده باشد، ولی در مرکز توجه نباشد، یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "Pop up notifications when a contact logs in" msgstr "وقتی آشنایی وارد میشود، اطلاعیههای واشو انجام شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "Whether to show a popup notification when a contact goes online." msgstr "اینکه وقتی آشنایی برخط میشود، یک اطلاعیهی واشو نمایش داده شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Pop up notifications when a contact logs out" msgstr "وقتی آشنایی خارج میشود، اطلاعیههای واشو انجام شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Whether to show a popup notification when a contact goes offline." msgstr "اینکه وقتی آشنایی برونخط میشود، یک اطلاعیهی واشو نمایش داده شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use graphical smileys" msgstr "استفاده از صورتکهای گرافیکی" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether to convert smileys into graphical images in conversations." msgstr "اینکه در گفتگوها، صورتکها تبدیل به تصویر گرافیکی شوند یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Show contact list in rooms" msgstr "نمایش فهرست افراد در اتاقها" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether to show the contact list in chat rooms." msgstr "اینکه فهرست آشناها در اتاقهای گپ دیده شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Chat window theme" msgstr "تم پنجرهی گپ" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "The theme that is used to display the conversation in chat windows." msgstr "تمی که برای نشان دادن گفتگو در پنجرهی چت استفاده میشود." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "Chat window theme variant" msgstr "گزینههای تم پنجرهی گپ" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "The theme variant that is used to display the conversation in chat windows." msgstr "گزینه تمی که برای نمایش گفتگو پنجره گپ استفاده میشود." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "Path of the Adium theme to use" msgstr "مسیر تم Adium برای استفاده" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "مسیر تم Adium برای استفاده چناچه تم مورد استفاده برای گپ Adium باشد." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "Enable WebKit Developer Tools" msgstr "فعالسازی ابزارهای توسعهی WebKit" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "اینکه ابزارهای توسعهی WebKit، مانند Web Inspector، باید به کار بیافتد یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Inform other users when you are typing to them" msgstr "هنگامی که شما در حال تایپ هستید به کاربران دیگر اطلاع داده شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state." msgstr "اینکه آیا وضعیتهای «درحال ارسال» یا «مکث» ارسال شود یا نه. درحال حاضر در وضعیت «غایب» تاثیری ندارد." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Use theme for chat rooms" msgstr "استفاده از تم برای اتاقهای گپ" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "Whether to use the theme for chat rooms." msgstr "اینکه از تم برای اتاقهای گپ استفاده شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Spell checking languages" msgstr "زبانها برای غلطیابی املایی" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "فهرست زبانها جهت غلطیابی املایی، جدا شده با ویرگول (مثال: «en, fr, nl»)." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Enable spell checker" msgstr "به کار انداختن غلطیابی املایی" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "Whether to check words typed against the languages you want to check with." msgstr "اینکه کلماتی که تایپ میکنید براساس زبانهایی که میخواهید بررسی شود، یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Nick completed character" msgstr "نویسهی کامل شده لقب" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "Character to add after nickname when using nick completion (tab) in group chat." msgstr "نویسهای که هنگام کامل کردن اسم (با کلید جهش) در گپ گروهی، بعد از نام مستعار اضافه میشود." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "امپاتی از آواتار برای شمایل پنجرهی گپ استفاده کند" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "اینکه امپاتی از آواتار آشنا برای شمایل پنجرهی گپ استفاده کند یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Last account selected in Join Room dialog" msgstr "آخرین حساب انتخاب شده در محاورهی «پیوستن به اتاق»" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "D-Bus object path of the last account selected to join a room." msgstr "مسیر شی در D-Bus برای آخرین حساب انتخاب شده برای پیوستن به یک اتاق." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Camera device" msgstr "دوربین" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "دستگاه دوربین پیشفرض جهت استفاده در تماسهای ویدئویی، مثال dev/video0/." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "Camera position" msgstr "محل دوربین" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Position the camera preview should be during a call." msgstr "موقعیتی که پیشنمایش دوربین باید در حین تماس آنجا باشد." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Echo cancellation support" msgstr "پشتیبانی از لغو پژواک صدا" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "اینکه آیا فیلتر لغو پژواک صدای Pulseaudio فعال شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Show hint about closing the main window" msgstr "هنگام بستن پنجره، راهنمایی نشان داده شود" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar." msgstr "اینکه در صورت بستن برنامه توسط دکمهی «x»، محاورهی پیام در این مورد نشان داده شود یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "Empathy can publish the user's location" msgstr "امپاتی میتواند مکان کاربر را منتشر کند" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "اینکه امپاتی اجازه داشته باشد، مکان کاربر را برای آشنایان منتشر کنند یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "Empathy can use the network to guess the location" msgstr "امپاتی میتواند از شبکه برای حدس مکان استفاده کند" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 msgid "Whether Empathy can use the network to guess the location." msgstr "اینکه امپاتی اجازه داشته باشد، از شبکه برای حدس مکان استفاده کند یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 msgid "Empathy can use the cellular network to guess the location" msgstr "امپاتی میتواند از شبکهی سلولی برای حدس مکان استفاده کند" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "اینکه امپاتی اجازه داشته باشد، از شبکهی سلولی برای حدس مکان استفاده کند یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 msgid "Empathy can use the GPS to guess the location" msgstr "امپاتی میتواند از مکانیاب جغرافیایی (جیپیاس) استفاده کند تا مکان کاربر را حدس بزند" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:105 msgid "Whether Empathy can use the GPS to guess the location." msgstr "اینکه امپاتی اجازه داشته باشد، از مکانیاب جغرافیایی (جیپیاس) برای حدس مکان استفاده کند یا خیر." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:105 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:106 msgid "Empathy should reduce the location's accuracy" msgstr "امپاتی دقت مکان را کاهش دهد" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:106 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:107 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "اینکه امپاتی دقت مکان را به دلیل حریم خصوصی کاهش دهد یا خیر." @@ -655,7 +650,6 @@ msgid "Connection has been lost" msgstr "اتصال از دست رفت" #: ../libempathy/empathy-utils.c:355 -#| msgid "This resource is already connected to the server" msgid "This account is already connected to the server" msgstr "این منبع از قبل به کارگزار متصل شده است" @@ -688,7 +682,6 @@ msgid "Your software is too old" msgstr "نرمافزار شما خیلی قدیمی است" #: ../libempathy/empathy-utils.c:375 -#| msgid "Interval (seconds)" msgid "Internal error" msgstr "خطا داخلی" @@ -755,7 +748,6 @@ msgid "in the future" msgstr "در آینده" #: ../libempathy/empathy-keyring.c:75 -#| msgid "Phrase not found" msgid "Password not found" msgstr "گذرواژه یافت نشد" @@ -774,7 +766,7 @@ msgid "All accounts" msgstr "تمام حسابها" #: ../libempathy-gtk/empathy-account-widget.c:682 -#: ../src/empathy-import-widget.c:336 +#: ../src/empathy-import-widget.c:323 msgid "Account" msgstr "حساب" @@ -799,7 +791,7 @@ msgid "%s:" msgstr "%s:" #: ../libempathy-gtk/empathy-account-widget.c:1398 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16 msgid "Username:" msgstr "نام کاربری:" @@ -892,11 +884,11 @@ msgstr "_کارگزار:" #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 msgid "Advanced" msgstr "پیشرفته" @@ -914,7 +906,7 @@ msgstr "گذرواژهی AIM شما چیست؟" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 msgid "Remember Password" msgstr "به خاطر سپردن گذرواژه" @@ -958,36 +950,32 @@ msgstr "نام کاربری (UIN) شما در ICQ چیست؟" msgid "What is your ICQ password?" msgstr "گذرواژهی ICQ شما چیست؟" -#: ../libempathy-gtk/empathy-account-widget-sip.c:206 -#: ../libempathy-gtk/empathy-account-widget-sip.c:239 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 +#: ../libempathy-gtk/empathy-account-widget-sip.c:240 msgid "Auto" msgstr "خودکار" -#: ../libempathy-gtk/empathy-account-widget-sip.c:209 +#: ../libempathy-gtk/empathy-account-widget-sip.c:210 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:212 +#: ../libempathy-gtk/empathy-account-widget-sip.c:213 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:215 +#: ../libempathy-gtk/empathy-account-widget-sip.c:216 msgid "TLS" msgstr "TLS" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:244 +#: ../libempathy-gtk/empathy-account-widget-sip.c:245 msgid "Register" msgstr "Register" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:249 +#: ../libempathy-gtk/empathy-account-widget-sip.c:250 msgid "Options" msgstr "Options" -#: ../libempathy-gtk/empathy-account-widget-sip.c:252 +#: ../libempathy-gtk/empathy-account-widget-sip.c:253 msgid "None" msgstr "هیچکدام" @@ -1016,44 +1004,45 @@ msgstr "افزودن..." msgid "Remove" msgstr "حذف" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 +#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Up" msgstr "بالا" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 -#| msgid "Domain" +#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 msgid "Down" msgstr "پایین" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Servers" msgstr "کارگزارها" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password." msgstr "بیشتر کارگزارهای IRC احتیاجی به گذرواژه ندارند، بنابراین چناچه مطمئن نیستید، هیچ گذرواژهای وارد نکنید." -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Nickname:" msgstr "نام مستعار:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Password:" msgstr "گذرواژه:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14 msgid "Quit message:" msgstr "پیغام ترک:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15 msgid "Real name:" msgstr "نام واقعی:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18 msgid "Which IRC network?" msgstr "کدام شبکه IRC؟" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19 msgid "What is your IRC nickname?" msgstr "نام مستعار شما در IRC چیست؟" @@ -1241,11 +1230,16 @@ msgstr "نادیده گرفتن خطاهای TLS" msgid "Port:" msgstr "درگاه:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#| msgid "E-_mail address:" +msgid "Local IP Address:" +msgstr "آدرس IP محلی:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "شناسهی ورود SIP شما چیست؟" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "What is your SIP account password?" msgstr "گذرواژهی حساب SIP شما چیست؟" @@ -1431,7 +1425,6 @@ msgstr "خطا در فرستان پیام: %s" #. * account to send the message. #: ../libempathy-gtk/empathy-chat.c:1577 #, c-format -#| msgid "insufficient balance to send message" msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "مانده اعتبار برای ارسال پیام کافی نیست. <a href='%s'>بالا بردن</a>." @@ -1475,7 +1468,6 @@ msgstr "سرفصل تنظیم شد: %s" #: ../libempathy-gtk/empathy-chat.c:1724 #, c-format -#| msgid "Topic set to: %s" msgid "Topic set by %s to: %s" msgstr "سرفصل توسط %s تنظیم شد: %s" @@ -1582,9 +1574,9 @@ msgstr "فرد %s اکنون با %s شناخته میشود" #: ../libempathy-gtk/empathy-chat.c:2994 #: ../src/empathy-streamed-media-window.c:1888 #: ../src/empathy-event-manager.c:1279 -#: ../src/empathy-call-window.c:1502 -#: ../src/empathy-call-window.c:1552 -#: ../src/empathy-call-window.c:2590 +#: ../src/empathy-call-window.c:1466 +#: ../src/empathy-call-window.c:1516 +#: ../src/empathy-call-window.c:2562 msgid "Disconnected" msgstr "قطع شد" @@ -1661,7 +1653,7 @@ msgstr "ویرایش آشناهای مسدود شده" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:503 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 #: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:2 @@ -1733,27 +1725,27 @@ msgid "Decide _Later" msgstr "بعدا _تصمیم میگیرم" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:496 msgid "Search contacts" msgstr "جستجو آشناها" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:526 msgid "Search: " msgstr "جستجو: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:584 msgid "_Add Contact" msgstr "ا_فزودن آشنا" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:602 msgid "No contacts found" msgstr "هیچ آشنایی پیدا نشد" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:618 msgid "Your message introducing yourself:" msgstr "پیام شما برای معرفی خودتان:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:626 msgid "Please let me see when you're online. Thanks!" msgstr "لطفا اجازه بدهید بدانم چه زمانی برخط هستید. تشکر!" @@ -1912,39 +1904,33 @@ msgstr "ذخیرهی آواتار" msgid "Unable to save avatar" msgstr "ذخیرهی آواتار ممکن نیست" -#: ../libempathy-gtk/empathy-contact-widget.c:1444 -#| msgid "Technical Details" +#: ../libempathy-gtk/empathy-contact-widget.c:1455 msgid "Personal Details" msgstr "جزئیات شخصی" -#: ../libempathy-gtk/empathy-contact-widget.c:1447 +#: ../libempathy-gtk/empathy-contact-widget.c:1458 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" msgstr "جزئیات آشنا" #: ../libempathy-gtk/empathy-contactinfo-utils.c:104 -#| msgid "Full name:" msgid "Full name" msgstr "نام کامل" #: ../libempathy-gtk/empathy-contactinfo-utils.c:105 -#| msgid "Phone number:" msgid "Phone number" msgstr "شمارهی تلفن" #: ../libempathy-gtk/empathy-contactinfo-utils.c:106 -#| msgid "E-mail address:" msgid "E-mail address" msgstr "نشانی پستالکترونیکی" #: ../libempathy-gtk/empathy-contactinfo-utils.c:107 -#| msgid "Website:" msgid "Website" msgstr "پایگاهوب" #: ../libempathy-gtk/empathy-contactinfo-utils.c:108 -#| msgid "Birthday:" msgid "Birthday" msgstr "روز تولد" @@ -1966,27 +1952,22 @@ msgid "Away message:" msgstr "پیغام ترک:" #: ../libempathy-gtk/empathy-contactinfo-utils.c:132 -#| msgid "Work" msgid "work" msgstr "کار" #: ../libempathy-gtk/empathy-contactinfo-utils.c:133 -#| msgid "Romeo" msgid "home" msgstr "خانه" #: ../libempathy-gtk/empathy-contactinfo-utils.c:134 -#| msgid "Mobile" msgid "mobile" msgstr "تلفن همراه" #: ../libempathy-gtk/empathy-contactinfo-utils.c:135 -#| msgid "Favorite" msgid "voice" msgstr "صوتی" #: ../libempathy-gtk/empathy-contactinfo-utils.c:136 -#| msgid "Preferences" msgid "preferred" msgstr "ترجیح داده شده" @@ -1995,7 +1976,6 @@ msgid "postal" msgstr "کد پستی" #: ../libempathy-gtk/empathy-contactinfo-utils.c:138 -#| msgid "Appearance" msgid "parcel" msgstr "بسته" @@ -2037,24 +2017,24 @@ msgstr "نسخه:" msgid "Client:" msgstr "کارگیر:" -#: ../libempathy-gtk/empathy-groups-widget.c:331 +#: ../libempathy-gtk/empathy-groups-widget.c:327 msgid "Groups" msgstr "گروهها" -#: ../libempathy-gtk/empathy-groups-widget.c:343 +#: ../libempathy-gtk/empathy-groups-widget.c:339 msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups." msgstr "گروههایی که میخواهید این آشنا در آنها دیده شود. میتوانید بیش از یک گروه انتخاب کنید یا هیچ گروهی را انتخاب نکنید." -#: ../libempathy-gtk/empathy-groups-widget.c:362 +#: ../libempathy-gtk/empathy-groups-widget.c:358 msgid "_Add Group" msgstr "_افزودن گروه" -#: ../libempathy-gtk/empathy-groups-widget.c:397 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "انتخاب" -#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../libempathy-gtk/empathy-groups-widget.c:403 #: ../src/empathy-roster-window.c:1970 msgid "Group" msgstr "گروه" @@ -2159,7 +2139,6 @@ msgid "Favorite" msgstr "علاقهمندیها" #: ../libempathy-gtk/empathy-individual-menu.c:1264 -#| msgid "telepathy-salut not installed" msgid "gnome-contacts not installed" msgstr "برنامهی gnome-contacts نصب نشده است" @@ -2333,68 +2312,65 @@ msgstr "دیروز" #. Translators: A date such as '23 May 2010' (strftime format) #: ../libempathy-gtk/empathy-log-window.c:1739 -#| msgctxt "" -#| "A date such as '23 May 2010', %e is the day, %B the month and %Y the year" -#| msgid "%e %B %Y" msgid "%e %B %Y" msgstr "%e %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1827 -#: ../libempathy-gtk/empathy-log-window.c:3487 +#: ../libempathy-gtk/empathy-log-window.c:1843 +#: ../libempathy-gtk/empathy-log-window.c:3471 msgid "Anytime" msgstr "هرزمانی" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2400 +#: ../libempathy-gtk/empathy-log-window.c:1942 +#: ../libempathy-gtk/empathy-log-window.c:2401 msgid "Anyone" msgstr "هرکسی" -#: ../libempathy-gtk/empathy-log-window.c:2713 +#: ../libempathy-gtk/empathy-log-window.c:2714 msgid "Who" msgstr "چه کسی" -#: ../libempathy-gtk/empathy-log-window.c:2922 +#: ../libempathy-gtk/empathy-log-window.c:2923 msgid "When" msgstr "چه زمانی" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3039 msgid "Anything" msgstr "هرچیزی" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3041 msgid "Text chats" msgstr "گپهای متنی" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3043 #: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "تماسها" -#: ../libempathy-gtk/empathy-log-window.c:3047 +#: ../libempathy-gtk/empathy-log-window.c:3048 msgid "Incoming calls" msgstr "تماسهای ورودی" -#: ../libempathy-gtk/empathy-log-window.c:3048 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Outgoing calls" msgstr "تماس خروجی" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Missed calls" msgstr "تماسهای از دست رفته" -#: ../libempathy-gtk/empathy-log-window.c:3071 +#: ../libempathy-gtk/empathy-log-window.c:3072 msgid "What" msgstr "کدام" -#: ../libempathy-gtk/empathy-log-window.c:3780 +#: ../libempathy-gtk/empathy-log-window.c:3764 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "آیا مطمئنید که میخواهید تمام وقایع ثبت شده گفتگوهای قبلی را حذف کنید؟" -#: ../libempathy-gtk/empathy-log-window.c:3784 +#: ../libempathy-gtk/empathy-log-window.c:3768 msgid "Clear All" msgstr "پاک کردن همه" -#: ../libempathy-gtk/empathy-log-window.c:3791 +#: ../libempathy-gtk/empathy-log-window.c:3775 msgid "Delete from:" msgstr "پاک کردن از:" @@ -2437,17 +2413,14 @@ msgid "<span size=\"x-large\">Loading...</span>" msgstr "<span size=\"x-large\">بارگیری...</span>" #: ../libempathy-gtk/empathy-new-message-dialog.c:83 -#| msgid "The specified contact is offline" msgid "The contact is offline" msgstr "آشنا برونخط است" #: ../libempathy-gtk/empathy-new-message-dialog.c:85 -#| msgid "The specified contact is not valid" msgid "The specified contact is either invalid or unknown" msgstr "آشنای مشخص شده یا نامعتبر است یا ناشناس" #: ../libempathy-gtk/empathy-new-message-dialog.c:87 -#| msgid "Topic not supported on this conversation" msgid "The contact does not support this kind of conversation" msgstr "آشنا از این نوع گفتگو پشتیبانی نمیکند" @@ -2468,22 +2441,18 @@ msgid "This channel is full" msgstr "این کانال پُر است" #: ../libempathy-gtk/empathy-new-message-dialog.c:101 -#| msgid "You have been invited to join %s" msgid "You must be invited to join this channel" msgstr "شما باید به این اتاق دعوت شده باشید تا به آن بپیوندید" #: ../libempathy-gtk/empathy-new-message-dialog.c:103 -#| msgid "Contact disconnected" msgid "Can't proceed while disconnected" msgstr "نمیتوان هنگام قطع ارتباط ادامه داد" #: ../libempathy-gtk/empathy-new-message-dialog.c:105 -#| msgid "permission denied" msgid "Permission denied" msgstr "مجوز رد شد" #: ../libempathy-gtk/empathy-new-message-dialog.c:111 -#| msgid "There was an error starting the call" msgid "There was an error starting the conversation" msgstr "خطایی در هنگام شروع گفتگو رُخ داد" @@ -2499,15 +2468,11 @@ msgstr "گفتگوی جدید" #. add video button #: ../libempathy-gtk/empathy-new-call-dialog.c:223 -#| msgctxt "menu item" -#| msgid "_Video Call" msgid "_Video Call" msgstr "تماس _تصویری" #. add audio button #: ../libempathy-gtk/empathy-new-call-dialog.c:233 -#| msgctxt "menu item" -#| msgid "_Audio Call" msgid "_Audio Call" msgstr "تماس _صوتی" @@ -2518,7 +2483,6 @@ msgstr "تماس جدید" #: ../libempathy-gtk/empathy-bad-password-dialog.c:130 #, c-format -#| msgid "Authentication failed" msgid "Authentification failed for account <b>%s</b>" msgstr "تأیید هویتِ حساب <b>%s</b> شکست خورد" @@ -2556,12 +2520,12 @@ msgstr "برای برداشتن این مورد از فهرست علاقهم msgid "Click to make this status a favorite" msgstr "برای افزودن این وضعیت به علاقهمندیها کلیک کنید" -#: ../libempathy-gtk/empathy-presence-chooser.c:388 +#: ../libempathy-gtk/empathy-presence-chooser.c:396 msgid "Set status" msgstr "تنظیم وضعیت" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1135 +#: ../libempathy-gtk/empathy-presence-chooser.c:1145 msgid "Custom messages…" msgstr "پیامهای دلخواه..." @@ -2718,7 +2682,6 @@ msgid "Certificate hostname: %s" msgstr "گواهی نام میزبان: %s" #: ../libempathy-gtk/empathy-tls-dialog.c:281 -#| msgid "Continue" msgid "C_ontinue" msgstr "_ادامه" @@ -2928,22 +2891,18 @@ msgid "Vietnamese" msgstr "ویتنامی" #: ../libempathy-gtk/empathy-calendar-button.c:66 -#| msgctxt "verb in a column header displaying group names" -#| msgid "Select" msgid "Select..." msgstr "انتخاب..." #: ../libempathy-gtk/empathy-calendar-button.c:154 -#| msgctxt "verb in a column header displaying group names" -#| msgid "Select" msgid "_Select" msgstr "_انتخاب" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201 msgid "No error message" msgstr "پیغام خطایی وجود ندارد" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274 msgid "Instant Message (Empathy)" msgstr "پیام فوری (امپاتی)" @@ -3009,65 +2968,64 @@ msgstr "تغییرات ذخیره نشده برای حساب %s شما وجود msgid "Your new account has not been saved yet." msgstr "حساب جدید شما هنوز ذخیره نشده است." -#: ../src/empathy-accounts-dialog.c:381 +#: ../src/empathy-accounts-dialog.c:405 #: ../src/empathy-streamed-media-window.c:759 -#: ../src/empathy-call-window.c:1289 +#: ../src/empathy-call-window.c:1267 msgid "Connecting…" msgstr "در حال اتصال..." -#: ../src/empathy-accounts-dialog.c:422 +#: ../src/empathy-accounts-dialog.c:446 #, c-format msgid "Offline — %s" msgstr "برونخط — %s" -#: ../src/empathy-accounts-dialog.c:434 +#: ../src/empathy-accounts-dialog.c:458 #, c-format msgid "Disconnected — %s" msgstr "قطع شد — %s" -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:469 msgid "Offline — No Network Connection" msgstr "برونخط — هیچ اتصال شبکهای نیست" -#: ../src/empathy-accounts-dialog.c:452 +#: ../src/empathy-accounts-dialog.c:476 msgid "Unknown Status" msgstr "وضعیت ناشناخته" -#: ../src/empathy-accounts-dialog.c:469 +#: ../src/empathy-accounts-dialog.c:493 msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account." msgstr "این حساب به دلیل استفاده از یک پسانهی قدیمی و پشتیبانی نشده غیرفعال شده است. لطفا telepathy-haze را نصب و نشست را مجددا راهاندازی کنید تا حساب منتقل شود." -#: ../src/empathy-accounts-dialog.c:479 +#: ../src/empathy-accounts-dialog.c:503 msgid "Offline — Account Disabled" msgstr "برونخط — حساب غیرفعال شد" -#: ../src/empathy-accounts-dialog.c:585 -#| msgid "Connection has been refused" +#: ../src/empathy-accounts-dialog.c:609 msgid "Edit Connection Parameters" msgstr "ویرایش پارامترهای اتصال" -#: ../src/empathy-accounts-dialog.c:750 +#: ../src/empathy-accounts-dialog.c:774 msgid "Failed to retrieve your personal information from the server." msgstr "دریافت اطلاعات شخصی شما از کارگزار شکست خورد." -#: ../src/empathy-accounts-dialog.c:756 +#: ../src/empathy-accounts-dialog.c:780 msgid "Go online to edit your personal information." msgstr "برای ویرایش اطلاعات شخصی برخط شوید." -#: ../src/empathy-accounts-dialog.c:843 +#: ../src/empathy-accounts-dialog.c:867 msgid "_Edit Connection Parameters..." msgstr "_ویرایش پارامترهای اتصال" -#: ../src/empathy-accounts-dialog.c:1339 +#: ../src/empathy-accounts-dialog.c:1363 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "آیا میخواهید %s را از رایانهتان حذف کنید؟" -#: ../src/empathy-accounts-dialog.c:1343 +#: ../src/empathy-accounts-dialog.c:1367 msgid "This will not remove your account on the server." msgstr "این کار حساب شما بر روی کارگزار را پاک نخواهد کرد." -#: ../src/empathy-accounts-dialog.c:1579 +#: ../src/empathy-accounts-dialog.c:1604 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3075,25 +3033,27 @@ msgstr "" "شما درحال انتخاب حساب دیگری هستید، که این کار تغییرات شما را نادیده\n" "خواهد گرفت. آیا مطمئنید که میخواهید ادامه دهید؟" -#. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1755 -msgid "_Enable" -msgstr "_فعالکردن" +#. Menu item: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1795 +#| msgid "_Enable" +msgid "_Enabled" +msgstr "_فعال شده" -#: ../src/empathy-accounts-dialog.c:1756 -msgid "_Disable" -msgstr "_غیرفعالکردن" +#. Menu item: Rename +#: ../src/empathy-accounts-dialog.c:1818 +#| msgid "Real name:" +msgid "Rename" +msgstr "تغییر نام" -#: ../src/empathy-accounts-dialog.c:2184 +#: ../src/empathy-accounts-dialog.c:2234 msgid "_Skip" msgstr "_نادیده گرفتن" -#: ../src/empathy-accounts-dialog.c:2188 -#| msgid "Connected" +#: ../src/empathy-accounts-dialog.c:2238 msgid "_Connect" msgstr "_اتصال" -#: ../src/empathy-accounts-dialog.c:2365 +#: ../src/empathy-accounts-dialog.c:2415 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3114,7 +3074,6 @@ msgid "To add a new account, you first have to install a backend for each protoc msgstr "برای افزودن حساب جدید، اول از همه باید پسانهی لازم برای هر قراردادی را که میخواهید استفاده کنید، نصب کنید." #: ../src/empathy-accounts-dialog.ui.h:6 -#| msgid "No protocol installed" msgid "No protocol backends installed" msgstr "هیچ پسانهی قراردادی نصب نشده است" @@ -3175,33 +3134,33 @@ msgstr "جزئیات" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title #: ../src/empathy-streamed-media-window.c:1211 -#: ../src/empathy-call-window.c:1889 +#: ../src/empathy-call-window.c:1861 #, c-format msgid "Call with %s" msgstr "تماس با %s" #: ../src/empathy-streamed-media-window.c:1444 -#: ../src/empathy-call-window.c:2133 +#: ../src/empathy-call-window.c:2105 msgid "The IP address as seen by the machine" msgstr "نشانی IP همانطور که توسط ماشین دیده میشود" #: ../src/empathy-streamed-media-window.c:1446 -#: ../src/empathy-call-window.c:2135 +#: ../src/empathy-call-window.c:2107 msgid "The IP address as seen by a server on the Internet" msgstr "آدرس IP همانطور که توسط کارگزار روی اینترنت دیده میشود" #: ../src/empathy-streamed-media-window.c:1448 -#: ../src/empathy-call-window.c:2137 +#: ../src/empathy-call-window.c:2109 msgid "The IP address of the peer as seen by the other side" msgstr "آدرس IP مربوط به peer همانطور که توسط طرف مقابل دیده میشود" #: ../src/empathy-streamed-media-window.c:1450 -#: ../src/empathy-call-window.c:2139 +#: ../src/empathy-call-window.c:2111 msgid "The IP address of a relay server" msgstr "آدرس IP مربوط به سرور بازپخش" #: ../src/empathy-streamed-media-window.c:1452 -#: ../src/empathy-call-window.c:2141 +#: ../src/empathy-call-window.c:2113 msgid "The IP address of the multicast group" msgstr "آدرس IP مربوط به گروه چندگانه" @@ -3209,7 +3168,6 @@ msgstr "آدرس IP مربوط به گروه چندگانه" #: ../src/empathy-streamed-media-window.c:1840 #: ../src/empathy-streamed-media-window.c:1843 #: ../src/empathy-streamed-media-window.c:1846 -#| msgid "Unknown" msgctxt "codec" msgid "Unknown" msgstr "ناشناس" @@ -3221,66 +3179,66 @@ msgid "Connected — %d:%02dm" msgstr "متصل شد — %Id: %I02dm" #: ../src/empathy-streamed-media-window.c:2199 -#: ../src/empathy-call-window.c:2992 +#: ../src/empathy-call-window.c:2964 msgid "Technical Details" msgstr "جزئیات فنی" #: ../src/empathy-streamed-media-window.c:2237 -#: ../src/empathy-call-window.c:3031 +#: ../src/empathy-call-window.c:3003 #, c-format msgid "%s's software does not understand any of the audio formats supported by your computer" msgstr "نرمافزار %s هیچکدام از قالبهای صوتی پشتیبانی شده توسط رایانهی شما را تشخیص نمیدهد" #: ../src/empathy-streamed-media-window.c:2242 -#: ../src/empathy-call-window.c:3036 +#: ../src/empathy-call-window.c:3008 #, c-format msgid "%s's software does not understand any of the video formats supported by your computer" msgstr "نرمافزار %s هیچکدام از قالبهای ویدئویی پشتیبانی شده توسط رایانهی شما را تشخیص نمیدهد" #: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:3042 +#: ../src/empathy-call-window.c:3014 #, 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-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:3048 +#: ../src/empathy-call-window.c:3020 msgid "There was a failure on the network" msgstr "یک خرابی در شبکه بوجود آمده بود" #: ../src/empathy-streamed-media-window.c:2258 -#: ../src/empathy-call-window.c:3052 +#: ../src/empathy-call-window.c:3024 msgid "The audio formats necessary for this call are not installed on your computer" msgstr "قالبهای صوتی لازم برای برقراری این تماس روی رایانهی شما نصب نشدهاند" #: ../src/empathy-streamed-media-window.c:2261 -#: ../src/empathy-call-window.c:3055 +#: ../src/empathy-call-window.c:3027 msgid "The video formats necessary for this call are not installed on your computer" msgstr "قالبهای ویدئویی لازم برای برقراری این تماس روی رایانهی شما نصب نشدهاند" #: ../src/empathy-streamed-media-window.c:2271 -#: ../src/empathy-call-window.c:3067 +#: ../src/empathy-call-window.c:3039 #, 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 "اتفاقی ناخواسته در یک مؤلفهی تلهپاتی رخ داد. لطفا <a href=\"%s\"> این ایراد را گزارش دهید</a> و ثبت وقایع جمعآوری شده از پنجرهی اشکالزدایی در منوی راهنما، را پیوست کنید." #: ../src/empathy-streamed-media-window.c:2279 -#: ../src/empathy-call-window.c:3076 +#: ../src/empathy-call-window.c:3048 msgid "There was a failure in the call engine" msgstr "یک خرابی در موتور تماس بوجود آمده بود" #: ../src/empathy-streamed-media-window.c:2282 -#: ../src/empathy-call-window.c:3079 +#: ../src/empathy-call-window.c:3051 msgid "The end of the stream was reached" msgstr "به انتهای جریان رسیدیم" #: ../src/empathy-streamed-media-window.c:2322 -#: ../src/empathy-call-window.c:3119 +#: ../src/empathy-call-window.c:3091 msgid "Can't establish audio stream" msgstr "نمیتوان جریان صوتی را برقرار کرد" #: ../src/empathy-streamed-media-window.c:2332 -#: ../src/empathy-call-window.c:3129 +#: ../src/empathy-call-window.c:3101 msgid "Can't establish video stream" msgstr "نمیتوان جریان ویدئویی را برقرار کرد" @@ -3395,10 +3353,10 @@ msgstr "رمزنگاری کُدک:" #: ../src/empathy-call-window.ui.h:28 #: ../src/empathy-streamed-media-window.ui.h:21 -#: ../src/empathy-call-window.c:2542 -#: ../src/empathy-call-window.c:2543 -#: ../src/empathy-call-window.c:2544 -#: ../src/empathy-call-window.c:2545 +#: ../src/empathy-call-window.c:2514 +#: ../src/empathy-call-window.c:2515 +#: ../src/empathy-call-window.c:2516 +#: ../src/empathy-call-window.c:2517 msgid "Unknown" msgstr "ناشناخته" @@ -3424,7 +3382,6 @@ msgid "Audio" msgstr "صدا" #: ../src/empathy-chat-window.c:289 -#| msgid "Hide the main window." msgid "Close this window?" msgstr "بستن این پنجره؟" @@ -3442,7 +3399,6 @@ msgstr[1] "بستن این پنجره باعث ترک %Iu اتاق گپ می #: ../src/empathy-chat-window.c:314 #, c-format -#| msgid "Level " msgid "Leave %s?" msgstr "ترک %s؟" @@ -3455,7 +3411,6 @@ msgid "Close window" msgstr "بستن پنجره" #: ../src/empathy-chat-window.c:334 -#| msgid "Level " msgid "Leave room" msgstr "ترک اتاق" @@ -3585,7 +3540,7 @@ msgid "Incoming video call" msgstr "در حال دریافت تماس ویدئویی" #: ../src/empathy-event-manager.c:522 -#: ../src/empathy-call-window.c:1519 +#: ../src/empathy-call-window.c:1483 msgid "Incoming call" msgstr "در حال دریافت تماس" @@ -3602,7 +3557,7 @@ msgstr "فرد %s با شما تماس گرفته است، آیا جواب می #: ../src/empathy-event-manager.c:530 #: ../src/empathy-event-manager.c:731 #: ../src/empathy-event-manager.c:764 -#: ../src/empathy-call-window.c:1525 +#: ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming call from %s" msgstr "در حال دریافت تماس از %s" @@ -3622,7 +3577,7 @@ msgstr "_پاسخگویی با ویدئو" #: ../src/empathy-event-manager.c:731 #: ../src/empathy-event-manager.c:764 -#: ../src/empathy-call-window.c:1525 +#: ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming video call from %s" msgstr "ویدئو ورودی از %s" @@ -3799,7 +3754,6 @@ msgid "Remove completed, canceled and failed file transfers from the list" msgstr "انتقالهای کامل شده، لغو شده و خراب شده از فهرست حذف شوند" #: ../src/empathy-import-dialog.c:76 -#| msgid "Import" msgid "_Import" msgstr "_وارد کردن" @@ -3812,15 +3766,15 @@ msgid "Import Accounts" msgstr "وارد کردن حسابها" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:316 +#: ../src/empathy-import-widget.c:303 msgid "Import" msgstr "وارد کردن" -#: ../src/empathy-import-widget.c:325 +#: ../src/empathy-import-widget.c:312 msgid "Protocol" msgstr "قرارداد" -#: ../src/empathy-import-widget.c:349 +#: ../src/empathy-import-widget.c:336 msgid "Source" msgstr "منبع" @@ -3897,7 +3851,6 @@ msgid "Contact List" msgstr "فهرست آشناها" #: ../src/empathy-roster-window.ui.h:1 -#| msgid "_Accounts" msgid "Account settings" msgstr "تنظیمات حساب" @@ -3997,7 +3950,7 @@ 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:637 +#: ../src/empathy-new-chatroom-dialog.c:636 #, c-format msgid "" "%s\n" @@ -4010,21 +3963,21 @@ msgstr "" "نیاز به گذرواژه: %s\n" "اعضا: %s" +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "بله" +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "خیر" -#: ../src/empathy-new-chatroom-dialog.c:668 +#: ../src/empathy-new-chatroom-dialog.c:666 msgid "Could not start room listing" msgstr "شروع به فهرست کردن اتاق ممکن نبود" -#: ../src/empathy-new-chatroom-dialog.c:678 +#: ../src/empathy-new-chatroom-dialog.c:676 msgid "Could not stop room listing" msgstr "توقف فهرست کردن اتاق امکان پذیر نشد" @@ -4065,7 +4018,6 @@ msgid "New conversation" msgstr "گفتگوی جدید" #: ../src/empathy-preferences.c:169 -#| msgid "Contact goes online" msgid "Contact comes online" msgstr "آشنا برخط میشود" @@ -4086,46 +4038,46 @@ msgid "Language" msgstr "زبان" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:726 +#: ../src/empathy-preferences.c:724 msgid "Juliet" msgstr "ژولیت" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:733 +#: ../src/empathy-preferences.c:731 msgid "Romeo" msgstr "رومئو" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:739 +#: ../src/empathy-preferences.c:737 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "چه کار داری میکنی؟" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:743 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "مِی میزنم." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:746 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "مِی میزنی که چی؟" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:749 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "که فراموش کنم." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:752 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "چی رو فراموش کنی؟" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:755 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "ژولیت قطع شده است" -#: ../src/empathy-preferences.c:1159 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "ترجیحات" @@ -4350,12 +4302,6 @@ msgstr "پیوند Pastebin" msgid "Pastebin response" msgstr "پاسخ Pastebin" -#: ../src/empathy-debug-window.c:1680 -#, c-format -#| msgid "%s:" -msgid "%s" -msgstr "%s" - #: ../src/empathy-debug-window.c:1683 msgid "Data too large for a single paste. Please save logs to file." msgstr "دادهها برای یک ارسال بسیار بزرگ است. لطفا رویدادها را بر روی یک پرونده ذخیره کنید." @@ -4474,39 +4420,39 @@ msgstr "اشکالزدای امپاتی" msgid "- Empathy Chat Client" msgstr "- کارگیر گپ امپاتی" -#: ../src/empathy-notifications-approver.c:189 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "پاسخ" -#: ../src/empathy-notifications-approver.c:203 -#: ../src/empathy-call-window.c:1529 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1493 msgid "Reject" msgstr "رَد" -#: ../src/empathy-notifications-approver.c:208 -#: ../src/empathy-notifications-approver.c:213 -#: ../src/empathy-call-window.c:1530 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1494 msgid "Answer" msgstr "پاسخ" -#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "پاسخگویی با ویدئو" -#: ../src/empathy-notifications-approver.c:221 -#: ../src/empathy-notifications-approver.c:231 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "چشم پوشی" -#: ../src/empathy-notifications-approver.c:225 -#: ../src/empathy-notifications-approver.c:236 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "پذیرش" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:246 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "فراهم کردن" @@ -4517,40 +4463,39 @@ msgstr "لحظاتی پیش %s سعی کرد تا با شما تماس بگیر #. Translators: this is an "Info" label. It should be as short #. * as possible. +#: ../src/empathy-call-window.c:1124 #: ../src/empathy-call-window.c:1140 -#: ../src/empathy-call-window.c:1162 msgid "i" msgstr "ر" -#: ../src/empathy-call-window.c:2888 +#: ../src/empathy-call-window.c:2860 msgid "On hold" msgstr "نگه داشتن پشت خط" -#: ../src/empathy-call-window.c:2891 +#: ../src/empathy-call-window.c:2863 msgid "Mute" msgstr "بیصدا" -#: ../src/empathy-call-window.c:2893 +#: ../src/empathy-call-window.c:2865 msgid "Duration" msgstr "مدت" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2896 +#: ../src/empathy-call-window.c:2868 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %Id:%I02dm" -#: ../src/empathy-call-window.c:3166 +#: ../src/empathy-call-window.c:3138 #, c-format msgid "Your current balance is %s." msgstr "اعتبار فعلی شما %s." -#: ../src/empathy-call-window.c:3170 +#: ../src/empathy-call-window.c:3142 msgid "Sorry, you don’t have enough credit for that call." msgstr "متاسفم، شما برای این تماس اعتبار کافی ندارید." -#: ../src/empathy-call-window.c:3172 -#| msgid "Top Up..." +#: ../src/empathy-call-window.c:3144 msgid "Top Up" msgstr "بالا بردن" @@ -4563,7 +4508,6 @@ msgid "What kind of chat account do you have?" msgstr "چه نوع حساب گپی دارید؟" #: ../libempathy-gtk/empathy-new-account-dialog.c:166 -#| msgid "New account" msgid "Adding new account" msgstr "اضافه کردن حساب جدید" @@ -4572,11 +4516,6 @@ msgid "People nearby" msgstr "افراد دور و بر" #: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150 -#| 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" 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." msgstr "امپاتی میتواند به طور خودکار افرادی که بر روی شبکه مشابه هستند را پیدا کند تا با آنها گپ بزنید. اگر میخواهید از این قابلیت استفاده کنید، بررسی کنید که جزئیات زیر درست باشند." @@ -4584,244 +4523,5 @@ msgstr "امپاتی میتواند به طور خودکار افرادی ک msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List." msgstr "شما میتوانید این جزئیات را بعدا تغییر دهید یا این امکان را با انتخاب <span style=\"italic\">ویرایش ⃪ حسابها</span> در فهرست آشناها غیرفعال کنید." -#~ msgid "Call volume" -#~ msgstr "بلندی صدای تماس" - -#~ msgid "Call volume, as a percentage." -#~ msgstr "بلندی صدای تماس، بر اساس درصد" - -#~ msgid "Empathy has migrated butterfly logs" -#~ msgstr "امپاتی ثبت وقایع پروانهای (butterfly) را منتقل کرده است" - -#~ msgid "Whether Empathy has migrated butterfly logs." -#~ msgstr "اینکه امپاتی وقایع پروانهای را منتقل کرده است یا خیر." - -#~ msgid "Socket type not supported" -#~ msgstr "نوع سوکت پشتیبانی نمیشود" - -#~ msgid "My Web Accounts" -#~ msgstr "حسابهای وب من" - -#~ msgid "The account %s is edited via %s." -#~ msgstr "حساب %s از طریقِ %s ویرایش شد." - -#~ msgid "The account %s cannot be edited in Empathy." -#~ msgstr "حساب %s از طریق امپاتی قابل ویرایش نیست." - -#~ msgid "Launch My Web Accounts" -#~ msgstr "اجرای حسابهای وب من" - -#~ msgid "Edit %s" -#~ msgstr "ویرایش %s" - -#~ msgid "Ca_ncel" -#~ msgstr "_لغو" - -#~ msgid "Personal Information" -#~ msgstr "اطلاعات شخصی" - -#~ msgid "Ungrouped" -#~ msgstr "گروهبندی لغو شد" - -#~ msgid "Favorite People" -#~ msgstr "افراد موردپسند" -#~ msgctxt "Edit contact (contextual menu)" - -#~ msgid "_Edit" -#~ msgstr "_ویرایش" - -#~ msgid "Select a contact" -#~ msgstr "آشنایی انتخاب کنید" - -#~ msgid "Select contacts to link" -#~ msgstr "آشناها را انتخاب کنید تا پیوند داده شود" - -#~ msgid "New contact preview" -#~ msgstr "پیشنمایش آشنای جدید" - -#~ msgid "Contacts selected in the list on the left will be linked together." -#~ msgstr "آشناهای انتخاب شده در فهرست سمت چپ با یکدیگر پیوند داده میشوند." -#~ msgctxt "Link individual (contextual menu)" - -#~ msgid "_Link Contacts…" -#~ msgstr "_پیوند آشناها..." - -#~ msgid "Link Contacts" -#~ msgstr "پیوند آشنایان" -#~ msgctxt "Unlink individual (button)" - -#~ msgid "_Unlink…" -#~ msgstr "_لغو پیوند..." - -#~ msgid "" -#~ "Completely split the displayed linked contacts into the separate contacts." -#~ msgstr "" -#~ "جدا کردن کامل آشناهای پیوند شدهی نمایش داده شده به آشناهای جدا از هم." - -#~ msgid "_Link" -#~ msgstr "_پیوند" - -#~ msgid "Unlink linked contacts '%s'?" -#~ msgstr "لغو پیوند آشناهای پیوند شده «%s»؟" - -#~ msgid "" -#~ "Are you sure you want to unlink these linked contacts? This will " -#~ "completely split the linked contacts into separate contacts." -#~ msgstr "" -#~ "آیا مطمئن هستید که میخواهید این آشناهای پیوند شده را لغو پیوند کنید؟ این " -#~ "کار باعث میشود تا آشناهای پیوند شده کاملا از هم جدا شوند." -#~ msgctxt "Unlink individual (button)" - -#~ msgid "_Unlink" -#~ msgstr "_لغو پیوند" - -#~ msgid "Contact ID:" -#~ msgstr "شناسهی آشنا:" - -#~ msgid "C_hat" -#~ msgstr "_گپ" - -#~ msgid "Send _Video" -#~ msgstr "فرستادن _ویدئو" - -#~ msgid "C_all" -#~ msgstr "_تماس" - -#~ msgid "Set your presence and current status" -#~ msgstr "حضور و وضعیت جاری خود را تنظیم کنید" - -#~ msgid "The selected contact cannot receive files." -#~ msgstr "آشنای گزیده شده نمیتواند پرونده دریافت کند." - -#~ msgid "The selected contact is offline." -#~ msgstr "آشنای انتخاب شده برونخط است." - -#~ msgid "There was an error while importing the accounts." -#~ msgstr "هنگام وارد کردن حسابها خطایی به رخ داد." - -#~ msgid "There was an error while parsing the account details." -#~ msgstr "هنگام تجزیه کردن جزئیات حساب خطایی رخ داد." - -#~ msgid "There was an error while creating the account." -#~ msgstr "خطایی در هنگام ایجاد حساب رخ داد." - -#~ msgid "There was an error." -#~ msgstr "خطایی وجود داشت." - -#~ msgid "The error message was: %s" -#~ msgstr "خطا این بود: %s" - -#~ msgid "" -#~ "You can either go back and try to enter your accounts' details again or " -#~ "quit this assistant and add accounts later from the Edit menu." -#~ msgstr "" -#~ "میتوانید جزئیات حسابهای خود را دوباره وارد کنید یا از این دستیار خارج شده " -#~ "و بعدا حسابهای خود را از منوی ویرایش بافزایید." - -#~ msgid "An error occurred" -#~ msgstr "خطایی رخ داد" - -#~ msgid "Do you have any other chat accounts you want to set up?" -#~ msgstr "آیا حسابهای گپ دیگری هم دارید که بخواهید برپا کنید؟" - -#~ msgid "Enter your account details" -#~ msgstr "جزئیات حساب خود را وارد کنید" - -#~ msgid "What kind of chat account do you want to create?" -#~ msgstr "چه نوع حساب گپی میخواهید ایجاد کنید؟" - -#~ msgid "Do you want to create other chat accounts?" -#~ msgstr "آیا میخواهید حسابهای گپ دیگری هم بسازید؟" - -#~ msgid "Enter the details for the new account" -#~ msgstr "جزئیات حساب جدید را وارد کنید" - -#~ 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 "" -#~ "با امپاتی میتوانید با دیگران به صورت بر خط گپ بزنید و با دوستان و هم " -#~ "دورهایهایی که از گوگلتاک، AIM، ویندوز لایو و خیلی برنامههای گپ دیگر " -#~ "استفاده میکنند ارتباط داشته باشید. با یک میکروفون یا یک وبکم میتوانید صدا " -#~ "و تصویر ویدئویی هم داشته باشید." - -#~ msgid "Do you have an account you've been using with another chat program?" -#~ msgstr "آیا حسابی دارید که با برنامهی گپ دیگری از آن استفاده میکردهاید؟" - -#~ msgid "Yes, import my account details from " -#~ msgstr "بله، جزئیات حساب مرا وارد کن از " - -#~ msgid "Yes, I'll enter my account details now" -#~ msgstr "بله، جزئیات حسابم را هم اکنون وارد خواهم کرد" - -#~ msgid "No, I want a new account" -#~ msgstr "خیر، حساب جدیدی میخواهم" - -#~ msgid "No, I just want to see people online nearby for now" -#~ msgstr "خیر، الان فقط میخواهم افراد برخطِ دور و بر را ببینم" - -#~ msgid "Select the accounts you want to import:" -#~ msgstr "حسابهایی که میخواهید وارد کنید را انتخاب کنید:" - -#~ msgid "No, that's all for now" -#~ msgstr "خیر، فعلا کافیه" - -#~ msgid "Edit->Accounts" -#~ msgstr "ویرایش->حسابها" - -#~ msgid "I do _not want to enable this feature for now" -#~ msgstr "_نمیخواهم فعلا این قابلیت را فعلا فعال کنم" - -#~ msgid "" -#~ "You won't be able to chat with people connected to your local network, as " -#~ "telepathy-salut is not installed. If you want to enable this feature, " -#~ "please install the telepathy-salut package and create a People Nearby " -#~ "account from the Accounts dialog" -#~ msgstr "" -#~ "چون telepathy-salut نصب نیست، شما نخواهید توانست با افراد متصل به شبکهی " -#~ "محلی خودتان گپ بزنید. اگر میخواهید این قابلیت را به کار اندازید، لطفا " -#~ "بستهی telepathy-salut را نصب کنید و در محاورهی حسابها یک حسابِ «افراد دور و " -#~ "بر» ایجاد کنید" - -#~ msgid "Messaging and VoIP Accounts Assistant" -#~ msgstr "دستیار حسابهای پیامرسان و VoIP" - -#~ msgid "Welcome to Empathy" -#~ msgstr "به امپاتی خوش آمدید" - -#~ msgid "Import your existing accounts" -#~ msgstr "وارد کردن حسابهای موجود شما" - -#~ msgid "Please enter personal details" -#~ msgstr "لطفاً جزئیات شخصی را وارد کنید" - -#~ msgid "" -#~ "You are about to create a new account, which will discard\n" -#~ "your changes. Are you sure you want to proceed?" -#~ msgstr "" -#~ "شما درحال ایجاد یک حساب جدید هستید، این کار تغییرات شما را نادیده\n" -#~ "خواهد گرفت. آیا مطمئنید که میخواهید ادامه دهید؟" - -#~ msgid "Protocol:" -#~ msgstr "قرارداد:" -#~ msgctxt "encoding video codec" - -#~ msgid "Unknown" -#~ msgstr "ناشناخته" -#~ msgctxt "encoding audio codec" - -#~ msgid "Unknown" -#~ msgstr "ناشناخته" -#~ msgctxt "decoding video codec" - -#~ msgid "Unknown" -#~ msgstr "ناشناخته" -#~ msgctxt "decoding audio codec" - -#~ msgid "Unknown" -#~ msgstr "ناشناخته" - -#~ msgid "_Personal Information" -#~ msgstr "_اطلاعات شخصی" +#~ msgid "_Disable" +#~ msgstr "_غیرفعالکردن" @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy-master-po-gl-57278_.merged\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-17 15:14+0100\n" -"PO-Revision-Date: 2012-03-17 15:15+0100\n" +"POT-Creation-Date: 2012-04-02 16:34+0200\n" +"PO-Revision-Date: 2012-04-02 16:34+0200\n" "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n" "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n" "Language: gl\n" @@ -42,7 +42,7 @@ msgstr "Converse en Google Talk, Facebook, MSN e moitos máis servizos de chat" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 -#: ../src/empathy-accounts-dialog.c:2512 +#: ../src/empathy-accounts-dialog.c:2563 msgid "Messaging and VoIP Accounts" msgstr "Contas de mensaxaría e Voz IP" @@ -99,12 +99,13 @@ msgstr "Cartafol de descargas predeterminado do Empathy" msgid "The default folder to save file transfers in." msgstr "O cartafol predeterminado no que gardar os ficheiros transferidos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:9 +#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once. +#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 msgid "Magic number used to check if sanity cleaning tasks should be run" msgstr "" "Número máxico usado para comprobar se se deben executar as tarefas de limpeza" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:10 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 msgid "" "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks " "should be executed or not. Users should not change this key manually." @@ -113,96 +114,96 @@ msgstr "" "as tarefas de limpeza. Os usuarios non deben cambiar esta chave manualmente." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:11 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 msgid "Show offline contacts" msgstr "Mostrar contactos desconectados" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:12 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 msgid "Whether to show contacts that are offline in the contact list." msgstr "" "Indica se se debe mostrar os contactos que están desconectados na lista de " "contactos." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:13 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 msgid "Show avatars" msgstr "Mostrar avatares" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:14 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "" "Indica se se deben mostrar os avatares dos contactos na lista de contactos e " "das xanelas de conversa." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:15 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 msgid "Show protocols" msgstr "Mostrar protocolos" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:16 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 msgid "Whether to show protocols for contacts in the contact list." msgstr "" "Indica se se deben mostrar os protocolos para os contactos na lista de " "contactos." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:17 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 msgid "Show Balance in contact list" msgstr "Mostrar crédito na lista de contactos" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:18 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 msgid "Whether to show account balances in the contact list." msgstr "Indica se se debe mostrar o crédito na lista de contactos." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:19 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 msgid "Compact contact list" msgstr "Lista compacta de contactos" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:20 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 msgid "Whether to show the contact list in compact mode." msgstr "Indica se se debe mostrar a lista de contactos en modo compacto." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:21 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 msgid "Hide main window" msgstr "Ocultar a xanela principal" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:22 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 msgid "Hide the main window." msgstr "Ocultar a xanela principal." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:23 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 msgid "Default directory to select an avatar image from" msgstr "Cartafol predeterminado para seleccionar un avatar" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:24 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 msgid "The last directory that an avatar image was chosen from." msgstr "Último cartafol do que escolleu unha imaxe de avatar." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:25 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 msgid "Open new chats in separate windows" msgstr "Abrir as novas conversas en xanelas separadas" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:26 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 msgid "Always open a separate chat window for new chats." msgstr "Abrir sempre unha xanela de conversa separada para as conversas novas." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:27 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 msgid "Display incoming events in the status area" msgstr "Mostrar os eventos entrantes na área de estado" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:28 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 msgid "" "Display incoming events in the status area. If false, present them to the " "user immediately." @@ -210,32 +211,32 @@ msgstr "" "Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos " "directamente ao usuario." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:29 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 msgid "The position for the chat window side pane" msgstr "A posición do panel lateral da xanela de conversa" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:30 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 msgid "The stored position (in pixels) of the chat window side pane." msgstr "" "A posición almacenada (en píxeles) do panel lateral da xanela de conversa." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:31 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 msgid "Show contact groups" msgstr "Mostrar grupos de contactos" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:32 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 msgid "Whether to show groups in the contact list." msgstr "Indica se se deben mostrar os grupos na lista de contactos." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:33 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 msgid "Contact list sort criterion" msgstr "Criterio de ordenación da lista de contactos" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:34 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's state with the value \"state\". A value of \"name\" will sort " @@ -246,76 +247,76 @@ msgstr "" "«name» (nome) ordenará a lista de contactos polo nome." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:35 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 msgid "Use notification sounds" msgstr "Usar sons de notificación" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:36 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 msgid "Whether to play a sound to notify of events." msgstr "Indica se se debe reproducir un son para notificar os eventos." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:37 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 msgid "Disable sounds when away" msgstr "Desactivar os sons ao ausentarse" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:38 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 msgid "Whether to play sound notifications when away or busy." msgstr "" "Indica se se debe reproducir un son para notificar cando se está ocupado ou " "ausente." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:39 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 msgid "Play a sound for incoming messages" msgstr "Reproducir un son cando cheguen mensaxes" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:40 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 msgid "Whether to play a sound to notify of incoming messages." msgstr "Indica se se debe reproducir un son para notificar mensaxes entrantes." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:41 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 msgid "Play a sound for outgoing messages" msgstr "Reproducir un son ao enviar mensaxes" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:42 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 msgid "Whether to play a sound to notify of outgoing messages." msgstr "" "Indica se se debe reproducir un son para notificar as mensaxes saíntes." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:43 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Play a sound for new conversations" msgstr "Reproducir un son para as conversas novas" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:44 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 msgid "Whether to play a sound to notify of new conversations." msgstr "Indica se se debe reproducir un son para notificar as conversas novas." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:45 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 msgid "Play a sound when a contact logs in" msgstr "Reproducir un son cando un contacto inicie sesión" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:46 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "" "Indica se se debe reproducir un son para notificar os inicio de sesión dos " "contactos na rede." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:47 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 msgid "Play a sound when a contact logs out" msgstr "Reproducir un son cando un contacto saia da sesión" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:48 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "" @@ -323,56 +324,56 @@ msgstr "" "unha sesión na rede." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:49 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 msgid "Play a sound when we log in" msgstr "Reproducir un son cando inicio sesión" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:50 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 msgid "Whether to play a sound when logging into a network." msgstr "Indica se se debe reproducir un son cando se inicia sesión na rede." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:51 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 msgid "Play a sound when we log out" msgstr "Reproducir un son cando ao saír da sesión" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:52 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 msgid "Whether to play a sound when logging out of a network." msgstr "Indica se se debe reproducir un son cando se sae da sesión na rede." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:53 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 msgid "Enable popup notifications for new messages" msgstr "Activar as notificacións emerxentes para as mensaxes novas" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:54 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 msgid "Whether to show a popup notification when receiving a new message." msgstr "" "Indica se mostrar ou non unha notificación emerxente cando se reciba unha " "mensaxe nova." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:55 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "Disable popup notifications when away" msgstr "Desactivar as notificacións emerxentes cando se está ausente" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:56 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 msgid "Whether to show popup notifications when away or busy." msgstr "" "Indica se mostrar ou non as notificacións emerxentes cando se está ausente " "ou ocupado." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:57 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 msgid "Pop up notifications if the chat isn't focused" msgstr "Facer emerxer unha notificación cando a conversa non está enfocada" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:58 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." @@ -381,98 +382,98 @@ msgstr "" "mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:59 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 msgid "Pop up notifications when a contact logs in" msgstr "Facer emerxer unha notificación cando un contacto entra" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:60 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 msgid "Whether to show a popup notification when a contact goes online." msgstr "" "Indica se mostrar ou non unha notificación emerxente cando un contacto está " "conectado." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:61 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 msgid "Pop up notifications when a contact logs out" msgstr "Facer emerxer unha notificación cando un contacto sae" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:62 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 msgid "Whether to show a popup notification when a contact goes offline." msgstr "" "Indica se mostrar ou non unha notificación emerxente cando un contacto está " "desconectado." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:63 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 msgid "Use graphical smileys" msgstr "Usar emoticonas gráficas" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:64 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 msgid "Whether to convert smileys into graphical images in conversations." msgstr "" "Indica se converter ou non as emoticonas en imaxes gráficas nas conversas." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:65 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 msgid "Show contact list in rooms" msgstr "Mostrar a lista de contactos nas salas" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:66 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 msgid "Whether to show the contact list in chat rooms." msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:67 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 msgid "Chat window theme" msgstr "Tema da xanela de conversa" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:68 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 msgid "The theme that is used to display the conversation in chat windows." msgstr "O tema usado para mostrar as conversa nas xanelas de conversa." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:69 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 msgid "Chat window theme variant" msgstr "Variante do tema da xanela de charla" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:70 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "" "A variante do tema que se usará para mostrar a conversa nas xanelas de chat." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:71 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "Path of the Adium theme to use" msgstr "Ruta do tema de Adium para usar" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:72 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "" "Ruta do tema de Adium para usar se o tema usado para o chat é de Adium." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:73 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 msgid "Enable WebKit Developer Tools" msgstr "Activar as ferramentas de desenvolvedor WebKit" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:74 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 msgid "" "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" "Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, " "deberían ser activadas." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:75 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 msgid "Inform other users when you are typing to them" msgstr "Informar a outros usuarios cando vostede está escribindo" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:76 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 msgid "" "Whether to send the 'composing' or 'paused' chat states. Does not currently " "affect the 'gone' state." @@ -481,22 +482,22 @@ msgstr "" "afecta realmente ao estado «ausente»." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:77 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 msgid "Use theme for chat rooms" msgstr "Usar un tema para as salas de conversa" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:78 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 msgid "Whether to use the theme for chat rooms." msgstr "Indica se usar ou non o tema para as salas de conversa." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:79 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 msgid "Spell checking languages" msgstr "Idiomas para a corrección ortográfica" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:80 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" @@ -504,12 +505,12 @@ msgstr "" "ex., «gl, pt, en»)." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:81 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 msgid "Enable spell checker" msgstr "Activar a verificación ortográfica" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:82 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 msgid "" "Whether to check words typed against the languages you want to check with." msgstr "" @@ -517,12 +518,12 @@ msgstr "" "as quere verificar." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:83 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 msgid "Nick completed character" msgstr "Carácter de completado de alcume" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:84 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." @@ -531,63 +532,63 @@ msgstr "" "alcume (tabulador) nunha conversa de grupo." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:85 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "" "O Empathy debería usar o avatar do contacto como a icona da xanela de " "conversa" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:86 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" "Indica se o Empathy debería usar o avatar dos contactos como a icona da " "xanela da conversa ou non." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:87 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 msgid "Last account selected in Join Room dialog" msgstr "Última conta seleccionada no diálogo Unirse á sala" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:88 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 msgid "D-Bus object path of the last account selected to join a room." msgstr "" "Ruta do obxecto D-Bus da última conta seleccionada para unirse a unha sala." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:89 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 msgid "Camera device" msgstr "Dispositivo da cámara" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:90 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 msgid "Default camera device to use in video calls, e.g. /dev/video0." msgstr "" "Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /" "dev/video0." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:91 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 msgid "Camera position" msgstr "Posición da cámara" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:92 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 msgid "Position the camera preview should be during a call." msgstr "" "Posición onde debe estar a vista previa da cámara durante unha chamada." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:93 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 msgid "Echo cancellation support" msgstr "Compatibilidade de cancelación de eco" -#: ../data/org.gnome.Empathy.gschema.xml.in.h:94 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 msgid "Whether to enable Pulseaudio's echo cancellation filter." msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:95 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 msgid "Show hint about closing the main window" msgstr "Mostrar unha indicación sobre pechar a xanela principal" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:96 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." @@ -595,55 +596,55 @@ msgstr "" "Indica se mostrar ou non o diálogo de mensaxe sobre pechar a xanela " "principal co botón 'x' da barra de título." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:97 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 msgid "Empathy can publish the user's location" msgstr "Empathy pode publicar a localización dos usuarios" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:98 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "" "Indica se o Empathy pode ou non publicar a localización do usuario aos seus " "contactos." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:99 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 msgid "Empathy can use the network to guess the location" msgstr "Empathy pode usar a rede para adiviñar a localización" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:100 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 msgid "Whether Empathy can use the network to guess the location." msgstr "" "Indica se o Empathy pode ou non usar a rede para adiviñar a localización." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:101 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 msgid "Empathy can use the cellular network to guess the location" msgstr "Empathy pode usar a rede de móbiles para seguir a localización" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:102 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 msgid "Whether Empathy can use the cellular network to guess the location." msgstr "" "Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar " "a localización." -#: ../data/org.gnome.Empathy.gschema.xml.in.h:103 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 msgid "Empathy can use the GPS to guess the location" msgstr "Empathy pode usar o GPS para seguir a localización" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:104 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:105 msgid "Whether Empathy can use the GPS to guess the location." msgstr "" "Indica se o Empathy pode usar ou non o GPS para adiviñar a localización." # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:105 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:106 msgid "Empathy should reduce the location's accuracy" msgstr "O Empathy debería reducir a precisión da localización" # rever -#: ../data/org.gnome.Empathy.gschema.xml.in.h:106 +#: ../data/org.gnome.Empathy.gschema.xml.in.h:107 msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" @@ -967,7 +968,7 @@ msgid "All accounts" msgstr "Todas as contas" #: ../libempathy-gtk/empathy-account-widget.c:682 -#: ../src/empathy-import-widget.c:336 +#: ../src/empathy-import-widget.c:323 msgid "Account" msgstr "Conta" @@ -992,7 +993,7 @@ msgid "%s:" msgstr "%s:" #: ../libempathy-gtk/empathy-account-widget.c:1398 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16 msgid "Username:" msgstr "Nome de usuario:" @@ -1088,11 +1089,11 @@ msgstr "_Servidor:" #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 msgid "Advanced" msgstr "Avanzadas" @@ -1110,7 +1111,7 @@ msgstr "Cal e o seu contrasinal para AIM?" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 msgid "Remember Password" msgstr "Lembrar o contrasinal" @@ -1156,36 +1157,32 @@ msgstr "Cal é o seu UIN para ICQ?" msgid "What is your ICQ password?" msgstr "Cal é o seu contrasinal pra ICQ?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:206 -#: ../libempathy-gtk/empathy-account-widget-sip.c:239 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 +#: ../libempathy-gtk/empathy-account-widget-sip.c:240 msgid "Auto" msgstr "Auto" -#: ../libempathy-gtk/empathy-account-widget-sip.c:209 +#: ../libempathy-gtk/empathy-account-widget-sip.c:210 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:212 +#: ../libempathy-gtk/empathy-account-widget-sip.c:213 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:215 +#: ../libempathy-gtk/empathy-account-widget-sip.c:216 msgid "TLS" msgstr "TLS" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:244 +#: ../libempathy-gtk/empathy-account-widget-sip.c:245 msgid "Register" msgstr "Rexistrador" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:249 +#: ../libempathy-gtk/empathy-account-widget-sip.c:250 msgid "Options" msgstr "Opcións" -#: ../libempathy-gtk/empathy-account-widget-sip.c:252 +#: ../libempathy-gtk/empathy-account-widget-sip.c:253 msgid "None" msgstr "Ningún" @@ -1215,19 +1212,21 @@ msgstr "Engadir…" msgid "Remove" msgstr "Eliminar" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 +#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Up" msgstr "Arriba" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 +#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 msgid "Down" msgstr "Abaixo" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Servers" msgstr "Servidores" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "" "Most IRC servers don't need a password, so if you're not sure, don't enter a " "password." @@ -1235,28 +1234,28 @@ msgstr "" "A maioría dos servidores IRC non precisan contrasinal, polo que se non está " "seguro non escriba un contrasinal." -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Nickname:" msgstr "Alcume:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Password:" msgstr "Contrasinal:" # rever -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14 msgid "Quit message:" msgstr "Mensaxe de saída:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15 msgid "Real name:" msgstr "Nome real:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18 msgid "Which IRC network?" msgstr "Que rede IRC?" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19 msgid "What is your IRC nickname?" msgstr "Cal é o seu alcume de IRC?" @@ -1452,11 +1451,15 @@ msgstr "Ignorar erros TLS" msgid "Port:" msgstr "Porto:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +msgid "Local IP Address:" +msgstr "Enderezo IP local:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 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:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "What is your SIP account password?" msgstr "Cal é o contrasinal da súa conta SIP?" @@ -1819,8 +1822,8 @@ msgstr "%s agora é coñecido como %s" #. * we get the new handler. #: ../libempathy-gtk/empathy-chat.c:2994 #: ../src/empathy-streamed-media-window.c:1888 -#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502 -#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590 +#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1466 +#: ../src/empathy-call-window.c:1516 ../src/empathy-call-window.c:2562 msgid "Disconnected" msgstr "Desconectado" @@ -1897,7 +1900,7 @@ msgstr "Editar os contactos bloqueados" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:503 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 #: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:2 @@ -1974,29 +1977,29 @@ msgstr "Decidir máis _adiante" # rever #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:496 msgid "Search contacts" msgstr "Buscar contactos" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:526 msgid "Search: " msgstr "Buscar:" # rever -#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:584 msgid "_Add Contact" msgstr "_Engadir contacto" # rever -#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:602 msgid "No contacts found" msgstr "Non se atoparon contactos" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:618 msgid "Your message introducing yourself:" msgstr "A súa mensaxe de presentación:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:626 msgid "Please let me see when you're online. Thanks!" msgstr "Permítame ver cando está en liña. Grazas." @@ -2159,12 +2162,12 @@ msgid "Unable to save avatar" msgstr "Non foi posíbel gardar o avatar" # rever -#: ../libempathy-gtk/empathy-contact-widget.c:1444 +#: ../libempathy-gtk/empathy-contact-widget.c:1455 msgid "Personal Details" msgstr "Detalles persoais" # rever -#: ../libempathy-gtk/empathy-contact-widget.c:1447 +#: ../libempathy-gtk/empathy-contact-widget.c:1458 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" @@ -2276,11 +2279,11 @@ msgstr "Versión:" msgid "Client:" msgstr "Cliente:" -#: ../libempathy-gtk/empathy-groups-widget.c:331 +#: ../libempathy-gtk/empathy-groups-widget.c:327 msgid "Groups" msgstr "Grupos" -#: ../libempathy-gtk/empathy-groups-widget.c:343 +#: ../libempathy-gtk/empathy-groups-widget.c:339 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2288,16 +2291,16 @@ msgstr "" "Seleccione os grupos en que quere que aparezan estes contactos. Note que " "pode seleccionar máis dun grupo ou ningún." -#: ../libempathy-gtk/empathy-groups-widget.c:362 +#: ../libempathy-gtk/empathy-groups-widget.c:358 msgid "_Add Group" msgstr "Eng_adir grupo" -#: ../libempathy-gtk/empathy-groups-widget.c:397 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Seleccionar" -#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../libempathy-gtk/empathy-groups-widget.c:403 #: ../src/empathy-roster-window.c:1970 msgid "Group" msgstr "Grupo" @@ -2594,64 +2597,64 @@ msgstr "Mañá" msgid "%e %B %Y" msgstr "%e de %B de %Y" -#: ../libempathy-gtk/empathy-log-window.c:1827 -#: ../libempathy-gtk/empathy-log-window.c:3487 +#: ../libempathy-gtk/empathy-log-window.c:1843 +#: ../libempathy-gtk/empathy-log-window.c:3471 msgid "Anytime" msgstr "Calquera momento" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2400 +#: ../libempathy-gtk/empathy-log-window.c:1942 +#: ../libempathy-gtk/empathy-log-window.c:2401 msgid "Anyone" msgstr "Calquera persoa" -#: ../libempathy-gtk/empathy-log-window.c:2713 +#: ../libempathy-gtk/empathy-log-window.c:2714 msgid "Who" msgstr "Quen" -#: ../libempathy-gtk/empathy-log-window.c:2922 +#: ../libempathy-gtk/empathy-log-window.c:2923 msgid "When" msgstr "Cando" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3039 msgid "Anything" msgstr "Calquera cousa" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3041 msgid "Text chats" msgstr "Conversas de texto" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3043 #: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "Chamadas" # rever -#: ../libempathy-gtk/empathy-log-window.c:3047 +#: ../libempathy-gtk/empathy-log-window.c:3048 msgid "Incoming calls" msgstr "Chamadas entrantes" # rever -#: ../libempathy-gtk/empathy-log-window.c:3048 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Outgoing calls" msgstr "Chamadas de voz saíntes" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Missed calls" msgstr "Chamadas perdidas de %s" -#: ../libempathy-gtk/empathy-log-window.c:3071 +#: ../libempathy-gtk/empathy-log-window.c:3072 msgid "What" msgstr "Que" -#: ../libempathy-gtk/empathy-log-window.c:3780 +#: ../libempathy-gtk/empathy-log-window.c:3764 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Ten certeza de eliminar tódolos rexistros das conversas anteriores?" -#: ../libempathy-gtk/empathy-log-window.c:3784 +#: ../libempathy-gtk/empathy-log-window.c:3768 msgid "Clear All" msgstr "Limpar todo" -#: ../libempathy-gtk/empathy-log-window.c:3791 +#: ../libempathy-gtk/empathy-log-window.c:3775 msgid "Delete from:" msgstr "Eliminar desde:" @@ -2804,12 +2807,12 @@ msgstr "Faga clic para eliminar este estado como favorito" msgid "Click to make this status a favorite" msgstr "Faga clic para facer este estado un dos favoritos" -#: ../libempathy-gtk/empathy-presence-chooser.c:388 +#: ../libempathy-gtk/empathy-presence-chooser.c:396 msgid "Set status" msgstr "Estabelecer status" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1135 +#: ../libempathy-gtk/empathy-presence-chooser.c:1145 msgid "Custom messages…" msgstr "Mensaxes personalizadas…" @@ -3208,11 +3211,11 @@ msgid "_Select" msgstr "_Seleccionar" # rever -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201 msgid "No error message" msgstr "Non hai mensaxe de erro" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274 msgid "Instant Message (Empathy)" msgstr "Mensaxe instantáneo (Empathy)" @@ -3313,31 +3316,31 @@ msgstr "Hai modificacións sen gardar respecto da súa conta %s." msgid "Your new account has not been saved yet." msgstr "A súa nova conta aínda non foi gardada." -#: ../src/empathy-accounts-dialog.c:381 +#: ../src/empathy-accounts-dialog.c:405 #: ../src/empathy-streamed-media-window.c:759 -#: ../src/empathy-call-window.c:1289 +#: ../src/empathy-call-window.c:1267 msgid "Connecting…" msgstr "Conectando…" -#: ../src/empathy-accounts-dialog.c:422 +#: ../src/empathy-accounts-dialog.c:446 #, c-format msgid "Offline — %s" msgstr "Desconectado — %s" -#: ../src/empathy-accounts-dialog.c:434 +#: ../src/empathy-accounts-dialog.c:458 #, c-format msgid "Disconnected — %s" msgstr "Desconectado — %s" -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:469 msgid "Offline — No Network Connection" msgstr "Desconectado — Sen conexión de rede" -#: ../src/empathy-accounts-dialog.c:452 +#: ../src/empathy-accounts-dialog.c:476 msgid "Unknown Status" msgstr "Estado descoñecido" -#: ../src/empathy-accounts-dialog.c:469 +#: ../src/empathy-accounts-dialog.c:493 msgid "" "This account has been disabled because it relies on an old, unsupported " "backend. Please install telepathy-haze and restart your session to migrate " @@ -3346,39 +3349,39 @@ msgstr "" "Esta conta desactivouse porque básease nun «backend» non compatíbel. Instale " "telepathy-haze e reinicie a sesión para migrar esta conta." -#: ../src/empathy-accounts-dialog.c:479 +#: ../src/empathy-accounts-dialog.c:503 msgid "Offline — Account Disabled" msgstr "Desconectado — Conta desactivada" # rever -#: ../src/empathy-accounts-dialog.c:585 +#: ../src/empathy-accounts-dialog.c:609 msgid "Edit Connection Parameters" msgstr "Editar os parámetros da conexión" -#: ../src/empathy-accounts-dialog.c:750 +#: ../src/empathy-accounts-dialog.c:774 msgid "Failed to retrieve your personal information from the server." msgstr "Produciuse un fallo ao recuperar a súa información persoal do servidor" -#: ../src/empathy-accounts-dialog.c:756 +#: ../src/empathy-accounts-dialog.c:780 msgid "Go online to edit your personal information." msgstr "Conéctese para editar a súa información persoal" -#: ../src/empathy-accounts-dialog.c:843 +#: ../src/empathy-accounts-dialog.c:867 msgid "_Edit Connection Parameters..." msgstr "_Editar os parámetros da conexión…" # rever -#: ../src/empathy-accounts-dialog.c:1339 +#: ../src/empathy-accounts-dialog.c:1363 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?" -#: ../src/empathy-accounts-dialog.c:1343 +#: ../src/empathy-accounts-dialog.c:1367 msgid "This will not remove your account on the server." msgstr "Isto non eliminará a súa conta no servidor." # rever -#: ../src/empathy-accounts-dialog.c:1579 +#: ../src/empathy-accounts-dialog.c:1604 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3386,25 +3389,26 @@ msgstr "" "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:1755 -msgid "_Enable" -msgstr "_Activar" +#. Menu item: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1795 +msgid "_Enabled" +msgstr "_Activado" -#: ../src/empathy-accounts-dialog.c:1756 -msgid "_Disable" -msgstr "_Desactivar" +#. Menu item: Rename +#: ../src/empathy-accounts-dialog.c:1818 +msgid "Rename" +msgstr "Renomear" -#: ../src/empathy-accounts-dialog.c:2184 +#: ../src/empathy-accounts-dialog.c:2234 msgid "_Skip" msgstr "_Omitir" -#: ../src/empathy-accounts-dialog.c:2188 +#: ../src/empathy-accounts-dialog.c:2238 msgid "_Connect" msgstr "_Conectar" # rever -#: ../src/empathy-accounts-dialog.c:2365 +#: ../src/empathy-accounts-dialog.c:2415 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3494,33 +3498,33 @@ msgstr "Detalles" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title #: ../src/empathy-streamed-media-window.c:1211 -#: ../src/empathy-call-window.c:1889 +#: ../src/empathy-call-window.c:1861 #, c-format msgid "Call with %s" msgstr "Chamada con %s" #: ../src/empathy-streamed-media-window.c:1444 -#: ../src/empathy-call-window.c:2133 +#: ../src/empathy-call-window.c:2105 msgid "The IP address as seen by the machine" msgstr "O enderezo IP como é visto polo computador" #: ../src/empathy-streamed-media-window.c:1446 -#: ../src/empathy-call-window.c:2135 +#: ../src/empathy-call-window.c:2107 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-streamed-media-window.c:1448 -#: ../src/empathy-call-window.c:2137 +#: ../src/empathy-call-window.c:2109 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-streamed-media-window.c:1450 -#: ../src/empathy-call-window.c:2139 +#: ../src/empathy-call-window.c:2111 msgid "The IP address of a relay server" msgstr "O enderezo IP dun servidor de desvío" #: ../src/empathy-streamed-media-window.c:1452 -#: ../src/empathy-call-window.c:2141 +#: ../src/empathy-call-window.c:2113 msgid "The IP address of the multicast group" msgstr "O enderezo IP do grupo multicast" @@ -3541,12 +3545,12 @@ msgstr "Conectado — %d:%02dm" # rever #: ../src/empathy-streamed-media-window.c:2199 -#: ../src/empathy-call-window.c:2992 +#: ../src/empathy-call-window.c:2964 msgid "Technical Details" msgstr "Detalles técnicos" #: ../src/empathy-streamed-media-window.c:2237 -#: ../src/empathy-call-window.c:3031 +#: ../src/empathy-call-window.c:3003 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3556,7 +3560,7 @@ msgstr "" "computador" #: ../src/empathy-streamed-media-window.c:2242 -#: ../src/empathy-call-window.c:3036 +#: ../src/empathy-call-window.c:3008 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3566,7 +3570,7 @@ msgstr "" "computador" #: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:3042 +#: ../src/empathy-call-window.c:3014 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3576,24 +3580,24 @@ msgstr "" "que non permite conexións directas." #: ../src/empathy-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:3048 +#: ../src/empathy-call-window.c:3020 msgid "There was a failure on the network" msgstr "Produciuse un fallo na rede" #: ../src/empathy-streamed-media-window.c:2258 -#: ../src/empathy-call-window.c:3052 +#: ../src/empathy-call-window.c:3024 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-streamed-media-window.c:2261 -#: ../src/empathy-call-window.c:3055 +#: ../src/empathy-call-window.c:3027 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-streamed-media-window.c:2271 -#: ../src/empathy-call-window.c:3067 +#: ../src/empathy-call-window.c:3039 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3605,22 +3609,22 @@ msgstr "" "«Depuración» no menú Axuda." #: ../src/empathy-streamed-media-window.c:2279 -#: ../src/empathy-call-window.c:3076 +#: ../src/empathy-call-window.c:3048 msgid "There was a failure in the call engine" msgstr "Produciuse un fallo ao chamar ao motor" #: ../src/empathy-streamed-media-window.c:2282 -#: ../src/empathy-call-window.c:3079 +#: ../src/empathy-call-window.c:3051 msgid "The end of the stream was reached" msgstr "Chegouse ao final do fluxo" #: ../src/empathy-streamed-media-window.c:2322 -#: ../src/empathy-call-window.c:3119 +#: ../src/empathy-call-window.c:3091 msgid "Can't establish audio stream" msgstr "Non é posíbel estabelecer un fluxo de audio" #: ../src/empathy-streamed-media-window.c:2332 -#: ../src/empathy-call-window.c:3129 +#: ../src/empathy-call-window.c:3101 msgid "Can't establish video stream" msgstr "Non é posíbel estabelecer un fluxo de vídeo" @@ -3735,8 +3739,8 @@ msgstr "Códec de codificación:" #: ../src/empathy-call-window.ui.h:28 #: ../src/empathy-streamed-media-window.ui.h:21 -#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543 -#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545 +#: ../src/empathy-call-window.c:2514 ../src/empathy-call-window.c:2515 +#: ../src/empathy-call-window.c:2516 ../src/empathy-call-window.c:2517 msgid "Unknown" msgstr "Descoñecido" @@ -3941,7 +3945,7 @@ msgid "Incoming video call" msgstr "Chamada de vídeo entrante" # rever -#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519 +#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1483 msgid "Incoming call" msgstr "Chamada entrante" @@ -3958,7 +3962,7 @@ msgid "%s is calling you. Do you want to answer?" msgstr "%s estao chamando. Quere responder?" #: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731 -#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525 +#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming call from %s" msgstr "Chamada entrante de %s" @@ -3977,7 +3981,7 @@ msgid "_Answer with video" msgstr "_Responder con vídeo" #: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764 -#: ../src/empathy-call-window.c:1525 +#: ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming video call from %s" msgstr "Videochamada entrante de %s" @@ -4187,15 +4191,15 @@ msgid "Import Accounts" msgstr "Importar contas" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:316 +#: ../src/empathy-import-widget.c:303 msgid "Import" msgstr "Importar" -#: ../src/empathy-import-widget.c:325 +#: ../src/empathy-import-widget.c:312 msgid "Protocol" msgstr "Protocolo" -#: ../src/empathy-import-widget.c:349 +#: ../src/empathy-import-widget.c:336 msgid "Source" msgstr "Orixe" @@ -4380,7 +4384,7 @@ msgstr "Membros" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. -#: ../src/empathy-new-chatroom-dialog.c:637 +#: ../src/empathy-new-chatroom-dialog.c:636 #, c-format msgid "" "%s\n" @@ -4393,21 +4397,21 @@ msgstr "" "Requírese contrasinal: %s\n" "Membros: %s" +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "Si" +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "Non" -#: ../src/empathy-new-chatroom-dialog.c:668 +#: ../src/empathy-new-chatroom-dialog.c:666 msgid "Could not start room listing" msgstr "Non foi posíbel arrincar a lista da sala" -#: ../src/empathy-new-chatroom-dialog.c:678 +#: ../src/empathy-new-chatroom-dialog.c:676 msgid "Could not stop room listing" msgstr "Non foi posíbel deter a lista da sala" @@ -4482,47 +4486,47 @@ msgid "Language" msgstr "Idioma" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:726 +#: ../src/empathy-preferences.c:724 msgid "Juliet" msgstr "Xulieta" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:733 +#: ../src/empathy-preferences.c:731 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:739 +#: ../src/empathy-preferences.c:737 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Oh, Romeu, Romeu!, ¿onde estás que non te vexo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:743 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "Nega ao teu pai e rexeita o teu nome;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:746 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "Ou, se non queres, xúrame tan só que me amas" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:749 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "E deixarei eu de ser un Capuleto." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:752 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "Debo escoitar máis ou contestar ao dito?" # rever #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:755 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "Xulieta desconectouse" -#: ../src/empathy-preferences.c:1159 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "Preferencias" @@ -4783,11 +4787,6 @@ msgstr "Ligazón a pastebin" msgid "Pastebin response" msgstr "Resposta de pastebin" -#: ../src/empathy-debug-window.c:1680 -#, c-format -msgid "%s" -msgstr "%s" - #: ../src/empathy-debug-window.c:1683 msgid "Data too large for a single paste. Please save logs to file." msgstr "" @@ -4917,40 +4916,40 @@ msgstr "Depurador de Empathy" msgid "- Empathy Chat Client" msgstr "- Cliente de conversa Empathy" -#: ../src/empathy-notifications-approver.c:189 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "Responder" -#: ../src/empathy-notifications-approver.c:203 -#: ../src/empathy-call-window.c:1529 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1493 msgid "Reject" msgstr "Rexeitar" # rever -#: ../src/empathy-notifications-approver.c:208 -#: ../src/empathy-notifications-approver.c:213 -#: ../src/empathy-call-window.c:1530 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1494 msgid "Answer" msgstr "Responder" -#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "Responder con vídeo" -#: ../src/empathy-notifications-approver.c:221 -#: ../src/empathy-notifications-approver.c:231 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "Rexeitar" -#: ../src/empathy-notifications-approver.c:225 -#: ../src/empathy-notifications-approver.c:236 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "Aceptar" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:246 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "Fornecer" @@ -4961,39 +4960,39 @@ msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada." #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162 +#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140 msgid "i" msgstr "Información" -#: ../src/empathy-call-window.c:2888 +#: ../src/empathy-call-window.c:2860 msgid "On hold" msgstr "En espera" -#: ../src/empathy-call-window.c:2891 +#: ../src/empathy-call-window.c:2863 msgid "Mute" msgstr "Silenciar" -#: ../src/empathy-call-window.c:2893 +#: ../src/empathy-call-window.c:2865 msgid "Duration" msgstr "Duración" # rever #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2896 +#: ../src/empathy-call-window.c:2868 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:3166 +#: ../src/empathy-call-window.c:3138 #, c-format msgid "Your current balance is %s." msgstr "O seu crédito actual é %s." -#: ../src/empathy-call-window.c:3170 +#: ../src/empathy-call-window.c:3142 msgid "Sorry, you don’t have enough credit for that call." msgstr "Non ten crédito dabondo para facer esta chamada." -#: ../src/empathy-call-window.c:3172 +#: ../src/empathy-call-window.c:3144 msgid "Top Up" msgstr "Recargar" @@ -5034,6 +5033,15 @@ msgstr "" "característica usando o diálogo <span style=\"italic\">Editar → Contas</" "span> na Lista de contactos." +#~ msgid "_Enable" +#~ msgstr "_Activar" + +#~ msgid "_Disable" +#~ msgstr "_Desactivar" + +#~ msgid "%s" +#~ msgstr "%s" + # rever #~ msgid "There was an error while importing the accounts." #~ msgstr "Produciuse un erro ao importar as contas." @@ -5352,9 +5360,6 @@ msgstr "" #~ msgid "_For:" #~ msgstr "_Por:" -#~ msgid "_Enabled" -#~ msgstr "_Activado" - #~ msgid "Context" #~ msgstr "Contexto" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-24 19:28+0200\n" -"PO-Revision-Date: 2012-03-24 19:30+0200\n" +"POT-Creation-Date: 2012-04-13 01:01+0300\n" +"PO-Revision-Date: 2012-04-13 01:02+0200\n" "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" "Language-Team: \n" "Language: \n" @@ -39,7 +39,7 @@ msgstr "ניהול חשבונות התכתבות ו־VoIP" #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/empathy-accounts-dialog.c:2513 +#: ../src/empathy-accounts-dialog.c:2527 msgid "Messaging and VoIP Accounts" msgstr "חשבונות התכתבות ו־VoIP" @@ -513,19 +513,19 @@ msgstr "הקובץ הנבחר אינו קובץ רגיל" msgid "The selected file is empty" msgstr "הקובץ הנבחר ריק" -#: ../libempathy/empathy-message.c:415 +#: ../libempathy/empathy-message.c:407 #: ../src/empathy-call-observer.c:129 #, c-format msgid "Missed call from %s" msgstr "שיחה שלא נענתה מאת %s" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:419 +#: ../libempathy/empathy-message.c:411 #, c-format msgid "Called %s" msgstr "התקשרת ל%s" -#: ../libempathy/empathy-message.c:422 +#: ../libempathy/empathy-message.c:414 #, c-format msgid "Call from %s" msgstr "שיחה מאת %s" @@ -762,7 +762,7 @@ msgid "All accounts" msgstr "כל החשבונות" #: ../libempathy-gtk/empathy-account-widget.c:682 -#: ../src/empathy-import-widget.c:336 +#: ../src/empathy-import-widget.c:323 msgid "Account" msgstr "חשבון" @@ -799,11 +799,11 @@ msgstr "ה_חלה" msgid "L_og in" msgstr "_כניסה" -#: ../libempathy-gtk/empathy-account-widget.c:1812 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "חשבון זה כבר קיים על השרת" -#: ../libempathy-gtk/empathy-account-widget.c:1816 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "יצירת חשבון חדש על השרת" @@ -812,19 +812,19 @@ msgstr "יצירת חשבון חדש על השרת" #. * like: "MyUserName on freenode". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:2241 +#: ../libempathy-gtk/empathy-account-widget.c:2236 #, 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:2267 +#: ../libempathy-gtk/empathy-account-widget.c:2262 #, c-format msgid "%s Account" msgstr "חשבון %s" -#: ../libempathy-gtk/empathy-account-widget.c:2271 +#: ../libempathy-gtk/empathy-account-widget.c:2266 msgid "New account" msgstr "חשבון חדש" @@ -850,7 +850,7 @@ msgstr "מתקדם" #: ../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:13 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "Pass_word:" msgstr "ססמ_ה:" @@ -860,7 +860,7 @@ msgstr "ססמ_ה:" #: ../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:16 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 msgid "Remember Password" msgstr "שמירת הססמה" @@ -870,7 +870,7 @@ msgstr "שמירת הססמה" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 #: ../libempathy-gtk/empathy-base-password-dialog.c:261 msgid "Remember password" @@ -946,36 +946,32 @@ msgstr "מספר מנוי ה־ICQ שלך?" msgid "What is your ICQ password?" msgstr "ססמת ה־ICQ שלך?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:206 -#: ../libempathy-gtk/empathy-account-widget-sip.c:239 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 +#: ../libempathy-gtk/empathy-account-widget-sip.c:240 msgid "Auto" msgstr "אוטומטי" -#: ../libempathy-gtk/empathy-account-widget-sip.c:209 +#: ../libempathy-gtk/empathy-account-widget-sip.c:210 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:212 +#: ../libempathy-gtk/empathy-account-widget-sip.c:213 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:215 +#: ../libempathy-gtk/empathy-account-widget-sip.c:216 msgid "TLS" msgstr "TLS" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:244 +#: ../libempathy-gtk/empathy-account-widget-sip.c:245 msgid "Register" msgstr "הרשמה" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:249 +#: ../libempathy-gtk/empathy-account-widget-sip.c:250 msgid "Options" msgstr "אפשרויות" -#: ../libempathy-gtk/empathy-account-widget-sip.c:252 +#: ../libempathy-gtk/empathy-account-widget-sip.c:253 msgid "None" msgstr "ללא" @@ -1186,55 +1182,59 @@ msgid "Keep-Alive Options" msgstr "אפשרויות Keep-Alive" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 +msgid "Local IP Address:" +msgstr "כתובת IP מקומית:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 msgid "Loose Routing" msgstr "Loose Routing" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 msgid "Mechanism:" msgstr "מנגנון:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 msgid "Miscellaneous Options" msgstr "אפשרויות אחרות" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 msgid "NAT Traversal Options" msgstr "אפשרויות מעקף NAT" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 msgid "Port:" msgstr "_פתחה:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 msgid "Proxy Options" msgstr "אפשרויות מתווך" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 msgid "STUN Server:" msgstr "שרת STUN:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 #: ../libempathy-gtk/empathy-contactinfo-utils.c:114 msgid "Server:" msgstr "שרת:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 msgid "Transport:" msgstr "תעבורה:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 msgid "Use this account to call _landlines and mobile phones" msgstr "יש להשתמש בחשבון זה על מנת להתקשר לטלפונים ניי_חים וניידים" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP account password?" msgstr "מהי ססמת חשבון ה־SIP שלך?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "What is your SIP login ID?" msgstr "מהו מזהה ההתחברות של חשבון ה־SIP שלך?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 msgid "_Username:" msgstr "ש_ם משתמש:" @@ -1320,194 +1320,194 @@ msgstr "אין תמיכה בשיחות חירום בפרוטוקול זה" msgid "You don't have enough credit in order to place this call" msgstr "אין לך די אשראי כדי לבצע שיחה זו" -#: ../libempathy-gtk/empathy-chat.c:729 +#: ../libempathy-gtk/empathy-chat.c:727 msgid "Failed to open private chat" msgstr "ארע כשל בפתיחת שיחה פרטית" -#: ../libempathy-gtk/empathy-chat.c:787 +#: ../libempathy-gtk/empathy-chat.c:785 msgid "Topic not supported on this conversation" msgstr "אין תמיכה בשימוש בנושא בדיון זה" -#: ../libempathy-gtk/empathy-chat.c:793 +#: ../libempathy-gtk/empathy-chat.c:791 msgid "You are not allowed to change the topic" msgstr "אין לך הרשאה לשנות את הנושא" -#: ../libempathy-gtk/empathy-chat.c:992 +#: ../libempathy-gtk/empathy-chat.c:990 #, c-format msgid "“%s” is not a valid contact ID" msgstr "\"%s\" אינו מזהה איש קשר לא תקין" -#: ../libempathy-gtk/empathy-chat.c:1087 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: פינוי כל ההודעות מהדיון הנוכחי" -#: ../libempathy-gtk/empathy-chat.c:1090 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <נושא>: הגדרת נושא השיחה הנוכחית" -#: ../libempathy-gtk/empathy-chat.c:1093 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <זיהוי החדר>: הצטרפות לחדר שיחה חדש" -#: ../libempathy-gtk/empathy-chat.c:1096 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <זיהוי החדר>: הצטרפות לחדר שיחה חדש" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1098 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one" msgstr "/part [<זיהוי החדר>] [<סיבה>]: עזיבת ערוץ השיחה, הנוכחי הוא בררת המחדל" -#: ../libempathy-gtk/empathy-chat.c:1104 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <זיהוי איש הקשר> [<הודעה>]: פתיחת צ׳אט אישי" -#: ../libempathy-gtk/empathy-chat.c:1107 +#: ../libempathy-gtk/empathy-chat.c:1105 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <זיהוי איש הקשר> <הודעה>: פתיחת צ׳אט פרטי" -#: ../libempathy-gtk/empathy-chat.c:1110 +#: ../libempathy-gtk/empathy-chat.c:1108 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <כינוי>: שינוי הכינוי שלך בשרת הנוכחי" -#: ../libempathy-gtk/empathy-chat.c:1113 +#: ../libempathy-gtk/empathy-chat.c:1111 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <הודעה>: שליחת הודעת ACTION לדיון הנוכחי" -#: ../libempathy-gtk/empathy-chat.c:1116 +#: ../libempathy-gtk/empathy-chat.c:1114 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:1121 +#: ../libempathy-gtk/empathy-chat.c:1119 msgid "/whois <contact ID>: display information about a contact" msgstr "/whois <מזהה המשתמש>: הצגת פרטים על איש הקשר" -#: ../libempathy-gtk/empathy-chat.c:1124 +#: ../libempathy-gtk/empathy-chat.c:1122 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage." msgstr "/help [<פקודה>]: הצגת כל הפקודות הנתמכות. אם יש הגדרה ל־<פקודה> יוצג אופן הפעלתה." -#: ../libempathy-gtk/empathy-chat.c:1143 +#: ../libempathy-gtk/empathy-chat.c:1141 #, c-format msgid "Usage: %s" msgstr "שימוש: %s" -#: ../libempathy-gtk/empathy-chat.c:1188 +#: ../libempathy-gtk/empathy-chat.c:1186 msgid "Unknown command" msgstr "פקודה לא ידועה" -#: ../libempathy-gtk/empathy-chat.c:1314 +#: ../libempathy-gtk/empathy-chat.c:1312 msgid "Unknown command; see /help for the available commands" msgstr "פקודה בלתי מוכרת; יש לעיין ב־/help לצפייה בפקודות הזמינות" -#: ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1563 msgid "insufficient balance to send message" msgstr "המאזן אינו מאפשר לשלוח הודעה" -#: ../libempathy-gtk/empathy-chat.c:1569 -#: ../libempathy-gtk/empathy-chat.c:1583 -#: ../libempathy-gtk/empathy-chat.c:1646 +#: ../libempathy-gtk/empathy-chat.c:1567 +#: ../libempathy-gtk/empathy-chat.c:1581 +#: ../libempathy-gtk/empathy-chat.c:1644 #, c-format msgid "Error sending message '%s': %s" msgstr "שגיאה בשליחת ההודעה '%s': %s" -#: ../libempathy-gtk/empathy-chat.c:1571 -#: ../libempathy-gtk/empathy-chat.c:1588 -#: ../libempathy-gtk/empathy-chat.c:1650 +#: ../libempathy-gtk/empathy-chat.c:1569 +#: ../libempathy-gtk/empathy-chat.c:1586 +#: ../libempathy-gtk/empathy-chat.c:1648 #, c-format msgid "Error sending message: %s" msgstr "שגיאה בשליחת ההודעה: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1577 +#: ../libempathy-gtk/empathy-chat.c:1575 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "המאזן אינו מאפשר לשלוח הודעה. <a href='%s'>Top up</a>." -#: ../libempathy-gtk/empathy-chat.c:1617 +#: ../libempathy-gtk/empathy-chat.c:1615 msgid "not capable" msgstr "ללא יכולת" -#: ../libempathy-gtk/empathy-chat.c:1624 +#: ../libempathy-gtk/empathy-chat.c:1622 msgid "offline" msgstr "לא מחובר" -#: ../libempathy-gtk/empathy-chat.c:1627 +#: ../libempathy-gtk/empathy-chat.c:1625 msgid "invalid contact" msgstr "איש קשר לא תקין" -#: ../libempathy-gtk/empathy-chat.c:1630 +#: ../libempathy-gtk/empathy-chat.c:1628 msgid "permission denied" msgstr "איש קשר לא תקין" -#: ../libempathy-gtk/empathy-chat.c:1633 +#: ../libempathy-gtk/empathy-chat.c:1631 msgid "too long message" msgstr "הודעה ארוכה מדי" -#: ../libempathy-gtk/empathy-chat.c:1636 +#: ../libempathy-gtk/empathy-chat.c:1634 msgid "not implemented" msgstr "לא ממומש" -#: ../libempathy-gtk/empathy-chat.c:1640 +#: ../libempathy-gtk/empathy-chat.c:1638 msgid "unknown" msgstr "לא ידוע" -#: ../libempathy-gtk/empathy-chat.c:1707 -#: ../src/empathy-chat-window.c:920 +#: ../libempathy-gtk/empathy-chat.c:1705 +#: ../src/empathy-chat-window.c:919 msgid "Topic:" msgstr "נושא:" -#: ../libempathy-gtk/empathy-chat.c:1722 +#: ../libempathy-gtk/empathy-chat.c:1720 #, c-format msgid "Topic set to: %s" msgstr "הנושא הוגדר ל־: %s" -#: ../libempathy-gtk/empathy-chat.c:1724 +#: ../libempathy-gtk/empathy-chat.c:1722 #, c-format msgid "Topic set by %s to: %s" msgstr "הנושא הוגדר על ידי %s בתור: %s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1729 +#: ../libempathy-gtk/empathy-chat.c:1727 msgid "No topic defined" msgstr "לא נקבע נושא" -#: ../libempathy-gtk/empathy-chat.c:2245 +#: ../libempathy-gtk/empathy-chat.c:2243 msgid "(No Suggestions)" msgstr "(אין הצעות)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2313 +#: ../libempathy-gtk/empathy-chat.c:2311 #, 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:2350 +#: ../libempathy-gtk/empathy-chat.c:2348 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "הוספת '%s' למילון %s" -#: ../libempathy-gtk/empathy-chat.c:2420 +#: ../libempathy-gtk/empathy-chat.c:2418 msgid "Insert Smiley" msgstr "הכנס סמיילי" #. send button -#: ../libempathy-gtk/empathy-chat.c:2438 +#: ../libempathy-gtk/empathy-chat.c:2436 #: ../libempathy-gtk/empathy-ui-utils.c:1880 msgid "_Send" msgstr "_שלח" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2495 +#: ../libempathy-gtk/empathy-chat.c:2493 msgid "_Spelling Suggestions" msgstr "הצעות _איות" -#: ../libempathy-gtk/empathy-chat.c:2584 +#: ../libempathy-gtk/empathy-chat.c:2582 msgid "Failed to retrieve recent logs" msgstr "ארע כשל בקבלת הדוחות האחרונים" -#: ../libempathy-gtk/empathy-chat.c:2723 +#: ../libempathy-gtk/empathy-chat.c:2721 #, c-format msgid "%s has disconnected" msgstr "%s התנתק" @@ -1515,12 +1515,12 @@ msgstr "%s התנתק" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2730 +#: ../libempathy-gtk/empathy-chat.c:2728 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s סולק על ידי %2$s" -#: ../libempathy-gtk/empathy-chat.c:2733 +#: ../libempathy-gtk/empathy-chat.c:2731 #, c-format msgid "%s was kicked" msgstr "%s סולק" @@ -1528,17 +1528,17 @@ msgstr "%s סולק" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2741 +#: ../libempathy-gtk/empathy-chat.c:2739 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s נחסם על ידי %2$s" -#: ../libempathy-gtk/empathy-chat.c:2744 +#: ../libempathy-gtk/empathy-chat.c:2742 #, c-format msgid "%s was banned" msgstr "%s נחסם" -#: ../libempathy-gtk/empathy-chat.c:2748 +#: ../libempathy-gtk/empathy-chat.c:2746 #, c-format msgid "%s has left the room" msgstr "%s עזב את החדר" @@ -1548,17 +1548,17 @@ msgstr "%s עזב את החדר" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2757 +#: ../libempathy-gtk/empathy-chat.c:2755 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2782 +#: ../libempathy-gtk/empathy-chat.c:2780 #, c-format msgid "%s has joined the room" msgstr "%s הצטרף לחדר" -#: ../libempathy-gtk/empathy-chat.c:2807 +#: ../libempathy-gtk/empathy-chat.c:2805 #, c-format msgid "%s is now known as %s" msgstr "%s נודע כעת בכינוי %s" @@ -1566,58 +1566,58 @@ msgstr "%s נודע כעת בכינוי %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2994 +#: ../libempathy-gtk/empathy-chat.c:2992 #: ../src/empathy-streamed-media-window.c:1888 #: ../src/empathy-event-manager.c:1279 -#: ../src/empathy-call-window.c:1502 -#: ../src/empathy-call-window.c:1552 -#: ../src/empathy-call-window.c:2590 +#: ../src/empathy-call-window.c:1466 +#: ../src/empathy-call-window.c:1516 +#: ../src/empathy-call-window.c:2562 msgid "Disconnected" msgstr "מנותק" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3658 +#: ../libempathy-gtk/empathy-chat.c:3656 msgid "Would you like to store this password?" msgstr "האם ברצונך לאחסן ססמה זו?" -#: ../libempathy-gtk/empathy-chat.c:3664 +#: ../libempathy-gtk/empathy-chat.c:3662 msgid "Remember" msgstr "שמירה" -#: ../libempathy-gtk/empathy-chat.c:3674 +#: ../libempathy-gtk/empathy-chat.c:3672 msgid "Not now" msgstr "לא כעת" -#: ../libempathy-gtk/empathy-chat.c:3718 +#: ../libempathy-gtk/empathy-chat.c:3716 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "ניסיון חוזר" -#: ../libempathy-gtk/empathy-chat.c:3722 +#: ../libempathy-gtk/empathy-chat.c:3720 msgid "Wrong password; please try again:" msgstr "ססמה שגויה; נא לנסות שוב:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3852 +#: ../libempathy-gtk/empathy-chat.c:3850 msgid "This room is protected by a password:" msgstr "חדר זה מוגן בססמה:" -#: ../libempathy-gtk/empathy-chat.c:3879 +#: ../libempathy-gtk/empathy-chat.c:3877 msgid "Join" msgstr "הצטרפות" -#: ../libempathy-gtk/empathy-chat.c:4071 +#: ../libempathy-gtk/empathy-chat.c:4069 #: ../src/empathy-event-manager.c:1300 msgid "Connected" msgstr "מחובר" -#: ../libempathy-gtk/empathy-chat.c:4126 +#: ../libempathy-gtk/empathy-chat.c:4124 msgid "Conversation" msgstr "שיחה" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4131 +#: ../libempathy-gtk/empathy-chat.c:4129 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" @@ -1648,7 +1648,7 @@ msgstr "עריכת אנשי הקשר החסומים" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:503 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 #: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:1 @@ -1720,157 +1720,157 @@ msgid "_Block User" msgstr "_חסימת משתמש" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:496 msgid "Search contacts" msgstr "חיפוש בין אנשי הקשר" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:526 msgid "Search: " msgstr "חיפוש:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:584 msgid "_Add Contact" msgstr "הוספת _איש קשר" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:602 msgid "No contacts found" msgstr "לא נמצאו אנשי קשר" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:618 msgid "Your message introducing yourself:" msgstr "ההודעה המציגה אותך:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:626 msgid "Please let me see when you're online. Thanks!" msgstr "נא לאפשר לי לראות מתי מצבך הוא מחובר. תודה!" -#: ../libempathy-gtk/empathy-contact-widget.c:567 +#: ../libempathy-gtk/empathy-contact-widget.c:566 #: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "ערוצים:" -#: ../libempathy-gtk/empathy-contact-widget.c:747 +#: ../libempathy-gtk/empathy-contact-widget.c:746 #: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "קוד המדינה בתקן ISO:" -#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-contact-widget.c:748 #: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "ארץ:" -#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-contact-widget.c:750 #: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "מדינה:" -#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-contact-widget.c:752 #: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "עיר:" -#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-contact-widget.c:754 #: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "אזור:" -#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-contact-widget.c:756 #: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "מיקוד:" -#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-contact-widget.c:758 #: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "רחוב:" -#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-contact-widget.c:760 #: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "מבנה:" -#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-contact-widget.c:762 #: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "קומה:" -#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-contact-widget.c:764 #: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "חדר:" -#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-contact-widget.c:766 #: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "טקסט:" -#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-contact-widget.c:768 #: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "תיאור:" -#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-contact-widget.c:770 #: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "כתובת:" -#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-contact-widget.c:772 #: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "רמת דיוק:" -#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-contact-widget.c:774 #: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "שגיאה:" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:776 #: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "סטייה אנכית (מטרים):" -#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-contact-widget.c:778 #: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "סטייה אופקית (מטרים):" -#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-contact-widget.c:780 #: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "מהירות:" -#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-contact-widget.c:782 #: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "אזימוט:" -#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-contact-widget.c:784 #: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "מהירות הטיפוס:" -#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-contact-widget.c:786 #: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "עדכון אחרון ב־:" -#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-contact-widget.c:788 #: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "קו אורך:" -#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-contact-widget.c:790 #: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "קו רוחב:" -#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-contact-widget.c:792 #: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "גובה:" -#: ../libempathy-gtk/empathy-contact-widget.c:846 -#: ../libempathy-gtk/empathy-contact-widget.c:861 +#: ../libempathy-gtk/empathy-contact-widget.c:845 +#: ../libempathy-gtk/empathy-contact-widget.c:860 #: ../libempathy-gtk/empathy-individual-widget.c:593 #: ../libempathy-gtk/empathy-individual-widget.c:608 #: ../src/empathy-preferences.ui.h:15 @@ -1878,32 +1878,32 @@ msgid "Location" msgstr "מיקום" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-contact-widget.c:862 #: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:915 +#: ../libempathy-gtk/empathy-contact-widget.c:914 #: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y ב־%R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:997 +#: ../libempathy-gtk/empathy-contact-widget.c:996 #: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "שמירת תמונה אישית" -#: ../libempathy-gtk/empathy-contact-widget.c:1053 +#: ../libempathy-gtk/empathy-contact-widget.c:1052 #: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "לא ניתן לשמור תמונה אישית" -#: ../libempathy-gtk/empathy-contact-widget.c:1444 +#: ../libempathy-gtk/empathy-contact-widget.c:1454 msgid "Personal Details" msgstr "פרטים אישיים" -#: ../libempathy-gtk/empathy-contact-widget.c:1447 +#: ../libempathy-gtk/empathy-contact-widget.c:1457 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 #: ../libempathy-gtk/empathy-individual-widget.ui.h:2 msgid "Contact Details" @@ -2012,25 +2012,25 @@ msgstr "מערכת הפעלה:" msgid "Version:" msgstr "גרסה:" -#: ../libempathy-gtk/empathy-groups-widget.c:331 +#: ../libempathy-gtk/empathy-groups-widget.c:327 msgid "Groups" msgstr "קבוצות" -#: ../libempathy-gtk/empathy-groups-widget.c:343 +#: ../libempathy-gtk/empathy-groups-widget.c:339 msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups." msgstr "יש לבחור את הקבוצות בהן אתה מעוניין שאיש קשר זה יופיע. ניתן לבחור ביותר מקבוצה אחת או לא לבחור קבוצות בכלל." -#: ../libempathy-gtk/empathy-groups-widget.c:362 +#: ../libempathy-gtk/empathy-groups-widget.c:358 msgid "_Add Group" msgstr "הוס_פת קבוצה" -#: ../libempathy-gtk/empathy-groups-widget.c:397 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "בחירה" -#: ../libempathy-gtk/empathy-groups-widget.c:407 -#: ../src/empathy-roster-window.c:1970 +#: ../libempathy-gtk/empathy-groups-widget.c:403 +#: ../src/empathy-roster-window.c:1969 msgid "Group" msgstr "קבוצה" @@ -2058,108 +2058,109 @@ 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:173 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:345 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "נא לבחור את החשבון לשימוש לצורך ההתקשרות" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:349 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:2 #: ../src/empathy-streamed-media-window.c:1290 #: ../src/empathy-call-window.ui.h:2 msgid "Call" msgstr "התקשרות" -#: ../libempathy-gtk/empathy-individual-menu.c:414 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "סלולרי" -#: ../libempathy-gtk/empathy-individual-menu.c:416 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "עבודה" -#: ../libempathy-gtk/empathy-individual-menu.c:418 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "בית" -#: ../libempathy-gtk/empathy-individual-menu.c:659 +#: ../libempathy-gtk/empathy-individual-menu.c:658 msgid "_Block Contact" msgstr "ח_סימת איש קשר" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1018 +#: ../libempathy-gtk/empathy-individual-menu.c:1017 #: ../libempathy-gtk/empathy-new-message-dialog.c:319 #: ../src/empathy-roster-window-menubar.ui.h:16 msgid "_Chat" msgstr "_שיחה" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1053 +#: ../libempathy-gtk/empathy-individual-menu.c:1052 #: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1086 +#: ../libempathy-gtk/empathy-individual-menu.c:1085 msgctxt "menu item" msgid "_Audio Call" msgstr "שיחה _קולית" -#: ../libempathy-gtk/empathy-individual-menu.c:1119 +#: ../libempathy-gtk/empathy-individual-menu.c:1118 msgctxt "menu item" msgid "_Video Call" msgstr "שיחת _וידאו" -#: ../libempathy-gtk/empathy-individual-menu.c:1160 +#: ../libempathy-gtk/empathy-individual-menu.c:1159 #: ../src/empathy-roster-window-menubar.ui.h:26 msgid "_Previous Conversations" msgstr "שיחות _קודמות" -#: ../libempathy-gtk/empathy-individual-menu.c:1189 +#: ../libempathy-gtk/empathy-individual-menu.c:1188 msgid "Send File" msgstr "שליחת קובץ" -#: ../libempathy-gtk/empathy-individual-menu.c:1219 +#: ../libempathy-gtk/empathy-individual-menu.c:1218 msgid "Share My Desktop" msgstr "שיתוף שולחן העבודה שלי" -#: ../libempathy-gtk/empathy-individual-menu.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1244 #: ../libempathy-gtk/empathy-individual-widget.c:1357 msgid "Favorite" msgstr "מועדף" -#: ../libempathy-gtk/empathy-individual-menu.c:1264 +#: ../libempathy-gtk/empathy-individual-menu.c:1263 msgid "gnome-contacts not installed" msgstr "לא הותקנה התכנית gnome-contacts" -#: ../libempathy-gtk/empathy-individual-menu.c:1267 +#: ../libempathy-gtk/empathy-individual-menu.c:1266 msgid "Please install gnome-contacts to access contacts details." msgstr "נא להתקין את gnome-contacts כדי לכשת לפרטי אנשי הקשר." -#: ../libempathy-gtk/empathy-individual-menu.c:1398 +#: ../libempathy-gtk/empathy-individual-menu.c:1397 msgid "Infor_mation" msgstr "_מידע" -#: ../libempathy-gtk/empathy-individual-menu.c:1447 +#: ../libempathy-gtk/empathy-individual-menu.c:1446 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "ע_ריכה" -#: ../libempathy-gtk/empathy-individual-menu.c:1564 -#: ../src/empathy-chat-window.c:1192 +#. send invitation +#: ../libempathy-gtk/empathy-individual-menu.c:1562 +#: ../src/empathy-chat-window.c:1190 msgid "Inviting you to this room" msgstr "מזמין/ה אותך לחדר זה" -#: ../libempathy-gtk/empathy-individual-menu.c:1610 +#: ../libempathy-gtk/empathy-individual-menu.c:1608 msgid "_Invite to Chat Room" msgstr "ה_זמנה לחדר שיחה" -#: ../libempathy-gtk/empathy-individual-menu.c:1806 +#: ../libempathy-gtk/empathy-individual-menu.c:1804 #: ../src/empathy-roster-window-menubar.ui.h:14 msgid "_Add Contact…" msgstr "הוספת _איש קשר…" @@ -2237,135 +2238,135 @@ msgstr "שרת חדש" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:620 +#: ../libempathy-gtk/empathy-log-window.c:617 msgid "History" msgstr "היסטוריה" -#: ../libempathy-gtk/empathy-log-window.c:675 +#: ../libempathy-gtk/empathy-log-window.c:672 msgid "Show" msgstr "הצגה" -#: ../libempathy-gtk/empathy-log-window.c:697 +#: ../libempathy-gtk/empathy-log-window.c:694 msgid "Search" msgstr "חיפוש" -#: ../libempathy-gtk/empathy-log-window.c:1148 +#: ../libempathy-gtk/empathy-log-window.c:1145 #, c-format msgid "Chat in %s" msgstr "שיחה תחת %s" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1147 #, c-format msgid "Chat with %s" msgstr "שיחה עם %s" -#: ../libempathy-gtk/empathy-log-window.c:1200 -#: ../libempathy-gtk/empathy-log-window.c:1347 +#: ../libempathy-gtk/empathy-log-window.c:1197 +#: ../libempathy-gtk/empathy-log-window.c:1341 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A %d ב%B %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1289 +#: ../libempathy-gtk/empathy-log-window.c:1284 #, c-format msgid "<i>* %s %s</i>" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1295 +#: ../libempathy-gtk/empathy-log-window.c:1290 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1371 +#: ../libempathy-gtk/empathy-log-window.c:1365 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "שנייה אחת" msgstr[1] "%s שניות" -#: ../libempathy-gtk/empathy-log-window.c:1378 +#: ../libempathy-gtk/empathy-log-window.c:1372 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "דקה אחת" msgstr[1] "%s דקות" -#: ../libempathy-gtk/empathy-log-window.c:1386 +#: ../libempathy-gtk/empathy-log-window.c:1380 #, c-format msgid "Call took %s, ended at %s" msgstr "השיחה ארכה %s, הסתיימה ב־%s" -#: ../libempathy-gtk/empathy-log-window.c:1720 +#: ../libempathy-gtk/empathy-log-window.c:1711 msgid "Today" msgstr "היום" -#: ../libempathy-gtk/empathy-log-window.c:1724 +#: ../libempathy-gtk/empathy-log-window.c:1715 msgid "Yesterday" msgstr "אתמול" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1739 +#: ../libempathy-gtk/empathy-log-window.c:1730 msgid "%e %B %Y" msgstr "ה־%e ב%B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1827 -#: ../libempathy-gtk/empathy-log-window.c:3487 +#: ../libempathy-gtk/empathy-log-window.c:1834 +#: ../libempathy-gtk/empathy-log-window.c:3457 msgid "Anytime" msgstr "כל זמן שהוא" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2400 +#: ../libempathy-gtk/empathy-log-window.c:1933 +#: ../libempathy-gtk/empathy-log-window.c:2392 msgid "Anyone" msgstr "כל אחד" -#: ../libempathy-gtk/empathy-log-window.c:2713 +#: ../libempathy-gtk/empathy-log-window.c:2705 msgid "Who" msgstr "מי" -#: ../libempathy-gtk/empathy-log-window.c:2922 +#: ../libempathy-gtk/empathy-log-window.c:2914 msgid "When" msgstr "מתי" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3032 msgid "Anything" msgstr "כל דבר" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3034 msgid "Text chats" msgstr "מלל הצ׳אטים" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3035 #: ../src/empathy-preferences.ui.h:4 msgid "Calls" msgstr "שיחות" -#: ../libempathy-gtk/empathy-log-window.c:3047 +#: ../libempathy-gtk/empathy-log-window.c:3039 msgid "Incoming calls" msgstr "שיחות נכנסות" -#: ../libempathy-gtk/empathy-log-window.c:3048 +#: ../libempathy-gtk/empathy-log-window.c:3040 msgid "Outgoing calls" msgstr "שיחות יוצאות" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3041 msgid "Missed calls" msgstr "שיחות שלא נענו" -#: ../libempathy-gtk/empathy-log-window.c:3071 +#: ../libempathy-gtk/empathy-log-window.c:3061 msgid "What" msgstr "מה" -#: ../libempathy-gtk/empathy-log-window.c:3780 +#: ../libempathy-gtk/empathy-log-window.c:3750 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "האם אכן ברצונך למחוק את כל היומנים של הדיונים האחרונים שלך?" -#: ../libempathy-gtk/empathy-log-window.c:3784 +#: ../libempathy-gtk/empathy-log-window.c:3754 msgid "Clear All" msgstr "מחיקת הכול" -#: ../libempathy-gtk/empathy-log-window.c:3791 +#: ../libempathy-gtk/empathy-log-window.c:3761 msgid "Delete from:" msgstr "מחיקה עד מ־:" @@ -2497,30 +2498,40 @@ msgstr "" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:167 -#: ../libempathy-gtk/empathy-presence-chooser.c:203 +#: ../libempathy-gtk/empathy-presence-chooser.c:166 +#: ../libempathy-gtk/empathy-presence-chooser.c:202 msgid "Custom Message…" msgstr "הודעה מותאמת אישית…" -#: ../libempathy-gtk/empathy-presence-chooser.c:220 -#: ../libempathy-gtk/empathy-presence-chooser.c:222 +#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:221 msgid "Edit Custom Messages…" msgstr "עריכת ההודעות המותאמות אישית…" -#: ../libempathy-gtk/empathy-presence-chooser.c:345 +#: ../libempathy-gtk/empathy-presence-chooser.c:344 msgid "Click to remove this status as a favorite" msgstr "יש ללחוץ כדי להסיר מצב זה מהמועדפים" -#: ../libempathy-gtk/empathy-presence-chooser.c:354 +#: ../libempathy-gtk/empathy-presence-chooser.c:353 msgid "Click to make this status a favorite" msgstr "יש ללחוץ כדי להוסיף מצב זה למועדפים" -#: ../libempathy-gtk/empathy-presence-chooser.c:388 +#. Translators: %s is a status message like 'At the pub' for example +#: ../libempathy-gtk/empathy-presence-chooser.c:387 +#, c-format +msgid "" +"<b>Current message: %s</b>\n" +"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>" +msgstr "" +"<b>הודעה נוכחית: %s</b>\n" +"<small>יש ללחוץ על Enter כדי להגדיר הודעה חדשה או Esc כדי לבטל.</small>" + +#: ../libempathy-gtk/empathy-presence-chooser.c:396 msgid "Set status" msgstr "הגדרת מצב" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1135 +#: ../libempathy-gtk/empathy-presence-chooser.c:1147 msgid "Custom messages…" msgstr "הודעות מותאמות אישית…" @@ -2893,31 +2904,31 @@ msgstr "בחירה..." msgid "_Select" msgstr "_בחירה" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201 msgid "No error message" msgstr "אין הודעת שגיאה" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274 msgid "Instant Message (Empathy)" msgstr "הודעה מיידית (Empathy)" -#: ../src/empathy.c:435 +#: ../src/empathy.c:425 msgid "Don't connect on startup" msgstr "לא להתחבר בהפעלה" -#: ../src/empathy.c:439 +#: ../src/empathy.c:429 msgid "Don't display the contact list or any other dialogs on startup" msgstr "אין להציג את רשימת אנשי הקשר או כל דו־שיח אחר בהפעלה" -#: ../src/empathy.c:454 +#: ../src/empathy.c:444 msgid "- Empathy IM Client" msgstr "- לקוח המסרים המידיים Empathy" -#: ../src/empathy.c:641 +#: ../src/empathy.c:620 msgid "Error contacting the Account Manager" msgstr "שגיאה ביצירת קשר עם מנהל החשבונות" -#: ../src/empathy.c:643 +#: ../src/empathy.c:622 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n" @@ -2955,75 +2966,75 @@ msgstr "" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:72 +#: ../src/empathy-accounts-dialog.c:71 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "ישנם שינויים שלא נשמרו בחשבון ה־%s שלך." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:76 +#: ../src/empathy-accounts-dialog.c:75 msgid "Your new account has not been saved yet." msgstr "החשבון החדש שלך לא נשמר עדיין." -#: ../src/empathy-accounts-dialog.c:381 +#: ../src/empathy-accounts-dialog.c:404 #: ../src/empathy-streamed-media-window.c:759 -#: ../src/empathy-call-window.c:1289 +#: ../src/empathy-call-window.c:1267 msgid "Connecting…" msgstr "בהתחברות…" -#: ../src/empathy-accounts-dialog.c:422 +#: ../src/empathy-accounts-dialog.c:445 #, c-format msgid "Offline — %s" msgstr "לא מחובר — %s" -#: ../src/empathy-accounts-dialog.c:434 +#: ../src/empathy-accounts-dialog.c:457 #, c-format msgid "Disconnected — %s" msgstr "מנותק — %s" -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:468 msgid "Offline — No Network Connection" msgstr "מנותק — אין חיבור לרשת" -#: ../src/empathy-accounts-dialog.c:452 +#: ../src/empathy-accounts-dialog.c:475 msgid "Unknown Status" msgstr "מצב לא ידוע" -#: ../src/empathy-accounts-dialog.c:469 +#: ../src/empathy-accounts-dialog.c:492 msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account." msgstr "חשבון זה נוטרל כיוון שהוא נשען על מנגנון ישן שאינו נתמך עוד. נא להתקין את telepathy-haze ולצאת ולהיכנס לחשבון המשתמש שלך כדי לייבא את החשבון." -#: ../src/empathy-accounts-dialog.c:479 +#: ../src/empathy-accounts-dialog.c:502 msgid "Offline — Account Disabled" msgstr "מנותק — החשבון מנוטרל" -#: ../src/empathy-accounts-dialog.c:585 +#: ../src/empathy-accounts-dialog.c:608 msgid "Edit Connection Parameters" msgstr "עריכת הגדרות החיבור" -#: ../src/empathy-accounts-dialog.c:750 +#: ../src/empathy-accounts-dialog.c:773 msgid "Failed to retrieve your personal information from the server." msgstr "אירע כשל בקבלת הפרטים האישיים שלך מהשרת." -#: ../src/empathy-accounts-dialog.c:756 +#: ../src/empathy-accounts-dialog.c:779 msgid "Go online to edit your personal information." msgstr "עליך להתחבר כדי לערוך את הפרטים האישיים שלך." -#: ../src/empathy-accounts-dialog.c:843 +#: ../src/empathy-accounts-dialog.c:866 msgid "_Edit Connection Parameters..." msgstr "ע_ריכת הגדרות החיבור..." -#: ../src/empathy-accounts-dialog.c:1339 +#: ../src/empathy-accounts-dialog.c:1362 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "האם ברצונך להסיר את החשבון '%s' ממחשבך?" -#: ../src/empathy-accounts-dialog.c:1343 +#: ../src/empathy-accounts-dialog.c:1366 msgid "This will not remove your account on the server." msgstr "פעולה זו לא תסיר את חשבונך מהשרת." -#: ../src/empathy-accounts-dialog.c:1579 +#: ../src/empathy-accounts-dialog.c:1571 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3031,24 +3042,25 @@ msgstr "" "אתה עומד לבחור חשבון חדש, מה שיבטל\n" "את השינויים שלך. האת אתה בטוח שברצונך להמשיך?" -#. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1755 -msgid "_Enable" -msgstr "ה_פעלה" +#. Menu item: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1762 +msgid "_Enabled" +msgstr "מו_פעל" -#: ../src/empathy-accounts-dialog.c:1756 -msgid "_Disable" -msgstr "נ_טרול" +#. Menu item: Rename +#: ../src/empathy-accounts-dialog.c:1785 +msgid "Rename" +msgstr "שנה שם" -#: ../src/empathy-accounts-dialog.c:2184 +#: ../src/empathy-accounts-dialog.c:2201 msgid "_Skip" msgstr "_דילוג" -#: ../src/empathy-accounts-dialog.c:2188 +#: ../src/empathy-accounts-dialog.c:2205 msgid "_Connect" msgstr "הת_חברות" -#: ../src/empathy-accounts-dialog.c:2365 +#: ../src/empathy-accounts-dialog.c:2384 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3072,21 +3084,21 @@ msgstr "על מנת להוסיף חשבון חדש עליך להתקין מנו msgid "_Import…" msgstr "י_בוא…" -#: ../src/empathy-auth-client.c:288 +#: ../src/empathy-auth-client.c:286 msgid " - Empathy authentication client" msgstr "- לקוח האימות של Empathy" -#: ../src/empathy-auth-client.c:304 +#: ../src/empathy-auth-client.c:302 msgid "Empathy authentication client" msgstr "לקוח האימות של Empathy" -#: ../src/empathy-av.c:118 -#: ../src/empathy-call.c:201 +#: ../src/empathy-av.c:115 +#: ../src/empathy-call.c:198 msgid "- Empathy Audio/Video Client" msgstr "- לקוח השמע/הווידאו Empathy" -#: ../src/empathy-av.c:134 -#: ../src/empathy-call.c:223 +#: ../src/empathy-av.c:131 +#: ../src/empathy-call.c:220 msgid "Empathy Audio/Video Client" msgstr "לקוח השמע/הווידאו Empathy" @@ -3129,33 +3141,33 @@ msgstr "פרטים" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title #: ../src/empathy-streamed-media-window.c:1211 -#: ../src/empathy-call-window.c:1889 +#: ../src/empathy-call-window.c:1861 #, c-format msgid "Call with %s" msgstr "שיחה עם %s" #: ../src/empathy-streamed-media-window.c:1444 -#: ../src/empathy-call-window.c:2133 +#: ../src/empathy-call-window.c:2105 msgid "The IP address as seen by the machine" msgstr "כתובת ה־IP כפי שנראית על ידי המחשב" #: ../src/empathy-streamed-media-window.c:1446 -#: ../src/empathy-call-window.c:2135 +#: ../src/empathy-call-window.c:2107 msgid "The IP address as seen by a server on the Internet" msgstr "כתובת ה־IP כפי שנראית על ידי שרת באינטרנט" #: ../src/empathy-streamed-media-window.c:1448 -#: ../src/empathy-call-window.c:2137 +#: ../src/empathy-call-window.c:2109 msgid "The IP address of the peer as seen by the other side" msgstr "כתובת ה־IP כדי שנראית על ידי עמית מהצד השני" #: ../src/empathy-streamed-media-window.c:1450 -#: ../src/empathy-call-window.c:2139 +#: ../src/empathy-call-window.c:2111 msgid "The IP address of a relay server" msgstr "כתובת ה־IP של שרת הממסר" #: ../src/empathy-streamed-media-window.c:1452 -#: ../src/empathy-call-window.c:2141 +#: ../src/empathy-call-window.c:2113 msgid "The IP address of the multicast group" msgstr "כתובת ה־IP של קבוצת התשדורת" @@ -3174,66 +3186,66 @@ msgid "Connected — %d:%02dm" msgstr "מחובר — %d:%02d דק׳" #: ../src/empathy-streamed-media-window.c:2199 -#: ../src/empathy-call-window.c:2992 +#: ../src/empathy-call-window.c:2964 msgid "Technical Details" msgstr "פרטים טכניים" #: ../src/empathy-streamed-media-window.c:2237 -#: ../src/empathy-call-window.c:3031 +#: ../src/empathy-call-window.c:3003 #, c-format msgid "%s's software does not understand any of the audio formats supported by your computer" msgstr "התכנה של %s אינה מבינה את מבני השמע הנתמכים על ידי המחשב שלך" #: ../src/empathy-streamed-media-window.c:2242 -#: ../src/empathy-call-window.c:3036 +#: ../src/empathy-call-window.c:3008 #, c-format msgid "%s's software does not understand any of the video formats supported by your computer" msgstr "התכנה של %s אינה מבינה את מבני הווידאו הנתמכים על ידי המחשב שלך" #: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:3042 +#: ../src/empathy-call-window.c:3014 #, 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-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:3048 +#: ../src/empathy-call-window.c:3020 msgid "There was a failure on the network" msgstr "אירעה שגיאה ברשת" #: ../src/empathy-streamed-media-window.c:2258 -#: ../src/empathy-call-window.c:3052 +#: ../src/empathy-call-window.c:3024 msgid "The audio formats necessary for this call are not installed on your computer" msgstr "מבני השמע הדרושים לקיום שיחה זו אינם מותקנים במחשבך" #: ../src/empathy-streamed-media-window.c:2261 -#: ../src/empathy-call-window.c:3055 +#: ../src/empathy-call-window.c:3027 msgid "The video formats necessary for this call are not installed on your computer" msgstr "מבני הווידאו הדרושים לקיום שיחה זו אינם מותקנים במחשבך" #: ../src/empathy-streamed-media-window.c:2271 -#: ../src/empathy-call-window.c:3067 +#: ../src/empathy-call-window.c:3039 #, c-format msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu." msgstr "משהו בלתי צפוי ארע ברכיב של Telepathy. נא <a href=\"%s\">לדווח על באג זה</a> ולהוסיף דוחות שנאספו מחלון 'ניפוי השגיאות' שבתפריט העזרה." #: ../src/empathy-streamed-media-window.c:2279 -#: ../src/empathy-call-window.c:3076 +#: ../src/empathy-call-window.c:3048 msgid "There was a failure in the call engine" msgstr "אירעה שגיאה במנוע הקריאה" #: ../src/empathy-streamed-media-window.c:2282 -#: ../src/empathy-call-window.c:3079 +#: ../src/empathy-call-window.c:3051 msgid "The end of the stream was reached" msgstr "התזרים הגיע לסיומו" #: ../src/empathy-streamed-media-window.c:2322 -#: ../src/empathy-call-window.c:3119 +#: ../src/empathy-call-window.c:3091 msgid "Can't establish audio stream" msgstr "לא ניתן לקיים תזרים שמע" #: ../src/empathy-streamed-media-window.c:2332 -#: ../src/empathy-call-window.c:3129 +#: ../src/empathy-call-window.c:3101 msgid "Can't establish video stream" msgstr "לא ניתן לקיים תזרים וידאו" @@ -3325,10 +3337,10 @@ msgstr "החלפת מצב העברת וידאו" #: ../src/empathy-call-window.ui.h:21 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:2542 -#: ../src/empathy-call-window.c:2543 -#: ../src/empathy-call-window.c:2544 -#: ../src/empathy-call-window.c:2545 +#: ../src/empathy-call-window.c:2514 +#: ../src/empathy-call-window.c:2515 +#: ../src/empathy-call-window.c:2516 +#: ../src/empathy-call-window.c:2517 msgid "Unknown" msgstr "לא ידוע" @@ -3376,80 +3388,80 @@ msgstr "ה_גדרות" msgid "_View" msgstr "_תצוגה" -#: ../src/empathy-chat-window.c:289 +#: ../src/empathy-chat-window.c:288 msgid "Close this window?" msgstr "האם לסגור חלון זה?" -#: ../src/empathy-chat-window.c:294 +#: ../src/empathy-chat-window.c:293 #, c-format msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it." msgstr "סגירת חלון זה תגרום לעזיבת %s. לא יתקבלו עוד הודעות על להצטרפותך אליו מחדש." -#: ../src/empathy-chat-window.c:305 +#: ../src/empathy-chat-window.c:304 #, c-format msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it." msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them." msgstr[0] "סגירת חלון זה תוביל לעזיבת חדר הצ׳אט. לא יתקבלו עוד הודעות עד להתחברותך מחדש אליו." msgstr[1] "סגירת חלון זה תוביל לעזיבת %u חדרי הצ׳אט. לא יתקבלו עוד הודעות עד להתחברותך מחדש אליהם." -#: ../src/empathy-chat-window.c:314 +#: ../src/empathy-chat-window.c:313 #, c-format msgid "Leave %s?" msgstr "האם לעזוב את %s?" -#: ../src/empathy-chat-window.c:315 +#: ../src/empathy-chat-window.c:314 msgid "You will not receive any further messages from this chat room until you rejoin it." msgstr "לא יתקבלו עוד הודעות מחדר צ׳אט זה עד להצטרפותך המחודשת אליו." -#: ../src/empathy-chat-window.c:334 +#: ../src/empathy-chat-window.c:333 msgid "Close window" msgstr "סגירת החלון" -#: ../src/empathy-chat-window.c:334 +#: ../src/empathy-chat-window.c:333 msgid "Leave room" msgstr "עזיבת החדר" -#: ../src/empathy-chat-window.c:640 -#: ../src/empathy-chat-window.c:660 +#: ../src/empathy-chat-window.c:639 +#: ../src/empathy-chat-window.c:659 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (אחת שלא נקראה)" msgstr[1] "%s (%d שלא נקראו)" -#: ../src/empathy-chat-window.c:652 +#: ../src/empathy-chat-window.c:651 #, 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:668 +#: ../src/empathy-chat-window.c:667 #, 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:677 +#: ../src/empathy-chat-window.c:676 #, 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:892 +#: ../src/empathy-chat-window.c:891 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:902 +#: ../src/empathy-chat-window.c:901 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "נשלחת הודעה אחת" msgstr[1] "נשלחות %d הודעות" -#: ../src/empathy-chat-window.c:924 +#: ../src/empathy-chat-window.c:923 msgid "Typing a message." msgstr "הודעה מוקלדת." @@ -3535,7 +3547,7 @@ msgid "Incoming video call" msgstr "שיחה קולית נכנסת" #: ../src/empathy-event-manager.c:522 -#: ../src/empathy-call-window.c:1519 +#: ../src/empathy-call-window.c:1483 msgid "Incoming call" msgstr "שיחה נכנסת" @@ -3552,7 +3564,7 @@ msgstr "%s מתקשר אליך, האם ברצונך לענות?" #: ../src/empathy-event-manager.c:530 #: ../src/empathy-event-manager.c:731 #: ../src/empathy-event-manager.c:764 -#: ../src/empathy-call-window.c:1525 +#: ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming call from %s" msgstr "שיחה נכנסת מ־%s" @@ -3572,7 +3584,7 @@ msgstr "מ_ענה עם וידאו" #: ../src/empathy-event-manager.c:731 #: ../src/empathy-event-manager.c:764 -#: ../src/empathy-call-window.c:1525 +#: ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming video call from %s" msgstr "שיחת וידאו נכנסת מ־%s" @@ -3616,7 +3628,7 @@ msgid "Incoming file transfer from %s" msgstr "העברת קבצים נכנסת מ־%s" #: ../src/empathy-event-manager.c:1146 -#: ../src/empathy-roster-window.c:374 +#: ../src/empathy-roster-window.c:373 msgid "Password required" msgstr "נדרשת ססמה" @@ -3761,87 +3773,87 @@ msgid "Import Accounts" msgstr "יבוא חשבונות" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:316 +#: ../src/empathy-import-widget.c:303 msgid "Import" msgstr "יבוא" -#: ../src/empathy-import-widget.c:325 +#: ../src/empathy-import-widget.c:312 msgid "Protocol" msgstr "פרוטוקול" -#: ../src/empathy-import-widget.c:349 +#: ../src/empathy-import-widget.c:336 msgid "Source" msgstr "מקור" -#: ../src/empathy-roster-window.c:391 +#: ../src/empathy-roster-window.c:390 msgid "Provide Password" msgstr "הזנת ססמה" -#: ../src/empathy-roster-window.c:397 +#: ../src/empathy-roster-window.c:396 msgid "Disconnect" msgstr "ניתוק" -#: ../src/empathy-roster-window.c:657 +#: ../src/empathy-roster-window.c:656 msgid "You need to setup an account to see contacts here." msgstr "עליך להגדיר חשבון כדי שיופיעו כאן אנשי קשר." -#: ../src/empathy-roster-window.c:673 +#: ../src/empathy-roster-window.c:672 msgid "No match found" msgstr "לא נמצאה התאמה" -#: ../src/empathy-roster-window.c:783 +#: ../src/empathy-roster-window.c:782 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "לא ניתן להשתמש בחשבונות %s עד שהתכנה %s תעודכן, עמך הסליחה." -#: ../src/empathy-roster-window.c:849 +#: ../src/empathy-roster-window.c:848 msgid "Update software..." msgstr "עדכון התכנה..." -#: ../src/empathy-roster-window.c:855 -#: ../src/empathy-roster-window.c:972 +#: ../src/empathy-roster-window.c:854 +#: ../src/empathy-roster-window.c:971 msgid "Close" msgstr "סגירה" -#: ../src/empathy-roster-window.c:960 +#: ../src/empathy-roster-window.c:959 msgid "Reconnect" msgstr "התחברות מחדש" -#: ../src/empathy-roster-window.c:966 +#: ../src/empathy-roster-window.c:965 msgid "Edit Account" msgstr "עריכת חשבון" #. Translators: this string will be something like: #. * Top up My Account ($1.23)..." -#: ../src/empathy-roster-window.c:1110 +#: ../src/empathy-roster-window.c:1109 #, c-format msgid "Top up %s (%s)..." msgstr "Top up %s (%s)..." -#: ../src/empathy-roster-window.c:1156 +#: ../src/empathy-roster-window.c:1155 msgid "Top up account credit" msgstr "אשראי חשבון ה־Top up" #. top up button -#: ../src/empathy-roster-window.c:1228 +#: ../src/empathy-roster-window.c:1227 msgid "Top Up..." msgstr "Top Up..." -#: ../src/empathy-roster-window.c:1952 +#: ../src/empathy-roster-window.c:1951 msgid "Contact" msgstr "איש קשר" -#: ../src/empathy-roster-window.c:2150 +#: ../src/empathy-roster-window.c:2149 msgid "You need to enable one of your accounts to see contacts here." msgstr "עליך להפעיל את אחד החשבונות שלך כדי שיופיעו כאן אנשי קשר." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:2158 +#: ../src/empathy-roster-window.c:2157 #, c-format msgid "You need to enable %s to see contacts here." msgstr "עליך להפעיל את %s כדי שיופיעו כאן אנשי קשר." -#: ../src/empathy-roster-window.c:2460 +#: ../src/empathy-roster-window.c:2459 msgid "Contact List" msgstr "רשימת אנשי קשר" @@ -3945,7 +3957,7 @@ 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:637 +#: ../src/empathy-new-chatroom-dialog.c:636 #, c-format msgid "" "%s\n" @@ -3958,21 +3970,21 @@ msgstr "" "נדרשת ססמה: %s\n" "חברים: %s" +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "כן" +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "לא" -#: ../src/empathy-new-chatroom-dialog.c:668 +#: ../src/empathy-new-chatroom-dialog.c:666 msgid "Could not start room listing" msgstr "לא ניתן להתחיל את הצגת החדרים" -#: ../src/empathy-new-chatroom-dialog.c:678 +#: ../src/empathy-new-chatroom-dialog.c:676 msgid "Could not stop room listing" msgstr "לא ניתן לעצור את הצגת החדרים" @@ -4033,46 +4045,46 @@ msgid "Language" msgstr "שפה" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:726 +#: ../src/empathy-preferences.c:724 msgid "Juliet" msgstr "יוליה" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:733 +#: ../src/empathy-preferences.c:731 msgid "Romeo" msgstr "רומיאו" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:739 +#: ../src/empathy-preferences.c:737 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "הו רומיאו, רומיאו, מן אין שבת רומיאו?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:743 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "התכחש לאביך וסרב לשמו;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:746 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "או אם לא תסכים, אשבע לך באהבתי" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:749 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "ולא אהיה עוד בת קפולט." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:752 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "האם דיברתי די או שמא אוסיף לדבר?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:755 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "יוליה התנתקה" -#: ../src/empathy-preferences.c:1159 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "העדפות" @@ -4362,16 +4374,16 @@ msgstr "רמה" msgid "The selected connection manager does not support the remote debugging extension." msgstr "מנהל החיבורים שנבחר אינו תומך בהרחבת ניפוי שגיאות מרחוק." -#: ../src/empathy-invite-participant-dialog.c:202 -#: ../src/empathy-invite-participant-dialog.c:230 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "הזמנת משתתפים" -#: ../src/empathy-invite-participant-dialog.c:203 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "נא לבחור אנשי קשר להזמנה לדיון:" -#: ../src/empathy-invite-participant-dialog.c:226 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "הזמנה" @@ -4395,7 +4407,7 @@ msgstr "<account-id>" msgid "- Empathy Accounts" msgstr "- חשבונות Empathy" -#: ../src/empathy-accounts.c:231 +#: ../src/empathy-accounts.c:230 msgid "Empathy Accounts" msgstr "חשבונות Empathy" @@ -4407,47 +4419,47 @@ msgstr "הצגת שירות מסוים" msgid "- Empathy Debugger" msgstr "- מנפה השגיאות של Empathy" -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:112 msgid "Empathy Debugger" msgstr "מנפה השגיאות של Empathy" -#: ../src/empathy-chat.c:109 +#: ../src/empathy-chat.c:106 msgid "- Empathy Chat Client" msgstr "- לקוח הצ׳אטים Empathy" -#: ../src/empathy-notifications-approver.c:189 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "תגובה" -#: ../src/empathy-notifications-approver.c:203 -#: ../src/empathy-call-window.c:1529 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1493 msgid "Reject" msgstr "דחייה" -#: ../src/empathy-notifications-approver.c:208 -#: ../src/empathy-notifications-approver.c:213 -#: ../src/empathy-call-window.c:1530 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1494 msgid "Answer" msgstr "מענה" -#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "מענה עם וידאו" -#: ../src/empathy-notifications-approver.c:221 -#: ../src/empathy-notifications-approver.c:231 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "סירוב" -#: ../src/empathy-notifications-approver.c:225 -#: ../src/empathy-notifications-approver.c:236 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "אישור" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:246 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "הזנה" @@ -4458,39 +4470,39 @@ msgstr "התקבלה בקשת שיחה מאת %s, אך באותו הזמן כב #. Translators: this is an "Info" label. It should be as short #. * as possible. +#: ../src/empathy-call-window.c:1124 #: ../src/empathy-call-window.c:1140 -#: ../src/empathy-call-window.c:1162 msgid "i" msgstr "i" -#: ../src/empathy-call-window.c:2888 +#: ../src/empathy-call-window.c:2860 msgid "On hold" msgstr "בהמתנה" -#: ../src/empathy-call-window.c:2891 +#: ../src/empathy-call-window.c:2863 msgid "Mute" msgstr "השתק" -#: ../src/empathy-call-window.c:2893 +#: ../src/empathy-call-window.c:2865 msgid "Duration" msgstr "משך" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2896 +#: ../src/empathy-call-window.c:2868 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02d דק׳" -#: ../src/empathy-call-window.c:3166 +#: ../src/empathy-call-window.c:3138 #, c-format msgid "Your current balance is %s." msgstr "המאזן הנוכחי שלך הוא %s." -#: ../src/empathy-call-window.c:3170 +#: ../src/empathy-call-window.c:3142 msgid "Sorry, you don’t have enough credit for that call." msgstr "אין לך מספיק אשראי כדי לבצע שיחה זו." -#: ../src/empathy-call-window.c:3172 +#: ../src/empathy-call-window.c:3144 msgid "Top Up" msgstr "Top Up" @@ -4518,6 +4530,12 @@ msgstr "באפשרות Empathy לגלות ולנהל שיחות עם אנשים msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List." msgstr "באפשרותך לשנות פרטים אלה מאוחר יותר או לנטרל תכונה זו על ידי בחירה ב<span style=\"italic\">עריכה ← חשבונות</span> ברשימת אנשי הקשר." +#~ msgid "_Enable" +#~ msgstr "ה_פעלה" + +#~ msgid "_Disable" +#~ msgstr "נ_טרול" + #~ msgid "%s" #~ msgstr "%s" @@ -4811,9 +4829,6 @@ msgstr "באפשרותך לשנות פרטים אלה מאוחר יותר או #~ msgid "_For:" #~ msgstr "_ערך:" -#~ msgid "_Enabled" -#~ msgstr "מו_פעל" - #~ msgid "%s is now offline." #~ msgstr "%s מנותק/ת כעת." @@ -5192,8 +5207,5 @@ msgstr "באפשרותך לשנות פרטים אלה מאוחר יותר או #~ msgid "Re_name" #~ msgstr "שנה _שם" -#~ msgid "Rename" -#~ msgstr "שנה שם" - #~ msgid "_Use for chat rooms" #~ msgstr "_שימוש בחדרי שיחה" @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2012-04-16 08:59+0000\n" +"POT-Creation-Date: 2012-04-11 09:10+0000\n" "PO-Revision-Date: 2012-04-16 13:53+0200\n" "Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n" "Language-Team: Slovak <gnome-sk-list@gnome.org>\n" -"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" #: ../data/empathy.desktop.in.in.h:1 @@ -37,7 +37,7 @@ msgstr "Komunikujte pomocou služieb Google Talk, Facebook, MSN a mnoho ďalší #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 -#: ../src/empathy-accounts-dialog.c:2552 +#: ../src/empathy-accounts-dialog.c:2527 msgid "Messaging and VoIP Accounts" msgstr "Rozhovory a VoIP účty" @@ -182,6 +182,7 @@ msgstr "" #: ../data/org.gnome.Empathy.gschema.xml.in.h:32 #, fuzzy +#| msgid "Show contact list in rooms" msgid "Show contact groups" msgstr "Zobraziť zoznam kontaktov v miestnostiach" @@ -363,8 +364,7 @@ msgstr "Variant témy okna rozhovoru" msgid "" "The theme variant that is used to display the conversation in chat windows." msgstr "" -"Variant témy, ktorý je použitý na zobrazenie konverzácie v oknách s " -"rozhovormi." +"Variant témy, ktorý je použitý na zobrazenie konverzácie v oknách s rozhovormi." #: ../data/org.gnome.Empathy.gschema.xml.in.h:72 msgid "Path of the Adium theme to use" @@ -698,6 +698,7 @@ msgstr "Pripojenie bolo prerušené" #: ../libempathy/empathy-utils.c:355 #, fuzzy +#| msgid "This resource is already connected to the server" msgid "This account is already connected to the server" msgstr "Tento zdroj už je pripojený k serveru" @@ -737,6 +738,7 @@ msgstr "" #: ../libempathy/empathy-utils.c:375 #, fuzzy +#| msgid "Interval (seconds)" msgid "Internal error" msgstr "Interval (sekundy)" @@ -810,6 +812,7 @@ msgstr "v budúcnosti" #: ../libempathy/empathy-keyring.c:75 #, fuzzy +#| msgid "Phrase not found" msgid "Password not found" msgstr "Fráza sa nenašla" @@ -865,11 +868,11 @@ msgstr "Po_užiť" msgid "L_og in" msgstr "_Prihlásiť sa" -#: ../libempathy-gtk/empathy-account-widget.c:1812 +#: ../libempathy-gtk/empathy-account-widget.c:1810 msgid "This account already exists on the server" msgstr "Tento účet už na serveri existuje" -#: ../libempathy-gtk/empathy-account-widget.c:1816 +#: ../libempathy-gtk/empathy-account-widget.c:1814 msgid "Create a new account on the server" msgstr "Vytvoriť na serveri nový účet" @@ -878,19 +881,19 @@ msgstr "Vytvoriť na serveri nový účet" #. * 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:2241 +#: ../libempathy-gtk/empathy-account-widget.c:2236 #, 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:2267 +#: ../libempathy-gtk/empathy-account-widget.c:2262 #, c-format msgid "%s Account" msgstr "Účet %s" -#: ../libempathy-gtk/empathy-account-widget.c:2271 +#: ../libempathy-gtk/empathy-account-widget.c:2266 msgid "New account" msgstr "Nový účet" @@ -950,7 +953,7 @@ msgstr "_Server:" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 msgid "Advanced" msgstr "Pokročilé" @@ -968,7 +971,7 @@ msgstr "Aké je vaše heslo pre AIM?" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 msgid "Remember Password" msgstr "Zapamätať heslo" @@ -1018,34 +1021,34 @@ msgstr "Aké je vaše heslo pre ICQ?" # * https://bugzilla.gnome.org/show_bug.cgi?id=645689 # PŠ: toto asi nebude správny odkaz na bugreport... opraviť! -#: ../libempathy-gtk/empathy-account-widget-sip.c:205 -#: ../libempathy-gtk/empathy-account-widget-sip.c:238 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 +#: ../libempathy-gtk/empathy-account-widget-sip.c:240 msgid "Auto" msgstr "Automaticky" -#: ../libempathy-gtk/empathy-account-widget-sip.c:208 +#: ../libempathy-gtk/empathy-account-widget-sip.c:210 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:211 +#: ../libempathy-gtk/empathy-account-widget-sip.c:213 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:214 +#: ../libempathy-gtk/empathy-account-widget-sip.c:216 msgid "TLS" msgstr "TLS" -#: ../libempathy-gtk/empathy-account-widget-sip.c:243 +#: ../libempathy-gtk/empathy-account-widget-sip.c:245 msgid "Register" msgstr "Registrovať" -#: ../libempathy-gtk/empathy-account-widget-sip.c:248 +#: ../libempathy-gtk/empathy-account-widget-sip.c:250 msgid "Options" msgstr "Voľby" # * https://bugzilla.gnome.org/show_bug.cgi?id=645689 # PŠ: toto asi nebude správny odkaz na bugreport... opraviť! -#: ../libempathy-gtk/empathy-account-widget-sip.c:251 +#: ../libempathy-gtk/empathy-account-widget-sip.c:253 msgid "None" msgstr "Žiadna" @@ -1082,6 +1085,7 @@ msgstr "" #. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 #, fuzzy +#| msgid "Domain" msgid "Down" msgstr "Doména" @@ -1309,11 +1313,17 @@ msgstr "Ignorovať chyby TLS" msgid "Port:" msgstr "Port:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#, fuzzy +#| msgid "E-_mail address:" +msgid "Local IP Address:" +msgstr "E_mailová adresa:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Aký je váš identifikátor pre SIP prihlásenie?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "What is your SIP account password?" msgstr "Aké je heslo pre váš SIP účet?" @@ -1403,41 +1413,41 @@ msgstr "Tiesňové volania nie sú podporované týmto protokolom" msgid "You don't have enough credit in order to place this call" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:728 +#: ../libempathy-gtk/empathy-chat.c:727 msgid "Failed to open private chat" msgstr "Zlyhalo otvorenie súkromného rozhovoru" -#: ../libempathy-gtk/empathy-chat.c:786 +#: ../libempathy-gtk/empathy-chat.c:785 msgid "Topic not supported on this conversation" msgstr "Téma nie je pri tejto konverzácii podporovaná" -#: ../libempathy-gtk/empathy-chat.c:792 +#: ../libempathy-gtk/empathy-chat.c:791 msgid "You are not allowed to change the topic" msgstr "Nie je vám dovolené meniť tému" -#: ../libempathy-gtk/empathy-chat.c:991 +#: ../libempathy-gtk/empathy-chat.c:990 #, c-format msgid "“%s” is not a valid contact ID" msgstr "“%s” je neplatný identifikátor kontaktu" -#: ../libempathy-gtk/empathy-chat.c:1086 +#: ../libempathy-gtk/empathy-chat.c:1085 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: vymaže všetky správy z aktuálnej konverzácie" -#: ../libempathy-gtk/empathy-chat.c:1089 +#: ../libempathy-gtk/empathy-chat.c:1088 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <téma>: nastaví tému aktuálnej konverzácie" -#: ../libempathy-gtk/empathy-chat.c:1092 +#: ../libempathy-gtk/empathy-chat.c:1091 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <ID diskusnej miestnosti>: vstúpi do novej diskusnej miestnosti" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1094 msgid "/j <chat room ID>: join a new chat room" msgstr "" "/j <identifikátor diskusnej miestnosti>: vstúpi do novej diskusnej miestnosti" -#: ../libempathy-gtk/empathy-chat.c:1099 +#: ../libempathy-gtk/empathy-chat.c:1098 msgid "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" @@ -1445,23 +1455,23 @@ msgstr "" "/part [<identifikátor diskusnej miestnosti>] [<dôvod>]: opustí diskusnú " "miestnosť, predvolene aktuálnu" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1102 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <identifikátor kontaktu> [<správa>]: otvorí súkromný rozhovor" -#: ../libempathy-gtk/empathy-chat.c:1106 +#: ../libempathy-gtk/empathy-chat.c:1105 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <identifikátor kontaktu> <správa>: otvorí súkromný rozhovor" -#: ../libempathy-gtk/empathy-chat.c:1109 +#: ../libempathy-gtk/empathy-chat.c:1108 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <prezývka>: zmeni vašu prezývku na aktuálnom serveri" -#: ../libempathy-gtk/empathy-chat.c:1112 +#: ../libempathy-gtk/empathy-chat.c:1111 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <správa>: pošle ACTION správu do aktuálnej konverzácie" -#: ../libempathy-gtk/empathy-chat.c:1115 +#: ../libempathy-gtk/empathy-chat.c:1114 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 " @@ -1471,11 +1481,11 @@ msgstr "" "odoslanie správy začínajúcej s '/'. Napríklad: \"/say /join sa používa na " "vstúpenie do novej diskusnej miestnosti\"" -#: ../libempathy-gtk/empathy-chat.c:1120 +#: ../libempathy-gtk/empathy-chat.c:1119 msgid "/whois <contact ID>: display information about a contact" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:1123 +#: ../libempathy-gtk/empathy-chat.c:1122 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1483,95 +1493,96 @@ msgstr "" "/help [<príkaz>]: zobrazí zoznam všetkých podporovaných príkazov. Ak je " "zadaný aj <príkaz>, zobrazí sa jeho použitie." -#: ../libempathy-gtk/empathy-chat.c:1142 +#: ../libempathy-gtk/empathy-chat.c:1141 #, c-format msgid "Usage: %s" msgstr "Použitie: %s" -#: ../libempathy-gtk/empathy-chat.c:1187 +#: ../libempathy-gtk/empathy-chat.c:1186 msgid "Unknown command" msgstr "Neznámy príkaz" -#: ../libempathy-gtk/empathy-chat.c:1313 +#: ../libempathy-gtk/empathy-chat.c:1312 msgid "Unknown command; see /help for the available commands" msgstr "Neznámy príkaz; použite /help na zobrazenie dostupných príkazov" -#: ../libempathy-gtk/empathy-chat.c:1564 +#: ../libempathy-gtk/empathy-chat.c:1563 msgid "insufficient balance to send message" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582 -#: ../libempathy-gtk/empathy-chat.c:1645 +#: ../libempathy-gtk/empathy-chat.c:1567 ../libempathy-gtk/empathy-chat.c:1581 +#: ../libempathy-gtk/empathy-chat.c:1644 #, c-format msgid "Error sending message '%s': %s" msgstr "Chyba pri posielaní správy '%s': %s" -#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587 -#: ../libempathy-gtk/empathy-chat.c:1649 +#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1586 +#: ../libempathy-gtk/empathy-chat.c:1648 #, c-format msgid "Error sending message: %s" msgstr "Chyba pri posielaní správy: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1576 +#: ../libempathy-gtk/empathy-chat.c:1575 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "" -#: ../libempathy-gtk/empathy-chat.c:1616 +#: ../libempathy-gtk/empathy-chat.c:1615 msgid "not capable" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:1623 +#: ../libempathy-gtk/empathy-chat.c:1622 msgid "offline" msgstr "odpojený" -#: ../libempathy-gtk/empathy-chat.c:1626 +#: ../libempathy-gtk/empathy-chat.c:1625 msgid "invalid contact" msgstr "neplatný kontakt" -#: ../libempathy-gtk/empathy-chat.c:1629 +#: ../libempathy-gtk/empathy-chat.c:1628 msgid "permission denied" msgstr "prístup zamietnutý" -#: ../libempathy-gtk/empathy-chat.c:1632 +#: ../libempathy-gtk/empathy-chat.c:1631 msgid "too long message" msgstr "príliš dlhá správa" -#: ../libempathy-gtk/empathy-chat.c:1635 +#: ../libempathy-gtk/empathy-chat.c:1634 msgid "not implemented" msgstr "nie je implementované" -#: ../libempathy-gtk/empathy-chat.c:1639 +#: ../libempathy-gtk/empathy-chat.c:1638 msgid "unknown" msgstr "neznámy" -#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920 +#: ../libempathy-gtk/empathy-chat.c:1705 ../src/empathy-chat-window.c:919 msgid "Topic:" msgstr "Téma:" -#: ../libempathy-gtk/empathy-chat.c:1721 +#: ../libempathy-gtk/empathy-chat.c:1720 #, c-format msgid "Topic set to: %s" msgstr "Téma nastavená na: %s" -#: ../libempathy-gtk/empathy-chat.c:1723 +#: ../libempathy-gtk/empathy-chat.c:1722 #, fuzzy, c-format +#| msgid "Topic set to: %s" msgid "Topic set by %s to: %s" msgstr "Téma nastavená na: %s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1728 +#: ../libempathy-gtk/empathy-chat.c:1727 msgid "No topic defined" msgstr "Nebola nastavená žiadna téma" -#: ../libempathy-gtk/empathy-chat.c:2244 +#: ../libempathy-gtk/empathy-chat.c:2243 msgid "(No Suggestions)" msgstr "(Žiadne návrhy)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2312 +#: ../libempathy-gtk/empathy-chat.c:2311 #, c-format msgid "Add '%s' to Dictionary" msgstr "Pridať '%s' do slovníka" @@ -1579,32 +1590,32 @@ msgstr "Pridať '%s' do slovníka" # slovnik je v tvare napr. "slovencina", "anglictina" (podst. m.) #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2349 +#: ../libempathy-gtk/empathy-chat.c:2348 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Pridať '%s' do slovníka pre jazyk %s" # http://live.gnome.org/SlovakTranslation/Others/JULS -#: ../libempathy-gtk/empathy-chat.c:2419 +#: ../libempathy-gtk/empathy-chat.c:2418 msgid "Insert Smiley" msgstr "Vložiť smejka" #. send button -#: ../libempathy-gtk/empathy-chat.c:2437 +#: ../libempathy-gtk/empathy-chat.c:2436 #: ../libempathy-gtk/empathy-ui-utils.c:1880 msgid "_Send" msgstr "_Poslať" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2494 +#: ../libempathy-gtk/empathy-chat.c:2493 msgid "_Spelling Suggestions" msgstr "_Návrhy kontroly pravopisu" -#: ../libempathy-gtk/empathy-chat.c:2583 +#: ../libempathy-gtk/empathy-chat.c:2582 msgid "Failed to retrieve recent logs" msgstr "Zlyhalo získavanie nedávnych záznamov" -#: ../libempathy-gtk/empathy-chat.c:2722 +#: ../libempathy-gtk/empathy-chat.c:2721 #, c-format msgid "%s has disconnected" msgstr "Kontakt %s sa odpojil" @@ -1612,12 +1623,12 @@ msgstr "Kontakt %s sa odpojil" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2729 +#: ../libempathy-gtk/empathy-chat.c:2728 #, c-format msgid "%1$s was kicked by %2$s" msgstr "Kontakt %1$s bol vykopnutý používateľom %2$s" -#: ../libempathy-gtk/empathy-chat.c:2732 +#: ../libempathy-gtk/empathy-chat.c:2731 #, c-format msgid "%s was kicked" msgstr "Kontakt %s bol vykopnutý" @@ -1625,17 +1636,17 @@ msgstr "Kontakt %s bol vykopnutý" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2740 +#: ../libempathy-gtk/empathy-chat.c:2739 #, c-format msgid "%1$s was banned by %2$s" msgstr "Kontakt %1$s dostal zákaz od %2$s" -#: ../libempathy-gtk/empathy-chat.c:2743 +#: ../libempathy-gtk/empathy-chat.c:2742 #, c-format msgid "%s was banned" msgstr "Kontakt %s dostal zákaz" -#: ../libempathy-gtk/empathy-chat.c:2747 +#: ../libempathy-gtk/empathy-chat.c:2746 #, c-format msgid "%s has left the room" msgstr "Kontakt %s opustil miestnosť" @@ -1645,17 +1656,17 @@ msgstr "Kontakt %s opustil miestnosť" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2756 +#: ../libempathy-gtk/empathy-chat.c:2755 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2781 +#: ../libempathy-gtk/empathy-chat.c:2780 #, c-format msgid "%s has joined the room" msgstr "Kontakt %s vstúpil do miestnosti" -#: ../libempathy-gtk/empathy-chat.c:2806 +#: ../libempathy-gtk/empathy-chat.c:2805 #, c-format msgid "%s is now known as %s" msgstr "Kontakt %s je teraz známy ako %s" @@ -1663,7 +1674,7 @@ msgstr "Kontakt %s je teraz známy ako %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2993 +#: ../libempathy-gtk/empathy-chat.c:2992 #: ../src/empathy-streamed-media-window.c:1888 #: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1466 #: ../src/empathy-call-window.c:1516 ../src/empathy-call-window.c:2562 @@ -1671,47 +1682,47 @@ msgid "Disconnected" msgstr "Odpojený" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3657 +#: ../libempathy-gtk/empathy-chat.c:3656 msgid "Would you like to store this password?" msgstr "Želáte si uložiť toto heslo?" -#: ../libempathy-gtk/empathy-chat.c:3663 +#: ../libempathy-gtk/empathy-chat.c:3662 msgid "Remember" msgstr "Zapamätať" -#: ../libempathy-gtk/empathy-chat.c:3673 +#: ../libempathy-gtk/empathy-chat.c:3672 msgid "Not now" msgstr "Teraz nie" -#: ../libempathy-gtk/empathy-chat.c:3717 +#: ../libempathy-gtk/empathy-chat.c:3716 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142 msgid "Retry" msgstr "Opakovať" -#: ../libempathy-gtk/empathy-chat.c:3721 +#: ../libempathy-gtk/empathy-chat.c:3720 msgid "Wrong password; please try again:" msgstr "Nesprávne heslo; prosím, skúste to znova:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3851 +#: ../libempathy-gtk/empathy-chat.c:3850 msgid "This room is protected by a password:" msgstr "Miestnosť je chránená heslom:" -#: ../libempathy-gtk/empathy-chat.c:3878 +#: ../libempathy-gtk/empathy-chat.c:3877 msgid "Join" msgstr "Vstúpiť" -#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300 +#: ../libempathy-gtk/empathy-chat.c:4069 ../src/empathy-event-manager.c:1300 msgid "Connected" msgstr "Pripojený" -#: ../libempathy-gtk/empathy-chat.c:4125 +#: ../libempathy-gtk/empathy-chat.c:4124 msgid "Conversation" msgstr "Konverzácia" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4130 +#: ../libempathy-gtk/empathy-chat.c:4129 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" @@ -1839,133 +1850,133 @@ msgstr "Správa, ktorá vás predstaví:" msgid "Please let me see when you're online. Thanks!" msgstr "Prosím, dovoľte mi vidieť, keď ste prihlásený. Ďakujem!" -#: ../libempathy-gtk/empathy-contact-widget.c:567 +#: ../libempathy-gtk/empathy-contact-widget.c:566 #: ../libempathy-gtk/empathy-individual-widget.c:304 msgid "Channels:" msgstr "Kanály:" -#: ../libempathy-gtk/empathy-contact-widget.c:747 +#: ../libempathy-gtk/empathy-contact-widget.c:746 #: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Country ISO Code:" msgstr "ISO kód krajiny:" -#: ../libempathy-gtk/empathy-contact-widget.c:749 +#: ../libempathy-gtk/empathy-contact-widget.c:748 #: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Country:" msgstr "Krajina:" -#: ../libempathy-gtk/empathy-contact-widget.c:751 +#: ../libempathy-gtk/empathy-contact-widget.c:750 #: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "State:" msgstr "Štát:" -#: ../libempathy-gtk/empathy-contact-widget.c:753 +#: ../libempathy-gtk/empathy-contact-widget.c:752 #: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "City:" msgstr "Mesto:" -#: ../libempathy-gtk/empathy-contact-widget.c:755 +#: ../libempathy-gtk/empathy-contact-widget.c:754 #: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Area:" msgstr "Oblasť:" -#: ../libempathy-gtk/empathy-contact-widget.c:757 +#: ../libempathy-gtk/empathy-contact-widget.c:756 #: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Postal Code:" msgstr "PSČ:" -#: ../libempathy-gtk/empathy-contact-widget.c:759 +#: ../libempathy-gtk/empathy-contact-widget.c:758 #: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Street:" msgstr "Ulica:" -#: ../libempathy-gtk/empathy-contact-widget.c:761 +#: ../libempathy-gtk/empathy-contact-widget.c:760 #: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "Building:" msgstr "Budova:" -#: ../libempathy-gtk/empathy-contact-widget.c:763 +#: ../libempathy-gtk/empathy-contact-widget.c:762 #: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Floor:" msgstr "Poschodie:" -#: ../libempathy-gtk/empathy-contact-widget.c:765 +#: ../libempathy-gtk/empathy-contact-widget.c:764 #: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Room:" msgstr "Miestnosť:" -#: ../libempathy-gtk/empathy-contact-widget.c:767 +#: ../libempathy-gtk/empathy-contact-widget.c:766 #: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Text:" msgstr "Text:" -#: ../libempathy-gtk/empathy-contact-widget.c:769 +#: ../libempathy-gtk/empathy-contact-widget.c:768 #: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Description:" msgstr "Popis:" -#: ../libempathy-gtk/empathy-contact-widget.c:771 +#: ../libempathy-gtk/empathy-contact-widget.c:770 #: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:773 +#: ../libempathy-gtk/empathy-contact-widget.c:772 #: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Accuracy Level:" msgstr "Stupeň presnosti:" -#: ../libempathy-gtk/empathy-contact-widget.c:775 +#: ../libempathy-gtk/empathy-contact-widget.c:774 #: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Error:" msgstr "Chyba:" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:776 #: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Vertical Error (meters):" msgstr "Vertikálna chyba (v metroch):" -#: ../libempathy-gtk/empathy-contact-widget.c:779 +#: ../libempathy-gtk/empathy-contact-widget.c:778 #: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Horizontal Error (meters):" msgstr "Horizontálna chyba (v metroch):" -#: ../libempathy-gtk/empathy-contact-widget.c:781 +#: ../libempathy-gtk/empathy-contact-widget.c:780 #: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Speed:" msgstr "Rýchlosť:" -#: ../libempathy-gtk/empathy-contact-widget.c:783 +#: ../libempathy-gtk/empathy-contact-widget.c:782 #: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Bearing:" msgstr "Azimut:" -#: ../libempathy-gtk/empathy-contact-widget.c:785 +#: ../libempathy-gtk/empathy-contact-widget.c:784 #: ../libempathy-gtk/empathy-individual-widget.c:493 msgid "Climb Speed:" msgstr "Rýchlosť stúpania:" -#: ../libempathy-gtk/empathy-contact-widget.c:787 +#: ../libempathy-gtk/empathy-contact-widget.c:786 #: ../libempathy-gtk/empathy-individual-widget.c:495 msgid "Last Updated on:" msgstr "Posledná aktualizácia:" -#: ../libempathy-gtk/empathy-contact-widget.c:789 +#: ../libempathy-gtk/empathy-contact-widget.c:788 #: ../libempathy-gtk/empathy-individual-widget.c:497 msgid "Longitude:" msgstr "Zemepisná dĺžka:" -#: ../libempathy-gtk/empathy-contact-widget.c:791 +#: ../libempathy-gtk/empathy-contact-widget.c:790 #: ../libempathy-gtk/empathy-individual-widget.c:499 msgid "Latitude:" msgstr "Zemepisná šírka:" -#: ../libempathy-gtk/empathy-contact-widget.c:793 +#: ../libempathy-gtk/empathy-contact-widget.c:792 #: ../libempathy-gtk/empathy-individual-widget.c:501 msgid "Altitude:" msgstr "Nadmorská výška:" -#: ../libempathy-gtk/empathy-contact-widget.c:846 -#: ../libempathy-gtk/empathy-contact-widget.c:861 +#: ../libempathy-gtk/empathy-contact-widget.c:845 +#: ../libempathy-gtk/empathy-contact-widget.c:860 #: ../libempathy-gtk/empathy-individual-widget.c:593 #: ../libempathy-gtk/empathy-individual-widget.c:608 #: ../src/empathy-preferences.ui.h:35 @@ -1973,34 +1984,35 @@ msgid "Location" msgstr "Poloha" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-contact-widget.c:863 +#: ../libempathy-gtk/empathy-contact-widget.c:862 #: ../libempathy-gtk/empathy-individual-widget.c:610 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-contact-widget.c:915 +#: ../libempathy-gtk/empathy-contact-widget.c:914 #: ../libempathy-gtk/empathy-individual-widget.c:659 msgid "%B %e, %Y at %R UTC" msgstr "%d. %B %Y, %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:997 +#: ../libempathy-gtk/empathy-contact-widget.c:996 #: ../libempathy-gtk/empathy-individual-widget.c:900 msgid "Save Avatar" msgstr "Uložiť podobizeň" -#: ../libempathy-gtk/empathy-contact-widget.c:1053 +#: ../libempathy-gtk/empathy-contact-widget.c:1052 #: ../libempathy-gtk/empathy-individual-widget.c:958 msgid "Unable to save avatar" msgstr "Podobizeň sa nedá uložiť" -#: ../libempathy-gtk/empathy-contact-widget.c:1455 +#: ../libempathy-gtk/empathy-contact-widget.c:1454 #, fuzzy +#| msgid "Technical Details" msgid "Personal Details" msgstr "Technické údaje" # Podrobnosti, že? -#: ../libempathy-gtk/empathy-contact-widget.c:1458 +#: ../libempathy-gtk/empathy-contact-widget.c:1457 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" @@ -2008,26 +2020,31 @@ msgstr "Informácie o kontakte" #: ../libempathy-gtk/empathy-contactinfo-utils.c:104 #, fuzzy +#| msgid "Full name:" msgid "Full name" msgstr "Celé meno:" #: ../libempathy-gtk/empathy-contactinfo-utils.c:105 #, fuzzy +#| msgid "Phone number:" msgid "Phone number" msgstr "Telefónne číslo:" #: ../libempathy-gtk/empathy-contactinfo-utils.c:106 #, fuzzy +#| msgid "E-mail address:" msgid "E-mail address" msgstr "Emailová adresa:" #: ../libempathy-gtk/empathy-contactinfo-utils.c:107 #, fuzzy +#| msgid "Website:" msgid "Website" msgstr "Webová stránka:" #: ../libempathy-gtk/empathy-contactinfo-utils.c:108 #, fuzzy +#| msgid "Birthday:" msgid "Birthday" msgstr "Narodeniny:" @@ -2050,26 +2067,31 @@ msgstr "Správa pri odchode:" #: ../libempathy-gtk/empathy-contactinfo-utils.c:132 #, fuzzy +#| msgid "Work" msgid "work" msgstr "Práca" #: ../libempathy-gtk/empathy-contactinfo-utils.c:133 #, fuzzy +#| msgid "Romeo" msgid "home" msgstr "Rómeo" #: ../libempathy-gtk/empathy-contactinfo-utils.c:134 #, fuzzy +#| msgid "Mobile" msgid "mobile" msgstr "Mobil" #: ../libempathy-gtk/empathy-contactinfo-utils.c:135 #, fuzzy +#| msgid "Favorite" msgid "voice" msgstr "Obľúbený" #: ../libempathy-gtk/empathy-contactinfo-utils.c:136 #, fuzzy +#| msgid "Preferences" msgid "preferred" msgstr "Nastavenia" @@ -2079,6 +2101,7 @@ msgstr "" #: ../libempathy-gtk/empathy-contactinfo-utils.c:138 #, fuzzy +#| msgid "Appearance" msgid "parcel" msgstr "Vzhľad" @@ -2143,7 +2166,7 @@ msgid "Select" msgstr "Vybrať" #: ../libempathy-gtk/empathy-groups-widget.c:403 -#: ../src/empathy-roster-window.c:1970 +#: ../src/empathy-roster-window.c:1969 msgid "Group" msgstr "Skupina" @@ -2173,110 +2196,112 @@ msgstr "Prepojené kontakty" #. 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:173 +#: ../libempathy-gtk/empathy-individual-menu.c:172 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:345 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "" #. translators: Call is a noun. This string is used in the window #. * title -#: ../libempathy-gtk/empathy-individual-menu.c:349 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-streamed-media-window.c:1290 #: ../src/empathy-call-window.ui.h:18 msgid "Call" msgstr "Hovor" -#: ../libempathy-gtk/empathy-individual-menu.c:414 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Mobil" -#: ../libempathy-gtk/empathy-individual-menu.c:416 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Práca" -#: ../libempathy-gtk/empathy-individual-menu.c:418 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "DOMOV" -#: ../libempathy-gtk/empathy-individual-menu.c:659 +#: ../libempathy-gtk/empathy-individual-menu.c:658 msgid "_Block Contact" msgstr "Za_blokovať kontakt" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1018 +#: ../libempathy-gtk/empathy-individual-menu.c:1017 #: ../libempathy-gtk/empathy-new-message-dialog.c:319 #: ../src/empathy-roster-window-menubar.ui.h:1 msgid "_Chat" msgstr "_Rozhovor" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1053 +#: ../libempathy-gtk/empathy-individual-menu.c:1052 #: ../libempathy-gtk/empathy-new-message-dialog.c:313 msgid "_SMS" msgstr "_SMS" # PŠ: navrhujem Hlasový -#: ../libempathy-gtk/empathy-individual-menu.c:1086 +#: ../libempathy-gtk/empathy-individual-menu.c:1085 msgctxt "menu item" msgid "_Audio Call" msgstr "_Zvukový hovor" -#: ../libempathy-gtk/empathy-individual-menu.c:1119 +#: ../libempathy-gtk/empathy-individual-menu.c:1118 msgctxt "menu item" msgid "_Video Call" msgstr "_Videohovor" -#: ../libempathy-gtk/empathy-individual-menu.c:1160 +#: ../libempathy-gtk/empathy-individual-menu.c:1159 #: ../src/empathy-roster-window-menubar.ui.h:4 msgid "_Previous Conversations" msgstr "P_redchádzajúce konverzácie" -#: ../libempathy-gtk/empathy-individual-menu.c:1189 +#: ../libempathy-gtk/empathy-individual-menu.c:1188 msgid "Send File" msgstr "Poslať súbor" -#: ../libempathy-gtk/empathy-individual-menu.c:1219 +#: ../libempathy-gtk/empathy-individual-menu.c:1218 msgid "Share My Desktop" msgstr "Zdieľať moju plochu" -#: ../libempathy-gtk/empathy-individual-menu.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1244 #: ../libempathy-gtk/empathy-individual-widget.c:1357 msgid "Favorite" msgstr "Obľúbený" -#: ../libempathy-gtk/empathy-individual-menu.c:1264 +#: ../libempathy-gtk/empathy-individual-menu.c:1263 #, fuzzy +#| msgid "telepathy-salut not installed" msgid "gnome-contacts not installed" msgstr "telepathy-salut nie je nainštalovaný" -#: ../libempathy-gtk/empathy-individual-menu.c:1267 +#: ../libempathy-gtk/empathy-individual-menu.c:1266 msgid "Please install gnome-contacts to access contacts details." msgstr "" -#: ../libempathy-gtk/empathy-individual-menu.c:1398 +#: ../libempathy-gtk/empathy-individual-menu.c:1397 msgid "Infor_mation" msgstr "_Informácie" -#: ../libempathy-gtk/empathy-individual-menu.c:1447 +#: ../libempathy-gtk/empathy-individual-menu.c:1446 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Upraviť" -#: ../libempathy-gtk/empathy-individual-menu.c:1564 -#: ../src/empathy-chat-window.c:1192 +#. send invitation +#: ../libempathy-gtk/empathy-individual-menu.c:1562 +#: ../src/empathy-chat-window.c:1190 msgid "Inviting you to this room" msgstr "Pozýva vás do tejto miestnosti" -#: ../libempathy-gtk/empathy-individual-menu.c:1610 +#: ../libempathy-gtk/empathy-individual-menu.c:1608 msgid "_Invite to Chat Room" msgstr "_Pozvať do diskusnej miestnosti" -#: ../libempathy-gtk/empathy-individual-menu.c:1806 +#: ../libempathy-gtk/empathy-individual-menu.c:1804 #: ../src/empathy-roster-window-menubar.ui.h:5 msgid "_Add Contact…" msgstr "_Pridať kontakt…" @@ -2532,16 +2557,19 @@ msgstr "<span size=\"x-large\">Načítava sa...</span>" #: ../libempathy-gtk/empathy-new-message-dialog.c:83 #, fuzzy +#| msgid "The specified contact is offline" msgid "The contact is offline" msgstr "Zvolený kontakt je odhlásený" #: ../libempathy-gtk/empathy-new-message-dialog.c:85 #, fuzzy +#| msgid "The specified contact is not valid" msgid "The specified contact is either invalid or unknown" msgstr "Zvolený kontakt nie je platný" #: ../libempathy-gtk/empathy-new-message-dialog.c:87 #, fuzzy +#| msgid "Topic not supported on this conversation" msgid "The contact does not support this kind of conversation" msgstr "Téma nie je pri tejto konverzácii podporovaná" @@ -2563,21 +2591,25 @@ msgstr "" #: ../libempathy-gtk/empathy-new-message-dialog.c:101 #, fuzzy +#| msgid "You have been invited to join %s" msgid "You must be invited to join this channel" msgstr "Boli ste pozvaný na vstup do %s" #: ../libempathy-gtk/empathy-new-message-dialog.c:103 #, fuzzy +#| msgid "Contact disconnected" msgid "Can't proceed while disconnected" msgstr "Kontakt sa odpojil" #: ../libempathy-gtk/empathy-new-message-dialog.c:105 #, fuzzy +#| msgid "permission denied" msgid "Permission denied" msgstr "prístup zamietnutý" #: ../libempathy-gtk/empathy-new-message-dialog.c:111 #, fuzzy +#| msgid "There was an error starting the call" msgid "There was an error starting the conversation" msgstr "Počas vytvárania hovoru nastala chyba." @@ -2600,6 +2632,8 @@ msgstr "_Videohovor" #. add audio button #: ../libempathy-gtk/empathy-new-call-dialog.c:233 #, fuzzy +#| msgctxt "menu item" +#| msgid "_Audio Call" msgid "_Audio Call" msgstr "_Zvukový hovor" @@ -2610,6 +2644,7 @@ msgstr "Nový hovor" #: ../libempathy-gtk/empathy-bad-password-dialog.c:130 #, fuzzy, c-format +#| msgid "Authentication failed" msgid "Authentification failed for account <b>%s</b>" msgstr "Overenie totožnosti zlyhalo" @@ -2629,30 +2664,38 @@ msgstr "" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:167 -#: ../libempathy-gtk/empathy-presence-chooser.c:203 +#: ../libempathy-gtk/empathy-presence-chooser.c:166 +#: ../libempathy-gtk/empathy-presence-chooser.c:202 msgid "Custom Message…" msgstr "Vlastná správa…" -#: ../libempathy-gtk/empathy-presence-chooser.c:220 -#: ../libempathy-gtk/empathy-presence-chooser.c:222 +#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:221 msgid "Edit Custom Messages…" msgstr "Upraviť vlastné správy…" -#: ../libempathy-gtk/empathy-presence-chooser.c:345 +#: ../libempathy-gtk/empathy-presence-chooser.c:344 msgid "Click to remove this status as a favorite" msgstr "Kliknutím odstránite tento stav z obľúbených" -#: ../libempathy-gtk/empathy-presence-chooser.c:354 +#: ../libempathy-gtk/empathy-presence-chooser.c:353 msgid "Click to make this status a favorite" msgstr "Kliknutím nastavíte tento stav ako obľúbený" -#: ../libempathy-gtk/empathy-presence-chooser.c:388 +#. Translators: %s is a status message like 'At the pub' for example +#: ../libempathy-gtk/empathy-presence-chooser.c:387 +#, c-format +msgid "" +"<b>Current message: %s</b>\n" +"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>" +msgstr "" + +#: ../libempathy-gtk/empathy-presence-chooser.c:396 msgid "Set status" msgstr "Nastaviť stav" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1135 +#: ../libempathy-gtk/empathy-presence-chooser.c:1147 msgid "Custom messages…" msgstr "Vlastné správy…" @@ -2735,7 +2778,7 @@ msgid "Message edited at %s" msgstr "Prijatá správa" # Varianta: -# PŠ: keď už, tak "variant"... rod upravený +#PŠ: keď už, tak "variant"... rod upravený #: ../libempathy-gtk/empathy-theme-adium.c:1757 msgid "Normal" msgstr "Normálny" @@ -2814,6 +2857,7 @@ msgstr "Názov hostiteľa certifikátu: %s" #: ../libempathy-gtk/empathy-tls-dialog.c:281 #, fuzzy +#| msgid "Continue" msgid "C_ontinue" msgstr "Pokračovať" @@ -3028,11 +3072,15 @@ msgstr "Vietnamské" #: ../libempathy-gtk/empathy-calendar-button.c:66 #, fuzzy +#| msgctxt "verb in a column header displaying group names" +#| msgid "Select" msgid "Select..." msgstr "Vybrať" #: ../libempathy-gtk/empathy-calendar-button.c:154 #, fuzzy +#| msgctxt "verb in a column header displaying group names" +#| msgid "Select" msgid "_Select" msgstr "Vybrať" @@ -3044,24 +3092,24 @@ msgstr "Žiadna chybová správa" msgid "Instant Message (Empathy)" msgstr "Okamžitá správa (Empathy)" -#: ../src/empathy.c:428 +#: ../src/empathy.c:425 msgid "Don't connect on startup" msgstr "Nepripájať sa po spustení" -#: ../src/empathy.c:432 +#: ../src/empathy.c:429 msgid "Don't display the contact list or any other dialogs on startup" msgstr "" "Nezobrazovať zoznam kontaktov alebo akékoľvek iné dialógové okno pri spustení" -#: ../src/empathy.c:447 +#: ../src/empathy.c:444 msgid "- Empathy IM Client" msgstr "- Komunikátor Empathy" -#: ../src/empathy.c:634 +#: ../src/empathy.c:620 msgid "Error contacting the Account Manager" msgstr "" -#: ../src/empathy.c:636 +#: ../src/empathy.c:622 #, fuzzy, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3116,14 +3164,14 @@ msgstr "" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:72 +#: ../src/empathy-accounts-dialog.c:71 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Vo vašom účte %s máte neuložené zmeny." #. 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:76 +#: ../src/empathy-accounts-dialog.c:75 msgid "Your new account has not been saved yet." msgstr "Váš nový účet ešte nebol uložený." @@ -3164,6 +3212,7 @@ msgstr "Odhlásený — Účet zablokovaný" #: ../src/empathy-accounts-dialog.c:608 #, fuzzy +#| msgid "Connection has been refused" msgid "Edit Connection Parameters" msgstr "Pripojenie bolo zamietnuté" @@ -3188,7 +3237,7 @@ msgstr "Naozaj chcete odstrániť %s z vášho počítača?" msgid "This will not remove your account on the server." msgstr "Toto neodstráni váš účet na serveri." -#: ../src/empathy-accounts-dialog.c:1602 +#: ../src/empathy-accounts-dialog.c:1571 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3198,26 +3247,31 @@ msgstr "" # * https://bugzilla.gnome.org/show_bug.cgi?id=645689 # PŠ: toto asi nebude správny odkaz na bugreport... opraviť! -#. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1779 +#. Menu item: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1762 #, fuzzy -msgid "_Enable" +#| msgid "_Enable" +msgid "_Enabled" msgstr "_Povoliť" -#: ../src/empathy-accounts-dialog.c:1780 -msgid "_Disable" -msgstr "_Zakázať" +#. Menu item: Rename +#: ../src/empathy-accounts-dialog.c:1785 +#, fuzzy +#| msgid "Real name:" +msgid "Rename" +msgstr "Skutočné meno:" -#: ../src/empathy-accounts-dialog.c:2221 +#: ../src/empathy-accounts-dialog.c:2201 msgid "_Skip" msgstr "" -#: ../src/empathy-accounts-dialog.c:2225 +#: ../src/empathy-accounts-dialog.c:2205 #, fuzzy +#| msgid "Connected" msgid "_Connect" msgstr "Pripojený" -#: ../src/empathy-accounts-dialog.c:2404 +#: ../src/empathy-accounts-dialog.c:2384 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3243,24 +3297,25 @@ msgstr "" #: ../src/empathy-accounts-dialog.ui.h:6 #, fuzzy +#| msgid "No protocol installed" msgid "No protocol backends installed" msgstr "Nebol nainštalovaný žiadny protokol" -#: ../src/empathy-auth-client.c:288 +#: ../src/empathy-auth-client.c:286 #, fuzzy msgid " - Empathy authentication client" msgstr "- Komunikátor Empathy" -#: ../src/empathy-auth-client.c:304 +#: ../src/empathy-auth-client.c:302 #, fuzzy msgid "Empathy authentication client" msgstr "Autentifikácia zlyhala" -#: ../src/empathy-av.c:118 ../src/empathy-call.c:201 +#: ../src/empathy-av.c:115 ../src/empathy-call.c:198 msgid "- Empathy Audio/Video Client" msgstr "- Empathy - klient pre zvuk a video" -#: ../src/empathy-av.c:134 ../src/empathy-call.c:223 +#: ../src/empathy-av.c:131 ../src/empathy-call.c:220 msgid "Empathy Audio/Video Client" msgstr "Empathy - klient pre zvuk a video" @@ -3571,19 +3626,20 @@ msgstr "" msgid "Audio" msgstr "Zvuk" -#: ../src/empathy-chat-window.c:289 +#: ../src/empathy-chat-window.c:288 #, fuzzy +#| msgid "Hide the main window." msgid "Close this window?" msgstr "Skryje hlavné okno." -#: ../src/empathy-chat-window.c:294 +#: ../src/empathy-chat-window.c:293 #, c-format msgid "" "Closing this window will leave %s. You will not receive any further messages " "until you rejoin it." msgstr "" -#: ../src/empathy-chat-window.c:305 +#: ../src/empathy-chat-window.c:304 #, c-format msgid "" "Closing this window will leave a chat room. You will not receive any further " @@ -3595,27 +3651,29 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../src/empathy-chat-window.c:314 +#: ../src/empathy-chat-window.c:313 #, fuzzy, c-format +#| msgid "Level " msgid "Leave %s?" msgstr "Úroveň" -#: ../src/empathy-chat-window.c:315 +#: ../src/empathy-chat-window.c:314 msgid "" "You will not receive any further messages from this chat room until you " "rejoin it." msgstr "" -#: ../src/empathy-chat-window.c:334 +#: ../src/empathy-chat-window.c:333 msgid "Close window" msgstr "" -#: ../src/empathy-chat-window.c:334 +#: ../src/empathy-chat-window.c:333 #, fuzzy +#| msgid "Level " msgid "Leave room" msgstr "Úroveň" -#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660 +#: ../src/empathy-chat-window.c:639 ../src/empathy-chat-window.c:659 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -3623,7 +3681,7 @@ msgstr[0] "%s (%d neprečítaných)" msgstr[1] "%s (%d neprečítaná)" msgstr[2] "%s (%d neprečítané)" -#: ../src/empathy-chat-window.c:652 +#: ../src/empathy-chat-window.c:651 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -3631,7 +3689,7 @@ msgstr[0] "%s (a %u ostatných)" msgstr[1] "%s (a %u ostatný)" msgstr[2] "%s (a %u ostatní)" -#: ../src/empathy-chat-window.c:668 +#: ../src/empathy-chat-window.c:667 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -3639,7 +3697,7 @@ msgstr[0] "%s (%d neprečítaných od iných)" msgstr[1] "%s (%d neprečítaná od iných)" msgstr[2] "%s (%d neprečítané od iných)" -#: ../src/empathy-chat-window.c:677 +#: ../src/empathy-chat-window.c:676 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -3647,11 +3705,11 @@ msgstr[0] "%s (%d neprečítaných od všetkých)" msgstr[1] "%s (%d neprečítaná od všetkých)" msgstr[2] "%s (%d neprečítané od všetkých)" -#: ../src/empathy-chat-window.c:892 +#: ../src/empathy-chat-window.c:891 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:902 +#: ../src/empathy-chat-window.c:901 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3659,7 +3717,7 @@ msgstr[0] "Posiela sa %d správ" msgstr[1] "Posiela sa %d správa" msgstr[2] "Posielajú sa %d správy" -#: ../src/empathy-chat-window.c:924 +#: ../src/empathy-chat-window.c:923 msgid "Typing a message." msgstr "Píše správu." @@ -3820,7 +3878,7 @@ msgstr "Boli ste pozvaný na vstup do %s" msgid "Incoming file transfer from %s" msgstr "Prichádzajúci prenos súboru od %s" -#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374 +#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:373 msgid "Password required" msgstr "Vyžadované heslo" @@ -3951,6 +4009,7 @@ msgstr "Odstrániť dokončené, zrušené a chybné prenosy súborov zo zoznamu #: ../src/empathy-import-dialog.c:76 #, fuzzy +#| msgid "Import" msgid "_Import" msgstr "Importovať" @@ -3979,79 +4038,80 @@ msgstr "Protokol" msgid "Source" msgstr "Zdroj" -#: ../src/empathy-roster-window.c:391 +#: ../src/empathy-roster-window.c:390 msgid "Provide Password" msgstr "Poskytnite heslo" -#: ../src/empathy-roster-window.c:397 +#: ../src/empathy-roster-window.c:396 msgid "Disconnect" msgstr "Odpojiť" -#: ../src/empathy-roster-window.c:657 +#: ../src/empathy-roster-window.c:656 msgid "You need to setup an account to see contacts here." msgstr "" -#: ../src/empathy-roster-window.c:673 +#: ../src/empathy-roster-window.c:672 msgid "No match found" msgstr "Nenájdená žiadna zhoda" -#: ../src/empathy-roster-window.c:783 +#: ../src/empathy-roster-window.c:782 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" -#: ../src/empathy-roster-window.c:849 +#: ../src/empathy-roster-window.c:848 msgid "Update software..." msgstr "" -#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972 +#: ../src/empathy-roster-window.c:854 ../src/empathy-roster-window.c:971 msgid "Close" msgstr "Zatvoriť" -#: ../src/empathy-roster-window.c:960 +#: ../src/empathy-roster-window.c:959 msgid "Reconnect" msgstr "Obnoviť spojenie" -#: ../src/empathy-roster-window.c:966 +#: ../src/empathy-roster-window.c:965 msgid "Edit Account" msgstr "Upraviť účet" #. Translators: this string will be something like: #. * Top up My Account ($1.23)..." -#: ../src/empathy-roster-window.c:1110 +#: ../src/empathy-roster-window.c:1109 #, c-format msgid "Top up %s (%s)..." msgstr "Dobiť %s (%s)..." -#: ../src/empathy-roster-window.c:1156 +#: ../src/empathy-roster-window.c:1155 msgid "Top up account credit" msgstr "Dobiť kredit na účte" #. top up button -#: ../src/empathy-roster-window.c:1228 +#: ../src/empathy-roster-window.c:1227 msgid "Top Up..." msgstr "Dobiť..." -#: ../src/empathy-roster-window.c:1952 +#: ../src/empathy-roster-window.c:1951 msgid "Contact" msgstr "Kontakt" -#: ../src/empathy-roster-window.c:2150 +#: ../src/empathy-roster-window.c:2149 msgid "You need to enable one of your accounts to see contacts here." msgstr "" #. translators: argument is an account name -#: ../src/empathy-roster-window.c:2158 +#: ../src/empathy-roster-window.c:2157 #, c-format msgid "You need to enable %s to see contacts here." msgstr "" -#: ../src/empathy-roster-window.c:2460 +#: ../src/empathy-roster-window.c:2459 msgid "Contact List" msgstr "Zoznam kontaktov" #: ../src/empathy-roster-window.ui.h:1 #, fuzzy +#| msgid "_Accounts" msgid "Account settings" msgstr "Účt_y" @@ -4226,6 +4286,7 @@ msgid "New conversation" msgstr "Nová konverzácia" #: ../src/empathy-preferences.c:169 +#| msgid "Contact goes online" msgid "Contact comes online" msgstr "Kontakt sa prihlásil" @@ -4386,8 +4447,8 @@ msgid "" "off and restarting the call." msgstr "" "Druhá osoba vám bude lepšie rozumieť potlačením ozveny, ale môže to spôsobiť " -"problémy na niektorých počítačoch. Ak druhá osoba počuje podivné zvuky alebo " -"zaznamená výpadky počas hovoru, skúste vypnúť potlačenie ozveny a " +"problémy na niektorých počítačoch. Ak druhá osoba počuje podivné zvuky " +"alebo zaznamená výpadky počas hovoru, skúste vypnúť potlačenie ozveny a " "reštartovať hovor." #: ../src/empathy-preferences.ui.h:26 @@ -4593,16 +4654,16 @@ msgid "" msgstr "" "Zvolený správca pripojenia nepodporuje rozšírenie pre vzdialené ladenie." -#: ../src/empathy-invite-participant-dialog.c:202 -#: ../src/empathy-invite-participant-dialog.c:230 +#: ../src/empathy-invite-participant-dialog.c:200 +#: ../src/empathy-invite-participant-dialog.c:228 msgid "Invite Participant" msgstr "Pozvať účastníka" -#: ../src/empathy-invite-participant-dialog.c:203 +#: ../src/empathy-invite-participant-dialog.c:201 msgid "Choose a contact to invite into the conversation:" msgstr "Vyberte kontakt, ktorý chcete pozvať do konverzácie:" -#: ../src/empathy-invite-participant-dialog.c:226 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite" msgstr "Pozvať" @@ -4630,7 +4691,7 @@ msgstr "<account-id>" msgid "- Empathy Accounts" msgstr "- účty Empathy" -#: ../src/empathy-accounts.c:231 +#: ../src/empathy-accounts.c:230 msgid "Empathy Accounts" msgstr "Empathy - účty" @@ -4642,11 +4703,11 @@ msgstr "" msgid "- Empathy Debugger" msgstr "- Odlaďovač Empathy" -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:112 msgid "Empathy Debugger" msgstr "Odlaďovač Empathy" -#: ../src/empathy-chat.c:109 +#: ../src/empathy-chat.c:106 msgid "- Empathy Chat Client" msgstr "- Komunikátor Empathy" @@ -4728,6 +4789,7 @@ msgstr "" #: ../src/empathy-call-window.c:3144 #, fuzzy +#| msgid "Top Up..." msgid "Top Up" msgstr "Dobiť..." @@ -4741,6 +4803,7 @@ msgstr "Aký typ účtu máte?" #: ../libempathy-gtk/empathy-new-account-dialog.c:166 #, fuzzy +#| msgid "New account" msgid "Adding new account" msgstr "Nový účet" @@ -4765,16 +4828,6 @@ msgid "" msgstr "" #, fuzzy -#~| msgid "E-_mail address:" -#~ msgid "Local IP Address:" -#~ msgstr "E_mailová adresa:" - -#, fuzzy -#~| msgid "Real name:" -#~ msgid "Rename" -#~ msgstr "Skutočné meno:" - -#, fuzzy #~ msgid "My Web Accounts" #~ msgstr "- Empathy účty" @@ -4956,6 +5009,9 @@ msgstr "" #~ "Chystáte sa vytvoriť nový účet, čím zrušíte vaše zmeny.\n" #~ "Naozaj chcete pokračovať?" +#~ msgid "_Disable" +#~ msgstr "_Zakázať" + #~ msgid "Protocol:" #~ msgstr "Protokol:" @@ -1,20 +1,19 @@ # translation of empathy.master.te.po to Telugu -# Copyright (C) 2011, 2012 Swecha localisation Team +# Copyright (C) 2011, 2012 Swecha Telugu localisation Team <localization@swecha.net> # This file is distributed under the same license as the empathy package. # -# # Krishna Babu K <kkrothap@redhat.com>, 2009.2011 # Praveen Illa <mail2ipn@gmail.com>, 2011. # Sasi Bhushan Boddepalli <Sasi@swecha.net>,2011, 2012 -# Naveen kandimala <naveen@swecha.net>, 2012 -# GVS.Giri (Swecha Team) <gvs.giri947@gmail.com>,2012, 2012. +# Naveen kandimala(Swecha) <naveen@swecha.net>, 2012 +# GVS.Giri (Swecha Team) <gvs.giri947@gmail.com>,2012. msgid "" msgstr "" "Project-Id-Version: empathy.master.te\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2012-03-24 07:45+0000\n" -"PO-Revision-Date: 2012-03-24 14:54+0530\n" +"POT-Creation-Date: 2012-04-02 11:48+0000\n" +"PO-Revision-Date: 2012-04-02 17:52+0530\n" "Last-Translator: Sasi Bhushan Boddepalli <sasi@swecha.net>\n" "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -42,7 +41,7 @@ msgstr "గూగుల్ టాక్, ఫేస్బుక్, MSN వం #. Tweak the dialog #: ../data/empathy-accounts.desktop.in.in.h:1 -#: ../src/empathy-accounts-dialog.c:2513 +#: ../src/empathy-accounts-dialog.c:2563 msgid "Messaging and VoIP Accounts" msgstr "సందేశకము మరియు VoIP ఖాతాలు" @@ -801,7 +800,7 @@ msgid "All accounts" msgstr "ఖాతాలు అన్నియు" #: ../libempathy-gtk/empathy-account-widget.c:682 -#: ../src/empathy-import-widget.c:336 +#: ../src/empathy-import-widget.c:323 msgid "Account" msgstr "ఖాతా" @@ -923,7 +922,7 @@ msgstr "సేవకము (_S):" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 msgid "Advanced" msgstr "అధునాతన" @@ -941,7 +940,7 @@ msgstr "మీ AIM సంకేతపదము ఏమిటి?" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 msgid "Remember Password" msgstr "సంకేతపదం గుర్తించుకొను" @@ -985,36 +984,32 @@ msgstr "మీ ICQ UIN ఏమిటి?" msgid "What is your ICQ password?" msgstr "మీ ICQ సంకేతపదము ఏమిటి?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:206 -#: ../libempathy-gtk/empathy-account-widget-sip.c:239 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 +#: ../libempathy-gtk/empathy-account-widget-sip.c:240 msgid "Auto" msgstr "స్వయం" -#: ../libempathy-gtk/empathy-account-widget-sip.c:209 +#: ../libempathy-gtk/empathy-account-widget-sip.c:210 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:212 +#: ../libempathy-gtk/empathy-account-widget-sip.c:213 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:215 +#: ../libempathy-gtk/empathy-account-widget-sip.c:216 msgid "TLS" msgstr "TLS" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:244 +#: ../libempathy-gtk/empathy-account-widget-sip.c:245 msgid "Register" msgstr "నమోదుచేసుకొను" -#. translators: this string is very specific to SIP's internal; maybe -#. * best to keep the English version. -#: ../libempathy-gtk/empathy-account-widget-sip.c:249 +#: ../libempathy-gtk/empathy-account-widget-sip.c:250 msgid "Options" msgstr "ఐచ్ఛికాలు" -#: ../libempathy-gtk/empathy-account-widget-sip.c:252 +#: ../libempathy-gtk/empathy-account-widget-sip.c:253 msgid "None" msgstr "ఏదీకాదు" @@ -1275,11 +1270,16 @@ msgstr "TLS దోషాలను విస్మరించు" msgid "Port:" msgstr "పోర్టు (_P):" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#| msgid "E-_mail address:" +msgid "Local IP Address:" +msgstr "స్థానిక IP చిరునామా: " + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "మీ SIP ప్రవేశ ఐడి ఏమిటి?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "What is your SIP account password?" msgstr "మీ SIP ఖాతా సంకేతపదం ఏమిటి?" @@ -1622,8 +1622,8 @@ msgstr "%s ఇప్పుడు %s వలె అయినారు" #. * we get the new handler. #: ../libempathy-gtk/empathy-chat.c:2994 #: ../src/empathy-streamed-media-window.c:1888 -#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502 -#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590 +#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1466 +#: ../src/empathy-call-window.c:1516 ../src/empathy-call-window.c:2562 msgid "Disconnected" msgstr "అననుసంధానించబడ్డారు" @@ -1699,7 +1699,7 @@ msgstr "నిరోధించబడిన పరిచయాలను సవ #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:506 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:503 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 #: ../libempathy-gtk/empathy-individual-widget.c:1474 #: ../src/empathy-chatrooms-window.ui.h:2 @@ -1771,27 +1771,27 @@ msgid "Decide _Later" msgstr "తర్వాత నిర్ణయిస్తాను (_L)" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:499 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:496 msgid "Search contacts" msgstr "పరిచయాలను వెతుకు" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:526 msgid "Search: " msgstr "వెతుకు: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:587 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:584 msgid "_Add Contact" msgstr "పరిచయాన్ని జతచేయి...(_A)" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:605 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:602 msgid "No contacts found" msgstr "ఏ పరిచయాలు కనపడలేదు" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:621 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:618 msgid "Your message introducing yourself:" msgstr "మీ సందేశం మిమ్మల్ని పరిచయం చెస్తుంది:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:629 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:626 msgid "Please let me see when you're online. Thanks!" msgstr "మీరు ఆన్లైన్ ఉన్నప్పుడు నన్ను చూడండి తెలియచేయండి. ధన్యవాదాలు!" @@ -1950,11 +1950,11 @@ msgstr "అవతారాన్ని భద్రపరుచు" msgid "Unable to save avatar" msgstr "అవతారాన్ని భద్రపరచలేకపోతుంది" -#: ../libempathy-gtk/empathy-contact-widget.c:1444 +#: ../libempathy-gtk/empathy-contact-widget.c:1455 msgid "Personal Details" msgstr "వ్యక్తిగత వివరాలు" -#: ../libempathy-gtk/empathy-contact-widget.c:1447 +#: ../libempathy-gtk/empathy-contact-widget.c:1458 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3 msgid "Contact Details" @@ -2063,11 +2063,11 @@ msgstr "వర్షన్:" msgid "Client:" msgstr "క్లయింటు:" -#: ../libempathy-gtk/empathy-groups-widget.c:331 +#: ../libempathy-gtk/empathy-groups-widget.c:327 msgid "Groups" msgstr "గుంపులు" -#: ../libempathy-gtk/empathy-groups-widget.c:343 +#: ../libempathy-gtk/empathy-groups-widget.c:339 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2075,16 +2075,16 @@ msgstr "" "గుంపులో కనిపించాలనుకుంటున్న పరిచయాన్ని ఎంచుకోండి. మీరు ఒకటి కన్నా ఎక్కువ గుంపులను " "ఎంచుకొనవచ్చు లేదా అస్సలు ఎంచుకొనపోవచ్చునని గమనించండి." -#: ../libempathy-gtk/empathy-groups-widget.c:362 +#: ../libempathy-gtk/empathy-groups-widget.c:358 msgid "_Add Group" msgstr "గుంపును జతచేయి (_A)" -#: ../libempathy-gtk/empathy-groups-widget.c:397 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "ఎంచుకోండి" -#: ../libempathy-gtk/empathy-groups-widget.c:407 +#: ../libempathy-gtk/empathy-groups-widget.c:403 #: ../src/empathy-roster-window.c:1970 msgid "Group" msgstr "గుంపు" @@ -2339,8 +2339,6 @@ msgstr "<b>%s:</b> %s" #: ../libempathy-gtk/empathy-log-window.c:1371 #, c-format -#| msgid "%s second" -#| msgid_plural "%s seconds" msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s సెకన్ " @@ -2371,62 +2369,62 @@ msgstr "నిన్న" msgid "%e %B %Y" msgstr "%A %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1827 -#: ../libempathy-gtk/empathy-log-window.c:3487 +#: ../libempathy-gtk/empathy-log-window.c:1843 +#: ../libempathy-gtk/empathy-log-window.c:3471 msgid "Anytime" msgstr "ఏ సమయములోనా" -#: ../libempathy-gtk/empathy-log-window.c:1916 -#: ../libempathy-gtk/empathy-log-window.c:2400 +#: ../libempathy-gtk/empathy-log-window.c:1942 +#: ../libempathy-gtk/empathy-log-window.c:2401 msgid "Anyone" msgstr "ఎవరైనా" -#: ../libempathy-gtk/empathy-log-window.c:2713 +#: ../libempathy-gtk/empathy-log-window.c:2714 msgid "Who" msgstr "ఎవరు" -#: ../libempathy-gtk/empathy-log-window.c:2922 +#: ../libempathy-gtk/empathy-log-window.c:2923 msgid "When" msgstr "ఎపుడు" -#: ../libempathy-gtk/empathy-log-window.c:3038 +#: ../libempathy-gtk/empathy-log-window.c:3039 msgid "Anything" msgstr "ఏదైనా" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3041 msgid "Text chats" msgstr "పాఠ్య చాట్లు" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3043 #: ../src/empathy-preferences.ui.h:25 msgid "Calls" msgstr "కాల్స్ " -#: ../libempathy-gtk/empathy-log-window.c:3047 +#: ../libempathy-gtk/empathy-log-window.c:3048 msgid "Incoming calls" msgstr "లోనికివచ్చు కాల్స్" -#: ../libempathy-gtk/empathy-log-window.c:3048 +#: ../libempathy-gtk/empathy-log-window.c:3049 msgid "Outgoing calls" msgstr "బయటకు వెళ్ళు వాయిస్ కాల్స్" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3050 msgid "Missed calls" msgstr "మిస్సుడ్ కాల్స్" -#: ../libempathy-gtk/empathy-log-window.c:3071 +#: ../libempathy-gtk/empathy-log-window.c:3072 msgid "What" msgstr "ఏమిటి" -#: ../libempathy-gtk/empathy-log-window.c:3780 +#: ../libempathy-gtk/empathy-log-window.c:3764 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "మీరు మునుపటి సంభాషణలు అన్ని లాగ్లను తొలగించడానికి నిశ్చయించుకున్నారా?" -#: ../libempathy-gtk/empathy-log-window.c:3784 +#: ../libempathy-gtk/empathy-log-window.c:3768 msgid "Clear All" msgstr "అన్న శుభ్రపరచు " -#: ../libempathy-gtk/empathy-log-window.c:3791 +#: ../libempathy-gtk/empathy-log-window.c:3775 msgid "Delete from:" msgstr "దీని నుండి తొలగ్మిచు:" @@ -2575,12 +2573,12 @@ msgstr "ఈ స్థితిని ఇష్టాంశము నుండి msgid "Click to make this status a favorite" msgstr "ఈ స్థితిని ఇష్టాంశముగా చేయుటకు నొక్కండి" -#: ../libempathy-gtk/empathy-presence-chooser.c:388 +#: ../libempathy-gtk/empathy-presence-chooser.c:396 msgid "Set status" msgstr "స్థితిని అమర్చు" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1135 +#: ../libempathy-gtk/empathy-presence-chooser.c:1145 msgid "Custom messages…" msgstr "అనురూపిత సందేశాలు..." @@ -2958,11 +2956,11 @@ msgstr "ఎంచుకోండి..." msgid "_Select" msgstr "ఎంచుకోండి_S" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201 msgid "No error message" msgstr "ఏ దోష సందేశము లేదు" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274 msgid "Instant Message (Empathy)" msgstr "సత్వర సందేశం (ఎంపతి)" @@ -3050,67 +3048,67 @@ msgstr "మీ %s ఖాతాకి భద్రపరుచబడని సవ msgid "Your new account has not been saved yet." msgstr "మీ కొత్త ఖాతా ఇంకా భద్రపరుచబడలేదు." -#: ../src/empathy-accounts-dialog.c:381 +#: ../src/empathy-accounts-dialog.c:405 #: ../src/empathy-streamed-media-window.c:759 -#: ../src/empathy-call-window.c:1289 +#: ../src/empathy-call-window.c:1267 msgid "Connecting…" msgstr "అనుసంధానిస్తున్నది..." -#: ../src/empathy-accounts-dialog.c:422 +#: ../src/empathy-accounts-dialog.c:446 #, c-format msgid "Offline — %s" msgstr "ఆఫ్లైన్ — %s" -#: ../src/empathy-accounts-dialog.c:434 +#: ../src/empathy-accounts-dialog.c:458 #, c-format msgid "Disconnected — %s" msgstr "అననుసంధానించబడ్డారు — %s" -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:469 msgid "Offline — No Network Connection" msgstr "ఆఫ్లైన్ — నెట్వర్క్ అనుసంధానం లేదు" -#: ../src/empathy-accounts-dialog.c:452 +#: ../src/empathy-accounts-dialog.c:476 msgid "Unknown Status" msgstr "తెలియని స్థితి" -#: ../src/empathy-accounts-dialog.c:469 +#: ../src/empathy-accounts-dialog.c:493 msgid "" "This account has been disabled because it relies on an old, unsupported " "backend. Please install telepathy-haze and restart your session to migrate " "the account." msgstr "ఈ ఖాతా నిలిపివేయబడుతున్నది ఎందుకనగా ఇది పాతదాని మీద ఆధారపడినది లేదా సహాయము లేనందున " -#: ../src/empathy-accounts-dialog.c:479 +#: ../src/empathy-accounts-dialog.c:503 msgid "Offline — Account Disabled" msgstr "ఆఫ్లైన్ — ఖాతా అచేతనం చేయబడింది" -#: ../src/empathy-accounts-dialog.c:585 +#: ../src/empathy-accounts-dialog.c:609 msgid "Edit Connection Parameters" msgstr "అనుసంధాన ప్రమాణాలు సవరించండి " -#: ../src/empathy-accounts-dialog.c:750 +#: ../src/empathy-accounts-dialog.c:774 msgid "Failed to retrieve your personal information from the server." msgstr "మీ వ్యక్తిగత వివరణములు సేవికనుండి తీసుకొనుటలో విఫలం అవుతున్నది " -#: ../src/empathy-accounts-dialog.c:756 +#: ../src/empathy-accounts-dialog.c:780 msgid "Go online to edit your personal information." msgstr "మీ వ్యక్తిగత సమాచారమును సవరించుటకు ఆన్లైన్ కి వెళ్ళండి " -#: ../src/empathy-accounts-dialog.c:843 +#: ../src/empathy-accounts-dialog.c:867 msgid "_Edit Connection Parameters..." msgstr "అనుసంధాన ప్రమాణాలు సవరించండి_E" -#: ../src/empathy-accounts-dialog.c:1339 +#: ../src/empathy-accounts-dialog.c:1363 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "కంప్యూటర్ నుండి %s ను తీసివేద్దామనుకుంటున్నారా?" -#: ../src/empathy-accounts-dialog.c:1343 +#: ../src/empathy-accounts-dialog.c:1367 msgid "This will not remove your account on the server." msgstr "ఇది మీ ఖాతాను సేవకము నుండి తీసివేయదులేండి." -#: ../src/empathy-accounts-dialog.c:1579 +#: ../src/empathy-accounts-dialog.c:1604 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3118,24 +3116,25 @@ msgstr "" "మీరు వేరే ఖాతాను ఎంచుకోబోతున్నారు, అది మీ మార్పులను\n" "తీసివేస్తుంది. మీరు ఖచ్చితంగా కొనసాగాలనుకుంటున్నారా?" -#. Menu items: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1755 -msgid "_Enable" -msgstr "చేతనపరుచు (_E)" +#. Menu item: to enabled/disable the account +#: ../src/empathy-accounts-dialog.c:1795 +msgid "_Enabled" +msgstr "చేతనపరుచు (_E) " -#: ../src/empathy-accounts-dialog.c:1756 -msgid "_Disable" -msgstr "అచేతనపరుచు (_D)" +#. Menu item: Rename +#: ../src/empathy-accounts-dialog.c:1818 +msgid "Rename" +msgstr "పేరు మార్చండి " -#: ../src/empathy-accounts-dialog.c:2184 +#: ../src/empathy-accounts-dialog.c:2234 msgid "_Skip" msgstr "దాటవేయు_S" -#: ../src/empathy-accounts-dialog.c:2188 +#: ../src/empathy-accounts-dialog.c:2238 msgid "_Connect" msgstr "అనుసంధానించండి_C" -#: ../src/empathy-accounts-dialog.c:2365 +#: ../src/empathy-accounts-dialog.c:2415 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3217,33 +3216,33 @@ msgstr "వివరాలు" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title #: ../src/empathy-streamed-media-window.c:1211 -#: ../src/empathy-call-window.c:1889 +#: ../src/empathy-call-window.c:1861 #, c-format msgid "Call with %s" msgstr "%sతో కాల్ చేయి" #: ../src/empathy-streamed-media-window.c:1444 -#: ../src/empathy-call-window.c:2133 +#: ../src/empathy-call-window.c:2105 msgid "The IP address as seen by the machine" msgstr "యంత్రముతో చూడబడిన IP చిరునామా" #: ../src/empathy-streamed-media-window.c:1446 -#: ../src/empathy-call-window.c:2135 +#: ../src/empathy-call-window.c:2107 msgid "The IP address as seen by a server on the Internet" msgstr "అంతర్జాలంతో ఒక సేవకముతో చూడబడిన IP చిరునామా" #: ../src/empathy-streamed-media-window.c:1448 -#: ../src/empathy-call-window.c:2137 +#: ../src/empathy-call-window.c:2109 msgid "The IP address of the peer as seen by the other side" msgstr "ఇతర వైపు కనిపించే పీర్ యొక్క IP చిరునామా" #: ../src/empathy-streamed-media-window.c:1450 -#: ../src/empathy-call-window.c:2139 +#: ../src/empathy-call-window.c:2111 msgid "The IP address of a relay server" msgstr "రిలే సేవకము యొక్క IP చిరునామా" #: ../src/empathy-streamed-media-window.c:1452 -#: ../src/empathy-call-window.c:2141 +#: ../src/empathy-call-window.c:2113 msgid "The IP address of the multicast group" msgstr "బహుళప్రసార గుంపు యొక్క IP చిరునామా" @@ -3262,12 +3261,12 @@ msgid "Connected — %d:%02dm" msgstr "అనుసంధానించబడింది — %d:%02dm" #: ../src/empathy-streamed-media-window.c:2199 -#: ../src/empathy-call-window.c:2992 +#: ../src/empathy-call-window.c:2964 msgid "Technical Details" msgstr "సాంకేతిక వివరాలు" #: ../src/empathy-streamed-media-window.c:2237 -#: ../src/empathy-call-window.c:3031 +#: ../src/empathy-call-window.c:3003 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3275,7 +3274,7 @@ msgid "" msgstr "మీ కంప్యూటరుచే సహకరించబడుతున్న ఏ ఆడియో ఫార్మేట్లను %s సాఫ్ట్వేర్ అర్థంచేసుకోలేకపోతున్నది" #: ../src/empathy-streamed-media-window.c:2242 -#: ../src/empathy-call-window.c:3036 +#: ../src/empathy-call-window.c:3008 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3283,7 +3282,7 @@ msgid "" msgstr "% s యొక్క సాఫ్ట్వేర్ మీ కంప్యూటర్ మద్దతు వీడియో ఫార్మాట్లలో అర్థం లేదు" #: ../src/empathy-streamed-media-window.c:2248 -#: ../src/empathy-call-window.c:3042 +#: ../src/empathy-call-window.c:3014 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3293,24 +3292,24 @@ msgstr "" "ఉండి వుండవచ్చును." #: ../src/empathy-streamed-media-window.c:2254 -#: ../src/empathy-call-window.c:3048 +#: ../src/empathy-call-window.c:3020 msgid "There was a failure on the network" msgstr "నెట్వర్కు నందు వైఫల్యము ఉన్నది" #: ../src/empathy-streamed-media-window.c:2258 -#: ../src/empathy-call-window.c:3052 +#: ../src/empathy-call-window.c:3024 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "ఈ కాల్కి అవసరమైన ఆడియో ఫార్మేట్లు మీ కంప్యూటర్లో స్థాపించబడిలేవు" #: ../src/empathy-streamed-media-window.c:2261 -#: ../src/empathy-call-window.c:3055 +#: ../src/empathy-call-window.c:3027 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "ఈ కాల్కి అవసరమైన వీడియో ఫార్మేట్లు మీ కంప్యూటర్లో స్థాపించబడిలేవు" #: ../src/empathy-streamed-media-window.c:2271 -#: ../src/empathy-call-window.c:3067 +#: ../src/empathy-call-window.c:3039 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3321,22 +3320,22 @@ msgstr "" "సహాయం మెను లో 'డీబగ్' విండో నుండి సేకరించిన లాగ్లను అటాచ్." #: ../src/empathy-streamed-media-window.c:2279 -#: ../src/empathy-call-window.c:3076 +#: ../src/empathy-call-window.c:3048 msgid "There was a failure in the call engine" msgstr "కాల్ ఇంజనులో ఒక వైఫల్యము ఉన్నది" #: ../src/empathy-streamed-media-window.c:2282 -#: ../src/empathy-call-window.c:3079 +#: ../src/empathy-call-window.c:3051 msgid "The end of the stream was reached" msgstr "ప్రవాహము చివరకు చేరుకున్నది" #: ../src/empathy-streamed-media-window.c:2322 -#: ../src/empathy-call-window.c:3119 +#: ../src/empathy-call-window.c:3091 msgid "Can't establish audio stream" msgstr "ఆడియో ప్రవాహాన్ని స్థాపించలేకపోతుంది" #: ../src/empathy-streamed-media-window.c:2332 -#: ../src/empathy-call-window.c:3129 +#: ../src/empathy-call-window.c:3101 msgid "Can't establish video stream" msgstr "వీడియో ప్రవాహాన్ని స్థాపించలేకపోతుంది" @@ -3449,8 +3448,8 @@ msgstr "ఎన్కోడింగ్ కొడెక్:" #: ../src/empathy-call-window.ui.h:28 #: ../src/empathy-streamed-media-window.ui.h:21 -#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543 -#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545 +#: ../src/empathy-call-window.c:2514 ../src/empathy-call-window.c:2515 +#: ../src/empathy-call-window.c:2516 ../src/empathy-call-window.c:2517 msgid "Unknown" msgstr "తెలియదు" @@ -3645,7 +3644,7 @@ msgstr "ఇష్టమైన గదులను నిర్వహించు" msgid "Incoming video call" msgstr "లోనికివచ్చు వీడియో కాల్" -#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519 +#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1483 msgid "Incoming call" msgstr "లోనికివచ్చు కాల్" @@ -3660,7 +3659,7 @@ msgid "%s is calling you. Do you want to answer?" msgstr "%s మీకు కాల్ చేస్తున్నారు. మీరు సమాధానమివ్వాలనుకుంటున్నారా?" #: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731 -#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525 +#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming call from %s" msgstr "%s నుండి లోనికి కాల్ వస్తున్నది" @@ -3678,7 +3677,7 @@ msgid "_Answer with video" msgstr "వీడియోతో జవాబువ్వండి (_A)" #: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764 -#: ../src/empathy-call-window.c:1525 +#: ../src/empathy-call-window.c:1489 #, c-format msgid "Incoming video call from %s" msgstr "%s నుండి వీడియో కాల్ వస్తున్నది" @@ -3867,15 +3866,15 @@ msgid "Import Accounts" msgstr "ఖాతాలను దిగుమతిచేయి" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:316 +#: ../src/empathy-import-widget.c:303 msgid "Import" msgstr "దిగుమతిచేయి" -#: ../src/empathy-import-widget.c:325 +#: ../src/empathy-import-widget.c:312 msgid "Protocol" msgstr "ప్రోటోకాల్" -#: ../src/empathy-import-widget.c:349 +#: ../src/empathy-import-widget.c:336 msgid "Source" msgstr "మూలము" @@ -4050,7 +4049,7 @@ 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:637 +#: ../src/empathy-new-chatroom-dialog.c:636 #, c-format msgid "" "%s\n" @@ -4063,21 +4062,21 @@ msgstr "" "సంకేతపదము అవసరం: %s\n" "సభ్యులు: %s" +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "Yes" msgstr "అవును" +#: ../src/empathy-new-chatroom-dialog.c:638 #: ../src/empathy-new-chatroom-dialog.c:639 -#: ../src/empathy-new-chatroom-dialog.c:640 msgid "No" msgstr "కాదు" -#: ../src/empathy-new-chatroom-dialog.c:668 +#: ../src/empathy-new-chatroom-dialog.c:666 msgid "Could not start room listing" msgstr "గది జాబితాకరణను ప్రారంభించలేకపోయింది" -#: ../src/empathy-new-chatroom-dialog.c:678 +#: ../src/empathy-new-chatroom-dialog.c:676 msgid "Could not stop room listing" msgstr "గది జాబితాకరణను ఆపలేకపోయింది" @@ -4142,46 +4141,46 @@ msgid "Language" msgstr "భాష" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:726 +#: ../src/empathy-preferences.c:724 msgid "Juliet" msgstr "జూలియట్" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:733 +#: ../src/empathy-preferences.c:731 msgid "Romeo" msgstr "రోమియో" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:739 +#: ../src/empathy-preferences.c:737 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "ఓ రోమియో, రోమియో, ఎక్కడున్నావు రోమియో?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:743 +#: ../src/empathy-preferences.c:741 msgid "Deny thy father and refuse thy name;" msgstr "నీ తండ్రి తిరస్కరించు మరియు నీ పేరు తిరస్కరించవచ్చు;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:746 +#: ../src/empathy-preferences.c:744 msgid "Or if thou wilt not, be but sworn my love" msgstr "లేదా నీవు విల్ట్ లేకపోతే, కానీ నా ప్రేమ ప్రమాణ స్వీకారం" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:749 +#: ../src/empathy-preferences.c:747 msgid "And I'll no longer be a Capulet." msgstr "నేను ఇకపై ఒక Capulet ఉంటాం." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:752 +#: ../src/empathy-preferences.c:750 msgid "Shall I hear more, or shall I speak at this?" msgstr "నేనింకా ఎక్కువ వినాలా, లేక నేను ఇక మాట్లాడవచ్చా?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:755 +#: ../src/empathy-preferences.c:753 msgid "Juliet has disconnected" msgstr "జూలియట్ అననుసంధానించింది" -#: ../src/empathy-preferences.c:1159 +#: ../src/empathy-preferences.c:1157 msgid "Preferences" msgstr "ప్రాధాన్యతలు" @@ -4540,39 +4539,39 @@ msgstr "ఎంపతి దోష శుద్దిచేసేది" msgid "- Empathy Chat Client" msgstr "- ఎంపతి చాట్ క్లయింటు" -#: ../src/empathy-notifications-approver.c:189 +#: ../src/empathy-notifications-approver.c:190 msgid "Respond" msgstr "స్పందించు" -#: ../src/empathy-notifications-approver.c:203 -#: ../src/empathy-call-window.c:1529 +#: ../src/empathy-notifications-approver.c:204 +#: ../src/empathy-call-window.c:1493 msgid "Reject" msgstr "తిరస్కరించు" -#: ../src/empathy-notifications-approver.c:208 -#: ../src/empathy-notifications-approver.c:213 -#: ../src/empathy-call-window.c:1530 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:214 +#: ../src/empathy-call-window.c:1494 msgid "Answer" msgstr "సమాధానమివ్వు" -#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:214 msgid "Answer with video" msgstr "వీడియో తో సమాధానం" -#: ../src/empathy-notifications-approver.c:221 -#: ../src/empathy-notifications-approver.c:231 +#: ../src/empathy-notifications-approver.c:222 +#: ../src/empathy-notifications-approver.c:232 msgid "Decline" msgstr "నిరాకరించు" -#: ../src/empathy-notifications-approver.c:225 -#: ../src/empathy-notifications-approver.c:236 +#: ../src/empathy-notifications-approver.c:226 +#: ../src/empathy-notifications-approver.c:237 msgid "Accept" msgstr "అంగీకరించు" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:246 +#: ../src/empathy-notifications-approver.c:247 msgid "Provide" msgstr "సమకూర్చు" @@ -4583,38 +4582,38 @@ msgstr "%s ఇప్పుడే కాల్ చేయడానికి ప్ #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162 +#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140 msgid "i" msgstr " నెను" -#: ../src/empathy-call-window.c:2888 +#: ../src/empathy-call-window.c:2860 msgid "On hold" msgstr "లొ దచు" -#: ../src/empathy-call-window.c:2891 +#: ../src/empathy-call-window.c:2863 msgid "Mute" msgstr "నిశబ్దం" -#: ../src/empathy-call-window.c:2893 +#: ../src/empathy-call-window.c:2865 msgid "Duration" msgstr "నిడివి" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2896 +#: ../src/empathy-call-window.c:2868 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:3166 +#: ../src/empathy-call-window.c:3138 #, c-format msgid "Your current balance is %s." msgstr "మీ యొక్క రొక్కము %s" -#: ../src/empathy-call-window.c:3170 +#: ../src/empathy-call-window.c:3142 msgid "Sorry, you don’t have enough credit for that call." msgstr "మీరు సంభాషించుటకు సరిపోయినంత రొక్కము లేదు " -#: ../src/empathy-call-window.c:3172 +#: ../src/empathy-call-window.c:3144 msgid "Top Up" msgstr "టాప్ అప్..." @@ -4652,6 +4651,9 @@ msgstr "" "మీరు <span ను ఎంచుకొనుట ద్వార ఈ లక్షణము యొక్క వివరములను తర్వాత మార్చండి లేదా అచేతనము చేయండి " "style=\"italic\">Edit → ఖాతాలు</span> చిరునామా జాబితాలో" +#~ msgid "_Disable" +#~ msgstr "అచేతనపరుచు (_D)" + #~| msgid "%s:" #~ msgid "%s" #~ msgstr "%s:" diff --git a/po/zh_CN.po b/po/zh_CN.po index 13bbbf49f..21c395f3a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -28,7 +28,7 @@ msgstr "" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&keywords=I18N+L10N&component=General\n" "POT-Creation-Date: 2012-03-16 10:47+0000\n" -"PO-Revision-Date: 2012-04-11 16:40+0000\n" +"PO-Revision-Date: 2012-04-11 16:38+0000\n" "Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" "MIME-Version: 1.0\n" diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 0e004f5a5..af85fd64f 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -40,7 +40,6 @@ #include <libempathy/empathy-utils.h> #include <libempathy/empathy-connection-managers.h> -#include <libempathy/empathy-connectivity.h> #include <libempathy/empathy-pkg-kit.h> #include <libempathy/empathy-tp-contact-factory.h> @@ -97,6 +96,7 @@ typedef struct { GtkWidget *enabled_switch; GtkWidget *treeview; + GtkCellRenderer *name_renderer; GtkWidget *button_add; GtkWidget *button_remove; @@ -133,7 +133,7 @@ typedef struct { TpAccountManager *account_manager; EmpathyConnectionManagers *cms; - EmpathyConnectivity *connectivity; + GNetworkMonitor *connectivity; GtkWindow *parent_window; TpAccount *initial_selection; @@ -463,7 +463,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, g_free (message); } - if (!empathy_connectivity_is_online (priv->connectivity)) + if (!g_network_monitor_get_network_available (priv->connectivity)) accounts_dialog_status_infobar_set_message (dialog, _("Offline — No Network Connection")); @@ -1390,24 +1390,6 @@ accounts_dialog_button_remove_clicked_cb (GtkWidget *button, accounts_dialog_remove_account_iter (dialog, &iter); } -#ifdef HAVE_MEEGO -static void -accounts_dialog_view_delete_activated_cb (EmpathyCellRendererActivatable *cell, - const gchar *path_string, - EmpathyAccountsDialog *dialog) -{ - EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); - GtkTreeModel *model; - GtkTreeIter iter; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview)); - if (!gtk_tree_model_get_iter_from_string (model, &iter, path_string)) - return; - - accounts_dialog_remove_account_iter (dialog, &iter); -} -#endif /* HAVE_MEEGO */ - static void accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog) { @@ -1443,35 +1425,22 @@ accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog) NULL); /* Name renderer */ - cell = gtk_cell_renderer_text_new (); - g_object_set (cell, + priv->name_renderer = gtk_cell_renderer_text_new (); + g_object_set (priv->name_renderer, "ellipsize", PANGO_ELLIPSIZE_END, "width-chars", 25, "editable", TRUE, NULL); - gtk_tree_view_column_pack_start (column, cell, TRUE); - gtk_tree_view_column_add_attribute (column, cell, "text", COL_NAME); - g_signal_connect (cell, "edited", + gtk_tree_view_column_pack_start (column, priv->name_renderer, TRUE); + gtk_tree_view_column_add_attribute (column, priv->name_renderer, + "text", COL_NAME); + g_signal_connect (priv->name_renderer, "edited", G_CALLBACK (accounts_dialog_name_edited_cb), dialog); - g_signal_connect (cell, "editing-started", + g_signal_connect (priv->name_renderer, "editing-started", G_CALLBACK (accounts_dialog_name_editing_started_cb), dialog); - g_object_set (cell, "ypad", 4, NULL); - -#ifdef HAVE_MEEGO - /* Delete column */ - cell = empathy_cell_renderer_activatable_new (); - gtk_tree_view_column_pack_start (column, cell, FALSE); - g_object_set (cell, - "icon-name", GTK_STOCK_DELETE, - "show-on-select", TRUE, - NULL); - - g_signal_connect (cell, "path-activated", - G_CALLBACK (accounts_dialog_view_delete_activated_cb), - dialog); -#endif /* HAVE_MEEGO */ + g_object_set (priv->name_renderer, "ypad", 4, NULL); } static EmpathyAccountSettings * @@ -1731,6 +1700,30 @@ accounts_dialog_treeview_enabled_cb (GtkMenuItem *item, enable_and_connect_account (account, !enabled); } +static void +accounts_dialog_treeview_rename_cb (GtkMenuItem *item, + EmpathyAccountsDialog *self) +{ + EmpathyAccountsDialogPriv *priv = GET_PRIV (self); + GtkTreePath *path; + GtkTreeIter iter; + GtkTreeSelection *selection; + GtkTreeModel *model; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview)); + if (!gtk_tree_selection_get_selected (selection, &model, &iter)) + return; + path = gtk_tree_model_get_path (model, &iter); + + g_object_set (G_OBJECT (priv->name_renderer), "editable", TRUE, NULL); + + gtk_widget_grab_focus (GTK_WIDGET (priv->treeview)); + gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->treeview), path, + gtk_tree_view_get_column (GTK_TREE_VIEW (priv->treeview), 0), TRUE); + + gtk_tree_path_free (path); +} + static gboolean accounts_dialog_treeview_button_press_event_cb (GtkTreeView *view, GdkEventButton *event, @@ -1742,8 +1735,7 @@ accounts_dialog_treeview_button_press_event_cb (GtkTreeView *view, GtkTreePath *path = NULL; GtkTreeIter iter; GtkWidget *menu; - GtkWidget *item_enable, *item_disable; - GtkWidget *image_enable, *image_disable; + GtkWidget *item; /* ignore multiple clicks */ if (event->type != GDK_BUTTON_PRESS) @@ -1766,49 +1758,37 @@ accounts_dialog_treeview_button_press_event_cb (GtkTreeView *view, /* Create the menu */ menu = empathy_context_menu_new (GTK_WIDGET (view)); - /* 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); + /* Menu item: to enabled/disable the account */ + item = gtk_check_menu_item_new_with_mnemonic (_("_Enabled")); + + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); if (account_can_be_enabled (account)) { - 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); - } + gboolean active; + + active = tp_account_is_enabled (account); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), + active); + + tp_g_signal_connect_object (item, "activate", + G_CALLBACK (accounts_dialog_treeview_enabled_cb), account, 0); } else { - gtk_widget_set_sensitive (item_enable, FALSE); - gtk_widget_set_sensitive (item_disable, FALSE); + gtk_widget_set_sensitive (item, FALSE); } - gtk_widget_show (item_enable); - gtk_widget_show (item_disable); + gtk_widget_show (item); + + /* Menu item: Rename */ + item = gtk_menu_item_new_with_mnemonic (_("Rename")); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + tp_g_signal_connect_object (item, "activate", + G_CALLBACK (accounts_dialog_treeview_rename_cb), dialog, 0); + + gtk_widget_show (item); /* FIXME: Add here presence items, to be able to set per-account presence */ @@ -2467,11 +2447,6 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog) action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); -#ifdef HAVE_MEEGO - gtk_widget_hide (action_area); - gtk_widget_hide (priv->button_remove); -#endif /* HAVE_MEEGO */ - /* Display loading page */ priv->loading = TRUE; @@ -2590,6 +2565,12 @@ do_dispose (GObject *obj) priv->connecting_id = 0; } + if (priv->connectivity) + { + g_object_unref (priv->connectivity); + priv->connectivity = NULL; + } + if (priv->account_manager != NULL) { g_object_unref (priv->account_manager); @@ -2602,12 +2583,6 @@ do_dispose (GObject *obj) priv->cms = NULL; } - if (priv->connectivity) - { - g_object_unref (priv->connectivity); - priv->connectivity = NULL; - } - if (priv->initial_selection != NULL) { g_object_unref (priv->initial_selection); @@ -2675,7 +2650,8 @@ do_constructed (GObject *object) tp_proxy_prepare_async (priv->account_manager, NULL, accounts_dialog_manager_ready_cb, dialog); - priv->connectivity = empathy_connectivity_dup_singleton (); + priv->connectivity = g_network_monitor_get_default (); + g_object_ref (priv->connectivity); } static void diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 6b51820f7..7b2964c4b 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -222,7 +222,6 @@ main (int argc, char *argv[]) GObjectClass *app_class; gint retval; - g_thread_init (NULL); empathy_init (); gtk_init (&argc, &argv); diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c index 2968fb53c..d48e6af20 100644 --- a/src/empathy-audio-sink.c +++ b/src/empathy-audio-sink.c @@ -65,7 +65,7 @@ struct _EmpathyGstAudioSinkPrivate gboolean echo_cancel; gdouble volume; gint volume_idle_id; - GStaticMutex volume_mutex; + GMutex volume_mutex; }; #define EMPATHY_GST_AUDIO_SINK_GET_PRIVATE(o) \ @@ -77,7 +77,7 @@ empathy_audio_sink_init (EmpathyGstAudioSink *self) { self->priv = EMPATHY_GST_AUDIO_SINK_GET_PRIVATE (self); self->priv->echo_cancel = TRUE; - g_static_mutex_init (&self->priv->volume_mutex); + g_mutex_init (&self->priv->volume_mutex); } static GstPad * empathy_audio_sink_request_new_pad (GstElement *self, @@ -95,9 +95,9 @@ empathy_audio_sink_set_property (GObject *object, switch (property_id) { case PROP_VOLUME: - g_static_mutex_lock (&self->priv->volume_mutex); + g_mutex_lock (&self->priv->volume_mutex); self->priv->volume = g_value_get_double (value); - g_static_mutex_unlock (&self->priv->volume_mutex); + g_mutex_unlock (&self->priv->volume_mutex); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -129,7 +129,7 @@ empathy_audio_sink_dispose (GObject *object) g_source_remove (priv->volume_idle_id); priv->volume_idle_id = 0; - g_static_mutex_free (&self->priv->volume_mutex); + g_mutex_clear (&self->priv->volume_mutex); /* release any references held by the object here */ if (G_OBJECT_CLASS (empathy_audio_sink_parent_class)->dispose) @@ -236,9 +236,9 @@ empathy_audio_sink_volume_idle_updated (gpointer user_data) { EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (user_data); - g_static_mutex_lock (&self->priv->volume_mutex); + g_mutex_lock (&self->priv->volume_mutex); self->priv->volume_idle_id = 0; - g_static_mutex_unlock (&self->priv->volume_mutex); + g_mutex_unlock (&self->priv->volume_mutex); g_object_notify (G_OBJECT (self), "volume"); @@ -253,7 +253,7 @@ empathy_audio_sink_volume_updated (GObject *object, EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (user_data); gdouble volume; - g_static_mutex_lock (&self->priv->volume_mutex); + g_mutex_lock (&self->priv->volume_mutex); g_object_get (object, "volume", &volume, NULL); if (self->priv->volume == volume) @@ -265,7 +265,7 @@ empathy_audio_sink_volume_updated (GObject *object, empathy_audio_sink_volume_idle_updated, self); out: - g_static_mutex_unlock (&self->priv->volume_mutex); + g_mutex_unlock (&self->priv->volume_mutex); } static gboolean @@ -274,9 +274,9 @@ empathy_audio_sink_volume_idle_setup (gpointer user_data) EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (user_data); gdouble volume; - g_static_mutex_lock (&self->priv->volume_mutex); + g_mutex_lock (&self->priv->volume_mutex); self->priv->volume_idle_id = 0; - g_static_mutex_unlock (&self->priv->volume_mutex); + g_mutex_unlock (&self->priv->volume_mutex); /* We can't do a bidirection bind as the ::notify comes from another * thread, for other bits of empathy it's most simpler if it comes from @@ -329,11 +329,11 @@ empathy_audio_sink_request_new_pad (GstElement *element, if (GST_IS_STREAM_VOLUME (self->priv->sink)) { - g_static_mutex_lock (&self->priv->volume_mutex); + g_mutex_lock (&self->priv->volume_mutex); if (self->priv->volume_idle_id == 0) self->priv->volume_idle_id = g_idle_add ( empathy_audio_sink_volume_idle_setup, self); - g_static_mutex_unlock (&self->priv->volume_mutex); + g_mutex_unlock (&self->priv->volume_mutex); } else { diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c index 9a882c146..590c65b66 100644 --- a/src/empathy-audio-src.c +++ b/src/empathy-audio-src.c @@ -77,7 +77,7 @@ struct _EmpathyGstAudioSrcPrivate /* the mixer track on src we follow and adjust */ GstMixerTrack *track; - GMutex *lock; + GMutex lock; guint level_idle_id; guint volume_idle_id; }; @@ -93,7 +93,7 @@ struct _EmpathyGstAudioSrcPrivate static void empathy_audio_set_hw_mute (EmpathyGstAudioSrc *self, gboolean mute) { - g_mutex_lock (self->priv->lock); + g_mutex_lock (&self->priv->lock); /* If there is no mixer available ignore the setting */ if (self->priv->track == NULL) goto out; @@ -101,7 +101,7 @@ empathy_audio_set_hw_mute (EmpathyGstAudioSrc *self, gboolean mute) gst_mixer_set_mute (GST_MIXER (self->priv->src), self->priv->track, mute); out: - g_mutex_unlock (self->priv->lock); + g_mutex_unlock (&self->priv->lock); self->priv->mute = mute; } @@ -110,13 +110,13 @@ empathy_audio_src_get_hw_mute (EmpathyGstAudioSrc *self) { gboolean result = self->priv->mute; - g_mutex_lock (self->priv->lock); + g_mutex_lock (&self->priv->lock); if (self->priv->track == NULL) goto out; result = GST_MIXER_TRACK_HAS_FLAG (self->priv->track, GST_MIXER_TRACK_MUTE); out: - g_mutex_unlock (self->priv->lock); + g_mutex_unlock (&self->priv->lock); return result; } @@ -128,7 +128,7 @@ empathy_audio_src_set_hw_volume (EmpathyGstAudioSrc *self, gint volumes[MAX_MIC_CHANNELS]; int i; - g_mutex_lock (self->priv->lock); + g_mutex_lock (&self->priv->lock); /* If there is no mixer available ignore the setting */ if (self->priv->track == NULL) goto out; @@ -140,7 +140,7 @@ empathy_audio_src_set_hw_volume (EmpathyGstAudioSrc *self, self->priv->track, volumes); out: - g_mutex_unlock (self->priv->lock); + g_mutex_unlock (&self->priv->lock); self->priv->volume = volume; } @@ -151,7 +151,7 @@ empathy_audio_src_get_hw_volume (EmpathyGstAudioSrc *self) gint volumes[MAX_MIC_CHANNELS]; gdouble result = self->priv->volume; - g_mutex_lock (self->priv->lock); + g_mutex_lock (&self->priv->lock); if (self->priv->track == NULL) goto out; @@ -160,7 +160,7 @@ empathy_audio_src_get_hw_volume (EmpathyGstAudioSrc *self) result = volumes[0]/(gdouble)self->priv->track->max_volume; out: - g_mutex_unlock (self->priv->lock); + g_mutex_unlock (&self->priv->lock); return result; } @@ -347,7 +347,8 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj) obj->priv = priv; priv->peak_level = -G_MAXDOUBLE; - priv->lock = g_mutex_new (); + g_mutex_init (&priv->lock); + priv->volume = 1.0; priv->src = create_src (); @@ -439,14 +440,14 @@ empathy_audio_src_get_property (GObject *object, g_value_set_boolean (value, priv->mute); break; case PROP_PEAK_LEVEL: - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); g_value_set_double (value, priv->peak_level); - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); break; case PROP_RMS_LEVEL: - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); g_value_set_double (value, priv->rms_level); - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); break; case PROP_MICROPHONE: g_value_set_uint (value, priv->source_idx); @@ -552,7 +553,7 @@ empathy_audio_src_finalize (GObject *object) EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self); /* free any data held directly by the object here */ - g_mutex_free (priv->lock); + g_mutex_clear (&priv->lock); G_OBJECT_CLASS (empathy_audio_src_parent_class)->finalize (object); } @@ -563,13 +564,13 @@ empathy_audio_src_levels_updated (gpointer user_data) EmpathyGstAudioSrc *self = EMPATHY_GST_AUDIO_SRC (user_data); EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self); - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); g_signal_emit (self, signals[PEAK_LEVEL_CHANGED], 0, priv->peak_level); g_signal_emit (self, signals[RMS_LEVEL_CHANGED], 0, priv->rms_level); priv->level_idle_id = 0; - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); return FALSE; } @@ -582,9 +583,9 @@ empathy_audio_src_volume_changed (gpointer user_data) gdouble volume; gboolean mute; - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); priv->volume_idle_id = 0; - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); volume = empathy_audio_src_get_hw_volume (self); @@ -652,7 +653,7 @@ empathy_audio_src_handle_message (GstBin *bin, GstMessage *message) rms = MAX (db, rms); } - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); priv->peak_level = peak; priv->rms_level = rms; @@ -660,7 +661,7 @@ empathy_audio_src_handle_message (GstBin *bin, GstMessage *message) priv->level_idle_id = g_idle_add ( empathy_audio_src_levels_updated, self); - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); } else if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_ELEMENT && GST_MESSAGE_SRC (message) == GST_OBJECT (priv->src)) @@ -677,13 +678,13 @@ empathy_audio_src_handle_message (GstBin *bin, GstMessage *message) GST_MIXER_MESSAGE_MUTE_TOGGLED) gst_mixer_message_parse_mute_toggled (message, &track, NULL); - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); if (track != NULL && track == priv->track && priv->volume_idle_id == 0) priv->volume_idle_id = g_idle_add ( empathy_audio_src_volume_changed, self); - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); } else if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_STATE_CHANGED && GST_MESSAGE_SRC (message) == GST_OBJECT (priv->src)) @@ -699,18 +700,18 @@ empathy_audio_src_handle_message (GstBin *bin, GstMessage *message) * Empathy. We want to pick up the level pulseaudio saved */ if (old == GST_STATE_NULL && new == GST_STATE_READY) { - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); priv->track = empathy_audio_src_get_track (priv->src); if (priv->track != NULL) priv->volume_idle_id = g_idle_add ( empathy_audio_src_volume_changed, self); - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); } else if (old == GST_STATE_READY && new == GST_STATE_NULL) { - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); priv->track = NULL; - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); } } diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c index ecf1ad173..ee33703fe 100644 --- a/src/empathy-auth-client.c +++ b/src/empathy-auth-client.c @@ -283,8 +283,6 @@ main (int argc, TpSimpleClientFactory *tp_factory; TpDBusDaemon *dbus; - g_thread_init (NULL); - context = g_option_context_new (N_(" - Empathy authentication client")); g_option_context_add_group (context, gtk_get_option_group (TRUE)); g_option_context_set_translation_domain (context, GETTEXT_PACKAGE); diff --git a/src/empathy-av.c b/src/empathy-av.c index 70acfc4f3..e65bef33b 100644 --- a/src/empathy-av.c +++ b/src/empathy-av.c @@ -112,9 +112,6 @@ main (int argc, GError *error = NULL; gint retval; - /* Init */ - g_thread_init (NULL); - optcontext = g_option_context_new (N_("- Empathy Audio/Video Client")); g_option_context_add_group (optcontext, gst_init_get_option_group ()); g_option_context_add_group (optcontext, gtk_get_option_group (TRUE)); diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 3b05d4d7a..7ecac2806 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -242,7 +242,7 @@ struct _EmpathyCallWindowPriv GTimer *timer; guint timer_id; - GMutex *lock; + GMutex lock; gboolean call_started; gboolean sending_video; CameraState camera_state; @@ -1638,7 +1638,7 @@ empathy_call_window_init (EmpathyCallWindow *self) g_signal_connect (priv->camera_monitor, "removed", G_CALLBACK (empathy_call_window_camera_removed_cb), self); - priv->lock = g_mutex_new (); + g_mutex_init (&priv->lock); gtk_container_add (GTK_CONTAINER (self), top_vbox); @@ -2371,7 +2371,7 @@ empathy_call_window_finalize (GObject *object) disconnect_video_output_motion_handler (self); /* free any data held directly by the object here */ - g_mutex_free (priv->lock); + g_mutex_clear (&priv->lock); g_timer_destroy (priv->timer); @@ -2544,7 +2544,7 @@ empathy_call_window_disconnected (EmpathyCallWindow *self, if (could_reset_pipeline) { - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); g_timer_stop (priv->timer); @@ -2552,7 +2552,7 @@ empathy_call_window_disconnected (EmpathyCallWindow *self, g_source_remove (priv->timer_id); priv->timer_id = 0; - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); if (!restart) /* We are about to destroy the window, no need to update it or create @@ -3202,12 +3202,12 @@ empathy_call_window_state_changed_cb (EmpathyCallHandler *handler, g_object_unref (call); - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); priv->timer_id = g_timeout_add_seconds (1, empathy_call_window_update_timer, self); - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); empathy_call_window_update_timer (self); @@ -3281,7 +3281,7 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, GstPad *pad; - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); g_object_get (content, "media-type", &media_type, NULL); @@ -3348,7 +3348,7 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, } - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); return TRUE; } diff --git a/src/empathy-call.c b/src/empathy-call.c index 207f32f25..5c3633be5 100644 --- a/src/empathy-call.c +++ b/src/empathy-call.c @@ -186,9 +186,6 @@ main (int argc, gint retval; GtkSettings *gtk_settings; - /* Init */ - g_thread_init (NULL); - #ifdef GDK_WINDOWING_X11 /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice * but to intiialise X11 threading ourself */ diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index ac3584f34..eb2e4b133 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -45,7 +45,6 @@ #include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-tp-contact-factory.h> -#include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-request-util.h> #include <libempathy/empathy-individual-manager.h> @@ -1188,8 +1187,7 @@ chat_window_invite_participant_activate_cb (GtkAction *action, contact = empathy_contact_dup_from_tp_contact (tp_contact); - empathy_contact_list_add (EMPATHY_CONTACT_LIST (tp_chat), - contact, _("Inviting you to this room")); + empathy_tp_chat_add (tp_chat, contact, _("Inviting you to this room")); g_object_unref (contact); } @@ -2045,7 +2043,7 @@ drag_data_received_individual_id (EmpathyChatWindow *self, tp_channel_get_identifier ((TpChannel *) chat)); contact = empathy_contact_dup_from_tp_contact (tp_contact); - empathy_contact_list_add (EMPATHY_CONTACT_LIST (chat), contact, NULL); + empathy_tp_chat_add (chat, contact, NULL); g_object_unref (contact); out: diff --git a/src/empathy-chat.c b/src/empathy-chat.c index bebca4382..66ad346e7 100644 --- a/src/empathy-chat.c +++ b/src/empathy-chat.c @@ -103,9 +103,6 @@ main (int argc, gint retval; EmpathyIndividualManager *individual_mgr; - /* Init */ - g_thread_init (NULL); - optcontext = g_option_context_new (N_("- Empathy Chat Client")); g_option_context_add_group (optcontext, gtk_get_option_group (TRUE)); g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE); diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c index 0bf34e015..c63a5b57b 100644 --- a/src/empathy-debugger.c +++ b/src/empathy-debugger.c @@ -101,7 +101,6 @@ main (int argc, GtkApplication *app; gint retval; - g_thread_init (NULL); gtk_init (&argc, &argv); empathy_gtk_init (); diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c index fd5bd8f76..d92b531ea 100644 --- a/src/empathy-invite-participant-dialog.c +++ b/src/empathy-invite-participant-dialog.c @@ -17,7 +17,6 @@ #include "empathy-invite-participant-dialog.h" #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-contact-list.h> #include <libempathy-gtk/empathy-contact-chooser.h> #include <libempathy-gtk/empathy-individual-view.h> @@ -146,8 +145,7 @@ filter_individual (EmpathyContactChooser *chooser, return FALSE; /* Filter out contacts which are already in the chat */ - members = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST ( - self->priv->tp_chat)); + members = empathy_tp_chat_get_members (self->priv->tp_chat); for (l = members; l != NULL; l = g_list_next (l)) { diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index 203a5aede..a8eb40808 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -37,7 +37,6 @@ #include <libempathy/empathy-request-util.h> #include <libempathy/empathy-chatroom-manager.h> #include <libempathy/empathy-chatroom.h> -#include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-individual-manager.h> #include <libempathy/empathy-gsettings.h> diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index deaae10d6..3bcb0e4f2 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -201,7 +201,7 @@ struct _EmpathyStreamedMediaWindowPriv GtkWidget *video_brightness; GtkWidget *video_gamma; - GMutex *lock; + GMutex lock; gboolean call_started; gboolean sending_video; CameraState camera_state; @@ -1035,7 +1035,7 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self) gtk_action_set_sensitive (priv->menu_fullscreen, FALSE); - priv->lock = g_mutex_new (); + g_mutex_init (&priv->lock); gtk_container_add (GTK_CONTAINER (self), top_vbox); @@ -1727,7 +1727,7 @@ empathy_streamed_media_window_finalize (GObject *object) disconnect_video_output_motion_handler (self); /* free any data held directly by the object here */ - g_mutex_free (priv->lock); + g_mutex_clear (&priv->lock); g_timer_destroy (priv->timer); @@ -1870,7 +1870,7 @@ empathy_streamed_media_window_disconnected (EmpathyStreamedMediaWindow *self, if (could_reset_pipeline) { - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); g_timer_stop (priv->timer); @@ -1878,7 +1878,7 @@ empathy_streamed_media_window_disconnected (EmpathyStreamedMediaWindow *self, g_source_remove (priv->timer_id); priv->timer_id = 0; - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); if (!restart) /* We are about to destroy the window, no need to update it or create @@ -2375,12 +2375,12 @@ empathy_streamed_media_window_connected (gpointer user_data) g_object_unref (call); - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); priv->timer_id = g_timeout_add_seconds (1, empathy_streamed_media_window_update_timer, self); - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); empathy_streamed_media_window_update_timer (self); @@ -2401,7 +2401,7 @@ empathy_streamed_media_window_src_added_cb (EmpathyStreamedMediaHandler *handler GstPad *pad; - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); if (priv->call_state != CONNECTED) { @@ -2467,7 +2467,7 @@ empathy_streamed_media_window_src_added_cb (EmpathyStreamedMediaHandler *handler } - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); return TRUE; } diff --git a/src/empathy-video-widget.c b/src/empathy-video-widget.c index adca53ef6..9cf31d9c1 100644 --- a/src/empathy-video-widget.c +++ b/src/empathy-video-widget.c @@ -78,7 +78,7 @@ struct _EmpathyVideoWidgetPriv gboolean flip_video; guintptr xid; - GMutex *lock; + GMutex lock; }; #define GET_PRIV(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ @@ -90,7 +90,7 @@ empathy_video_widget_init (EmpathyVideoWidget *obj) EmpathyVideoWidgetPriv *priv = GET_PRIV (obj); GdkRGBA black; - priv->lock = g_mutex_new (); + g_mutex_init (&priv->lock); priv->notifier = fs_element_added_notifier_new (); g_signal_connect (priv->notifier, "element-added", @@ -367,7 +367,7 @@ empathy_video_widget_finalize (GObject *object) EmpathyVideoWidgetPriv *priv = GET_PRIV (self); /* free any data held directly by the object here */ - g_mutex_free (priv->lock); + g_mutex_clear (&priv->lock); G_OBJECT_CLASS (empathy_video_widget_parent_class)->finalize (object); } @@ -400,9 +400,9 @@ empathy_video_widget_element_set_sink_properties (EmpathyVideoWidget *self) { EmpathyVideoWidgetPriv *priv = GET_PRIV (self); - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); empathy_video_widget_element_set_sink_properties_unlocked (self); - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); } static void @@ -412,7 +412,7 @@ empathy_video_widget_element_added_cb (FsElementAddedNotifier *notifier, EmpathyVideoWidgetPriv *priv = GET_PRIV (self); /* We assume the overlay is the sink */ - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); if (priv->overlay == NULL && GST_IS_X_OVERLAY (element)) { priv->overlay = element; @@ -421,7 +421,7 @@ empathy_video_widget_element_added_cb (FsElementAddedNotifier *notifier, empathy_video_widget_element_set_sink_properties_unlocked (self); gst_x_overlay_expose (GST_X_OVERLAY (priv->overlay)); } - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); } static void diff --git a/src/empathy.c b/src/empathy.c index b06b595e6..4db2cbb62 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -52,7 +52,6 @@ #include <libempathy/empathy-utils.h> #include <libempathy/empathy-chatroom-manager.h> #include <libempathy/empathy-account-settings.h> -#include <libempathy/empathy-connectivity.h> #include <libempathy/empathy-connection-managers.h> #include <libempathy/empathy-request-util.h> #include <libempathy/empathy-ft-factory.h> @@ -119,7 +118,6 @@ struct _EmpathyApp EmpathyChatroomManager *chatroom_manager; EmpathyFTFactory *ft_factory; EmpathyPresenceManager *presence_mgr; - EmpathyConnectivity *connectivity; GSettings *gsettings; EmpathyNotificationsApprover *notifications_approver; EmpathyConnectionAggregator *conn_aggregator; @@ -157,7 +155,6 @@ empathy_app_dispose (GObject *object) #endif tp_clear_object (&self->presence_mgr); - tp_clear_object (&self->connectivity); tp_clear_object (&self->icon); tp_clear_object (&self->account_manager); tp_clear_object (&self->log_manager); @@ -515,17 +512,6 @@ empathy_app_init (EmpathyApp *self) } static void -use_conn_notify_cb (GSettings *gsettings, - const gchar *key, - gpointer user_data) -{ - EmpathyConnectivity *connectivity = user_data; - - empathy_connectivity_set_use_conn (connectivity, - g_settings_get_boolean (gsettings, key)); -} - -static void migrate_config_to_xdg_dir (void) { gchar *xdg_dir, *old_dir, *xdg_filename, *old_filename; @@ -766,14 +752,6 @@ empathy_app_constructed (GObject *object) self->gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA); - /* Setting up Connectivity */ - self->connectivity = empathy_connectivity_dup_singleton (); - use_conn_notify_cb (self->gsettings, EMPATHY_PREFS_USE_CONN, - self->connectivity); - g_signal_connect (self->gsettings, - "changed::" EMPATHY_PREFS_USE_CONN, - G_CALLBACK (use_conn_notify_cb), self->connectivity); - /* account management */ self->account_manager = tp_account_manager_dup (); tp_proxy_prepare_async (self->account_manager, NULL, @@ -837,7 +815,6 @@ main (int argc, char *argv[]) EmpathyApp *app; gint retval; - g_thread_init (NULL); g_type_init (); #ifdef HAVE_LIBCHAMPLAIN diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c index 76717596e..0ed9f95e4 100644 --- a/tests/interactive/empathy-logs.c +++ b/tests/interactive/empathy-logs.c @@ -58,7 +58,6 @@ main (int argc, { TpAccountManager *mgr; - g_thread_init (NULL); gtk_init (&argc, &argv); empathy_gtk_init (); g_set_application_name (PACKAGE_NAME); |