diff options
104 files changed, 10827 insertions, 6069 deletions
diff --git a/configure.ac b/configure.ac index df6ec7ec0..e0d92fad3 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,7 @@ LIBCHAMPLAIN_GTK_REQUIRED=0.3.3 CLUTTER_GTK_REQUIRED=0.8.2 GEOCLUE_REQUIRED=0.11 WEBKIT_REQUIRED=1.1.7 +NETWORK_MANAGER_REQUIRED=0.7.0 # Use --enable-maintainer-mode to disabled deprecated symbols GNOME_MAINTAINER_MODE_DEFINES @@ -156,6 +157,32 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name]) AM_GLIB_GNU_GETTEXT # ----------------------------------------------------------- +# NM integration +# ----------------------------------------------------------- +AC_ARG_ENABLE(network-manager, + AS_HELP_STRING([--enable-network-manager=@<:@no/yes/auto@:>@], + [build with network-manager support]), , + enable_network_manager=auto) + +if test "x$enable_network_manager" != "xno"; then + 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 +else + have_nm=no +fi + +if test "x$enable_network_manager" = "xyes" -a "x$have_nm" != "xyes"; then + AC_MSG_ERROR([Couldn't find libnm-glib dependencies.]) +fi +AM_CONDITIONAL(HAVE_NM, test "x$have_NM" = "xyes") + +# ----------------------------------------------------------- # Webkit # ----------------------------------------------------------- AC_ARG_ENABLE(webkit, @@ -179,7 +206,6 @@ fi if test "x$enable_webkit" = "xyes" -a "x$have_webkit" != "xyes"; then AC_MSG_ERROR([Couldn't find webkit dependencies.]) fi - AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = "xyes") # ----------------------------------------------------------- @@ -453,6 +479,7 @@ Configure summary: Display maps (libchamplain).: ${have_libchamplain} Location awareness (Geoclue): ${have_geoclue} Adium themes (Webkit).......: ${have_webkit} + NetworkManager integration..: ${have_nm} Extras: Documentation...............: ${enable_gtk_doc} diff --git a/docs/libempathy-gtk/libempathy-gtk-docs.sgml b/docs/libempathy-gtk/libempathy-gtk-docs.sgml index 71f8ed3b6..edb31afb9 100644 --- a/docs/libempathy-gtk/libempathy-gtk-docs.sgml +++ b/docs/libempathy-gtk/libempathy-gtk-docs.sgml @@ -48,6 +48,7 @@ <xi:include href="xml/empathy-profile-chooser.xml"/> <xi:include href="xml/empathy-smiley-manager.xml"/> <xi:include href="xml/empathy-spell.xml"/> + <xi:include href="xml/empathy-sound.xml"/> <xi:include href="xml/empathy-status-preset-dialog.xml"/> <xi:include href="xml/empathy-theme-adium.xml"/> <xi:include href="xml/empathy-theme-boxes.xml"/> diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index c38a96f23..5903efb15 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -54,11 +54,13 @@ libempathy_gtk_handwritten_source = \ empathy-presence-chooser.c \ empathy-profile-chooser.c \ empathy-smiley-manager.c \ + empathy-sound.c \ empathy-spell.c \ empathy-status-preset-dialog.c \ empathy-theme-boxes.c \ empathy-theme-irc.c \ empathy-theme-manager.c \ + empathy-kludge-label.c \ empathy-ui-utils.c libempathy_gtk_la_SOURCES = \ @@ -113,11 +115,13 @@ libempathy_gtk_headers = \ empathy-presence-chooser.h \ empathy-profile-chooser.h \ empathy-smiley-manager.h \ + empathy-sound.h \ empathy-spell.h \ empathy-status-preset-dialog.h \ empathy-theme-boxes.h \ empathy-theme-irc.h \ empathy-theme-manager.h \ + empathy-kludge-label.h \ empathy-ui-utils.h check_c_sources = \ diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index 488486fdf..7dccb2179 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -65,7 +65,7 @@ typedef struct { typedef struct { EmpathyAccountChooser *chooser; - McAccount *account; + EmpathyAccount *account; gboolean set; } SetAccountData; @@ -88,19 +88,19 @@ static void account_chooser_set_property (GObject GParamSpec *pspec); static void account_chooser_setup (EmpathyAccountChooser *chooser); static void account_chooser_account_created_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountChooser *chooser); -static void account_chooser_account_add_foreach (McAccount *account, +static void account_chooser_account_add_foreach (EmpathyAccount *account, EmpathyAccountChooser *chooser); static void account_chooser_account_deleted_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountChooser *chooser); -static void account_chooser_account_remove_foreach (McAccount *account, +static void account_chooser_account_remove_foreach (EmpathyAccount *account, EmpathyAccountChooser *chooser); static void account_chooser_update_iter (EmpathyAccountChooser *chooser, GtkTreeIter *iter); static void account_chooser_connection_changed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, TpConnectionStatusReason reason, TpConnectionStatus new_status, TpConnectionStatus old_status, @@ -253,16 +253,16 @@ empathy_account_chooser_new (void) * @chooser: an #EmpathyAccountChooser * * Returns the account which is currently selected in the chooser or %NULL - * if there is no account selected. The #McAccount returned should be + * if there is no account selected. The #EmpathyAccount returned should be * unrefed with g_object_unref() when finished with. * - * Return value: a new ref to the #McAccount currently selected, or %NULL. + * Return value: a new ref to the #EmpathyAccount currently selected, or %NULL. */ -McAccount * +EmpathyAccount * empathy_account_chooser_dup_account (EmpathyAccountChooser *chooser) { EmpathyAccountChooserPriv *priv; - McAccount *account; + EmpathyAccount *account; GtkTreeModel *model; GtkTreeIter iter; @@ -295,7 +295,7 @@ TpConnection * empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser) { EmpathyAccountChooserPriv *priv; - McAccount *account; + EmpathyAccount *account; TpConnection *connection; g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), NULL); @@ -303,7 +303,7 @@ empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser) priv = GET_PRIV (chooser); account = empathy_account_chooser_dup_account (chooser); - connection = empathy_account_manager_get_connection (priv->manager, account); + connection = empathy_account_get_connection (account); g_object_unref (account); return connection; @@ -312,7 +312,7 @@ empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser) /** * empathy_account_chooser_set_account: * @chooser: an #EmpathyAccountChooser - * @account: an #McAccount + * @account: an #EmpathyAccount * * Sets the currently selected account to @account, if it exists in the list. * @@ -320,7 +320,7 @@ empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser) */ gboolean empathy_account_chooser_set_account (EmpathyAccountChooser *chooser, - McAccount *account) + EmpathyAccount *account) { GtkComboBox *combobox; GtkTreeModel *model; @@ -457,7 +457,7 @@ account_chooser_setup (EmpathyAccountChooser *chooser) G_TYPE_STRING, /* Image */ G_TYPE_STRING, /* Name */ G_TYPE_BOOLEAN, /* Enabled */ - MC_TYPE_ACCOUNT); + EMPATHY_TYPE_ACCOUNT); gtk_combo_box_set_model (combobox, GTK_TREE_MODEL (store)); @@ -477,25 +477,25 @@ account_chooser_setup (EmpathyAccountChooser *chooser) NULL); /* Populate accounts */ - accounts = mc_accounts_list (); + accounts = empathy_account_manager_dup_accounts (priv->manager); g_list_foreach (accounts, (GFunc) account_chooser_account_add_foreach, chooser); - mc_accounts_list_free (accounts); + g_list_free (accounts); g_object_unref (store); } static void account_chooser_account_created_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountChooser *chooser) { account_chooser_account_add_foreach (account, chooser); } static void -account_chooser_account_add_foreach (McAccount *account, +account_chooser_account_add_foreach (EmpathyAccount *account, EmpathyAccountChooser *chooser) { GtkListStore *store; @@ -511,18 +511,20 @@ account_chooser_account_add_foreach (McAccount *account, COL_ACCOUNT_POINTER, account, -1); account_chooser_update_iter (chooser, &iter); + /* We got a reffed account and it was reffed by the liststore as well */ + g_object_unref (account); } static void account_chooser_account_deleted_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountChooser *chooser) { account_chooser_account_remove_foreach (account, chooser); } typedef struct { - McAccount *account; + EmpathyAccount *account; GtkTreeIter *iter; gboolean found; } FindAccountData; @@ -534,7 +536,7 @@ account_chooser_find_account_foreach (GtkTreeModel *model, gpointer user_data) { FindAccountData *data = user_data; - McAccount *account; + EmpathyAccount *account; gtk_tree_model_get (model, iter, COL_ACCOUNT_POINTER, &account, -1); @@ -553,7 +555,7 @@ account_chooser_find_account_foreach (GtkTreeModel *model, static gboolean account_chooser_find_account (EmpathyAccountChooser *chooser, - McAccount *account, + EmpathyAccount *account, GtkTreeIter *iter) { GtkListStore *store; @@ -573,7 +575,7 @@ account_chooser_find_account (EmpathyAccountChooser *chooser, } static void -account_chooser_account_remove_foreach (McAccount *account, +account_chooser_account_remove_foreach (EmpathyAccount *account, EmpathyAccountChooser *chooser) { GtkListStore *store; @@ -595,7 +597,7 @@ account_chooser_update_iter (EmpathyAccountChooser *chooser, EmpathyAccountChooserPriv *priv; GtkListStore *store; GtkComboBox *combobox; - McAccount *account; + EmpathyAccount *account; const gchar *icon_name; gboolean is_enabled = TRUE; @@ -615,7 +617,7 @@ account_chooser_update_iter (EmpathyAccountChooser *chooser, gtk_list_store_set (store, iter, COL_ACCOUNT_IMAGE, icon_name, - COL_ACCOUNT_TEXT, mc_account_get_display_name (account), + COL_ACCOUNT_TEXT, empathy_account_get_display_name (account), COL_ACCOUNT_ENABLED, is_enabled, -1); @@ -630,7 +632,7 @@ account_chooser_update_iter (EmpathyAccountChooser *chooser, static void account_chooser_connection_changed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, TpConnectionStatusReason reason, TpConnectionStatus new_status, TpConnectionStatus old_status, @@ -671,7 +673,7 @@ account_chooser_set_account_foreach (GtkTreeModel *model, GtkTreeIter *iter, SetAccountData *data) { - McAccount *account; + EmpathyAccount *account; gboolean equal; gtk_tree_model_get (model, iter, COL_ACCOUNT_POINTER, &account, -1); @@ -744,7 +746,7 @@ empathy_account_chooser_set_filter (EmpathyAccountChooser *chooser, /** * EmpathyAccountChooserFilterFunc: - * @account: an #McAccount + * @account: an #EmpathyAccount * @user_data: user data, or %NULL * * A function which decides whether the account indicated by @account @@ -755,7 +757,7 @@ empathy_account_chooser_set_filter (EmpathyAccountChooser *chooser, /** * empathy_account_chooser_filter_is_connected: - * @account: an #McAccount + * @account: an #EmpathyAccount * @user_data: user data or %NULL * * A useful #EmpathyAccountChooserFilterFunc that one could pass into @@ -764,17 +766,12 @@ empathy_account_chooser_set_filter (EmpathyAccountChooser *chooser, * Return value: Whether @account is connected */ gboolean -empathy_account_chooser_filter_is_connected (McAccount *account, +empathy_account_chooser_filter_is_connected (EmpathyAccount *account, gpointer user_data) { - MissionControl *mc; TpConnectionStatus status; - g_return_val_if_fail (MC_IS_ACCOUNT (account), FALSE); - - mc = empathy_mission_control_dup_singleton (); - status = mission_control_get_connection_status (mc, account, NULL); - g_object_unref (mc); + g_object_get (account, "status", &status, NULL); return status == TP_CONNECTION_STATUS_CONNECTED; } diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h index c2105406a..255b6841f 100644 --- a/libempathy-gtk/empathy-account-chooser.h +++ b/libempathy-gtk/empathy-account-chooser.h @@ -27,7 +27,7 @@ #include <gtk/gtk.h> -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> G_BEGIN_DECLS @@ -38,7 +38,7 @@ G_BEGIN_DECLS #define EMPATHY_IS_ACCOUNT_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_ACCOUNT_CHOOSER)) #define EMPATHY_ACCOUNT_CHOOSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_ACCOUNT_CHOOSER, EmpathyAccountChooserClass)) -typedef gboolean (* EmpathyAccountChooserFilterFunc) (McAccount *account, +typedef gboolean (* EmpathyAccountChooserFilterFunc) (EmpathyAccount *account, gpointer user_data); @@ -58,17 +58,17 @@ struct _EmpathyAccountChooserClass { GType empathy_account_chooser_get_type (void) G_GNUC_CONST; GtkWidget * empathy_account_chooser_new (void); -McAccount * empathy_account_chooser_dup_account (EmpathyAccountChooser *chooser); +EmpathyAccount * empathy_account_chooser_dup_account (EmpathyAccountChooser *chooser); TpConnection * empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser); gboolean empathy_account_chooser_set_account (EmpathyAccountChooser *chooser, - McAccount *account); + EmpathyAccount *account); gboolean empathy_account_chooser_get_has_all_option (EmpathyAccountChooser *chooser); void empathy_account_chooser_set_has_all_option (EmpathyAccountChooser *chooser, gboolean has_all_option); void empathy_account_chooser_set_filter (EmpathyAccountChooser *chooser, EmpathyAccountChooserFilterFunc filter, gpointer user_data); -gboolean empathy_account_chooser_filter_is_connected (McAccount *account, +gboolean empathy_account_chooser_filter_is_connected (EmpathyAccount *account, gpointer user_data); G_END_DECLS diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c index 1306f517f..688a3e0e6 100644 --- a/libempathy-gtk/empathy-account-widget-irc.c +++ b/libempathy-gtk/empathy-account-widget-irc.c @@ -27,7 +27,6 @@ #include <glib/gi18n-lib.h> #include <gtk/gtk.h> -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mc-protocol.h> #include <libempathy/empathy-utils.h> @@ -44,7 +43,7 @@ #define IRC_NETWORKS_FILENAME "irc-networks.xml" typedef struct { - McAccount *account; + EmpathyAccount *account; EmpathyIrcNetworkManager *network_manager; GtkWidget *vbox_settings; @@ -70,9 +69,9 @@ static void unset_server_params (EmpathyAccountWidgetIrc *settings) { DEBUG ("Unset server, port and use-ssl"); - mc_account_unset_param (settings->account, "server"); - mc_account_unset_param (settings->account, "port"); - mc_account_unset_param (settings->account, "use-ssl"); + empathy_account_unset_param (settings->account, "server"); + empathy_account_unset_param (settings->account, "port"); + empathy_account_unset_param (settings->account, "use-ssl"); } static void @@ -98,7 +97,7 @@ update_server_params (EmpathyAccountWidgetIrc *settings) g_object_get (network, "charset", &charset, NULL); DEBUG ("Setting charset to %s", charset); - mc_account_set_param_string (settings->account, "charset", charset); + empathy_account_set_param_string (settings->account, "charset", charset); g_free (charset); servers = empathy_irc_network_get_servers (network); @@ -117,11 +116,11 @@ update_server_params (EmpathyAccountWidgetIrc *settings) NULL); DEBUG ("Setting server to %s", address); - mc_account_set_param_string (settings->account, "server", address); + empathy_account_set_param_string (settings->account, "server", address); DEBUG ("Setting port to %u", port); - mc_account_set_param_int (settings->account, "port", port); + empathy_account_set_param_int (settings->account, "port", port); DEBUG ("Setting use-ssl to %s", ssl ? "TRUE": "FALSE" ); - mc_account_set_param_boolean (settings->account, "use-ssl", ssl); + empathy_account_set_param_boolean (settings->account, "use-ssl", ssl); g_free (address); } @@ -332,17 +331,17 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings) gboolean ssl = FALSE; EmpathyIrcNetwork *network = NULL; - mc_account_get_param_string (settings->account, "account", &nick); - mc_account_get_param_string (settings->account, "fullname", &fullname); - mc_account_get_param_string (settings->account, "server", &server); - mc_account_get_param_string (settings->account, "charset", &charset); - mc_account_get_param_int (settings->account, "port", &port); - mc_account_get_param_boolean (settings->account, "use-ssl", &ssl); + nick = empathy_account_get_param_string (settings->account, "account"); + fullname = empathy_account_get_param_string (settings->account, "fullname"); + server = empathy_account_get_param_string (settings->account, "server"); + charset = empathy_account_get_param_string (settings->account, "charset"); + port = empathy_account_get_param_int (settings->account, "port"); + ssl = empathy_account_get_param_boolean (settings->account, "use-ssl"); if (!nick) { nick = g_strdup (g_get_user_name ()); - mc_account_set_param_string (settings->account, "account", nick); + empathy_account_set_param_string (settings->account, "account", nick); } if (!fullname) @@ -352,7 +351,7 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings) { fullname = g_strdup (nick); } - mc_account_set_param_string (settings->account, "fullname", fullname); + empathy_account_set_param_string (settings->account, "fullname", fullname); } if (server != NULL) @@ -414,14 +413,14 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings) /** * empathy_account_widget_irc_new: - * @account: the #McAccount to configure + * @account: the #EmpathyAccount to configure * - * Creates a new IRC account widget to configure a given #McAccount + * Creates a new IRC account widget to configure a given #EmpathyAccount * * Returns: The toplevel container of the configuration widget */ GtkWidget * -empathy_account_widget_irc_new (McAccount *account) +empathy_account_widget_irc_new (EmpathyAccount *account) { EmpathyAccountWidgetIrc *settings; gchar *dir, *user_file_with_path, *global_file_with_path; diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h index a89081fc0..40e58bbc3 100644 --- a/libempathy-gtk/empathy-account-widget-irc.h +++ b/libempathy-gtk/empathy-account-widget-irc.h @@ -22,11 +22,11 @@ #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__ #include <gtk/gtk.h> -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> G_BEGIN_DECLS -GtkWidget * empathy_account_widget_irc_new (McAccount *account); +GtkWidget * empathy_account_widget_irc_new (EmpathyAccount *account); G_END_DECLS diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c index da6082495..05e917e53 100644 --- a/libempathy-gtk/empathy-account-widget-sip.c +++ b/libempathy-gtk/empathy-account-widget-sip.c @@ -28,7 +28,6 @@ #include <glib/gi18n-lib.h> #include <gtk/gtk.h> -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mc-protocol.h> #include <libempathy/empathy-utils.h> @@ -38,7 +37,7 @@ #include "empathy-ui-utils.h" typedef struct { - McAccount *account; + EmpathyAccount *account; GtkWidget *vbox_settings; @@ -69,14 +68,14 @@ account_widget_sip_discover_stun_toggled_cb ( /** * empathy_account_widget_sip_new: - * @account: the #McAccount to configure + * @account: the #EmpathyAccount to configure * - * Creates a new SIP account widget to configure a given #McAccount + * Creates a new SIP account widget to configure a given #EmpathyAccount * * Returns: The toplevel container of the configuration widget */ GtkWidget * -empathy_account_widget_sip_new (McAccount *account) +empathy_account_widget_sip_new (EmpathyAccount *account) { EmpathyAccountWidgetSip *settings; GtkBuilder *gui; diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h index 9187c1e0c..69f60aacc 100644 --- a/libempathy-gtk/empathy-account-widget-sip.h +++ b/libempathy-gtk/empathy-account-widget-sip.h @@ -22,11 +22,11 @@ #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__ #include <gtk/gtk.h> -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> G_BEGIN_DECLS -GtkWidget * empathy_account_widget_sip_new (McAccount *account); +GtkWidget * empathy_account_widget_sip_new (EmpathyAccount *account); G_END_DECLS diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index b0d7f8de5..f602cd8bd 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -29,10 +29,10 @@ #include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mc-protocol.h> #include <libempathy/empathy-utils.h> +#include <libempathy/empathy-account.h> #include "empathy-account-widget.h" #include "empathy-ui-utils.h" @@ -43,7 +43,7 @@ static gboolean account_widget_entry_focus_cb (GtkWidget *widget, GdkEventFocus *event, - McAccount *account) + EmpathyAccount *account) { const gchar *str; const gchar *param_name; @@ -54,8 +54,8 @@ account_widget_entry_focus_cb (GtkWidget *widget, if (EMP_STR_EMPTY (str)) { gchar *value = NULL; - mc_account_unset_param (account, param_name); - mc_account_get_param_string (account, param_name, &value); + empathy_account_unset_param (account, param_name); + value = empathy_account_get_param_string (account, param_name); DEBUG ("Unset %s and restore to %s", param_name, value); gtk_entry_set_text (GTK_ENTRY (widget), value ? value : ""); g_free (value); @@ -64,7 +64,7 @@ account_widget_entry_focus_cb (GtkWidget *widget, const gchar *domain = NULL; gchar *dup_str = NULL; - profile = mc_account_get_profile (account); + profile = empathy_account_get_profile (account); if (mc_profile_get_capabilities (profile) & MC_PROFILE_CAPABILITY_SPLIT_ACCOUNT) { domain = mc_profile_get_default_account_domain (profile); @@ -78,7 +78,7 @@ account_widget_entry_focus_cb (GtkWidget *widget, } DEBUG ("Setting %s to %s", param_name, strstr (param_name, "password") ? "***" : str); - mc_account_set_param_string (account, param_name, str); + empathy_account_set_param_string (account, param_name, str); g_free (dup_str); g_object_unref (profile); } @@ -88,7 +88,7 @@ account_widget_entry_focus_cb (GtkWidget *widget, static void account_widget_int_changed_cb (GtkWidget *widget, - McAccount *account) + EmpathyAccount *account) { const gchar *param_name; gint value; @@ -97,19 +97,19 @@ account_widget_int_changed_cb (GtkWidget *widget, param_name = g_object_get_data (G_OBJECT (widget), "param_name"); if (value == 0) { - mc_account_unset_param (account, param_name); - mc_account_get_param_int (account, param_name, &value); + empathy_account_unset_param (account, param_name); + value = empathy_account_get_param_int (account, param_name); DEBUG ("Unset %s and restore to %d", param_name, value); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); } else { DEBUG ("Setting %s to %d", param_name, value); - mc_account_set_param_int (account, param_name, value); + empathy_account_set_param_int (account, param_name, value); } } static void account_widget_checkbutton_toggled_cb (GtkWidget *widget, - McAccount *account) + EmpathyAccount *account) { gboolean value; gboolean default_value; @@ -121,14 +121,14 @@ account_widget_checkbutton_toggled_cb (GtkWidget *widget, /* FIXME: This is ugly! checkbox don't have a "not-set" value so we * always unset the param and set the value if different from the * default value. */ - mc_account_unset_param (account, param_name); - mc_account_get_param_boolean (account, param_name, &default_value); + empathy_account_unset_param (account, param_name); + default_value = empathy_account_get_param_boolean (account, param_name); if (default_value == value) { DEBUG ("Unset %s and restore to %d", param_name, default_value); } else { DEBUG ("Setting %s to %d", param_name, value); - mc_account_set_param_boolean (account, param_name, value); + empathy_account_set_param_boolean (account, param_name, value); } } @@ -136,14 +136,14 @@ static void account_widget_forget_clicked_cb (GtkWidget *button, GtkWidget *entry) { - McAccount *account; + EmpathyAccount *account; const gchar *param_name; param_name = g_object_get_data (G_OBJECT (entry), "param_name"); account = g_object_get_data (G_OBJECT (entry), "account"); DEBUG ("Unset %s", param_name); - mc_account_unset_param (account, param_name); + empathy_account_unset_param (account, param_name); gtk_entry_set_text (GTK_ENTRY (entry), ""); } @@ -161,13 +161,13 @@ static void account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl, GtkWidget *spinbutton_port) { - McAccount *account; + EmpathyAccount *account; gboolean value; gint port = 0; value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton_ssl)); account = g_object_get_data (G_OBJECT (spinbutton_port), "account"); - mc_account_get_param_int (account, "port", &port); + port = empathy_account_get_param_int (account, "port"); if (value) { if (port == 5222 || port == 0) { @@ -184,7 +184,7 @@ account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl, static void account_widget_setup_widget (GtkWidget *widget, - McAccount *account, + EmpathyAccount *account, const gchar *param_name) { g_object_set_data_full (G_OBJECT (widget), "param_name", @@ -195,7 +195,7 @@ account_widget_setup_widget (GtkWidget *widget, if (GTK_IS_SPIN_BUTTON (widget)) { gint value = 0; - mc_account_get_param_int (account, param_name, &value); + value = empathy_account_get_param_int (account, param_name); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); g_signal_connect (widget, "value-changed", @@ -205,7 +205,7 @@ account_widget_setup_widget (GtkWidget *widget, else if (GTK_IS_ENTRY (widget)) { gchar *str = NULL; - mc_account_get_param_string (account, param_name, &str); + str = empathy_account_get_param_string (account, param_name); gtk_entry_set_text (GTK_ENTRY (widget), str ? str : ""); g_free (str); @@ -220,7 +220,7 @@ account_widget_setup_widget (GtkWidget *widget, else if (GTK_IS_TOGGLE_BUTTON (widget)) { gboolean value = FALSE; - mc_account_get_param_boolean (account, param_name, &value); + value = empathy_account_get_param_boolean (account, param_name); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value); g_signal_connect (widget, "toggled", @@ -256,7 +256,7 @@ account_widget_generic_format_param_name (const gchar *param_name) } static void -accounts_widget_generic_setup (McAccount *account, +accounts_widget_generic_setup (EmpathyAccount *account, GtkWidget *table_common_settings, GtkWidget *table_advanced_settings) { @@ -264,7 +264,7 @@ accounts_widget_generic_setup (McAccount *account, McProfile *profile; GSList *params, *l; - profile = mc_account_get_profile (account); + profile = empathy_account_get_profile (account); protocol = mc_profile_get_protocol (profile); if (!protocol) { @@ -400,7 +400,7 @@ accounts_widget_generic_setup (McAccount *account, } static void -account_widget_handle_params_valist (McAccount *account, +account_widget_handle_params_valist (EmpathyAccount *account, GtkBuilder *gui, const gchar *first_widget, va_list args) @@ -424,14 +424,13 @@ account_widget_handle_params_valist (McAccount *account, } void -empathy_account_widget_handle_params (McAccount *account, +empathy_account_widget_handle_params (EmpathyAccount *account, GtkBuilder *gui, const gchar *first_widget, ...) { va_list args; - g_return_if_fail (MC_IS_ACCOUNT (account)); g_return_if_fail (GTK_IS_BUILDER (gui)); va_start (args, first_widget); @@ -440,7 +439,7 @@ empathy_account_widget_handle_params (McAccount *account, } void -empathy_account_widget_add_forget_button (McAccount *account, +empathy_account_widget_add_forget_button (EmpathyAccount *account, GtkBuilder *gui, const gchar *button, const gchar *entry) @@ -452,7 +451,7 @@ empathy_account_widget_add_forget_button (McAccount *account, button_forget = GTK_WIDGET (gtk_builder_get_object (gui, button)); entry_password = GTK_WIDGET (gtk_builder_get_object (gui, entry)); - mc_account_get_param_string (account, "password", &password); + password = empathy_account_get_param_string (account, "password"); gtk_widget_set_sensitive (button_forget, !EMP_STR_EMPTY (password)); g_free (password); @@ -477,7 +476,7 @@ empathy_account_widget_set_default_focus (GtkBuilder *gui, } GtkWidget * -empathy_account_widget_generic_new (McAccount *account) +empathy_account_widget_generic_new (EmpathyAccount *account) { GtkBuilder *gui; GtkWidget *widget; @@ -485,8 +484,6 @@ empathy_account_widget_generic_new (McAccount *account) GtkWidget *table_advanced_settings; gchar *filename; - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); - filename = empathy_file_lookup ("empathy-account-widget-generic.ui", "libempathy-gtk"); gui = empathy_builder_get_file (filename, @@ -502,7 +499,7 @@ empathy_account_widget_generic_new (McAccount *account) } GtkWidget * -empathy_account_widget_salut_new (McAccount *account) +empathy_account_widget_salut_new (EmpathyAccount *account) { GtkBuilder *gui; GtkWidget *widget; @@ -530,7 +527,7 @@ empathy_account_widget_salut_new (McAccount *account) } GtkWidget * -empathy_account_widget_msn_new (McAccount *account) +empathy_account_widget_msn_new (EmpathyAccount *account) { GtkBuilder *gui; GtkWidget *widget; @@ -560,7 +557,7 @@ empathy_account_widget_msn_new (McAccount *account) } GtkWidget * -empathy_account_widget_jabber_new (McAccount *account) +empathy_account_widget_jabber_new (EmpathyAccount *account) { GtkBuilder *gui; GtkWidget *widget; @@ -603,7 +600,7 @@ empathy_account_widget_jabber_new (McAccount *account) } GtkWidget * -empathy_account_widget_icq_new (McAccount *account) +empathy_account_widget_icq_new (EmpathyAccount *account) { GtkBuilder *gui; GtkWidget *widget; @@ -636,7 +633,7 @@ empathy_account_widget_icq_new (McAccount *account) } GtkWidget * -empathy_account_widget_aim_new (McAccount *account) +empathy_account_widget_aim_new (EmpathyAccount *account) { GtkBuilder *gui; GtkWidget *widget; @@ -668,7 +665,7 @@ empathy_account_widget_aim_new (McAccount *account) } GtkWidget * -empathy_account_widget_yahoo_new (McAccount *account) +empathy_account_widget_yahoo_new (EmpathyAccount *account) { GtkBuilder *gui; GtkWidget *widget; @@ -702,7 +699,7 @@ empathy_account_widget_yahoo_new (McAccount *account) } GtkWidget * -empathy_account_widget_groupwise_new (McAccount *account) +empathy_account_widget_groupwise_new (EmpathyAccount *account) { GtkBuilder *gui; GtkWidget *widget; diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h index 7287f5675..7a76db9e0 100644 --- a/libempathy-gtk/empathy-account-widget.h +++ b/libempathy-gtk/empathy-account-widget.h @@ -27,28 +27,28 @@ #include <gtk/gtk.h> -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> G_BEGIN_DECLS -void empathy_account_widget_handle_params (McAccount *account, +void empathy_account_widget_handle_params (EmpathyAccount *account, GtkBuilder *gui, const gchar *first_widget, ...); -void empathy_account_widget_add_forget_button (McAccount *account, +void empathy_account_widget_add_forget_button (EmpathyAccount *account, GtkBuilder *gui, const gchar *button, const gchar *entry); void empathy_account_widget_set_default_focus (GtkBuilder *gui, const gchar *entry); -GtkWidget *empathy_account_widget_generic_new (McAccount *account); -GtkWidget *empathy_account_widget_salut_new (McAccount *account); -GtkWidget *empathy_account_widget_msn_new (McAccount *account); -GtkWidget *empathy_account_widget_jabber_new (McAccount *account); -GtkWidget *empathy_account_widget_icq_new (McAccount *account); -GtkWidget *empathy_account_widget_aim_new (McAccount *account); -GtkWidget *empathy_account_widget_yahoo_new (McAccount *account); -GtkWidget *empathy_account_widget_groupwise_new (McAccount *account); +GtkWidget *empathy_account_widget_generic_new (EmpathyAccount *account); +GtkWidget *empathy_account_widget_salut_new (EmpathyAccount *account); +GtkWidget *empathy_account_widget_msn_new (EmpathyAccount *account); +GtkWidget *empathy_account_widget_jabber_new (EmpathyAccount *account); +GtkWidget *empathy_account_widget_icq_new (EmpathyAccount *account); +GtkWidget *empathy_account_widget_aim_new (EmpathyAccount *account); +GtkWidget *empathy_account_widget_yahoo_new (EmpathyAccount *account); +GtkWidget *empathy_account_widget_groupwise_new (EmpathyAccount *account); G_END_DECLS diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 83475b565..af96885e4 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -786,24 +786,24 @@ avatar_chooser_drag_data_received_cb (GtkWidget *widget, gchar *target_type; gboolean handled = FALSE; - target_type = gdk_atom_name (selection_data->target); + target_type = gdk_atom_name (gtk_selection_data_get_target (selection_data)); if (!strcmp (target_type, URI_LIST_TYPE)) { GFile *file; GFileInputStream *input_stream; gchar *nl; gchar *data = NULL; - nl = strstr (selection_data->data, "\r\n"); + nl = strstr (gtk_selection_data_get_data (selection_data), "\r\n"); if (nl) { gchar *uri; - uri = g_strndup (selection_data->data, - nl - (gchar *) selection_data->data); + uri = g_strndup (gtk_selection_data_get_data (selection_data), + nl - (gchar *) gtk_selection_data_get_data (selection_data)); file = g_file_new_for_uri (uri); g_free (uri); } else { - file = g_file_new_for_uri (selection_data->data); + file = g_file_new_for_uri (gtk_selection_data_get_data (selection_data)); } input_stream = g_file_read (file, NULL, NULL); diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index d430c0fa6..f7898e1bd 100644 --- a/libempathy-gtk/empathy-avatar-image.c +++ b/libempathy-gtk/empathy-avatar-image.c @@ -232,7 +232,7 @@ avatar_image_button_press_event (GtkWidget *widget, GdkEventButton *event) gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); g_object_unref (pixbuf); - gdk_window_get_origin (priv->image->window, &x, &y); + gdk_window_get_origin (gtk_widget_get_window (priv->image), &x, &y); x = x - (popup_width - width) / 2; y = y - (popup_height - height) / 2; diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c index 6fb7cfded..bd5c89f19 100644 --- a/libempathy-gtk/empathy-cell-renderer-expander.c +++ b/libempathy-gtk/empathy-cell-renderer-expander.c @@ -101,9 +101,11 @@ empathy_cell_renderer_expander_init (EmpathyCellRendererExpander *expander) priv->activatable = TRUE; priv->animation_node = NULL; - GTK_CELL_RENDERER (expander)->xpad = 2; - GTK_CELL_RENDERER (expander)->ypad = 2; - GTK_CELL_RENDERER (expander)->mode = GTK_CELL_RENDERER_MODE_ACTIVATABLE; + g_object_set (expander, + "xpad", 2, + "ypad", 2, + "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, + NULL); } static void @@ -252,18 +254,27 @@ empathy_cell_renderer_expander_get_size (GtkCellRenderer *cell, { EmpathyCellRendererExpander *expander; EmpathyCellRendererExpanderPriv *priv; + gfloat xalign, yalign; + guint xpad, ypad; expander = (EmpathyCellRendererExpander *) cell; priv = GET_PRIV (expander); + g_object_get (cell, + "xalign", &xalign, + "yalign", &yalign, + "xpad", &xpad, + "ypad", &ypad, + NULL); + if (cell_area) { if (x_offset) { - *x_offset = cell->xalign * (cell_area->width - (priv->expander_size + (2 * cell->xpad))); + *x_offset = xalign * (cell_area->width - (priv->expander_size + (2 * xpad))); *x_offset = MAX (*x_offset, 0); } if (y_offset) { - *y_offset = cell->yalign * (cell_area->height - (priv->expander_size + (2 * cell->ypad))); + *y_offset = yalign * (cell_area->height - (priv->expander_size + (2 * ypad))); *y_offset = MAX (*y_offset, 0); } } else { @@ -275,10 +286,10 @@ empathy_cell_renderer_expander_get_size (GtkCellRenderer *cell, } if (width) - *width = cell->xpad * 2 + priv->expander_size; + *width = xpad * 2 + priv->expander_size; if (height) - *height = cell->ypad * 2 + priv->expander_size; + *height = ypad * 2 + priv->expander_size; } static void @@ -294,6 +305,8 @@ empathy_cell_renderer_expander_render (GtkCellRenderer *cell, EmpathyCellRendererExpanderPriv *priv; GtkExpanderStyle expander_style; gint x_offset, y_offset; + guint xpad, ypad; + expander = (EmpathyCellRendererExpander *) cell; priv = GET_PRIV (expander); @@ -319,14 +332,19 @@ empathy_cell_renderer_expander_render (GtkCellRenderer *cell, &x_offset, &y_offset, NULL, NULL); - gtk_paint_expander (widget->style, + g_object_get (cell, + "xpad", &xpad, + "ypad", &ypad, + NULL); + + gtk_paint_expander (gtk_widget_get_style (widget), window, GTK_STATE_NORMAL, expose_area, widget, "treeview", - cell_area->x + x_offset + cell->xpad + priv->expander_size / 2, - cell_area->y + y_offset + cell->ypad + priv->expander_size / 2, + cell_area->x + x_offset + xpad + priv->expander_size / 2, + cell_area->y + y_offset + ypad + priv->expander_size / 2, expander_style); } diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c index c47b5474f..d7ebda647 100644 --- a/libempathy-gtk/empathy-chat-text-view.c +++ b/libempathy-gtk/empathy-chat-text-view.c @@ -34,9 +34,9 @@ #include <gtk/gtk.h> #include <telepathy-glib/util.h> -#include <libmissioncontrol/mc-account.h> #include <libempathy/empathy-utils.h> +#include <libempathy/empathy-account.h> #include "empathy-chat-text-view.h" #include "empathy-chat.h" @@ -495,7 +495,9 @@ chat_text_view_size_allocate (GtkWidget *widget, GtkAdjustment *adj; adj = GTK_TEXT_VIEW (widget)->vadjustment; - gtk_adjustment_set_value (adj, adj->upper - adj->page_size); + gtk_adjustment_set_value (adj, + gtk_adjustment_get_upper (adj) - + gtk_adjustment_get_page_size (adj)); } } @@ -652,7 +654,7 @@ chat_text_view_scroll_cb (EmpathyChatTextView *view) priv = GET_PRIV (view); adj = GTK_TEXT_VIEW (view)->vadjustment; - max_val = adj->upper - adj->page_size; + max_val = gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj); g_return_val_if_fail (priv->scroll_time != NULL, FALSE); @@ -817,6 +819,10 @@ chat_text_view_clear (EmpathyChatView *view) priv = GET_PRIV (view); priv->last_timestamp = 0; + if (priv->last_contact) { + g_object_unref (priv->last_contact); + priv->last_contact = NULL; + } } static gboolean diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 9c5e47b0e..a8ca745e2 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -64,7 +64,7 @@ #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChat) typedef struct { EmpathyTpChat *tp_chat; - McAccount *account; + EmpathyAccount *account; gchar *id; gchar *name; gchar *subject; @@ -201,7 +201,7 @@ chat_new_connection_cb (EmpathyAccountManager *manager, EmpathyChat *chat) { EmpathyChatPriv *priv = GET_PRIV (chat); - McAccount *account; + EmpathyAccount *account; account = empathy_account_manager_get_account (manager, connection); if (!priv->tp_chat && empathy_account_equal (account, priv->account) && @@ -748,13 +748,14 @@ chat_input_key_press_event_cb (GtkWidget *widget, if (!(event->state & GDK_CONTROL_MASK) && event->keyval == GDK_Page_Up) { adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (text_view_sw)); - gtk_adjustment_set_value (adj, adj->value - adj->page_size); + gtk_adjustment_set_value (adj, gtk_adjustment_get_value (adj) - gtk_adjustment_get_page_size (adj)); return TRUE; } if ((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK && event->keyval == GDK_Page_Down) { adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (text_view_sw)); - val = MIN (adj->value + adj->page_size, adj->upper - adj->page_size); + val = MIN (gtk_adjustment_get_value (adj) + gtk_adjustment_get_page_size (adj), + gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj)); gtk_adjustment_set_value (adj, val); return TRUE; } @@ -1161,6 +1162,56 @@ chat_contacts_completion_func (const gchar *s1, return ret; } +static gchar * +build_part_message (guint reason, + const gchar *name, + EmpathyContact *actor, + const gchar *message) +{ + GString *s = g_string_new (""); + const gchar *actor_name = NULL; + + if (actor != NULL) { + actor_name = empathy_contact_get_name (actor); + } + + /* Having an actor only really makes sense for a few actions... */ + switch (reason) { + case TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE: + g_string_append_printf (s, _("%s has disconnected"), name); + break; + case TP_CHANNEL_GROUP_CHANGE_REASON_KICKED: + if (actor_name != NULL) { + g_string_append_printf (s, _("%s was kicked by %s"), + name, actor_name); + } else { + g_string_append_printf (s, _("%s was kicked"), name); + } + break; + case TP_CHANNEL_GROUP_CHANGE_REASON_BANNED: + if (actor_name != NULL) { + g_string_append_printf (s, _("%s was banned by %s"), + name, actor_name); + } else { + g_string_append_printf (s, _("%s was banned"), name); + } + break; + default: + g_string_append_printf (s, _("%s has left the room"), name); + } + + if (!EMP_STR_EMPTY (message)) { + /* Note to translators: this string is appended to + * notifications like "foo has left the room", with the message + * given by the user living the room. If this poses a problem, + * please let us know. :-) + */ + g_string_append_printf (s, _(" (%s)"), message); + } + + return g_string_free (s, FALSE); +} + static void chat_members_changed_cb (EmpathyTpChat *tp_chat, EmpathyContact *contact, @@ -1171,20 +1222,21 @@ chat_members_changed_cb (EmpathyTpChat *tp_chat, EmpathyChat *chat) { EmpathyChatPriv *priv = GET_PRIV (chat); + const gchar *name = empathy_contact_get_name (contact); + gchar *str; - if (priv->block_events_timeout_id == 0) { - gchar *str; + if (priv->block_events_timeout_id != 0) + return; - if (is_member) { - str = g_strdup_printf (_("%s has joined the room"), - empathy_contact_get_name (contact)); - } else { - str = g_strdup_printf (_("%s has left the room"), - empathy_contact_get_name (contact)); - } - empathy_chat_view_append_event (chat->view, str); - g_free (str); + if (is_member) { + str = g_strdup_printf (_("%s has joined the room"), + name); + } else { + str = build_part_message (reason, name, actor, message); } + + empathy_chat_view_append_event (chat->view, str); + g_free (str); } static gboolean @@ -1427,15 +1479,18 @@ chat_size_request (GtkWidget *widget, GtkRequisition *requisition) { GtkBin *bin = GTK_BIN (widget); + GtkWidget *child; + + requisition->width = gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2; + requisition->height = gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2; - requisition->width = GTK_CONTAINER (widget)->border_width * 2; - requisition->height = GTK_CONTAINER (widget)->border_width * 2; + child = gtk_bin_get_child (bin); - if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) + if (child && GTK_WIDGET_VISIBLE (child)) { GtkRequisition child_requisition; - gtk_widget_size_request (bin->child, &child_requisition); + gtk_widget_size_request (child, &child_requisition); requisition->width += child_requisition.width; requisition->height += child_requisition.height; @@ -1448,17 +1503,20 @@ chat_size_allocate (GtkWidget *widget, { GtkBin *bin = GTK_BIN (widget); GtkAllocation child_allocation; + GtkWidget *child; widget->allocation = *allocation; - if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) + child = gtk_bin_get_child (bin); + + if (child && GTK_WIDGET_VISIBLE (child)) { - child_allocation.x = allocation->x + GTK_CONTAINER (widget)->border_width; - child_allocation.y = allocation->y + GTK_CONTAINER (widget)->border_width; - child_allocation.width = MAX (allocation->width - GTK_CONTAINER (widget)->border_width * 2, 0); - child_allocation.height = MAX (allocation->height - GTK_CONTAINER (widget)->border_width * 2, 0); + child_allocation.x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (widget)); + child_allocation.y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (widget)); + child_allocation.width = MAX (allocation->width - gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2, 0); + child_allocation.height = MAX (allocation->height - gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2, 0); - gtk_widget_size_allocate (bin->child, &child_allocation); + gtk_widget_size_allocate (child, &child_allocation); } } @@ -1562,7 +1620,7 @@ empathy_chat_class_init (EmpathyChatClass *klass) g_param_spec_object ("account", "Account of the chat", "The account of the chat", - MC_TYPE_ACCOUNT, + EMPATHY_TYPE_ACCOUNT, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (object_class, @@ -1753,7 +1811,7 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, show_pending_messages (chat); } -McAccount * +EmpathyAccount * empathy_chat_get_account (EmpathyChat *chat) { EmpathyChatPriv *priv = GET_PRIV (chat); diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h index c38fd64a6..c7158759a 100644 --- a/libempathy-gtk/empathy-chat.h +++ b/libempathy-gtk/empathy-chat.h @@ -66,7 +66,7 @@ EmpathyChat * empathy_chat_new (EmpathyTpChat *tp_chat); EmpathyTpChat * empathy_chat_get_tp_chat (EmpathyChat *chat); void empathy_chat_set_tp_chat (EmpathyChat *chat, EmpathyTpChat *tp_chat); -McAccount * empathy_chat_get_account (EmpathyChat *chat); +EmpathyAccount * empathy_chat_get_account (EmpathyChat *chat); const gchar * empathy_chat_get_id (EmpathyChat *chat); const gchar * empathy_chat_get_name (EmpathyChat *chat); const gchar * empathy_chat_get_subject (EmpathyChat *chat); diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index 39edbf579..d271cdd28 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -193,7 +193,7 @@ empathy_contact_information_dialog_show (EmpathyContact *contact, EMPATHY_CONTACT_WIDGET_SHOW_LOCATION | EMPATHY_CONTACT_WIDGET_EDIT_NONE); gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), contact_widget, TRUE, TRUE, 0); gtk_widget_show (contact_widget); @@ -252,7 +252,7 @@ empathy_contact_edit_dialog_show (EmpathyContact *contact, EMPATHY_CONTACT_WIDGET_EDIT_ALIAS | EMPATHY_CONTACT_WIDGET_EDIT_GROUPS); gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), contact_widget, TRUE, TRUE, 0); gtk_widget_show (contact_widget); @@ -304,7 +304,7 @@ empathy_contact_personal_dialog_show (GtkWindow *parent) EMPATHY_CONTACT_WIDGET_EDIT_ALIAS | EMPATHY_CONTACT_WIDGET_EDIT_AVATAR); gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (personal_dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (personal_dialog))), contact_widget, TRUE, TRUE, 0); empathy_contact_widget_set_account_filter (contact_widget, @@ -328,26 +328,20 @@ empathy_contact_personal_dialog_show (GtkWindow *parent) */ static gboolean -can_add_contact_to_account (McAccount *account, +can_add_contact_to_account (EmpathyAccount *account, gpointer user_data) { - EmpathyAccountManager *account_manager; EmpathyContactManager *contact_manager; TpConnection *connection; gboolean result; - account_manager = empathy_account_manager_dup_singleton (); - connection = empathy_account_manager_get_connection (account_manager, - account); - if (!connection) { - g_object_unref (account_manager); + connection = empathy_account_get_connection (account); + if (connection == NULL) return FALSE; - } contact_manager = empathy_contact_manager_dup_singleton (); result = empathy_contact_manager_can_add (contact_manager, connection); g_object_unref (contact_manager); - g_object_unref (account_manager); return result; } @@ -413,7 +407,7 @@ empathy_new_contact_dialog_show (GtkWindow *parent) EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT | EMPATHY_CONTACT_WIDGET_EDIT_ID | EMPATHY_CONTACT_WIDGET_EDIT_GROUPS); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), contact_widget, TRUE, TRUE, 0); empathy_contact_widget_set_account_filter (contact_widget, diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 61db60cdf..9cebe1daa 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -32,7 +32,6 @@ #include <gtk/gtk.h> #include <telepathy-glib/util.h> -#include <libmissioncontrol/mc-account.h> #include <libempathy/empathy-account-manager.h> #include <libempathy/empathy-call-factory.h> @@ -247,7 +246,7 @@ contact_list_view_drag_data_received (GtkWidget *view, EmpathyContactListViewPriv *priv; EmpathyAccountManager *account_manager; EmpathyTpContactFactory *factory = NULL; - McAccount *account; + EmpathyAccount *account; GtkTreeModel *model; GtkTreeViewDropPosition position; GtkTreePath *path; @@ -293,7 +292,7 @@ contact_list_view_drag_data_received (GtkWidget *view, goto OUT; } - id = (const gchar*) selection->data; + id = (const gchar*) gtk_selection_data_get_data (selection); DEBUG ("Received %s%s drag & drop contact from roster with id:'%s'", context->action == GDK_ACTION_MOVE ? "move" : "", context->action == GDK_ACTION_COPY ? "copy" : "", @@ -302,19 +301,17 @@ contact_list_view_drag_data_received (GtkWidget *view, strv = g_strsplit (id, "/", 2); account_id = strv[0]; contact_id = strv[1]; - account = mc_account_lookup (account_id); + account_manager = empathy_account_manager_dup_singleton (); + account = empathy_account_manager_lookup (account_manager, account_id); if (account) { TpConnection *connection; - /* FIXME: We assume we have already an account manager */ - account_manager = empathy_account_manager_dup_singleton (); - connection = empathy_account_manager_get_connection (account_manager, - account); + connection = empathy_account_get_connection (account); if (connection) { factory = empathy_tp_contact_factory_dup_singleton (connection); } - g_object_unref (account_manager); } + g_object_unref (account_manager); if (!factory) { DEBUG ("Failed to get factory for account '%s'", account_id); @@ -451,7 +448,7 @@ contact_list_view_drag_data_get (GtkWidget *widget, GtkTreeIter iter; GtkTreeModel *model; EmpathyContact *contact; - McAccount *account; + EmpathyAccount *account; const gchar *contact_id; const gchar *account_id; gchar *str; @@ -481,7 +478,7 @@ contact_list_view_drag_data_get (GtkWidget *widget, } account = empathy_contact_get_account (contact); - account_id = mc_account_get_unique_name (account); + account_id = empathy_account_get_unique_name (account); contact_id = empathy_contact_get_id (contact); g_object_unref (contact); str = g_strconcat (account_id, "/", contact_id, NULL); @@ -854,7 +851,7 @@ contact_list_view_expander_cell_data_func (GtkTreeViewColumn *column, gboolean row_expanded; path = gtk_tree_model_get_path (model, iter); - row_expanded = gtk_tree_view_row_expanded (GTK_TREE_VIEW (column->tree_view), path); + row_expanded = gtk_tree_view_row_expanded (GTK_TREE_VIEW (gtk_tree_view_column_get_tree_view (column)), path); gtk_tree_path_free (path); g_object_set (cell, diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 12a139303..f078f5248 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -32,7 +32,6 @@ #include <champlain-gtk/champlain-gtk.h> #endif -#include <libmissioncontrol/mc-account.h> #include <telepathy-glib/util.h> #include <libempathy/empathy-tp-contact-factory.h> @@ -41,12 +40,14 @@ #include <libempathy/empathy-location.h> #include <libempathy/empathy-time.h> #include <libempathy/empathy-utils.h> +#include <libempathy/empathy-account.h> #include "empathy-contact-widget.h" #include "empathy-account-chooser.h" #include "empathy-avatar-chooser.h" #include "empathy-avatar-image.h" #include "empathy-ui-utils.h" +#include "empathy-kludge-label.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include <libempathy/empathy-debug.h> @@ -219,7 +220,6 @@ empathy_contact_widget_new (EmpathyContact *contact, "hbox_presence", &information->hbox_presence, "label_alias", &information->label_alias, "image_state", &information->image_state, - "label_status", &information->label_status, "table_contact", &information->table_contact, "vbox_avatar", &information->vbox_avatar, "vbox_location", &information->vbox_location, @@ -587,6 +587,12 @@ update_avatar_chooser_account_cb (EmpathyAccountChooser *account_chooser, static void contact_widget_contact_setup (EmpathyContactWidget *information) { + /* Setup label_status as a KludgeLabel */ + information->label_status = empathy_kludge_label_new (""); + gtk_box_pack_start (GTK_BOX (information->hbox_presence), + information->label_status, TRUE, TRUE, 0); + gtk_widget_show (information->label_status); + /* Setup account label/chooser */ if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT) { @@ -697,7 +703,7 @@ contact_widget_contact_setup (EmpathyContactWidget *information) static void contact_widget_contact_update (EmpathyContactWidget *information) { - McAccount *account = NULL; + EmpathyAccount *account = NULL; const gchar *id = NULL; /* Connect and get info from new contact */ @@ -737,7 +743,7 @@ contact_widget_contact_update (EmpathyContactWidget *information) { const gchar *name; - name = mc_account_get_display_name (account); + name = empathy_account_get_display_name (account); gtk_label_set_label (GTK_LABEL (information->widget_account), name); } } diff --git a/libempathy-gtk/empathy-contact-widget.ui b/libempathy-gtk/empathy-contact-widget.ui index c5bbd5bbe..5737b7d71 100644 --- a/libempathy-gtk/empathy-contact-widget.ui +++ b/libempathy-gtk/empathy-contact-widget.ui @@ -112,17 +112,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label_status"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> <packing> diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c index 63222badc..e6b4a6f7f 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.c +++ b/libempathy-gtk/empathy-irc-network-dialog.c @@ -27,10 +27,10 @@ #include <glib/gi18n-lib.h> #include <gtk/gtk.h> -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mc-protocol.h> #include <libempathy/empathy-utils.h> +#include <libempathy/empathy-account.h> #include <libempathy/empathy-irc-network-manager.h> #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-kludge-label.c b/libempathy-gtk/empathy-kludge-label.c new file mode 100644 index 000000000..f4a29dec2 --- /dev/null +++ b/libempathy-gtk/empathy-kludge-label.c @@ -0,0 +1,89 @@ +/* vim: set ts=4 sts=4 sw=4 et: */ +/* + * Copyright (C) 2009 Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk> + */ + +#include "empathy-kludge-label.h" + +G_DEFINE_TYPE (EmpathyKludgeLabel, empathy_kludge_label, GTK_TYPE_LABEL); + +static void +empathy_kludge_label_size_allocate (GtkWidget *self, + GtkAllocation *allocation) +{ + PangoLayout *layout; + + GTK_WIDGET_CLASS (empathy_kludge_label_parent_class)->size_allocate ( + self, allocation); + + /* force the width of the PangoLayout to be the width of the allocation */ + layout = gtk_label_get_layout (GTK_LABEL (self)); + pango_layout_set_width (layout, allocation->width * PANGO_SCALE); +} + +static gboolean +empathy_kludge_label_expose_event (GtkWidget *self, + GdkEventExpose *event) +{ + PangoLayout *layout; + PangoRectangle rect; + GtkAllocation real_allocation; + gboolean r; + + layout = gtk_label_get_layout (GTK_LABEL (self)); + pango_layout_get_pixel_extents (layout, NULL, &rect); + + /* this is mind-bendingly evil: + * get_layout_location() is going to remove rect.x from the position of the + * layout when painting it. This really sucks. We're going to compensate by + * adding this value to the allocation. + */ + real_allocation = self->allocation; + self->allocation.x += rect.x; + + r = GTK_WIDGET_CLASS (empathy_kludge_label_parent_class)->expose_event ( + self, event); + + self->allocation = real_allocation; + + return r; +} + +static void +empathy_kludge_label_class_init (EmpathyKludgeLabelClass *klass) +{ + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + widget_class->size_allocate = empathy_kludge_label_size_allocate; + widget_class->expose_event = empathy_kludge_label_expose_event; +} + +static void +empathy_kludge_label_init (EmpathyKludgeLabel *self) +{ +} + +GtkWidget * +empathy_kludge_label_new (const char *str) +{ + return g_object_new (EMPATHY_TYPE_KLUDGE_LABEL, + "label", str, + "xalign", 0., + NULL); +} diff --git a/libempathy-gtk/empathy-kludge-label.h b/libempathy-gtk/empathy-kludge-label.h new file mode 100644 index 000000000..f2ea1e938 --- /dev/null +++ b/libempathy-gtk/empathy-kludge-label.h @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2009 Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk> + */ + +#ifndef __EMPATHY_KLUDGE_LABEL_H__ +#define __EMPATHY_KLUDGE_LABEL_H__ + +#include <gtk/gtk.h> + +G_BEGIN_DECLS + +#define EMPATHY_TYPE_KLUDGE_LABEL (empathy_kludge_label_get_type ()) +#define EMPATHY_KLUDGE_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_KLUDGE_LABEL, EmpathyKludgeLabel)) +#define EMPATHY_KLUDGE_LABEL_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), EMPATHY_TYPE_KLUDGE_LABEL, EmpathyKludgeLabelClass)) +#define EMPATHY_IS_KLUDGE_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_KLUDGE_LABEL)) +#define EMPATHY_IS_KLUDGE_LABEL_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), EMPATHY_TYPE_KLUDGE_LABEL)) +#define EMPATHY_KLUDGE_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_KLUDGE_LABEL, EmpathyKludgeLabelClass)) + +typedef struct _EmpathyKludgeLabel EmpathyKludgeLabel; +typedef struct _EmpathyKludgeLabelClass EmpathyKludgeLabelClass; + +struct _EmpathyKludgeLabel +{ + GtkLabel parent; +}; + +struct _EmpathyKludgeLabelClass +{ + GtkLabelClass parent_class; +}; + +GType empathy_kludge_label_get_type (void); +GtkWidget *empathy_kludge_label_new (const char *str); + +G_END_DECLS + +#endif diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 21d73f8ea..f05017c9c 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -31,6 +31,7 @@ #include <gtk/gtk.h> #include <libempathy/empathy-log-manager.h> +#include <libempathy/empathy-account-manager.h> #include <libempathy/empathy-chatroom-manager.h> #include <libempathy/empathy-chatroom.h> #include <libempathy/empathy-message.h> @@ -94,11 +95,11 @@ static void log_window_chats_setup (EmpathyLogWindow *wi static void log_window_chats_accounts_changed_cb (GtkWidget *combobox, EmpathyLogWindow *window); static void log_window_chats_set_selected (EmpathyLogWindow *window, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean is_chatroom); static gboolean log_window_chats_get_selected (EmpathyLogWindow *window, - McAccount **account, + EmpathyAccount **account, gchar **chat_id, gboolean *is_chatroom); static void log_window_chats_get_messages (EmpathyLogWindow *window, @@ -134,14 +135,14 @@ enum { }; GtkWidget * -empathy_log_window_show (McAccount *account, +empathy_log_window_show (EmpathyAccount *account, const gchar *chat_id, gboolean is_chatroom, GtkWindow *parent) { static EmpathyLogWindow *window = NULL; EmpathyAccountChooser *account_chooser; - GList *accounts; + EmpathyAccountManager *account_manager; gint account_num; GtkBuilder *gui; gchar *filename; @@ -228,9 +229,9 @@ empathy_log_window_show (McAccount *account, window); /* Populate */ - accounts = mc_accounts_list (); - account_num = g_list_length (accounts); - mc_accounts_list_free (accounts); + account_manager = empathy_account_manager_dup_singleton (); + account_num = empathy_account_manager_get_count (account_manager); + g_object_unref (account_manager); if (account_num > 1) { gtk_widget_show (window->vbox_chats); @@ -301,7 +302,7 @@ log_window_find_changed_cb (GtkTreeSelection *selection, GtkTreeView *view; GtkTreeModel *model; GtkTreeIter iter; - McAccount *account; + EmpathyAccount *account; gchar *chat_id; gboolean is_chatroom; gchar *date; @@ -417,7 +418,7 @@ log_window_find_populate (EmpathyLogWindow *window, } date_readable = empathy_log_manager_get_date_readable (hit->date); - account_name = mc_account_get_display_name (hit->account); + account_name = empathy_account_get_display_name (hit->account); account_icon = empathy_icon_name_from_account (hit->account); gtk_list_store_append (store, &iter); @@ -464,7 +465,7 @@ log_window_find_setup (EmpathyLogWindow *window) store = gtk_list_store_new (COL_FIND_COUNT, G_TYPE_STRING, /* account icon name */ G_TYPE_STRING, /* account name */ - MC_TYPE_ACCOUNT, /* account */ + EMPATHY_TYPE_ACCOUNT, /* account */ G_TYPE_STRING, /* chat name */ G_TYPE_STRING, /* chat id */ G_TYPE_BOOLEAN, /* is chatroom */ @@ -608,7 +609,7 @@ static void log_window_chats_populate (EmpathyLogWindow *window) { EmpathyAccountChooser *account_chooser; - McAccount *account; + EmpathyAccount *account; GList *chats, *l; GtkTreeView *view; @@ -684,11 +685,11 @@ log_window_chats_setup (EmpathyLogWindow *window) /* new store */ store = gtk_list_store_new (COL_CHAT_COUNT, - G_TYPE_STRING, /* icon */ - G_TYPE_STRING, /* name */ - MC_TYPE_ACCOUNT, /* account */ - G_TYPE_STRING, /* id */ - G_TYPE_BOOLEAN); /* is chatroom */ + G_TYPE_STRING, /* icon */ + G_TYPE_STRING, /* name */ + EMPATHY_TYPE_ACCOUNT, /* account */ + G_TYPE_STRING, /* id */ + G_TYPE_BOOLEAN); /* is chatroom */ model = GTK_TREE_MODEL (store); sortable = GTK_TREE_SORTABLE (store); @@ -739,7 +740,7 @@ log_window_chats_accounts_changed_cb (GtkWidget *combobox, static void log_window_chats_set_selected (EmpathyLogWindow *window, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean is_chatroom) { @@ -763,7 +764,7 @@ log_window_chats_set_selected (EmpathyLogWindow *window, } for (ok = TRUE; ok; ok = gtk_tree_model_iter_next (model, &iter)) { - McAccount *this_account; + EmpathyAccount *this_account; gchar *this_chat_id; gboolean this_is_chatroom; @@ -792,7 +793,7 @@ log_window_chats_set_selected (EmpathyLogWindow *window, static gboolean log_window_chats_get_selected (EmpathyLogWindow *window, - McAccount **account, + EmpathyAccount **account, gchar **chat_id, gboolean *is_chatroom) { @@ -801,7 +802,7 @@ log_window_chats_get_selected (EmpathyLogWindow *window, GtkTreeSelection *selection; GtkTreeIter iter; gchar *id = NULL; - McAccount *acc = NULL; + EmpathyAccount *acc = NULL; gboolean room = FALSE; view = GTK_TREE_VIEW (window->treeview_chats); @@ -839,7 +840,7 @@ static void log_window_chats_get_messages (EmpathyLogWindow *window, const gchar *date_to_show) { - McAccount *account; + EmpathyAccount *account; gchar *chat_id; gboolean is_chatroom; EmpathyMessage *message; @@ -999,7 +1000,7 @@ static void log_window_calendar_chats_month_changed_cb (GtkWidget *calendar, EmpathyLogWindow *window) { - McAccount *account; + EmpathyAccount *account; gchar *chat_id; gboolean is_chatroom; guint year_selected; diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h index 6dd8c0303..298d96099 100644 --- a/libempathy-gtk/empathy-log-window.h +++ b/libempathy-gtk/empathy-log-window.h @@ -25,11 +25,11 @@ #ifndef __EMPATHY_LOG_WINDOW_H__ #define __EMPATHY_LOG_WINDOW_H__ -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> G_BEGIN_DECLS -GtkWidget * empathy_log_window_show (McAccount *account, +GtkWidget * empathy_log_window_show (EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, GtkWindow *parent); diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 9aee42913..77b368bd9 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -27,7 +27,6 @@ #include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mission-control.h> #include <libempathy/empathy-call-factory.h> @@ -35,6 +34,7 @@ #include <libempathy/empathy-contact-manager.h> #include <libempathy/empathy-dispatcher.h> #include <libempathy/empathy-utils.h> +#include <libempathy/empathy-account.h> #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include <libempathy/empathy-debug.h> diff --git a/libempathy-gtk/empathy-sound.c b/libempathy-gtk/empathy-sound.c new file mode 100644 index 000000000..d97f72bef --- /dev/null +++ b/libempathy-gtk/empathy-sound.c @@ -0,0 +1,385 @@ +/* + * empathy-sound.c - Various sound related utility functions. + * 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 + */ + +#include <config.h> + +#include "empathy-sound.h" + +#include <canberra-gtk.h> +#include <glib/gi18n-lib.h> +#include <gtk/gtk.h> + +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include <libempathy/empathy-debug.h> +#include <libempathy/empathy-utils.h> + +#include "empathy-conf.h" + +typedef struct { + EmpathySound sound_id; + const char * event_ca_id; + const char * event_ca_description; + const char * gconf_key; +} EmpathySoundEntry; + +typedef struct { + GtkWidget *widget; + gint sound_id; + guint play_interval; + guint replay_timeout_id; +} EmpathyRepeatableSound; + +/* NOTE: these entries MUST be in the same order than EmpathySound enum */ +static EmpathySoundEntry sound_entries[LAST_EMPATHY_SOUND] = { + { EMPATHY_SOUND_MESSAGE_INCOMING, "message-new-instant", + N_("Received an instant message"), EMPATHY_PREFS_SOUNDS_INCOMING_MESSAGE } , + { EMPATHY_SOUND_MESSAGE_OUTGOING, "message-sent-instant", + N_("Sent an instant message"), EMPATHY_PREFS_SOUNDS_OUTGOING_MESSAGE } , + { EMPATHY_SOUND_CONVERSATION_NEW, "message-new-instant", + N_("Incoming chat request"), EMPATHY_PREFS_SOUNDS_NEW_CONVERSATION }, + { EMPATHY_SOUND_CONTACT_CONNECTED, "service-login", + N_("Contact connected"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN }, + { EMPATHY_SOUND_CONTACT_DISCONNECTED, "service-logout", + N_("Contact disconnected"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT }, + { EMPATHY_SOUND_ACCOUNT_CONNECTED, "service-login", + N_("Connected to server"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGIN }, + { EMPATHY_SOUND_ACCOUNT_DISCONNECTED, "service-logout", + N_("Disconnected from server"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGOUT }, + { EMPATHY_SOUND_PHONE_INCOMING, "phone-incoming-call", + N_("Incoming voice call"), NULL }, + { EMPATHY_SOUND_PHONE_OUTGOING, "phone-outgoing-calling", + N_("Outgoing voice call"), NULL }, + { EMPATHY_SOUND_PHONE_HANGUP, "phone-hangup", + N_("Voice call ended"), NULL }, +}; + +/* An hash table containing currently repeating sounds. The format is the + * following: + * Key: An EmpathySound + * Value : The EmpathyRepeatableSound associated with that EmpathySound. */ +static GHashTable *repeating_sounds; + +static gboolean +empathy_sound_pref_is_enabled (EmpathySound sound_id) +{ + EmpathySoundEntry *entry; + EmpathyConf *conf; + gboolean res; + + entry = &(sound_entries[sound_id]); + g_return_val_if_fail (entry->sound_id == sound_id, FALSE); + + if (entry->gconf_key == NULL) + return TRUE; + + conf = empathy_conf_get (); + res = FALSE; + + empathy_conf_get_bool (conf, EMPATHY_PREFS_SOUNDS_ENABLED, &res); + + if (!res) + return FALSE; + + if (!empathy_check_available_state ()) + { + empathy_conf_get_bool (conf, EMPATHY_PREFS_SOUNDS_DISABLED_AWAY, &res); + + if (res) + return FALSE; + } + + empathy_conf_get_bool (conf, entry->gconf_key, &res); + + return res; +} + +/** + * empathy_sound_stop: + * @sound_id: The #EmpathySound to stop playing. + * + * Stop playing a sound. If it has been stated in loop with + * empathy_sound_start_playing(), it will also stop replaying. + */ +void +empathy_sound_stop (EmpathySound sound_id) +{ + EmpathySoundEntry *entry; + + g_return_if_fail (sound_id < LAST_EMPATHY_SOUND); + + entry = &(sound_entries[sound_id]); + g_return_if_fail (entry->sound_id == sound_id); + + if (repeating_sounds != NULL) + { + EmpathyRepeatableSound *repeatable_sound; + + repeatable_sound = g_hash_table_lookup (repeating_sounds, + GINT_TO_POINTER (sound_id)); + if (repeatable_sound != NULL) + { + /* The sound must be stopped... If it is waiting for replay, remove + * it from hash table to cancel. Otherwise we'll cancel the sound + * being played. */ + if (repeatable_sound->replay_timeout_id != 0) + { + g_hash_table_remove (repeating_sounds, GINT_TO_POINTER (sound_id)); + return; + } + } + } + + ca_context_cancel (ca_gtk_context_get (), entry->sound_id); +} + +static gboolean +empathy_sound_play_internal (GtkWidget *widget, EmpathySound sound_id, + ca_finish_callback_t callback, gpointer user_data) +{ + EmpathySoundEntry *entry; + ca_context *c; + ca_proplist *p = NULL; + + entry = &(sound_entries[sound_id]); + g_return_val_if_fail (entry->sound_id == sound_id, FALSE); + + c = ca_gtk_context_get (); + ca_context_cancel (c, entry->sound_id); + + DEBUG ("Play sound \"%s\" (%s)", + entry->event_ca_id, + entry->event_ca_description); + + if (ca_proplist_create (&p) < 0) + goto failed; + + if (ca_proplist_sets (p, CA_PROP_EVENT_ID, entry->event_ca_id) < 0) + goto failed; + + if (ca_proplist_sets (p, CA_PROP_EVENT_DESCRIPTION, + gettext (entry->event_ca_id)) < 0) + goto failed; + + if (ca_gtk_proplist_set_for_widget (p, widget) < 0) + goto failed; + + ca_context_play_full (ca_gtk_context_get (), entry->sound_id, p, callback, + user_data); + + ca_proplist_destroy (p); + + return TRUE; + +failed: + if (p != NULL) + ca_proplist_destroy (p); + + return FALSE; +} + +/** + * empathy_sound_play_full: + * @widget: The #GtkWidget from which the sound is originating. + * @sound_id: The #EmpathySound to play. + * @callback: The #ca_finish_callback_t function that will be called when the + * sound has stopped playing. + * @user_data: user data to pass to the function. + * + * Plays a sound. + * + * Returns %TRUE if the sound has successfully started playing, otherwise + * returning %FALSE and @callback won't be called. + * + * This function returns %FALSE if the sound is already playing in loop using + * %empathy_sound_start_playing. + * + * This function returns %FALSE if the sound is disabled in empathy preferences. + * + * Return value: %TRUE if the sound has successfully started playing, %FALSE + * otherwise. + */ +gboolean +empathy_sound_play_full (GtkWidget *widget, EmpathySound sound_id, + ca_finish_callback_t callback, gpointer user_data) +{ + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + g_return_val_if_fail (sound_id < LAST_EMPATHY_SOUND, FALSE); + + if (!empathy_sound_pref_is_enabled (sound_id)) + return FALSE; + + /* The sound might already be playing repeatedly. If it's the case, we + * immediadely return since there's no need to make it play again */ + if (repeating_sounds != NULL && + g_hash_table_lookup (repeating_sounds, GINT_TO_POINTER (sound_id)) != NULL) + return FALSE; + + return empathy_sound_play_internal (widget, sound_id, callback, user_data); +} + +/** + * empathy_sound_play: + * @widget: The #GtkWidget from which the sound is originating. + * @sound_id: The #EmpathySound to play. + * + * Plays a sound. See %empathy_sound_play_full for details.' + * + * Return value: %TRUE if the sound has successfully started playing, %FALSE + * otherwise. + */ +gboolean +empathy_sound_play (GtkWidget *widget, EmpathySound sound_id) +{ + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + g_return_val_if_fail (sound_id < LAST_EMPATHY_SOUND, FALSE); + + return empathy_sound_play_full (widget, sound_id, NULL, NULL); +} + +static void playing_finished_cb (ca_context *c, guint id, int error_code, + gpointer user_data); + +static gboolean +playing_timeout_cb (gpointer data) +{ + EmpathyRepeatableSound *repeatable_sound = data; + gboolean playing; + + repeatable_sound->replay_timeout_id = 0; + + playing = empathy_sound_play_internal (repeatable_sound->widget, + repeatable_sound->sound_id, playing_finished_cb, data); + + if (!playing) + { + DEBUG ("Failed to replay sound, stop repeating"); + g_hash_table_remove (repeating_sounds, + GINT_TO_POINTER (repeatable_sound->sound_id)); + } + + return FALSE; +} + +static void +playing_finished_cb (ca_context *c, guint id, int error_code, + gpointer user_data) +{ + EmpathyRepeatableSound *repeatable_sound = user_data; + + if (error_code != CA_SUCCESS) + { + DEBUG ("Error: %s", ca_strerror (error_code)); + g_hash_table_remove (repeating_sounds, + GINT_TO_POINTER (repeatable_sound->sound_id)); + return; + } + + repeatable_sound->replay_timeout_id = g_timeout_add ( + repeatable_sound->play_interval, playing_timeout_cb, user_data); +} + +static void +empathy_sound_widget_destroyed_cb (GtkWidget *widget, gpointer user_data) +{ + EmpathyRepeatableSound *repeatable_sound = user_data; + + /* The sound must be stopped... If it is waiting for replay, remove + * it from hash table to cancel. Otherwise playing_finished_cb will be + * called with an error. */ + if (repeatable_sound->replay_timeout_id != 0) + { + g_hash_table_remove (repeating_sounds, + GINT_TO_POINTER (repeatable_sound->sound_id)); + } +} + +static void +repeating_sounds_item_delete (gpointer data) +{ + EmpathyRepeatableSound *repeatable_sound = data; + + if (repeatable_sound->replay_timeout_id != 0) + g_source_remove (repeatable_sound->replay_timeout_id); + + g_signal_handlers_disconnect_by_func (repeatable_sound->widget, + empathy_sound_widget_destroyed_cb, repeatable_sound); + + g_slice_free (EmpathyRepeatableSound, repeatable_sound); +} + +/** + * empathy_sound_start_playing: + * @widget: The #GtkWidget from which the sound is originating. + * @sound_id: The #EmpathySound to play. + * @timeout_before_replay: The amount of time, in milliseconds, between two + * consecutive play. + * + * Start playing a sound in loop. To stop the sound, call empathy_call_stop () + * by passing it the same @sound_id. Note that if you start playing a sound + * multiple times, you'll have to call %empathy_sound_stop the same number of + * times. + * + * Return value: %TRUE if the sound has successfully started playing. + */ +gboolean +empathy_sound_start_playing (GtkWidget *widget, EmpathySound sound_id, + guint timeout_before_replay) +{ + EmpathyRepeatableSound *repeatable_sound; + gboolean playing = FALSE; + + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + g_return_val_if_fail (sound_id < LAST_EMPATHY_SOUND, FALSE); + + if (!empathy_sound_pref_is_enabled (sound_id)) + return FALSE; + + if (repeating_sounds == NULL) + { + repeating_sounds = g_hash_table_new_full (g_direct_hash, g_direct_equal, + NULL, repeating_sounds_item_delete); + } + else if (g_hash_table_lookup (repeating_sounds, + GINT_TO_POINTER (sound_id)) != NULL) + { + /* The sound is already playing in loop. No need to continue. */ + return FALSE; + } + + repeatable_sound = g_slice_new0 (EmpathyRepeatableSound); + repeatable_sound->widget = widget; + repeatable_sound->sound_id = sound_id; + repeatable_sound->play_interval = timeout_before_replay; + repeatable_sound->replay_timeout_id = 0; + + g_hash_table_insert (repeating_sounds, GINT_TO_POINTER (sound_id), + repeatable_sound); + + g_signal_connect (G_OBJECT (widget), "destroy", + G_CALLBACK (empathy_sound_widget_destroyed_cb), + repeatable_sound); + + playing = empathy_sound_play_internal (widget, sound_id, playing_finished_cb, + repeatable_sound); + + if (!playing) + g_hash_table_remove (repeating_sounds, GINT_TO_POINTER (sound_id)); + + return playing; +} diff --git a/libempathy-gtk/empathy-sound.h b/libempathy-gtk/empathy-sound.h new file mode 100644 index 000000000..f65f6260e --- /dev/null +++ b/libempathy-gtk/empathy-sound.h @@ -0,0 +1,56 @@ +/* + * empathy-sound.h - Various sound related utility functions. + * 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 + */ + + +#ifndef __EMPATHY_SOUND_H__ +#define __EMPATHY_SOUND_H__ + +#include <gtk/gtk.h> + +#include <canberra-gtk.h> + +G_BEGIN_DECLS + +/* NOTE: Keep this sync with sound_entries in empathy-sound.c */ +typedef enum { + EMPATHY_SOUND_MESSAGE_INCOMING = 0, + EMPATHY_SOUND_MESSAGE_OUTGOING, + EMPATHY_SOUND_CONVERSATION_NEW, + EMPATHY_SOUND_CONTACT_CONNECTED, + EMPATHY_SOUND_CONTACT_DISCONNECTED, + EMPATHY_SOUND_ACCOUNT_CONNECTED, + EMPATHY_SOUND_ACCOUNT_DISCONNECTED, + EMPATHY_SOUND_PHONE_INCOMING, + EMPATHY_SOUND_PHONE_OUTGOING, + EMPATHY_SOUND_PHONE_HANGUP, + LAST_EMPATHY_SOUND, +} EmpathySound; + +gboolean empathy_sound_play (GtkWidget *widget, EmpathySound sound_id); +void empathy_sound_stop (EmpathySound sound_id); + +gboolean empathy_sound_start_playing (GtkWidget *widget, EmpathySound sound_id, + guint timeout_before_replay); + +gboolean empathy_sound_play_full (GtkWidget *widget, EmpathySound sound_id, + ca_finish_callback_t callback, gpointer user_data); + +G_END_DECLS + +#endif /* #ifndef __EMPATHY_SOUND_H__*/ diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c index 7ac13ad38..802d116e7 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.c +++ b/libempathy-gtk/empathy-status-preset-dialog.c @@ -559,8 +559,8 @@ empathy_status_preset_dialog_init (EmpathyStatusPresetDialog *self) status_preset_dialog_setup_presets_treeview (self); status_preset_dialog_setup_add_combobox (self); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (self)->vbox), toplevel_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), + toplevel_vbox, TRUE, TRUE, 0); g_object_unref (gui); } diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index d5ea2ed52..3b4a895e4 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -52,6 +52,7 @@ typedef struct { EmpathySmileyManager *smiley_manager; EmpathyContact *last_contact; time_t last_timestamp; + gboolean last_is_backlog; gboolean page_loaded; GList *message_queue; gchar *hovered_uri; @@ -67,12 +68,20 @@ struct _EmpathyAdiumData { gchar *template_html; gchar *in_content_html; gsize in_content_len; + gchar *in_context_html; + gsize in_context_len; gchar *in_nextcontent_html; gsize in_nextcontent_len; + gchar *in_nextcontext_html; + gsize in_nextcontext_len; gchar *out_content_html; gsize out_content_len; + gchar *out_context_html; + gsize out_context_len; gchar *out_nextcontent_html; gsize out_nextcontent_len; + gchar *out_nextcontext_html; + gsize out_nextcontext_len; gchar *status_html; gsize status_len; GHashTable *info; @@ -474,7 +483,7 @@ theme_adium_append_message (EmpathyChatView *view, EmpathyThemeAdium *theme = EMPATHY_THEME_ADIUM (view); EmpathyThemeAdiumPriv *priv = GET_PRIV (theme); EmpathyContact *sender; - McAccount *account; + EmpathyAccount *account; McProfile *account_profile; gchar *dup_body = NULL; const gchar *body; @@ -487,7 +496,8 @@ theme_adium_append_message (EmpathyChatView *view, gsize len = 0; const gchar *func; const gchar *service_name; - const gchar *message_classes = NULL; + GString *message_classes = NULL; + gboolean is_backlog; if (!priv->page_loaded) { priv->message_queue = g_list_prepend (priv->message_queue, @@ -498,7 +508,7 @@ theme_adium_append_message (EmpathyChatView *view, /* Get information */ sender = empathy_message_get_sender (msg); account = empathy_contact_get_account (sender); - account_profile = mc_account_get_profile (account); + account_profile = empathy_account_get_profile (account); service_name = mc_profile_get_display_name (account_profile); timestamp = empathy_message_get_timestamp (msg); body = empathy_message_get_body (msg); @@ -541,45 +551,102 @@ theme_adium_append_message (EmpathyChatView *view, } } + is_backlog = empathy_message_is_backlog (msg); + /* Get the right html/func to add the message */ func = "appendMessage"; + + message_classes = g_string_new ("message"); + + /* eventually append the "history" class */ + if (is_backlog) { + g_string_append (message_classes, " history"); + } + + /* check the sender of the message and append the appropriate class */ + if (empathy_contact_is_user (sender)) { + g_string_append (message_classes, " outgoing"); + } + else { + g_string_append (message_classes, " incoming"); + } + /* * To mimick Adium's behavior, we only want to join messages - * sent within a 5 minute time frame. + * sent by the same contact within a 5 minute time frame. */ if (empathy_contact_equal (priv->last_contact, sender) && - (timestamp - priv->last_timestamp < MESSAGE_JOIN_PERIOD)) { + (timestamp - priv->last_timestamp < MESSAGE_JOIN_PERIOD) && + (is_backlog == priv->last_is_backlog)) { + /* the messages can be appended */ func = "appendNextMessage"; + g_string_append (message_classes, " consecutive"); + + /* check who is the sender of the message to use the correct html file */ if (empathy_contact_is_user (sender)) { - message_classes = "consecutive incoming message"; - html = priv->data->out_nextcontent_html; - len = priv->data->out_nextcontent_len; + /* check if this is a backlog message and use NextContext.html */ + if (is_backlog) { + html = priv->data->out_nextcontext_html; + len = priv->data->out_nextcontext_len; + } + + /* + * html is null if this is not a backlog message or + * if we have to fallback (NextContext.html missing). + * use NextContent.html + */ + if (html == NULL) { + html = priv->data->out_nextcontent_html; + len = priv->data->out_nextcontent_len; + } } - if (!html) { - message_classes = "consecutive message outgoing"; - html = priv->data->in_nextcontent_html; - len = priv->data->in_nextcontent_len; + else { + if (is_backlog) { + html = priv->data->in_nextcontext_html; + len = priv->data->in_nextcontext_len; + } + + if (html == NULL) { + html = priv->data->in_nextcontent_html; + len = priv->data->in_nextcontent_len; + } } } - if (!html) { + + /* + * we have html == NULL here if: + * 1. the message didn't have to be appended because + * the sender was different or the timestamp was too far + * 2. NextContent.html file does not exist, so we must + * not forget to fallback to the correct Content.html + */ + if (html == NULL) { if (empathy_contact_is_user (sender)) { - if (!message_classes) { - message_classes = "incoming message"; + if (is_backlog) { + html = priv->data->out_context_html; + len = priv->data->out_context_len; + } + + if (html == NULL) { + html = priv->data->out_content_html; + len = priv->data->out_content_len; } - html = priv->data->out_content_html; - len = priv->data->out_content_len; } - if (!html) { - if (!message_classes) { - message_classes = "message outgoing"; + else { + if (is_backlog) { + html = priv->data->in_context_html; + len = priv->data->in_context_len; + } + + if (html == NULL) { + html = priv->data->in_content_html; + len = priv->data->in_content_len; } - html = priv->data->in_content_html; - len = priv->data->in_content_len; } } theme_adium_append_html (theme, func, html, len, body, avatar_filename, - name, contact_id, service_name, message_classes, + name, contact_id, service_name, message_classes->str, timestamp); /* Keep the sender of the last displayed message */ @@ -588,8 +655,10 @@ theme_adium_append_message (EmpathyChatView *view, } priv->last_contact = g_object_ref (sender); priv->last_timestamp = timestamp; + priv->last_is_backlog = is_backlog; g_free (dup_body); + g_string_free (message_classes, TRUE); } static void @@ -646,6 +715,13 @@ theme_adium_clear (EmpathyChatView *view) priv->data->template_html, basedir_uri); g_free (basedir_uri); + + /* Clear last contact to avoid trying to add a 'joined' + * message when we don't have an insertion point. */ + if (priv->last_contact) { + g_object_unref (priv->last_contact); + priv->last_contact = NULL; + } } static gboolean @@ -899,6 +975,15 @@ empathy_adium_path_is_valid (const gchar *path) gboolean ret; gchar *file; + /* The theme is not valid if there is no Info.plist */ + file = g_build_filename (path, "Contents", "Info.plist", + NULL); + ret = g_file_test (file, G_FILE_TEST_EXISTS); + g_free (file); + + if (ret == FALSE) + return ret; + /* We ship a default Template.html as fallback if there is any problem * with the one inside the theme. The only other required file is * Content.html for incoming messages (outgoing fallback to use @@ -924,10 +1009,15 @@ empathy_adium_info_new (const gchar *path) value = empathy_plist_parse_from_file (file); g_free (file); - if (value) { - info = g_value_dup_boxed (value); - tp_g_value_slice_free (value); - } + if (value == NULL) + return NULL; + + info = g_value_dup_boxed (value); + tp_g_value_slice_free (value); + + /* Insert the theme's path into the hash table, + * keys have to be dupped */ + tp_asv_set_string (info, g_strdup ("path"), path); return info; } @@ -980,6 +1070,14 @@ empathy_adium_data_new_with_info (const gchar *path, GHashTable *info) g_file_get_contents (file, &data->in_nextcontent_html, &data->in_nextcontent_len, NULL); g_free (file); + file = g_build_filename (data->basedir, "Incoming", "Context.html", NULL); + g_file_get_contents (file, &data->in_context_html, &data->in_context_len, NULL); + g_free (file); + + file = g_build_filename (data->basedir, "Incoming", "NextContext.html", NULL); + g_file_get_contents (file, &data->in_nextcontext_html, &data->in_nextcontext_len, NULL); + g_free (file); + file = g_build_filename (data->basedir, "Outgoing", "Content.html", NULL); g_file_get_contents (file, &data->out_content_html, &data->out_content_len, NULL); g_free (file); @@ -988,6 +1086,14 @@ empathy_adium_data_new_with_info (const gchar *path, GHashTable *info) g_file_get_contents (file, &data->out_nextcontent_html, &data->out_nextcontent_len, NULL); g_free (file); + file = g_build_filename (data->basedir, "Outgoing", "Context.html", NULL); + g_file_get_contents (file, &data->out_context_html, &data->out_context_len, NULL); + g_free (file); + + file = g_build_filename (data->basedir, "Outgoing", "NextContext.html", NULL); + g_file_get_contents (file, &data->out_nextcontext_html, &data->out_nextcontext_len, NULL); + g_free (file); + file = g_build_filename (data->basedir, "Status.html", NULL); g_file_get_contents (file, &data->status_html, &data->status_len, NULL); g_free (file); @@ -1091,7 +1197,7 @@ empathy_adium_data_ref (EmpathyAdiumData *data) { g_return_val_if_fail (data != NULL, NULL); - data->ref_count++; + g_atomic_int_inc (&data->ref_count); return data; } @@ -1101,15 +1207,18 @@ empathy_adium_data_unref (EmpathyAdiumData *data) { g_return_if_fail (data != NULL); - data->ref_count--; - if (data->ref_count == 0) { + if (g_atomic_int_dec_and_test (&data->ref_count)) { g_free (data->path); g_free (data->basedir); g_free (data->template_html); g_free (data->in_content_html); g_free (data->in_nextcontent_html); + g_free (data->in_context_html); + g_free (data->in_nextcontext_html); g_free (data->out_content_html); g_free (data->out_nextcontent_html); + g_free (data->out_context_html); + g_free (data->out_nextcontext_html); g_free (data->default_avatar_filename); g_free (data->default_incoming_avatar_filename); g_free (data->default_outgoing_avatar_filename); diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c index ba3d48e68..fea2eca51 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -26,6 +26,7 @@ #include <string.h> #include <glib/gi18n-lib.h> +#include <telepathy-glib/dbus.h> #include <gtk/gtk.h> #include <telepathy-glib/util.h> @@ -67,9 +68,6 @@ static const gchar *themes[] = { "simple", N_("Simple"), "clean", N_("Clean"), "blue", N_("Blue"), -#ifdef HAVE_WEBKIT - "adium", N_("Adium"), -#endif NULL }; @@ -378,6 +376,10 @@ theme_manager_ensure_theme_exists (const gchar *name) return FALSE; } + if (strcmp ("adium", name) == 0) { + return TRUE; + } + for (i = 0; themes[i]; i += 2) { if (strcmp (themes[i], name) == 0) { return TRUE; @@ -534,3 +536,62 @@ empathy_theme_manager_get_themes (void) return themes; } +#ifdef HAVE_WEBKIT +static void +find_themes (GList **list, const gchar *dirpath) +{ + GDir *dir; + GError *error = NULL; + const gchar *name = NULL; + GHashTable *info = NULL; + + dir = g_dir_open (dirpath, 0, &error); + if (dir != NULL) { + name = g_dir_read_name (dir); + while (name != NULL) { + gchar *path; + + path = g_build_path (G_DIR_SEPARATOR_S, dirpath, name, NULL); + if (empathy_adium_path_is_valid (path)) { + info = empathy_adium_info_new (path); + if (info != NULL) { + *list = g_list_prepend (*list, info); + } + } + g_free (path); + name = g_dir_read_name (dir); + } + g_dir_close (dir); + } else { + DEBUG ("Error opening %s: %s\n", dirpath, error->message); + g_error_free (error); + } +} +#endif /* HAVE_WEBKIT */ + +GList * +empathy_theme_manager_get_adium_themes (void) +{ +#ifdef HAVE_WEBKIT + GList *themes = NULL; + gchar *userpath = NULL; + const gchar *const *paths = NULL; + gint i = 0; + + userpath = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), "adium/message-styles", NULL); + find_themes (&themes, userpath); + g_free (userpath); + + paths = g_get_system_data_dirs (); + for (i = 0; paths[i] != NULL; i++) { + userpath = g_build_path (G_DIR_SEPARATOR_S, paths[i], + "adium/message-styles", NULL); + find_themes (&themes, userpath); + g_free (userpath); + } + + return themes; +#else + return NULL; +#endif /* HAVE_WEBKIT */ +} diff --git a/libempathy-gtk/empathy-theme-manager.h b/libempathy-gtk/empathy-theme-manager.h index 99c96d784..a459b43cb 100644 --- a/libempathy-gtk/empathy-theme-manager.h +++ b/libempathy-gtk/empathy-theme-manager.h @@ -51,6 +51,7 @@ struct _EmpathyThemeManagerClass { GType empathy_theme_manager_get_type (void) G_GNUC_CONST; EmpathyThemeManager * empathy_theme_manager_get (void); const gchar ** empathy_theme_manager_get_themes (void); +GList * empathy_theme_manager_get_adium_themes (void); EmpathyChatView * empathy_theme_manager_create_view (EmpathyThemeManager *manager); G_END_DECLS diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 902bcb3e6..e91ac6291 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -37,7 +37,6 @@ #include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <gio/gio.h> -#include <canberra-gtk.h> #include <libmissioncontrol/mc-profile.h> @@ -184,11 +183,11 @@ empathy_builder_unref_and_keep_widget (GtkBuilder *gui, } const gchar * -empathy_icon_name_from_account (McAccount *account) +empathy_icon_name_from_account (EmpathyAccount *account) { McProfile *profile; - profile = mc_account_get_profile (account); + profile = empathy_account_get_profile (account); return mc_profile_get_icon_name (profile); } @@ -1251,7 +1250,7 @@ empathy_window_get_is_visible (GtkWindow *window) g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); - gdk_window = GTK_WIDGET (window)->window; + gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); if (!gdk_window) { return FALSE; } @@ -1273,7 +1272,7 @@ empathy_window_iconify (GtkWindow *window, GtkStatusIcon *status_icon) GdkWindow *gdk_window; gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL); - gdk_window = GTK_WIDGET (window)->window; + gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); dpy = gdk_x11_drawable_get_xdisplay (gdk_window); data[0] = icon_location.x; @@ -1540,140 +1539,4 @@ empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler) G_CALLBACK (file_manager_receive_file_response_cb), handler); gtk_widget_show (widget); -} - -typedef struct { - EmpathySound sound_id; - const char * event_ca_id; - const char * event_ca_description; - const char * gconf_key; -} EmpathySoundEntry; - -/* NOTE: these entries MUST be in the same order than EmpathySound enum */ -static EmpathySoundEntry sound_entries[LAST_EMPATHY_SOUND] = { - { EMPATHY_SOUND_MESSAGE_INCOMING, "message-new-instant", - N_("Received an instant message"), EMPATHY_PREFS_SOUNDS_INCOMING_MESSAGE } , - { EMPATHY_SOUND_MESSAGE_OUTGOING, "message-sent-instant", - N_("Sent an instant message"), EMPATHY_PREFS_SOUNDS_OUTGOING_MESSAGE } , - { EMPATHY_SOUND_CONVERSATION_NEW, "message-new-instant", - N_("Incoming chat request"), EMPATHY_PREFS_SOUNDS_NEW_CONVERSATION }, - { EMPATHY_SOUND_CONTACT_CONNECTED, "service-login", - N_("Contact connected"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN }, - { EMPATHY_SOUND_CONTACT_DISCONNECTED, "service-logout", - N_("Contact disconnected"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT }, - { EMPATHY_SOUND_ACCOUNT_CONNECTED, "service-login", - N_("Connected to server"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGIN }, - { EMPATHY_SOUND_ACCOUNT_DISCONNECTED, "service-logout", - N_("Disconnected from server"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGOUT }, - { EMPATHY_SOUND_PHONE_INCOMING, "phone-incoming-call", - N_("Incoming voice call"), NULL }, - { EMPATHY_SOUND_PHONE_OUTGOING, "phone-outgoing-calling", - N_("Outgoing voice call"), NULL }, - { EMPATHY_SOUND_PHONE_HANGUP, "phone-hangup", - N_("Voice call ended"), NULL }, -}; - - -static gboolean -empathy_sound_pref_is_enabled (const char *key) -{ - EmpathyConf *conf; - gboolean res; - - conf = empathy_conf_get (); - res = FALSE; - - empathy_conf_get_bool (conf, EMPATHY_PREFS_SOUNDS_ENABLED, &res); - - if (!res) { - return FALSE; - } - - if (!empathy_check_available_state ()) { - empathy_conf_get_bool (conf, EMPATHY_PREFS_SOUNDS_DISABLED_AWAY, - &res); - if (res) { - return FALSE; - } - } - - empathy_conf_get_bool (conf, key, &res); - - return res; -} - -void -empathy_sound_stop (EmpathySound sound_id) -{ - EmpathySoundEntry *entry; - - g_return_if_fail (sound_id < LAST_EMPATHY_SOUND); - - entry = &(sound_entries[sound_id]); - g_return_if_fail (entry->sound_id == sound_id); - - ca_context_cancel (ca_gtk_context_get (), entry->sound_id); -} - - -gboolean -empathy_sound_play_full (GtkWidget *widget, EmpathySound sound_id, - ca_finish_callback_t callback, gpointer user_data) -{ - EmpathySoundEntry *entry; - gboolean should_play = TRUE; - ca_proplist *p = NULL; - ca_context *c; - - g_return_val_if_fail (sound_id < LAST_EMPATHY_SOUND, FALSE); - - entry = &(sound_entries[sound_id]); - g_return_val_if_fail (entry->sound_id == sound_id, FALSE); - - if (entry->gconf_key != NULL) { - should_play = empathy_sound_pref_is_enabled (entry->gconf_key); - } - - if (!should_play) - return FALSE; - - c = ca_gtk_context_get (); - ca_context_cancel (c, entry->sound_id); - - DEBUG ("Play sound \"%s\" (%s)", - entry->event_ca_id, - entry->event_ca_description); - - if (ca_proplist_create (&p) < 0) - goto failed; - - if (ca_proplist_sets (p, CA_PROP_EVENT_ID, entry->event_ca_id) < 0) - goto failed; - - if (ca_proplist_sets (p, CA_PROP_EVENT_DESCRIPTION, - gettext (entry->event_ca_id)) < 0) - goto failed; - - if (ca_gtk_proplist_set_for_widget (p, widget) < 0) - goto failed; - - ca_context_play_full (ca_gtk_context_get (), entry->sound_id, - p, callback, user_data); - - ca_proplist_destroy (p); - - return TRUE; - -failed: - if (p != NULL) - ca_proplist_destroy (p); - - return FALSE; -} - -void -empathy_sound_play (GtkWidget *widget, EmpathySound sound_id) -{ - empathy_sound_play_full (widget, sound_id, NULL, NULL); -} - +}
\ No newline at end of file diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index 60d48f3c4..10f889b0c 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -34,33 +34,16 @@ #include <gtk/gtk.h> -#include <canberra-gtk.h> - -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mc-profile.h> #include <libempathy/empathy-contact.h> +#include <libempathy/empathy-account.h> #include <libempathy/empathy-ft-handler.h> #include "empathy-chat-view.h" G_BEGIN_DECLS -/* NOTE: Keep this sync with sound_entries in empathy-ui-utils.c */ -typedef enum { - EMPATHY_SOUND_MESSAGE_INCOMING = 0, - EMPATHY_SOUND_MESSAGE_OUTGOING, - EMPATHY_SOUND_CONVERSATION_NEW, - EMPATHY_SOUND_CONTACT_CONNECTED, - EMPATHY_SOUND_CONTACT_DISCONNECTED, - EMPATHY_SOUND_ACCOUNT_CONNECTED, - EMPATHY_SOUND_ACCOUNT_DISCONNECTED, - EMPATHY_SOUND_PHONE_INCOMING, - EMPATHY_SOUND_PHONE_OUTGOING, - EMPATHY_SOUND_PHONE_HANGUP, - LAST_EMPATHY_SOUND, -} EmpathySound; - void empathy_gtk_init (void); GRegex * empathy_uri_regex_dup_singleton (void); @@ -76,7 +59,7 @@ GtkWidget *empathy_builder_unref_and_keep_widget (GtkBuilder *gui, GtkWidget *root); /* Pixbufs */ -const gchar * empathy_icon_name_from_account (McAccount *account); +const gchar * empathy_icon_name_from_account (EmpathyAccount *account); const gchar * empathy_icon_name_for_presence (TpConnectionPresenceType presence); const gchar * empathy_icon_name_for_contact (EmpathyContact *contact); GdkPixbuf * empathy_pixbuf_from_data (gchar *data, @@ -129,15 +112,6 @@ GtkWidget * empathy_link_button_new (const gchar *url, void empathy_send_file_with_file_chooser (EmpathyContact *contact); void empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler); -/* Sounds */ -void empathy_sound_play (GtkWidget *widget, - EmpathySound sound_id); -gboolean empathy_sound_play_full (GtkWidget *widget, - EmpathySound sound_id, - ca_finish_callback_t callback, - gpointer user_data); -void empathy_sound_stop (EmpathySound sound_id); - G_END_DECLS #endif /* __EMPATHY_UI_UTILS_H__ */ diff --git a/libempathy-gtk/empathy-video-widget.c b/libempathy-gtk/empathy-video-widget.c index 79f27814f..0f62496de 100644 --- a/libempathy-gtk/empathy-video-widget.c +++ b/libempathy-gtk/empathy-video-widget.c @@ -403,7 +403,7 @@ empathy_video_widget_sync_message_cb (GstBus *bus, GstMessage *message, { g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (self))); gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (priv->overlay), - GDK_WINDOW_XID (GTK_WIDGET (self)->window)); + GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (self)))); } } @@ -418,13 +418,13 @@ empathy_video_widget_expose_event (GtkWidget *widget, GdkEventExpose *event) if (priv->overlay == NULL) { - gdk_window_clear_area (widget->window, 0, 0, + gdk_window_clear_area (gtk_widget_get_window (widget), 0, 0, widget->allocation.width, widget->allocation.height); return TRUE; } gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (priv->overlay), - GDK_WINDOW_XID (widget->window)); + GDK_WINDOW_XID (gtk_widget_get_window (widget))); gst_x_overlay_expose (GST_X_OVERLAY (priv->overlay)); diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 87b728464..27671543a 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"empathy\" \ $(LIBEMPATHY_CFLAGS) \ $(GEOCLUE_CFLAGS) \ + $(NETWORK_MANAGER_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) @@ -23,6 +24,8 @@ BUILT_SOURCES = \ lib_LTLIBRARIES = libempathy.la libempathy_la_SOURCES = \ + empathy-account.c \ + empathy-account-priv.h \ empathy-account-manager.c \ empathy-chatroom.c \ empathy-chatroom-manager.c \ @@ -65,13 +68,15 @@ nodist_libempathy_la_SOURCES =\ libempathy_la_LIBADD = \ $(top_builddir)/extensions/libemp-extensions.la \ $(LIBEMPATHY_LIBS) \ - $(GEOCLUE_LIBS) + $(GEOCLUE_LIBS) \ + $(NETWORK_MANAGER_LIBS) libempathy_la_LDFLAGS = \ -version-info ${LIBEMPATHY_CURRENT}:${LIBEMPATHY_REVISION}:${LIBEMPATHY_AGE} \ -export-symbols-regex ^empathy_ libempathy_headers = \ + empathy-account.h \ empathy-account-manager.h \ empathy-chatroom.h \ empathy-chatroom-manager.h \ diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c index dd0a72f59..fd8a21b1d 100644 --- a/libempathy/empathy-account-manager.c +++ b/libempathy/empathy-account-manager.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> + * Sjoerd Simons <sjoerd.simons@collabora.co.uk> */ #include "config.h" @@ -23,6 +24,7 @@ #include <libmissioncontrol/mc-account-monitor.h> #include "empathy-account-manager.h" +#include "empathy-account-priv.h" #include "empathy-marshal.h" #include "empathy-utils.h" @@ -35,22 +37,13 @@ typedef struct { McAccountMonitor *monitor; MissionControl *mc; - GHashTable *accounts; /* McAccount -> AccountData */ - GHashTable *connections; /* TpConnection -> McAccount */ + /* (owned) unique name -> (reffed) EmpathyAccount */ + GHashTable *accounts; int connected; int connecting; gboolean dispose_run; } EmpathyAccountManagerPriv; -typedef struct { - TpConnection *connection; - TpConnectionPresenceType presence; - TpConnectionStatus status; - gboolean is_enabled; - - guint source_id; -} AccountData; - enum { ACCOUNT_CREATED, ACCOUNT_DELETED, @@ -68,122 +61,154 @@ static EmpathyAccountManager *manager_singleton = NULL; G_DEFINE_TYPE (EmpathyAccountManager, empathy_account_manager, G_TYPE_OBJECT); -static AccountData * -account_data_new (McPresence presence, - TpConnectionStatus status, - gboolean is_enabled) +static TpConnectionPresenceType +mc_presence_to_tp_presence (McPresence presence) { - AccountData *retval; + switch (presence) + { + case MC_PRESENCE_OFFLINE: + return TP_CONNECTION_PRESENCE_TYPE_OFFLINE; + case MC_PRESENCE_AVAILABLE: + return TP_CONNECTION_PRESENCE_TYPE_AVAILABLE; + case MC_PRESENCE_AWAY: + return TP_CONNECTION_PRESENCE_TYPE_AWAY; + case MC_PRESENCE_EXTENDED_AWAY: + return TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY; + case MC_PRESENCE_HIDDEN: + return TP_CONNECTION_PRESENCE_TYPE_HIDDEN; + case MC_PRESENCE_DO_NOT_DISTURB: + return TP_CONNECTION_PRESENCE_TYPE_BUSY; + default: + return TP_CONNECTION_PRESENCE_TYPE_UNSET; + } +} - retval = g_slice_new0 (AccountData); - retval->presence = presence; - retval->status = status; - retval->is_enabled = is_enabled; - retval->source_id = 0; +static void +emp_account_connection_cb (EmpathyAccount *account, + GParamSpec *spec, + gpointer manager) +{ + TpConnection *connection = empathy_account_get_connection (account); - return retval; + DEBUG ("Signalling connection %p of account %s", + connection, empathy_account_get_unique_name (account)); + + if (connection != NULL) + g_signal_emit (manager, signals[NEW_CONNECTION], 0, connection); } -static AccountData * -account_data_new_default (MissionControl *mc, - McAccount *account) +static void +emp_account_status_changed_cb (EmpathyAccount *account, + TpConnectionStatus old, + TpConnectionStatus new, + TpConnectionStatusReason reason, + gpointer user_data) { - McPresence actual_p; - TpConnectionStatus actual_c; - GError *err = NULL; + EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (user_data); + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - actual_p = mission_control_get_presence_actual (mc, &err); - if (err != NULL) + switch (old) { - actual_p = MC_PRESENCE_UNSET; - g_clear_error (&err); + case TP_CONNECTION_STATUS_CONNECTING: + priv->connecting--; + break; + case TP_CONNECTION_STATUS_CONNECTED: + priv->connected--; + break; + default: + break; } - actual_c = mission_control_get_connection_status (mc, account, &err); - - if (err != NULL) + switch (new) { - actual_c = TP_CONNECTION_STATUS_DISCONNECTED; - g_error_free (err); + case TP_CONNECTION_STATUS_CONNECTING: + priv->connecting++; + break; + case TP_CONNECTION_STATUS_CONNECTED: + priv->connected++; + break; + default: + break; } - return account_data_new (actual_p, actual_c, mc_account_is_enabled (account)); + g_signal_emit (manager, signals[ACCOUNT_CONNECTION_CHANGED], 0, + account, reason, new, old); } static void -account_data_free (AccountData *data) +emp_account_presence_changed_cb (EmpathyAccount *account, + TpConnectionPresenceType old, + TpConnectionPresenceType new, + gpointer user_data) { - if (data->source_id > 0) - { - g_source_remove (data->source_id); - data->source_id = 0; - } - if (data->connection != NULL) - { - g_object_unref (data->connection); - data->connection = NULL; - } - - g_slice_free (AccountData, data); + EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (user_data); + g_signal_emit (manager, signals[ACCOUNT_PRESENCE_CHANGED], 0, + account, new, old); } -static void -connection_invalidated_cb (TpProxy *connection, - guint domain, - gint code, - gchar *message, - EmpathyAccountManager *manager) +static EmpathyAccount * +create_account (EmpathyAccountManager *manager, + const gchar *account_name, + McAccount *mc_account) { EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - McAccount *account; - AccountData *data; + EmpathyAccount *account; + TpConnectionStatus status; + TpConnectionPresenceType presence; + McPresence mc_presence; + TpConnection *connection; + GError *error = NULL; - DEBUG ("Message: %s", message); + if ((account = g_hash_table_lookup (priv->accounts, account_name)) != NULL) + return account; - account = g_hash_table_lookup (priv->connections, connection); - g_assert (account != NULL); + account = _empathy_account_new (mc_account); + g_hash_table_insert (priv->accounts, g_strdup (account_name), + account); - data = g_hash_table_lookup (priv->accounts, account); - g_assert (data != NULL); + _empathy_account_set_enabled (account, + mc_account_is_enabled (mc_account)); - g_object_unref (data->connection); - data->connection = NULL; + g_signal_emit (manager, signals[ACCOUNT_CREATED], 0, account); - g_hash_table_remove (priv->connections, connection); -} + g_signal_connect (account, "notify::connection", + G_CALLBACK (emp_account_connection_cb), manager); -static void -connection_ready_cb (TpConnection *connection, - const GError *error, - gpointer manager) -{ - /* Errors will be handled in invalidated callback */ - if (error != NULL) - return; + connection = mission_control_get_tpconnection (priv->mc, + mc_account, NULL); + _empathy_account_set_connection (account, connection); - g_signal_emit (manager, signals[NEW_CONNECTION], 0, connection); -} + status = mission_control_get_connection_status (priv->mc, + mc_account, &error); -static void -account_manager_update_connection (EmpathyAccountManager *manager, - AccountData *data, - McAccount *account) -{ - EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - - if (data->connection) - return; + if (error != NULL) + { + status = TP_CONNECTION_STATUS_DISCONNECTED; + g_clear_error (&error); + } - data->connection = mission_control_get_tpconnection (priv->mc, account, NULL); - if (data->connection != NULL) + mc_presence = mission_control_get_presence_actual (priv->mc, &error); + if (error != NULL) + { + presence = TP_CONNECTION_PRESENCE_TYPE_UNSET; + g_clear_error (&error); + } + else { - g_signal_connect (data->connection, "invalidated", - G_CALLBACK (connection_invalidated_cb), manager); - g_hash_table_insert (priv->connections, g_object_ref (data->connection), - g_object_ref (account)); - tp_connection_call_when_ready (data->connection, connection_ready_cb, - manager); + presence = mc_presence_to_tp_presence (mc_presence); } + + g_signal_connect (account, "status-changed", + G_CALLBACK (emp_account_status_changed_cb), manager); + + g_signal_connect (account, "presence-changed", + G_CALLBACK (emp_account_presence_changed_cb), manager); + + _empathy_account_set_status (account, status, + TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED, + presence); + + return account; } static void @@ -191,32 +216,10 @@ account_created_cb (McAccountMonitor *mon, gchar *account_name, EmpathyAccountManager *manager) { - McAccount *account; - EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - TpConnectionStatus initial_status; + McAccount *mc_account = mc_account_lookup (account_name); - account = mc_account_lookup (account_name); - - if (account) - { - AccountData *data; - - data = account_data_new_default (priv->mc, account); - g_hash_table_insert (priv->accounts, g_object_ref (account), data); - - initial_status = mission_control_get_connection_status (priv->mc, - account, NULL); - - if (initial_status == TP_CONNECTION_STATUS_CONNECTED) - priv->connected++; - else if (initial_status == TP_CONNECTION_STATUS_CONNECTING) - priv->connecting++; - - account_manager_update_connection (manager, data, account); - - g_signal_emit (manager, signals[ACCOUNT_CREATED], 0, account); - g_object_unref (account); - } + if (mc_account != NULL) + create_account (manager, account_name, mc_account); } static void @@ -224,16 +227,15 @@ account_deleted_cb (McAccountMonitor *mon, gchar *account_name, EmpathyAccountManager *manager) { - McAccount *account; EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + EmpathyAccount *account; - account = mc_account_lookup (account_name); + account = g_hash_table_lookup (priv->accounts, account_name); if (account) { - g_hash_table_remove (priv->accounts, account); g_signal_emit (manager, signals[ACCOUNT_DELETED], 0, account); - g_object_unref (account); + g_hash_table_remove (priv->accounts, account_name); } } @@ -242,15 +244,13 @@ account_changed_cb (McAccountMonitor *mon, gchar *account_name, EmpathyAccountManager *manager) { - McAccount *account; + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + EmpathyAccount *account; - account = mc_account_lookup (account_name); + account = g_hash_table_lookup (priv->accounts, account_name); - if (account) - { - g_signal_emit (manager, signals[ACCOUNT_CHANGED], 0, account); - g_object_unref (account); - } + if (account != NULL) + g_signal_emit (manager, signals[ACCOUNT_CHANGED], 0, account); } static void @@ -258,20 +258,15 @@ account_disabled_cb (McAccountMonitor *mon, gchar *account_name, EmpathyAccountManager *manager) { - McAccount *account; EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - AccountData *data; + EmpathyAccount *account; - account = mc_account_lookup (account_name); + account = g_hash_table_lookup (priv->accounts, account_name); if (account) { - data = g_hash_table_lookup (priv->accounts, account); - g_assert (data); - data->is_enabled = FALSE; - + _empathy_account_set_enabled (account, FALSE); g_signal_emit (manager, signals[ACCOUNT_DISABLED], 0, account); - g_object_unref (account); } } @@ -280,135 +275,60 @@ account_enabled_cb (McAccountMonitor *mon, gchar *account_name, EmpathyAccountManager *manager) { - McAccount *account; EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - AccountData *data; + EmpathyAccount *account; - account = mc_account_lookup (account_name); + account = g_hash_table_lookup (priv->accounts, account_name); if (account) { - data = g_hash_table_lookup (priv->accounts, account); - g_assert (data); - data->is_enabled = TRUE; - + _empathy_account_set_enabled (account, TRUE); g_signal_emit (manager, signals[ACCOUNT_ENABLED], 0, account); - g_object_unref (account); - } -} - -static void -update_connection_numbers (EmpathyAccountManager *manager, - TpConnectionStatus status, - TpConnectionStatus old_s) -{ - EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - - if (status == TP_CONNECTION_STATUS_CONNECTED) - { - priv->connected++; - if (old_s == TP_CONNECTION_STATUS_CONNECTING) - priv->connecting--; - } - - if (status == TP_CONNECTION_STATUS_CONNECTING) - { - priv->connecting++; - if (old_s == TP_CONNECTION_STATUS_CONNECTED) - priv->connected--; - } - - if (status == TP_CONNECTION_STATUS_DISCONNECTED) - { - if (old_s == TP_CONNECTION_STATUS_CONNECTED) - priv->connected--; - - if (old_s == TP_CONNECTION_STATUS_CONNECTING) - priv->connecting--; } } -static gboolean -remove_data_timeout (gpointer _data) -{ - AccountData *data = _data; - - data->source_id = 0; - - return FALSE; -} - typedef struct { TpConnectionStatus status; - McPresence presence; + TpConnectionPresenceType presence; TpConnectionStatusReason reason; gchar *unique_name; EmpathyAccountManager *manager; + McAccount *mc_account; } ChangedSignalData; static gboolean account_status_changed_idle_cb (ChangedSignalData *signal_data) { - McAccount *account; - AccountData *data; - McPresence presence, old_p; - TpConnectionStatus status, old_s; - gboolean emit_presence = FALSE, emit_connection = FALSE; + EmpathyAccount *account; EmpathyAccountManager *manager = signal_data->manager; EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - presence = signal_data->presence; - status = signal_data->status; - account = mc_account_lookup (signal_data->unique_name); + account = g_hash_table_lookup (priv->accounts, + signal_data->unique_name); if (account) { - data = g_hash_table_lookup (priv->accounts, account); - g_assert (data); - - old_p = data->presence; - old_s = data->status; - - if (old_p != presence) + if (empathy_account_get_connection (account) == NULL) { - data->presence = presence; - emit_presence = TRUE; - } + TpConnection *connection; - if (old_s != status) - { - data->status = status; - update_connection_numbers (manager, status, old_s); + connection = mission_control_get_tpconnection (priv->mc, + signal_data->mc_account, NULL); - if (status == TP_CONNECTION_STATUS_CONNECTED) + if (connection != NULL) { - if (data->source_id > 0) - { - g_source_remove (data->source_id); - data->source_id = 0; - } - - data->source_id = g_timeout_add_seconds (10, - remove_data_timeout, - data); + _empathy_account_set_connection (account, connection); + g_object_unref (connection); } - emit_connection = TRUE; } - account_manager_update_connection (manager, data, account); - - if (emit_presence) - g_signal_emit (manager, signals[ACCOUNT_PRESENCE_CHANGED], 0, - account, presence, old_p); - - if (emit_connection) - g_signal_emit (manager, signals[ACCOUNT_CONNECTION_CHANGED], 0, - account, signal_data->reason, status, old_s); - - g_object_unref (account); + _empathy_account_set_status (account, signal_data->status, + signal_data->reason, + signal_data->presence); } g_object_unref (signal_data->manager); + g_object_unref (signal_data->mc_account); g_free (signal_data->unique_name); g_slice_free (ChangedSignalData, signal_data); @@ -424,38 +344,18 @@ account_status_changed_cb (MissionControl *mc, EmpathyAccountManager *manager) { ChangedSignalData *data; - TpConnectionPresenceType tp_presence; - switch (presence) - { - case MC_PRESENCE_OFFLINE: - tp_presence = TP_CONNECTION_PRESENCE_TYPE_OFFLINE; - break; - case MC_PRESENCE_AVAILABLE: - tp_presence = TP_CONNECTION_PRESENCE_TYPE_AVAILABLE; - break; - case MC_PRESENCE_AWAY: - tp_presence = TP_CONNECTION_PRESENCE_TYPE_AWAY; - break; - case MC_PRESENCE_EXTENDED_AWAY: - tp_presence = TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY; - break; - case MC_PRESENCE_HIDDEN: - tp_presence = TP_CONNECTION_PRESENCE_TYPE_HIDDEN; - break; - case MC_PRESENCE_DO_NOT_DISTURB: - tp_presence = TP_CONNECTION_PRESENCE_TYPE_BUSY; - break; - default: - tp_presence = TP_CONNECTION_PRESENCE_TYPE_UNSET; - } + DEBUG ("Status of account %s became " + "status: %d presence: %d reason: %d", unique_name, status, + presence, reason); data = g_slice_new0 (ChangedSignalData); data->status = status; - data->presence = tp_presence; + data->presence = mc_presence_to_tp_presence (presence); data->reason = reason; data->unique_name = g_strdup (unique_name); data->manager = g_object_ref (manager); + data->mc_account = mc_account_lookup (unique_name); g_idle_add ((GSourceFunc) account_status_changed_idle_cb, data); } @@ -467,35 +367,33 @@ empathy_account_manager_init (EmpathyAccountManager *manager) GList *mc_accounts, *l; priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, - EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv); + EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv); + manager->priv = priv; priv->monitor = mc_account_monitor_new (); priv->mc = empathy_mission_control_dup_singleton (); priv->connected = priv->connecting = 0; priv->dispose_run = FALSE; - priv->accounts = g_hash_table_new_full (empathy_account_hash, - empathy_account_equal, - g_object_unref, - (GDestroyNotify) account_data_free); - priv->connections = g_hash_table_new_full (g_direct_hash, g_direct_equal, - g_object_unref, g_object_unref); + priv->accounts = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, (GDestroyNotify) g_object_unref); mc_accounts = mc_accounts_list (); for (l = mc_accounts; l; l = l->next) - account_created_cb (priv->monitor, (char *) mc_account_get_unique_name (l->data), manager); + account_created_cb (priv->monitor, + (char *) mc_account_get_unique_name (l->data), manager); g_signal_connect (priv->monitor, "account-created", - G_CALLBACK (account_created_cb), manager); + G_CALLBACK (account_created_cb), manager); g_signal_connect (priv->monitor, "account-deleted", - G_CALLBACK (account_deleted_cb), manager); + G_CALLBACK (account_deleted_cb), manager); g_signal_connect (priv->monitor, "account-disabled", - G_CALLBACK (account_disabled_cb), manager); + G_CALLBACK (account_disabled_cb), manager); g_signal_connect (priv->monitor, "account-enabled", - G_CALLBACK (account_enabled_cb), manager); + G_CALLBACK (account_enabled_cb), manager); g_signal_connect (priv->monitor, "account-changed", - G_CALLBACK (account_changed_cb), manager); + G_CALLBACK (account_changed_cb), manager); dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc), "AccountStatusChanged", G_CALLBACK (account_status_changed_cb), @@ -510,8 +408,7 @@ do_finalize (GObject *obj) EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (obj); EmpathyAccountManagerPriv *priv = GET_PRIV (manager); - g_hash_table_unref (priv->accounts); - g_hash_table_unref (priv->connections); + g_hash_table_destroy (priv->accounts); G_OBJECT_CLASS (empathy_account_manager_parent_class)->finalize (obj); } @@ -596,7 +493,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, - 1, MC_TYPE_ACCOUNT); + 1, EMPATHY_TYPE_ACCOUNT); signals[ACCOUNT_DELETED] = g_signal_new ("account-deleted", @@ -606,7 +503,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, - 1, MC_TYPE_ACCOUNT); + 1, EMPATHY_TYPE_ACCOUNT); signals[ACCOUNT_ENABLED] = g_signal_new ("account-enabled", @@ -616,7 +513,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, - 1, MC_TYPE_ACCOUNT); + 1, EMPATHY_TYPE_ACCOUNT); signals[ACCOUNT_DISABLED] = g_signal_new ("account-disabled", @@ -626,7 +523,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, - 1, MC_TYPE_ACCOUNT); + 1, EMPATHY_TYPE_ACCOUNT); signals[ACCOUNT_CHANGED] = g_signal_new ("account-changed", @@ -636,7 +533,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, - 1, MC_TYPE_ACCOUNT); + 1, EMPATHY_TYPE_ACCOUNT); signals[ACCOUNT_CONNECTION_CHANGED] = g_signal_new ("account-connection-changed", @@ -646,7 +543,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) NULL, NULL, _empathy_marshal_VOID__OBJECT_INT_UINT_UINT, G_TYPE_NONE, - 4, MC_TYPE_ACCOUNT, + 4, EMPATHY_TYPE_ACCOUNT, G_TYPE_INT, /* reason */ G_TYPE_UINT, /* actual connection */ G_TYPE_UINT); /* previous connection */ @@ -659,7 +556,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) NULL, NULL, _empathy_marshal_VOID__OBJECT_INT_INT, G_TYPE_NONE, - 3, MC_TYPE_ACCOUNT, + 3, EMPATHY_TYPE_ACCOUNT, G_TYPE_INT, /* actual presence */ G_TYPE_INT); /* previous presence */ @@ -684,6 +581,16 @@ empathy_account_manager_dup_singleton (void) return g_object_new (EMPATHY_TYPE_ACCOUNT_MANAGER, NULL); } +EmpathyAccount * +empathy_account_manager_create (EmpathyAccountManager *manager, + McProfile *profile) +{ + McAccount *mc_account = mc_account_create (profile); + return g_object_ref (create_account (manager, + mc_account_get_unique_name (mc_account), + mc_account)); +} + int empathy_account_manager_get_connected_accounts (EmpathyAccountManager *manager) { @@ -708,23 +615,6 @@ empathy_account_manager_get_connecting_accounts (EmpathyAccountManager *manager) return priv->connecting; } -gboolean -empathy_account_manager_is_account_just_connected (EmpathyAccountManager *manager, - McAccount *account) -{ - EmpathyAccountManagerPriv *priv; - AccountData *data; - - g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), FALSE); - - priv = GET_PRIV (manager); - data = g_hash_table_lookup (priv->accounts, account); - - g_assert (data); - - return (data->source_id > 0); -} - /** * empathy_account_manager_get_count: * @manager: a #EmpathyAccountManager @@ -745,62 +635,59 @@ empathy_account_manager_get_count (EmpathyAccountManager *manager) return g_hash_table_size (priv->accounts); } -McAccount * +EmpathyAccount * empathy_account_manager_get_account (EmpathyAccountManager *manager, TpConnection *connection) { EmpathyAccountManagerPriv *priv; + GHashTableIter iter; + gpointer value; g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0); priv = GET_PRIV (manager); - return g_hash_table_lookup (priv->connections, connection); + g_hash_table_iter_init (&iter, priv->accounts); + while (g_hash_table_iter_next (&iter, NULL, &value)) + { + EmpathyAccount *account = EMPATHY_ACCOUNT (value); + + if (connection == empathy_account_get_connection (account)) + return account; + } + + return NULL; } -GList * -empathy_account_manager_dup_accounts (EmpathyAccountManager *manager) +EmpathyAccount * +empathy_account_manager_lookup (EmpathyAccountManager *manager, + const gchar *unique_name) { - EmpathyAccountManagerPriv *priv; - GList *ret; - - g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL); + EmpathyAccountManagerPriv *priv = GET_PRIV (manager); + EmpathyAccount *account; - priv = GET_PRIV (manager); + account = g_hash_table_lookup (priv->accounts, unique_name); - ret = g_hash_table_get_keys (priv->accounts); - g_list_foreach (ret, (GFunc) g_object_ref, NULL); + if (account != NULL) + g_object_ref (account); - return ret; + return account; } -/** - * empathy_account_manager_get_connection: - * @manager: a #EmpathyAccountManager - * @account: a #McAccount - * - * Get the connection of the accounts, or NULL if account is offline or the - * connection is not yet ready. This function does not return a new ref. - * - * Returns: the connection of the accounts. - **/ -TpConnection * -empathy_account_manager_get_connection (EmpathyAccountManager *manager, - McAccount *account) +GList * +empathy_account_manager_dup_accounts (EmpathyAccountManager *manager) { EmpathyAccountManagerPriv *priv; - AccountData *data; + GList *ret; g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL); - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); priv = GET_PRIV (manager); - data = g_hash_table_lookup (priv->accounts, account); - if (data && data->connection && tp_connection_is_ready (data->connection)) - return data->connection; + ret = g_hash_table_get_values (priv->accounts); + g_list_foreach (ret, (GFunc) g_object_ref, NULL); - return NULL; + return ret; } /** @@ -817,18 +704,30 @@ empathy_account_manager_dup_connections (EmpathyAccountManager *manager) { EmpathyAccountManagerPriv *priv; GHashTableIter iter; - gpointer connection; + gpointer value; GList *ret = NULL; g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL); priv = GET_PRIV (manager); - g_hash_table_iter_init (&iter, priv->connections); - while (g_hash_table_iter_next (&iter, &connection, NULL)) - if (connection != NULL && tp_connection_is_ready (connection)) - ret = g_list_prepend (ret, g_object_ref (connection)); + g_hash_table_iter_init (&iter, priv->accounts); + while (g_hash_table_iter_next (&iter, NULL, &value)) + { + EmpathyAccount *account = EMPATHY_ACCOUNT (value); + TpConnection *connection; + + connection = empathy_account_get_connection (account); + if (connection != NULL) + ret = g_list_prepend (ret, g_object_ref (connection)); + } return ret; } +void +empathy_account_manager_remove (EmpathyAccountManager *manager, + EmpathyAccount *account) +{ + mc_account_delete (_empathy_account_get_mc_account (account)); +} diff --git a/libempathy/empathy-account-manager.h b/libempathy/empathy-account-manager.h index 11ca6aca2..b04571ff8 100644 --- a/libempathy/empathy-account-manager.h +++ b/libempathy/empathy-account-manager.h @@ -24,7 +24,7 @@ #include <glib-object.h> -#include <libmissioncontrol/mc-account.h> +#include "empathy-account.h" G_BEGIN_DECLS @@ -52,25 +52,28 @@ GType empathy_account_manager_get_type (void); /* public methods */ EmpathyAccountManager * empathy_account_manager_dup_singleton (void); +EmpathyAccount * empathy_account_manager_create + (EmpathyAccountManager *manager, + McProfile *profile); int empathy_account_manager_get_connected_accounts (EmpathyAccountManager *manager); int empathy_account_manager_get_connecting_accounts (EmpathyAccountManager *manager); -gboolean empathy_account_manager_is_account_just_connected - (EmpathyAccountManager *manager, - McAccount *account); int empathy_account_manager_get_count (EmpathyAccountManager *manager); -McAccount * empathy_account_manager_get_account +EmpathyAccount * empathy_account_manager_get_account (EmpathyAccountManager *manager, TpConnection *connection); +EmpathyAccount * empathy_account_manager_lookup + (EmpathyAccountManager *manager, + const gchar *unique_name); GList * empathy_account_manager_dup_accounts (EmpathyAccountManager *manager); -TpConnection * empathy_account_manager_get_connection - (EmpathyAccountManager *manager, - McAccount *account); GList * empathy_account_manager_dup_connections (EmpathyAccountManager *manager); +void empathy_account_manager_remove ( + EmpathyAccountManager *manager, + EmpathyAccount *account); G_END_DECLS diff --git a/libempathy/empathy-account-priv.h b/libempathy/empathy-account-priv.h new file mode 100644 index 000000000..8b656b4d8 --- /dev/null +++ b/libempathy/empathy-account-priv.h @@ -0,0 +1,44 @@ +/* + * empathy-account-priv.h - Private Header for EmpathyAccount + * Copyright (C) 2009 Collabora Ltd. + * @author Sjoerd Simons <sjoerd.simons@collabora.co.uk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __EMPATHY_ACCOUNT_PRIV_H__ +#define __EMPATHY_ACCOUNT_PRIV_H__ + +#include <glib.h> + +#include <libmissioncontrol/mc-account.h> +#include "empathy-account.h" + +G_BEGIN_DECLS + +EmpathyAccount *_empathy_account_new (McAccount *account); +void _empathy_account_set_status (EmpathyAccount *account, + TpConnectionStatus status, + TpConnectionStatusReason reason, + TpConnectionPresenceType presence); +void _empathy_account_set_connection (EmpathyAccount *account, + TpConnection *connection); +void _empathy_account_set_enabled (EmpathyAccount *account, + gboolean enabled); +McAccount *_empathy_account_get_mc_account (EmpathyAccount *account); + +G_END_DECLS + +#endif /* #ifndef __EMPATHY_ACCOUNT_PRIV_H__*/ diff --git a/libempathy/empathy-account.c b/libempathy/empathy-account.c new file mode 100644 index 000000000..e0a8e756b --- /dev/null +++ b/libempathy/empathy-account.c @@ -0,0 +1,575 @@ +/* + * empathy-account.c - Source for EmpathyAccount + * Copyright (C) 2009 Collabora Ltd. + * @author Sjoerd Simons <sjoerd.simons@collabora.co.uk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#include <stdio.h> +#include <stdlib.h> + +#include <telepathy-glib/enums.h> + +#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT +#include <libempathy/empathy-debug.h> + +#include "empathy-account.h" +#include "empathy-account-priv.h" +#include "empathy-utils.h" +#include "empathy-marshal.h" + +/* signals */ +enum { + STATUS_CHANGED, + PRESENCE_CHANGED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +/* properties */ +enum { + PROP_ENABLED = 1, + PROP_PRESENCE, + PROP_CONNECTION_STATUS, + PROP_CONNECTION_STATUS_REASON, + PROP_CONNECTION, + PROP_UNIQUE_NAME, + PROP_DISPLAY_NAME +}; + +G_DEFINE_TYPE(EmpathyAccount, empathy_account, G_TYPE_OBJECT) + +/* private structure */ +typedef struct _EmpathyAccountPriv EmpathyAccountPriv; + +struct _EmpathyAccountPriv +{ + gboolean dispose_has_run; + + TpConnection *connection; + guint connection_invalidated_id; + + TpConnectionStatus status; + TpConnectionStatusReason reason; + TpConnectionPresenceType presence; + + gboolean enabled; + /* Timestamp when the connection got connected in seconds since the epoch */ + glong connect_time; + + McAccount *mc_account; +}; + +#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccount) + +static void +empathy_account_init (EmpathyAccount *obj) +{ + EmpathyAccountPriv *priv; + + priv = G_TYPE_INSTANCE_GET_PRIVATE (obj, + EMPATHY_TYPE_ACCOUNT, EmpathyAccountPriv); + + obj->priv = priv; + + priv->status = TP_CONNECTION_STATUS_DISCONNECTED; +} + +static void +empathy_account_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + EmpathyAccount *account = EMPATHY_ACCOUNT (object); + EmpathyAccountPriv *priv = GET_PRIV (account); + + switch (prop_id) + { + case PROP_ENABLED: + g_value_set_boolean (value, priv->enabled); + break; + case PROP_PRESENCE: + g_value_set_uint (value, priv->presence); + break; + case PROP_CONNECTION_STATUS: + g_value_set_uint (value, priv->status); + break; + case PROP_CONNECTION_STATUS_REASON: + g_value_set_uint (value, priv->reason); + break; + case PROP_CONNECTION: + g_value_set_object (value, + empathy_account_get_connection (account)); + break; + case PROP_UNIQUE_NAME: + g_value_set_string (value, + empathy_account_get_unique_name (account)); + break; + case PROP_DISPLAY_NAME: + g_value_set_string (value, + empathy_account_get_display_name (account)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void empathy_account_dispose (GObject *object); +static void empathy_account_finalize (GObject *object); + +static void +empathy_account_class_init (EmpathyAccountClass *empathy_account_class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (empathy_account_class); + + g_type_class_add_private (empathy_account_class, + sizeof (EmpathyAccountPriv)); + + object_class->get_property = empathy_account_get_property; + object_class->dispose = empathy_account_dispose; + object_class->finalize = empathy_account_finalize; + + g_object_class_install_property (object_class, PROP_ENABLED, + g_param_spec_boolean ("enabled", + "Enabled", + "Whether this account is enabled or not", + FALSE, + G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (object_class, PROP_PRESENCE, + g_param_spec_uint ("presence", + "Presence", + "The account connections presence type", + 0, + NUM_TP_CONNECTION_PRESENCE_TYPES, + TP_CONNECTION_PRESENCE_TYPE_UNSET, + G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (object_class, PROP_CONNECTION_STATUS, + g_param_spec_uint ("status", + "ConnectionStatus", + "The accounts connections status type", + 0, + NUM_TP_CONNECTION_STATUSES, + TP_CONNECTION_STATUS_DISCONNECTED, + G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (object_class, PROP_CONNECTION_STATUS_REASON, + g_param_spec_uint ("status-reason", + "ConnectionStatusReason", + "The account connections status reason", + 0, + NUM_TP_CONNECTION_STATUS_REASONS, + TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED, + G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (object_class, PROP_CONNECTION, + g_param_spec_object ("connection", + "Connection", + "The accounts connection", + TP_TYPE_CONNECTION, + G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (object_class, PROP_UNIQUE_NAME, + g_param_spec_string ("unique-name", + "UniqueName", + "The accounts unique name", + NULL, + G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + g_object_class_install_property (object_class, PROP_DISPLAY_NAME, + g_param_spec_string ("display-name", + "DisplayName", + "The accounts display name", + NULL, + G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + signals[STATUS_CHANGED] = g_signal_new ("status-changed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + 0, NULL, NULL, + _empathy_marshal_VOID__UINT_UINT_UINT, + G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); + + signals[PRESENCE_CHANGED] = g_signal_new ("presence-changed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + 0, NULL, NULL, + _empathy_marshal_VOID__UINT_UINT, + G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); +} + +void +empathy_account_dispose (GObject *object) +{ + EmpathyAccount *self = EMPATHY_ACCOUNT (object); + EmpathyAccountPriv *priv = GET_PRIV (self); + + if (priv->dispose_has_run) + return; + + priv->dispose_has_run = TRUE; + + if (priv->connection_invalidated_id != 0) + g_signal_handler_disconnect (priv->connection, + priv->connection_invalidated_id); + priv->connection_invalidated_id = 0; + + if (priv->connection != NULL) + g_object_unref (priv->connection); + priv->connection = NULL; + + /* release any references held by the object here */ + if (G_OBJECT_CLASS (empathy_account_parent_class)->dispose != NULL) + G_OBJECT_CLASS (empathy_account_parent_class)->dispose (object); +} + +void +empathy_account_finalize (GObject *object) +{ + /* free any data held directly by the object here */ + if (G_OBJECT_CLASS (empathy_account_parent_class)->finalize != NULL) + G_OBJECT_CLASS (empathy_account_parent_class)->finalize (object); +} + +gboolean +empathy_account_is_just_connected (EmpathyAccount *account) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + GTimeVal val; + + if (priv->status != TP_CONNECTION_STATUS_CONNECTED) + return FALSE; + + g_get_current_time (&val); + + return (val.tv_sec - priv->connect_time) < 10; +} + +/** + * empathy_account_get_connection: + * @account: a #EmpathyAccount + * + * Get the connection of the account, or NULL if account is offline or the + * connection is not yet ready. This function does not return a new ref. + * + * Returns: the connection of the account. + **/ +TpConnection * +empathy_account_get_connection (EmpathyAccount *account) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + + if (priv->connection != NULL && + tp_connection_is_ready (priv->connection)) + return priv->connection; + + return NULL; +} + +/** + * empathy_account_get_unique_name: + * @account: a #EmpathyAccount + * + * Returns: the unique name of the account. + **/ +const gchar * +empathy_account_get_unique_name (EmpathyAccount *account) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + + return mc_account_get_unique_name (priv->mc_account); +} + +/** + * empathy_account_get_display_name: + * @account: a #EmpathyAccount + * + * Returns: the display name of the account. + **/ +const gchar * +empathy_account_get_display_name (EmpathyAccount *account) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + + return mc_account_get_display_name (priv->mc_account); +} + +gboolean +empathy_account_is_valid (EmpathyAccount *account) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + + return mc_account_is_complete (priv->mc_account); +} + +void +empathy_account_set_enabled (EmpathyAccount *account, gboolean enabled) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + + mc_account_set_enabled (priv->mc_account, enabled); +} + +gboolean +empathy_account_is_enabled (EmpathyAccount *account) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + + return priv->enabled; +} + +void +empathy_account_unset_param (EmpathyAccount *account, const gchar *param) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + + mc_account_unset_param (priv->mc_account, param); +} + +gchar * +empathy_account_get_param_string (EmpathyAccount *account, const gchar *param) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + gchar *value = NULL; + + mc_account_get_param_string (priv->mc_account, param, &value); + return value; +} + +gint +empathy_account_get_param_int (EmpathyAccount *account, const gchar *param) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + int value; + + mc_account_get_param_int (priv->mc_account, param, &value); + return value; +} + +gboolean +empathy_account_get_param_boolean (EmpathyAccount *account, const gchar *param) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + gboolean value; + + mc_account_get_param_boolean (priv->mc_account, param, &value); + return value; +} + +void +empathy_account_set_param_string (EmpathyAccount *account, + const gchar *param, + const gchar *value) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + mc_account_set_param_string (priv->mc_account, param, value); +} + +void +empathy_account_set_param_int (EmpathyAccount *account, + const gchar *param, + gint value) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + mc_account_set_param_int (priv->mc_account, param, value); +} + +void +empathy_account_set_param_boolean (EmpathyAccount *account, + const gchar *param, + gboolean value) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + mc_account_set_param_boolean (priv->mc_account, param, value); +} + +void +empathy_account_set_display_name (EmpathyAccount *account, + const gchar *display_name) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + mc_account_set_display_name (priv->mc_account, display_name); +} + +McProfile * +empathy_account_get_profile (EmpathyAccount *account) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + return mc_account_get_profile (priv->mc_account); +} + +EmpathyAccount * +_empathy_account_new (McAccount *mc_account) +{ + EmpathyAccount *account; + EmpathyAccountPriv *priv; + + account = g_object_new (EMPATHY_TYPE_ACCOUNT, NULL); + priv = GET_PRIV (account); + priv->mc_account = mc_account; + + return account; +} + +void +_empathy_account_set_status (EmpathyAccount *account, + TpConnectionStatus status, + TpConnectionStatusReason reason, + TpConnectionPresenceType presence) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + TpConnectionStatus old_s = priv->status; + TpConnectionPresenceType old_p = priv->presence; + + priv->status = status; + priv->presence = presence; + + if (priv->status != old_s) + { + if (priv->status == TP_CONNECTION_STATUS_CONNECTED) + { + GTimeVal val; + g_get_current_time (&val); + + priv->connect_time = val.tv_sec; + } + + priv->reason = reason; + g_signal_emit (account, signals[STATUS_CHANGED], 0, + old_s, priv->status, reason); + + g_object_notify (G_OBJECT (account), "status"); + } + + if (priv->presence != old_p) + { + g_signal_emit (account, signals[PRESENCE_CHANGED], 0, + old_p, priv->presence); + g_object_notify (G_OBJECT (account), "presence"); + } +} + +static void +empathy_account_connection_ready_cb (TpConnection *connection, + const GError *error, + gpointer user_data) +{ + EmpathyAccount *account = EMPATHY_ACCOUNT (user_data); + EmpathyAccountPriv *priv = GET_PRIV (account); + + if (error != NULL) + { + DEBUG ("(%s) Connection failed to become ready: %s", + empathy_account_get_unique_name (account), error->message); + priv->connection = NULL; + } + else + { + DEBUG ("(%s) Connection ready", + empathy_account_get_unique_name (account)); + g_object_notify (G_OBJECT (account), "connection"); + } +} + +static void +_empathy_account_connection_invalidated_cb (TpProxy *self, + guint domain, + gint code, + gchar *message, + gpointer user_data) +{ + EmpathyAccount *account = EMPATHY_ACCOUNT (user_data); + EmpathyAccountPriv *priv = GET_PRIV (account); + + if (priv->connection == NULL) + return; + + DEBUG ("(%s) Connection invalidated", + empathy_account_get_unique_name (account)); + + g_assert (priv->connection == TP_CONNECTION (self)); + + g_signal_handler_disconnect (priv->connection, + priv->connection_invalidated_id); + priv->connection_invalidated_id = 0; + + g_object_unref (priv->connection); + priv->connection = NULL; + + g_object_notify (G_OBJECT (account), "connection"); +} + +void +_empathy_account_set_connection (EmpathyAccount *account, + TpConnection *connection) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + + if (priv->connection == connection) + return; + + /* Connection already set, don't set the new one */ + if (connection != NULL && priv->connection != NULL) + return; + + if (connection == NULL) + { + g_signal_handler_disconnect (priv->connection, + priv->connection_invalidated_id); + priv->connection_invalidated_id = 0; + + g_object_unref (priv->connection); + priv->connection = NULL; + g_object_notify (G_OBJECT (account), "connection"); + } + else + { + priv->connection = g_object_ref (connection); + priv->connection_invalidated_id = g_signal_connect (priv->connection, + "invalidated", + G_CALLBACK (_empathy_account_connection_invalidated_cb), + account); + + /* notify a change in the connection property when it's ready */ + tp_connection_call_when_ready (priv->connection, + empathy_account_connection_ready_cb, account); + } +} + +void +_empathy_account_set_enabled (EmpathyAccount *account, + gboolean enabled) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + + if (priv->enabled == enabled) + return; + + priv->enabled = enabled; + g_object_notify (G_OBJECT (account), "enabled"); +} + +McAccount * +_empathy_account_get_mc_account (EmpathyAccount *account) +{ + EmpathyAccountPriv *priv = GET_PRIV (account); + return priv->mc_account; +} diff --git a/libempathy/empathy-account.h b/libempathy/empathy-account.h new file mode 100644 index 000000000..75babd826 --- /dev/null +++ b/libempathy/empathy-account.h @@ -0,0 +1,94 @@ +/* + * empathy-account.h - Header for EmpathyAccount + * Copyright (C) 2009 Collabora Ltd. + * @author Sjoerd Simons <sjoerd.simons@collabora.co.uk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __EMPATHY_ACCOUNT_H__ +#define __EMPATHY_ACCOUNT_H__ + +#include <glib-object.h> + +#include <telepathy-glib/connection.h> +#include <libmissioncontrol/mc-profile.h> + +G_BEGIN_DECLS + +typedef struct _EmpathyAccount EmpathyAccount; +typedef struct _EmpathyAccountClass EmpathyAccountClass; + +struct _EmpathyAccountClass { + GObjectClass parent_class; +}; + +struct _EmpathyAccount { + GObject parent; + gpointer priv; +}; + +GType empathy_account_get_type (void); + +/* TYPE MACROS */ +#define EMPATHY_TYPE_ACCOUNT (empathy_account_get_type ()) +#define EMPATHY_ACCOUNT(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_ACCOUNT, EmpathyAccount)) +#define EMPATHY_ACCOUNT_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_ACCOUNT, EmpathyAccountClass)) +#define EMPATHY_IS_ACCOUNT(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_ACCOUNT)) +#define EMPATHY_IS_ACCOUNT_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_ACCOUNT)) +#define EMPATHY_ACCOUNT_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ACCOUNT, \ + EmpathyAccountClass)) + +gboolean empathy_account_is_just_connected (EmpathyAccount *account); +TpConnection *empathy_account_get_connection (EmpathyAccount *account); +const gchar *empathy_account_get_unique_name (EmpathyAccount *account); +const gchar *empathy_account_get_display_name (EmpathyAccount *account); + +void empathy_account_set_enabled (EmpathyAccount *account, + gboolean enabled); +gboolean empathy_account_is_enabled (EmpathyAccount *account); + +void empathy_account_unset_param (EmpathyAccount *account, const gchar *param); +gchar *empathy_account_get_param_string (EmpathyAccount *account, + const gchar *param); +gint empathy_account_get_param_int (EmpathyAccount *account, + const gchar *param); +gboolean empathy_account_get_param_boolean (EmpathyAccount *account, + const gchar *param); + +void empathy_account_set_param_string (EmpathyAccount *account, + const gchar *param, const gchar *value); +void empathy_account_set_param_int (EmpathyAccount *account, + const gchar *param, gint value); +void empathy_account_set_param_boolean (EmpathyAccount *account, + const gchar *param, gboolean value); + +gboolean empathy_account_is_valid (EmpathyAccount *account); + +void empathy_account_set_display_name (EmpathyAccount *account, + const gchar *display_name); + + +/* TODO remove McProfile */ +McProfile *empathy_account_get_profile (EmpathyAccount *account); + +G_END_DECLS + +#endif /* #ifndef __EMPATHY_ACCOUNT_H__*/ diff --git a/libempathy/empathy-call-handler.c b/libempathy/empathy-call-handler.c index dd117eb99..f73c41e2e 100644 --- a/libempathy/empathy-call-handler.c +++ b/libempathy/empathy-call-handler.c @@ -614,4 +614,5 @@ empathy_call_handler_has_initial_video (EmpathyCallHandler *handler) EmpathyCallHandlerPriv *priv = GET_PRIV (handler); return priv->initial_video; -}
\ No newline at end of file +} + diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c index 44416670e..1ce7a6e5d 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -100,7 +100,8 @@ chatroom_manager_file_save (EmpathyChatroomManager *manager) continue; } - account_id = mc_account_get_unique_name (empathy_chatroom_get_account (chatroom)); + account_id = empathy_account_get_unique_name ( + empathy_chatroom_get_account (chatroom)); node = xmlNewChild (root, NULL, "chatroom", NULL); xmlNewTextChild (node, NULL, "name", empathy_chatroom_get_name (chatroom)); @@ -174,7 +175,7 @@ chatroom_manager_parse_chatroom (EmpathyChatroomManager *manager, { EmpathyChatroomManagerPriv *priv; EmpathyChatroom *chatroom; - McAccount *account; + EmpathyAccount *account; xmlNodePtr child; gchar *str; gchar *name; @@ -220,7 +221,7 @@ chatroom_manager_parse_chatroom (EmpathyChatroomManager *manager, xmlFree (str); } - account = mc_account_lookup (account_id); + account = empathy_account_manager_lookup (priv->account_manager, account_id); if (!account) { g_free (name); g_free (room); @@ -520,10 +521,11 @@ chatroom_manager_remove_link (EmpathyChatroomManager *manager, if (empathy_chatroom_is_favorite (chatroom)) reset_save_timeout (manager); + priv->chatrooms = g_list_delete_link (priv->chatrooms, l); + g_signal_emit (manager, signals[CHATROOM_REMOVED], 0, chatroom); g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb, manager); - priv->chatrooms = g_list_delete_link (priv->chatrooms, l); g_object_unref (chatroom); } @@ -556,21 +558,20 @@ empathy_chatroom_manager_remove (EmpathyChatroomManager *manager, EmpathyChatroom * empathy_chatroom_manager_find (EmpathyChatroomManager *manager, - McAccount *account, + EmpathyAccount *account, const gchar *room) { EmpathyChatroomManagerPriv *priv; GList *l; g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL); - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); g_return_val_if_fail (room != NULL, NULL); priv = GET_PRIV (manager); for (l = priv->chatrooms; l; l = l->next) { EmpathyChatroom *chatroom; - McAccount *this_account; + EmpathyAccount *this_account; const gchar *this_room; chatroom = l->data; @@ -589,7 +590,7 @@ empathy_chatroom_manager_find (EmpathyChatroomManager *manager, GList * empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager, - McAccount *account) + EmpathyAccount *account) { EmpathyChatroomManagerPriv *priv; GList *chatrooms, *l; @@ -619,7 +620,7 @@ empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager, guint empathy_chatroom_manager_get_count (EmpathyChatroomManager *manager, - McAccount *account) + EmpathyAccount *account) { EmpathyChatroomManagerPriv *priv; GList *l; @@ -686,7 +687,7 @@ chatroom_manager_observe_channel_cb (EmpathyDispatcher *dispatcher, const gchar *roomname; GQuark channel_type; TpHandleType handle_type; - McAccount *account; + EmpathyAccount *account; TpConnection *connection; channel_type = empathy_dispatch_operation_get_channel_type_id (operation); diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h index 76c71d955..a6038f7fc 100644 --- a/libempathy/empathy-chatroom-manager.h +++ b/libempathy/empathy-chatroom-manager.h @@ -27,8 +27,7 @@ #include <glib-object.h> -#include <libmissioncontrol/mc-account.h> - +#include "empathy-account.h" #include "empathy-chatroom.h" #include "empathy-dispatcher.h" @@ -60,12 +59,12 @@ gboolean empathy_chatroom_manager_add (EmpathyChatroomMa void empathy_chatroom_manager_remove (EmpathyChatroomManager *manager, EmpathyChatroom *chatroom); EmpathyChatroom * empathy_chatroom_manager_find (EmpathyChatroomManager *manager, - McAccount *account, - const gchar *room); + EmpathyAccount *account, + const gchar *room); GList * empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager, - McAccount *account); + EmpathyAccount *account); guint empathy_chatroom_manager_get_count (EmpathyChatroomManager *manager, - McAccount *account); + EmpathyAccount *account); void empathy_chatroom_manager_observe (EmpathyChatroomManager *manager, EmpathyDispatcher *dispatcher); diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c index 147fca0a9..b62d6ad77 100644 --- a/libempathy/empathy-chatroom.c +++ b/libempathy/empathy-chatroom.c @@ -31,7 +31,7 @@ #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom) typedef struct { - McAccount *account; + EmpathyAccount *account; gchar *room; gchar *name; gboolean auto_connect; @@ -84,7 +84,7 @@ empathy_chatroom_class_init (EmpathyChatroomClass *klass) g_param_spec_object ("account", "Chatroom Account", "The account associated with an chatroom", - MC_TYPE_ACCOUNT, + EMPATHY_TYPE_ACCOUNT, G_PARAM_READWRITE)); g_object_class_install_property (object_class, @@ -312,22 +312,19 @@ chatroom_set_property (GObject *object, } EmpathyChatroom * -empathy_chatroom_new (McAccount *account) +empathy_chatroom_new (EmpathyAccount *account) { - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); - return g_object_new (EMPATHY_TYPE_CHATROOM, "account", account, NULL); } EmpathyChatroom * -empathy_chatroom_new_full (McAccount *account, +empathy_chatroom_new_full (EmpathyAccount *account, const gchar *room, const gchar *name, gboolean auto_connect) { - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); g_return_val_if_fail (room != NULL, NULL); return g_object_new (EMPATHY_TYPE_CHATROOM, @@ -338,7 +335,7 @@ empathy_chatroom_new_full (McAccount *account, NULL); } -McAccount * +EmpathyAccount * empathy_chatroom_get_account (EmpathyChatroom *chatroom) { EmpathyChatroomPriv *priv; @@ -351,12 +348,11 @@ empathy_chatroom_get_account (EmpathyChatroom *chatroom) void empathy_chatroom_set_account (EmpathyChatroom *chatroom, - McAccount *account) + EmpathyAccount *account) { EmpathyChatroomPriv *priv; g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom)); - g_return_if_fail (MC_IS_ACCOUNT (account)); priv = GET_PRIV (chatroom); @@ -470,8 +466,8 @@ gboolean empathy_chatroom_equal (gconstpointer v1, gconstpointer v2) { - McAccount *account_a; - McAccount *account_b; + EmpathyAccount *account_a; + EmpathyAccount *account_b; const gchar *room_a; const gchar *room_b; diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h index 560517d48..c18c27449 100644 --- a/libempathy/empathy-chatroom.h +++ b/libempathy/empathy-chatroom.h @@ -24,8 +24,7 @@ #include <glib-object.h> -#include <libmissioncontrol/mc-account.h> - +#include <libempathy/empathy-account.h> #include <libempathy/empathy-tp-chat.h> G_BEGIN_DECLS @@ -52,14 +51,14 @@ struct _EmpathyChatroomClass { }; GType empathy_chatroom_get_type (void) G_GNUC_CONST; -EmpathyChatroom *empathy_chatroom_new (McAccount *account); -EmpathyChatroom *empathy_chatroom_new_full (McAccount *account, +EmpathyChatroom *empathy_chatroom_new (EmpathyAccount *account); +EmpathyChatroom *empathy_chatroom_new_full (EmpathyAccount *account, const gchar *room, const gchar *name, gboolean auto_connect); -McAccount * empathy_chatroom_get_account (EmpathyChatroom *chatroom); +EmpathyAccount * empathy_chatroom_get_account (EmpathyChatroom *chatroom); void empathy_chatroom_set_account (EmpathyChatroom *chatroom, - McAccount *account); + EmpathyAccount *account); const gchar * empathy_chatroom_get_room (EmpathyChatroom *chatroom); void empathy_chatroom_set_room (EmpathyChatroom *chatroom, const gchar *room); diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index 073424485..059382b60 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -87,26 +87,6 @@ contact_manager_groups_changed_cb (EmpathyTpContactList *list, } static void -contact_manager_disconnect_foreach (gpointer key, - gpointer value, - gpointer user_data) -{ - EmpathyTpContactList *list = value; - EmpathyContactManager *manager = user_data; - - /* Disconnect signals from the list */ - g_signal_handlers_disconnect_by_func (list, - contact_manager_members_changed_cb, - manager); - g_signal_handlers_disconnect_by_func (list, - contact_manager_pendings_changed_cb, - manager); - g_signal_handlers_disconnect_by_func (list, - contact_manager_groups_changed_cb, - manager); -} - -static void contact_manager_invalidated_cb (TpProxy *connection, guint domain, gint code, @@ -128,6 +108,30 @@ contact_manager_invalidated_cb (TpProxy *connection, } static void +contact_manager_disconnect_foreach (gpointer key, + gpointer value, + gpointer user_data) +{ + TpConnection *connection = key; + EmpathyTpContactList *list = value; + EmpathyContactManager *manager = user_data; + + /* Disconnect signals from the list */ + g_signal_handlers_disconnect_by_func (list, + contact_manager_members_changed_cb, + manager); + g_signal_handlers_disconnect_by_func (list, + contact_manager_pendings_changed_cb, + manager); + g_signal_handlers_disconnect_by_func (list, + contact_manager_groups_changed_cb, + manager); + g_signal_handlers_disconnect_by_func (connection, + contact_manager_invalidated_cb, + manager); +} + +static void contact_manager_new_connection_cb (EmpathyAccountManager *account_manager, TpConnection *connection, EmpathyContactManager *self) @@ -531,6 +535,7 @@ empathy_contact_manager_can_add (EmpathyContactManager *manager, EmpathyTpContactList *list; g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), FALSE); + g_return_val_if_fail (connection != NULL, FALSE); list = g_hash_table_lookup (priv->lists, connection); if (list == NULL) diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index bad6ef470..d351aecbc 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -39,7 +39,7 @@ #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContact) typedef struct { TpContact *tp_contact; - McAccount *account; + EmpathyAccount *account; gchar *id; gchar *name; EmpathyAvatar *avatar; @@ -159,7 +159,7 @@ empathy_contact_class_init (EmpathyContactClass *class) g_param_spec_object ("account", "The account", "The account associated with the contact", - MC_TYPE_ACCOUNT, + EMPATHY_TYPE_ACCOUNT, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (object_class, @@ -409,12 +409,11 @@ empathy_contact_new (TpContact *tp_contact) } EmpathyContact * -empathy_contact_new_for_log (McAccount *account, +empathy_contact_new_for_log (EmpathyAccount *account, const gchar *id, const gchar *name, gboolean is_user) { - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); g_return_val_if_fail (id != NULL, NULL); return g_object_new (EMPATHY_TYPE_CONTACT, @@ -554,7 +553,7 @@ empathy_contact_set_avatar (EmpathyContact *contact, g_object_notify (G_OBJECT (contact), "avatar"); } -McAccount * +EmpathyAccount * empathy_contact_get_account (EmpathyContact *contact) { EmpathyContactPriv *priv; @@ -830,7 +829,7 @@ static gchar * contact_get_avatar_filename (EmpathyContact *contact, const gchar *token) { - McAccount *account; + EmpathyAccount *account; gchar *avatar_path; gchar *avatar_file; gchar *token_escaped; @@ -847,7 +846,7 @@ contact_get_avatar_filename (EmpathyContact *contact, avatar_path = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "avatars", - mc_account_get_unique_name (account), + empathy_account_get_unique_name (account), contact_escaped, NULL); g_mkdir_with_parents (avatar_path, 0700); diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h index f88831342..d4e385924 100644 --- a/libempathy/empathy-contact.h +++ b/libempathy/empathy-contact.h @@ -25,7 +25,7 @@ #include <glib-object.h> #include <telepathy-glib/contact.h> -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> G_BEGIN_DECLS @@ -70,7 +70,7 @@ typedef enum { GType empathy_contact_get_type (void) G_GNUC_CONST; EmpathyContact * empathy_contact_new (TpContact *tp_contact); -EmpathyContact * empathy_contact_new_for_log (McAccount *account, +EmpathyContact * empathy_contact_new_for_log (EmpathyAccount *account, const gchar *id, const gchar *name, gboolean is_user); TpContact * empathy_contact_get_tp_contact (EmpathyContact *contact); const gchar * empathy_contact_get_id (EmpathyContact *contact); @@ -80,7 +80,7 @@ void empathy_contact_set_name (EmpathyContact *contact, const gchar *name); EmpathyAvatar * empathy_contact_get_avatar (EmpathyContact *contact); void empathy_contact_set_avatar (EmpathyContact *contact, EmpathyAvatar *avatar); -McAccount * empathy_contact_get_account (EmpathyContact *contact); +EmpathyAccount * empathy_contact_get_account (EmpathyContact *contact); TpConnection * empathy_contact_get_connection (EmpathyContact *contact); TpConnectionPresenceType empathy_contact_get_presence (EmpathyContact *contact); void empathy_contact_set_presence (EmpathyContact *contact, diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c index 7a116f870..79fe8c62d 100644 --- a/libempathy/empathy-dispatch-operation.c +++ b/libempathy/empathy-dispatch-operation.c @@ -22,6 +22,8 @@ #include <stdio.h> #include <stdlib.h> +#include <telepathy-glib/interfaces.h> + #include "empathy-dispatch-operation.h" #include <libempathy/empathy-enum-types.h> #include <libempathy/empathy-tp-contact-factory.h> @@ -215,7 +217,7 @@ empathy_dispatch_operation_constructed (GObject *object) handle = tp_channel_get_handle (priv->channel, &handle_type); - if (handle_type == TP_CONN_HANDLE_TYPE_CONTACT && priv->contact == NULL) + if (handle_type == TP_HANDLE_TYPE_CONTACT && priv->contact == NULL) { EmpathyTpContactFactory *factory; diff --git a/libempathy/empathy-dispatch-operation.h b/libempathy/empathy-dispatch-operation.h index 84ed36013..148adec90 100644 --- a/libempathy/empathy-dispatch-operation.h +++ b/libempathy/empathy-dispatch-operation.h @@ -24,6 +24,8 @@ #include <glib-object.h> #include <libempathy/empathy-contact.h> +#include <telepathy-glib/connection.h> +#include <telepathy-glib/channel.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c index 2ed1440fc..5d2fa2bdc 100644 --- a/libempathy/empathy-idle.c +++ b/libempathy/empathy-idle.c @@ -25,6 +25,9 @@ #include <glib/gi18n-lib.h> #include <dbus/dbus-glib.h> +#ifdef HAVE_NM +#include <nm-client.h> +#endif #include <telepathy-glib/dbus.h> #include <telepathy-glib/util.h> @@ -43,7 +46,9 @@ typedef struct { MissionControl *mc; DBusGProxy *gs_proxy; - DBusGProxy *nm_proxy; +#ifdef HAVE_NM + NMClient *nm_client; +#endif TpConnectionPresenceType state; gchar *status; @@ -61,14 +66,6 @@ typedef struct { } EmpathyIdlePriv; typedef enum { - NM_STATE_UNKNOWN, - NM_STATE_ASLEEP, - NM_STATE_CONNECTING, - NM_STATE_CONNECTED, - NM_STATE_DISCONNECTED -} NMState; - -typedef enum { SESSION_STATUS_AVAILABLE, SESSION_STATUS_INVISIBLE, SESSION_STATUS_BUSY, @@ -234,22 +231,24 @@ idle_session_status_changed_cb (DBusGProxy *gs_proxy, priv->is_idle = is_idle; } +#ifdef HAVE_NM static void -idle_nm_state_change_cb (DBusGProxy *proxy, - guint state, - EmpathyIdle *idle) +idle_nm_state_change_cb (NMClient *client, + const GParamSpec *pspec, + EmpathyIdle *idle) { EmpathyIdlePriv *priv; gboolean old_nm_connected; gboolean new_nm_connected; + NMState state; priv = GET_PRIV (idle); - if (!priv->use_nm - || priv->nm_saved_state == TP_CONNECTION_PRESENCE_TYPE_UNSET) { + if (!priv->use_nm) { return; } + state = nm_client_get_state (priv->nm_client); old_nm_connected = priv->nm_connected; new_nm_connected = !(state == NM_STATE_CONNECTING || state == NM_STATE_DISCONNECTED); @@ -266,7 +265,8 @@ idle_nm_state_change_cb (DBusGProxy *proxy, priv->nm_saved_status = g_strdup (priv->status); empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_OFFLINE); } - else if (!old_nm_connected && new_nm_connected) { + else if (!old_nm_connected && new_nm_connected + && priv->nm_saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) { /* We are now connected */ DEBUG ("Reconnected: Restore state %d (%s)", priv->nm_saved_state, priv->nm_saved_status); @@ -280,6 +280,7 @@ idle_nm_state_change_cb (DBusGProxy *proxy, priv->nm_connected = new_nm_connected; } +#endif static void idle_finalize (GObject *object) @@ -295,6 +296,12 @@ idle_finalize (GObject *object) g_object_unref (priv->gs_proxy); } +#ifdef HAVE_NM + if (priv->nm_client) { + g_object_unref (priv->nm_client); + } +#endif + idle_ext_away_stop (EMPATHY_IDLE (object)); } @@ -433,8 +440,8 @@ empathy_idle_class_init (EmpathyIdleClass *klass) g_param_spec_boolean ("use-nm", "Use Network Manager", "Set presence according to Network Manager", - FALSE, - G_PARAM_READWRITE)); + TRUE, + G_PARAM_CONSTRUCT | G_PARAM_READWRITE)); g_type_class_add_private (object_class, sizeof (EmpathyIdlePriv)); } @@ -461,14 +468,13 @@ empathy_idle_get_actual_presence (EmpathyIdle *idle, GError **error) case MC_PRESENCE_DO_NOT_DISTURB: return TP_CONNECTION_PRESENCE_TYPE_BUSY; default: - return TP_CONNECTION_PRESENCE_TYPE_UNSET; + return TP_CONNECTION_PRESENCE_TYPE_OFFLINE; } } static void empathy_idle_init (EmpathyIdle *idle) { - DBusGConnection *system_bus; GError *error = NULL; EmpathyIdlePriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (idle, EMPATHY_TYPE_IDLE, EmpathyIdlePriv); @@ -516,28 +522,16 @@ empathy_idle_init (EmpathyIdle *idle) DEBUG ("Failed to get gs proxy"); } - - system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - if (!system_bus) { - DEBUG ("Failed to get system bus: %s", - error ? error->message : "No error given"); - } else { - priv->nm_proxy = dbus_g_proxy_new_for_name (system_bus, - "org.freedesktop.NetworkManager", - "/org/freedesktop/NetworkManager", - "org.freedesktop.NetworkManager"); - } - if (priv->nm_proxy) { - dbus_g_proxy_add_signal (priv->nm_proxy, "StateChange", - G_TYPE_UINT, G_TYPE_INVALID); - dbus_g_proxy_connect_signal (priv->nm_proxy, "StateChange", - G_CALLBACK (idle_nm_state_change_cb), - idle, NULL); +#ifdef HAVE_NM + priv->nm_client = nm_client_new (); + if (priv->nm_client) { + g_signal_connect (priv->nm_client, "notify::" NM_CLIENT_STATE, + G_CALLBACK (idle_nm_state_change_cb), + idle); } else { DEBUG ("Failed to get nm proxy"); } - - priv->nm_connected = TRUE; +#endif } EmpathyIdle * @@ -722,29 +716,20 @@ empathy_idle_set_use_nm (EmpathyIdle *idle, { EmpathyIdlePriv *priv = GET_PRIV (idle); - if (!priv->nm_proxy || use_nm == priv->use_nm) { +#ifdef HAVE_NM + if (!priv->nm_client || use_nm == priv->use_nm) { return; } +#endif priv->use_nm = use_nm; +#ifdef HAVE_NM if (use_nm) { - guint nm_status; - GError *error = NULL; - - dbus_g_proxy_call (priv->nm_proxy, "state", - &error, - G_TYPE_INVALID, - G_TYPE_UINT, &nm_status, - G_TYPE_INVALID); - - if (error) { - DEBUG ("Couldn't get NM state: %s", error->message); - g_clear_error (&error); - nm_status = NM_STATE_ASLEEP; - } - - idle_nm_state_change_cb (priv->nm_proxy, nm_status, idle); + idle_nm_state_change_cb (priv->nm_client, NULL, idle); +#else + if (0) { +#endif } else { priv->nm_connected = TRUE; if (priv->nm_saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) { diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c index b4c1f1a92..c1e20f487 100644 --- a/libempathy/empathy-log-manager.c +++ b/libempathy/empathy-log-manager.c @@ -157,7 +157,7 @@ empathy_log_manager_add_message (EmpathyLogManager *manager, gboolean empathy_log_manager_exists (EmpathyLogManager *manager, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom) { @@ -165,7 +165,6 @@ empathy_log_manager_exists (EmpathyLogManager *manager, EmpathyLogManagerPriv *priv; g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), FALSE); - g_return_val_if_fail (MC_IS_ACCOUNT (account), FALSE); g_return_val_if_fail (chat_id != NULL, FALSE); priv = GET_PRIV (manager); @@ -182,7 +181,7 @@ empathy_log_manager_exists (EmpathyLogManager *manager, GList * empathy_log_manager_get_dates (EmpathyLogManager *manager, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom) { @@ -190,7 +189,6 @@ empathy_log_manager_get_dates (EmpathyLogManager *manager, EmpathyLogManagerPriv *priv; g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL); - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); g_return_val_if_fail (chat_id != NULL, NULL); priv = GET_PRIV (manager); @@ -219,7 +217,7 @@ empathy_log_manager_get_dates (EmpathyLogManager *manager, GList * empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, const gchar *date) @@ -228,7 +226,6 @@ empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager, EmpathyLogManagerPriv *priv; g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL); - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); g_return_val_if_fail (chat_id != NULL, NULL); priv = GET_PRIV (manager); @@ -261,7 +258,7 @@ log_manager_message_date_cmp (gconstpointer a, GList * empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, guint num_messages, @@ -274,7 +271,6 @@ empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager, guint i = 0; g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL); - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); g_return_val_if_fail (chat_id != NULL, NULL); priv = GET_PRIV (manager); @@ -322,13 +318,12 @@ empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager, GList * empathy_log_manager_get_chats (EmpathyLogManager *manager, - McAccount *account) + EmpathyAccount *account) { GList *l, *out = NULL; EmpathyLogManagerPriv *priv; g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL); - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); priv = GET_PRIV (manager); diff --git a/libempathy/empathy-log-manager.h b/libempathy/empathy-log-manager.h index da7be4a43..6907e2ede 100644 --- a/libempathy/empathy-log-manager.h +++ b/libempathy/empathy-log-manager.h @@ -65,7 +65,7 @@ struct _EmpathyLogManagerClass struct _EmpathyLogSearchHit { - McAccount *account; + EmpathyAccount *account; gchar *chat_id; gboolean is_chatroom; gchar *filename; @@ -81,17 +81,17 @@ gboolean empathy_log_manager_add_message (EmpathyLogManager *manager, const gchar *chat_id, gboolean chatroom, EmpathyMessage *message, GError **error); gboolean empathy_log_manager_exists (EmpathyLogManager *manager, - McAccount *account, const gchar *chat_id, gboolean chatroom); + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom); GList *empathy_log_manager_get_dates (EmpathyLogManager *manager, - McAccount *account, const gchar *chat_id, gboolean chatroom); + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom); GList *empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager, - McAccount *account, const gchar *chat_id, gboolean chatroom, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, const gchar *date); GList *empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager, - McAccount *account, const gchar *chat_id, gboolean chatroom, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, guint num_messages, EmpathyLogMessageFilter filter, gpointer user_data); GList *empathy_log_manager_get_chats (EmpathyLogManager *manager, - McAccount *account); + EmpathyAccount *account); GList *empathy_log_manager_search_new (EmpathyLogManager *manager, const gchar *text); void empathy_log_manager_search_free (GList *hits); diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c index 94f4d1457..b73c7218c 100644 --- a/libempathy/empathy-log-store-empathy.c +++ b/libempathy/empathy-log-store-empathy.c @@ -32,6 +32,7 @@ #include "empathy-log-store.h" #include "empathy-log-store-empathy.h" #include "empathy-log-manager.h" +#include "empathy-account-manager.h" #include "empathy-contact.h" #include "empathy-time.h" #include "empathy-utils.h" @@ -59,6 +60,7 @@ typedef struct { gchar *basedir; gchar *name; + EmpathyAccountManager *account_manager; } EmpathyLogStoreEmpathyPriv; static void log_store_iface_init (gpointer g_iface,gpointer iface_data); @@ -73,6 +75,7 @@ log_store_empathy_finalize (GObject *object) EmpathyLogStoreEmpathy *self = EMPATHY_LOG_STORE_EMPATHY (object); EmpathyLogStoreEmpathyPriv *priv = GET_PRIV (self); + g_object_unref (priv->account_manager); g_free (priv->basedir); g_free (priv->name); } @@ -99,11 +102,12 @@ empathy_log_store_empathy_init (EmpathyLogStoreEmpathy *self) ".gnome2", PACKAGE_NAME, "logs", NULL); priv->name = g_strdup ("Empathy"); + priv->account_manager = empathy_account_manager_dup_singleton (); } static gchar * log_store_empathy_get_dir (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom) { @@ -113,7 +117,7 @@ log_store_empathy_get_dir (EmpathyLogStore *self, priv = GET_PRIV (self); - account_id = mc_account_get_unique_name (account); + account_id = empathy_account_get_unique_name (account); if (chatroom) basedir = g_build_path (G_DIR_SEPARATOR_S, priv->basedir, account_id, @@ -154,7 +158,7 @@ log_store_empathy_get_timestamp_from_message (EmpathyMessage *message) static gchar * log_store_empathy_get_filename (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom) { @@ -180,7 +184,7 @@ log_store_empathy_add_message (EmpathyLogStore *self, GError **error) { FILE *file; - McAccount *account; + EmpathyAccount *account; EmpathyContact *sender; const gchar *body_str; const gchar *str; @@ -267,7 +271,7 @@ log_store_empathy_add_message (EmpathyLogStore *self, static gboolean log_store_empathy_exists (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom) { @@ -283,7 +287,7 @@ log_store_empathy_exists (EmpathyLogStore *self, static GList * log_store_empathy_get_dates (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom) { @@ -295,7 +299,6 @@ log_store_empathy_get_dates (EmpathyLogStore *self, const gchar *p; g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), NULL); - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); g_return_val_if_fail (chat_id != NULL, NULL); directory = log_store_empathy_get_dir (self, account, chat_id, chatroom); @@ -336,7 +339,7 @@ log_store_empathy_get_dates (EmpathyLogStore *self, static gchar * log_store_empathy_get_filename_for_date (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, const gchar *date) @@ -359,6 +362,7 @@ static EmpathyLogSearchHit * log_store_empathy_search_hit_new (EmpathyLogStore *self, const gchar *filename) { + EmpathyLogStoreEmpathyPriv *priv = GET_PRIV (self); EmpathyLogSearchHit *hit; const gchar *account_name; const gchar *end; @@ -383,7 +387,8 @@ log_store_empathy_search_hit_new (EmpathyLogStore *self, else account_name = strv[len-3]; - hit->account = mc_account_lookup (account_name); + hit->account = empathy_account_manager_lookup (priv->account_manager, + account_name); hit->filename = g_strdup (filename); g_strfreev (strv); @@ -401,7 +406,7 @@ log_store_empathy_get_messages_for_file (EmpathyLogStore *self, xmlNodePtr log_node; xmlNodePtr node; EmpathyLogSearchHit *hit; - McAccount *account; + EmpathyAccount *account; g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), NULL); g_return_val_if_fail (filename != NULL, NULL); @@ -492,6 +497,7 @@ log_store_empathy_get_messages_for_file (EmpathyLogStore *self, empathy_message_set_sender (message, sender); empathy_message_set_timestamp (message, t); empathy_message_set_tptype (message, msg_type); + empathy_message_set_is_backlog (message, TRUE); if (cm_id_str) empathy_message_set_id (message, cm_id); @@ -666,7 +672,7 @@ log_store_empathy_get_chats_for_dir (EmpathyLogStore *self, static GList * log_store_empathy_get_messages_for_date (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, const gchar *date) @@ -675,7 +681,6 @@ log_store_empathy_get_messages_for_date (EmpathyLogStore *self, GList *messages; g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), NULL); - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); g_return_val_if_fail (chat_id != NULL, NULL); filename = log_store_empathy_get_filename_for_date (self, account, @@ -688,7 +693,7 @@ log_store_empathy_get_messages_for_date (EmpathyLogStore *self, static GList * log_store_empathy_get_chats (EmpathyLogStore *self, - McAccount *account) + EmpathyAccount *account) { gchar *dir; GList *hits; @@ -697,7 +702,7 @@ log_store_empathy_get_chats (EmpathyLogStore *self, priv = GET_PRIV (self); dir = g_build_filename (priv->basedir, - mc_account_get_unique_name (account), NULL); + empathy_account_get_unique_name (account), NULL); hits = log_store_empathy_get_chats_for_dir (self, dir, FALSE); @@ -716,7 +721,7 @@ log_store_empathy_get_name (EmpathyLogStore *self) static GList * log_store_empathy_get_filtered_messages (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, guint num_messages, diff --git a/libempathy/empathy-log-store.c b/libempathy/empathy-log-store.c index 21a881559..f136f7910 100644 --- a/libempathy/empathy-log-store.c +++ b/libempathy/empathy-log-store.c @@ -55,7 +55,7 @@ empathy_log_store_get_name (EmpathyLogStore *self) gboolean empathy_log_store_exists (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom) { @@ -84,7 +84,7 @@ empathy_log_store_add_message (EmpathyLogStore *self, GList * empathy_log_store_get_dates (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom) { @@ -97,7 +97,7 @@ empathy_log_store_get_dates (EmpathyLogStore *self, GList * empathy_log_store_get_messages_for_date (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, const gchar *date) @@ -111,7 +111,7 @@ empathy_log_store_get_messages_for_date (EmpathyLogStore *self, GList * empathy_log_store_get_last_messages (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom) { @@ -124,7 +124,7 @@ empathy_log_store_get_last_messages (EmpathyLogStore *self, GList * empathy_log_store_get_chats (EmpathyLogStore *self, - McAccount *account) + EmpathyAccount *account) { if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_chats) return NULL; @@ -157,7 +157,7 @@ empathy_log_store_ack_message (EmpathyLogStore *self, GList * empathy_log_store_get_filtered_messages (EmpathyLogStore *self, - McAccount *account, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, guint num_messages, diff --git a/libempathy/empathy-log-store.h b/libempathy/empathy-log-store.h index db698c4b0..5b6a87875 100644 --- a/libempathy/empathy-log-store.h +++ b/libempathy/empathy-log-store.h @@ -25,7 +25,7 @@ #include <glib-object.h> -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> #include "empathy-message.h" #include "empathy-log-manager.h" @@ -50,23 +50,23 @@ struct _EmpathyLogStoreInterface GTypeInterface parent; const gchar * (*get_name) (EmpathyLogStore *self); - gboolean (*exists) (EmpathyLogStore *self, McAccount *account, + gboolean (*exists) (EmpathyLogStore *self, EmpathyAccount *account, const gchar *chat_id, gboolean chatroom); gboolean (*add_message) (EmpathyLogStore *self, const gchar *chat_id, gboolean chatroom, EmpathyMessage *message, GError **error); - GList * (*get_dates) (EmpathyLogStore *self, McAccount *account, + GList * (*get_dates) (EmpathyLogStore *self, EmpathyAccount *account, const gchar *chat_id, gboolean chatroom); GList * (*get_messages_for_date) (EmpathyLogStore *self, - McAccount *account, const gchar *chat_id, gboolean chatroom, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, const gchar *date); - GList * (*get_last_messages) (EmpathyLogStore *self, McAccount *account, + GList * (*get_last_messages) (EmpathyLogStore *self, EmpathyAccount *account, const gchar *chat_id, gboolean chatroom); GList * (*get_chats) (EmpathyLogStore *self, - McAccount *account); + EmpathyAccount *account); GList * (*search_new) (EmpathyLogStore *self, const gchar *text); void (*ack_message) (EmpathyLogStore *self, const gchar *chat_id, gboolean chatroom, EmpathyMessage *message); - GList * (*get_filtered_messages) (EmpathyLogStore *self, McAccount *account, + GList * (*get_filtered_messages) (EmpathyLogStore *self, EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, guint num_messages, EmpathyLogMessageFilter filter, gpointer user_data); }; @@ -75,25 +75,25 @@ GType empathy_log_store_get_type (void) G_GNUC_CONST; const gchar *empathy_log_store_get_name (EmpathyLogStore *self); gboolean empathy_log_store_exists (EmpathyLogStore *self, - McAccount *account, const gchar *chat_id, gboolean chatroom); + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom); gboolean empathy_log_store_add_message (EmpathyLogStore *self, const gchar *chat_id, gboolean chatroom, EmpathyMessage *message, GError **error); GList *empathy_log_store_get_dates (EmpathyLogStore *self, - McAccount *account, const gchar *chat_id, gboolean chatroom); + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom); GList *empathy_log_store_get_messages_for_date (EmpathyLogStore *self, - McAccount *account, const gchar *chat_id, gboolean chatroom, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, const gchar *date); GList *empathy_log_store_get_last_messages (EmpathyLogStore *self, - McAccount *account, const gchar *chat_id, gboolean chatroom); + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom); GList *empathy_log_store_get_chats (EmpathyLogStore *self, - McAccount *account); + EmpathyAccount *account); GList *empathy_log_store_search_new (EmpathyLogStore *self, const gchar *text); void empathy_log_store_ack_message (EmpathyLogStore *self, const gchar *chat_id, gboolean chatroom, EmpathyMessage *message); GList *empathy_log_store_get_filtered_messages (EmpathyLogStore *self, - McAccount *account, const gchar *chat_id, gboolean chatroom, + EmpathyAccount *account, const gchar *chat_id, gboolean chatroom, guint num_messages, EmpathyLogMessageFilter filter, gpointer user_data); G_END_DECLS diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index d020b72e4..a8fe6084c 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -39,6 +39,7 @@ typedef struct { EmpathyContact *receiver; gchar *body; time_t timestamp; + gboolean is_backlog; guint id; } EmpathyMessagePriv; @@ -61,6 +62,7 @@ enum { PROP_RECEIVER, PROP_BODY, PROP_TIMESTAMP, + PROP_IS_BACKLOG, }; static void @@ -112,6 +114,13 @@ empathy_message_class_init (EmpathyMessageClass *class) G_MAXLONG, -1, G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_IS_BACKLOG, + g_param_spec_boolean ("is-backlog", + "History message", + "If the message belongs to history", + FALSE, + G_PARAM_READWRITE)); g_type_class_add_private (object_class, sizeof (EmpathyMessagePriv)); @@ -387,6 +396,33 @@ empathy_message_set_timestamp (EmpathyMessage *message, g_object_notify (G_OBJECT (message), "timestamp"); } +gboolean +empathy_message_is_backlog (EmpathyMessage *message) +{ + EmpathyMessagePriv *priv; + + g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE); + + priv = GET_PRIV (message); + + return priv->is_backlog; +} + +void +empathy_message_set_is_backlog (EmpathyMessage *message, + gboolean is_backlog) +{ + EmpathyMessagePriv *priv; + + g_return_if_fail (EMPATHY_IS_MESSAGE (message)); + + priv = GET_PRIV (message); + + priv->is_backlog = is_backlog; + + g_object_notify (G_OBJECT (message), "is-backlog"); +} + #define IS_SEPARATOR(ch) (ch == ' ' || ch == ',' || ch == '.' || ch == ':') gboolean empathy_message_should_highlight (EmpathyMessage *message) diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h index 2172c9784..00064df57 100644 --- a/libempathy/empathy-message.h +++ b/libempathy/empathy-message.h @@ -68,6 +68,9 @@ void empathy_message_set_body (EmpathyMessage time_t empathy_message_get_timestamp (EmpathyMessage *message); void empathy_message_set_timestamp (EmpathyMessage *message, time_t timestamp); +gboolean empathy_message_is_backlog (EmpathyMessage *message); +void empathy_message_set_is_backlog (EmpathyMessage *message, + gboolean is_backlog); gboolean empathy_message_should_highlight (EmpathyMessage *message); TpChannelTextMessageType empathy_message_type_from_str (const gchar *type_str); const gchar * empathy_message_type_to_str (TpChannelTextMessageType type); diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index ac61392e0..a3282818f 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -875,6 +875,34 @@ tp_chat_got_added_contacts_cb (EmpathyTpContactFactory *factory, tp_chat_check_if_ready (EMPATHY_TP_CHAT (chat)); } +static EmpathyContact * +chat_lookup_contact (EmpathyTpChat *chat, + TpHandle handle, + gboolean remove) +{ + EmpathyTpChatPriv *priv = GET_PRIV (chat); + GList *l; + + for (l = priv->members; l; l = l->next) { + EmpathyContact *c = l->data; + + if (empathy_contact_get_handle (c) != handle) { + continue; + } + + if (remove) { + /* Caller takes the reference. */ + priv->members = g_list_delete_link (priv->members, l); + } else { + g_object_ref (c); + } + + return c; + } + + return NULL; +} + static void tp_chat_group_members_changed_cb (TpChannel *self, gchar *message, @@ -888,23 +916,30 @@ tp_chat_group_members_changed_cb (TpChannel *self, { EmpathyTpChatPriv *priv = GET_PRIV (chat); EmpathyContact *contact; - TpHandle handle; + EmpathyContact *actor_contact = NULL; guint i; - GList *l; + + if (actor != 0) { + actor_contact = chat_lookup_contact (chat, 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++) { - for (l = priv->members; l; l = l->next) { - contact = l->data; - handle = empathy_contact_get_handle (contact); - if (handle == g_array_index (removed, TpHandle, i)) { - priv->members = g_list_delete_link (priv->members, l); - g_signal_emit_by_name (chat, "members-changed", - contact, NULL, reason, - message, FALSE); - g_object_unref (contact); - break; - } + contact = chat_lookup_contact (chat, + g_array_index (removed, TpHandle, i), TRUE); + + if (contact != NULL) { + g_signal_emit_by_name (chat, "members-changed", contact, + actor_contact, reason, message, + FALSE); + g_object_unref (contact); } } @@ -917,6 +952,10 @@ tp_chat_group_members_changed_cb (TpChannel *self, } tp_chat_update_remote_contact (chat); + + if (actor_contact != NULL) { + g_object_unref (actor_contact); + } } static void diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c index 96fdfda68..27160a445 100644 --- a/libempathy/empathy-tp-contact-factory.c +++ b/libempathy/empathy-tp-contact-factory.c @@ -494,21 +494,47 @@ tp_contact_factory_geocode (EmpathyContact *contact) address = geoclue_address_details_new (); + str = get_dup_string (location, EMPATHY_LOCATION_COUNTRY_CODE); + if (str != NULL) { + g_hash_table_insert (address, + g_strdup (GEOCLUE_ADDRESS_KEY_COUNTRYCODE), str); + DEBUG ("\t - countrycode: %s", str); + } + str = get_dup_string (location, EMPATHY_LOCATION_COUNTRY); - if (str != NULL) - g_hash_table_insert (address, g_strdup ("country"), str); + if (str != NULL) { + g_hash_table_insert (address, + g_strdup (GEOCLUE_ADDRESS_KEY_COUNTRY), str); + DEBUG ("\t - country: %s", str); + } str = get_dup_string (location, EMPATHY_LOCATION_POSTAL_CODE); - if (str != NULL) - g_hash_table_insert (address, g_strdup ("postalcode"), str); + if (str != NULL) { + g_hash_table_insert (address, + g_strdup (GEOCLUE_ADDRESS_KEY_POSTALCODE), str); + DEBUG ("\t - postalcode: %s", str); + } + + str = get_dup_string (location, EMPATHY_LOCATION_REGION); + if (str != NULL) { + g_hash_table_insert (address, + g_strdup (GEOCLUE_ADDRESS_KEY_REGION), str); + DEBUG ("\t - region: %s", str); + } str = get_dup_string (location, EMPATHY_LOCATION_LOCALITY); - if (str != NULL) - g_hash_table_insert (address, g_strdup ("locality"), str); + if (str != NULL) { + g_hash_table_insert (address, + g_strdup (GEOCLUE_ADDRESS_KEY_LOCALITY), str); + DEBUG ("\t - locality: %s", str); + } str = get_dup_string (location, EMPATHY_LOCATION_STREET); - if (str != NULL) - g_hash_table_insert (address, g_strdup ("street"), str); + if (str != NULL) { + g_hash_table_insert (address, + g_strdup (GEOCLUE_ADDRESS_KEY_STREET), str); + DEBUG ("\t - street: %s", str); + } g_object_ref (contact); geoclue_geocode_address_to_position_async (geocode, address, diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c index 1b2e393d1..b3d955ee4 100644 --- a/libempathy/empathy-tp-roomlist.c +++ b/libempathy/empathy-tp-roomlist.c @@ -27,7 +27,7 @@ #include <telepathy-glib/dbus.h> #include <telepathy-glib/util.h> -#include <libmissioncontrol/mission-control.h> +#include "empathy-account.h" #include "empathy-tp-roomlist.h" #include "empathy-chatroom.h" @@ -40,7 +40,7 @@ typedef struct { TpConnection *connection; TpChannel *channel; - McAccount *account; + EmpathyAccount *account; gboolean is_listing; gboolean start_requested; } EmpathyTpRoomlistPriv; @@ -54,7 +54,7 @@ enum { enum { PROP_0, - PROP_CONNECTION, + PROP_ACCOUNT, PROP_IS_LISTING, }; @@ -352,13 +352,9 @@ static void tp_roomlist_constructed (GObject *list) { EmpathyTpRoomlistPriv *priv = GET_PRIV (list); - MissionControl *mc; - mc = empathy_mission_control_dup_singleton (); - priv->account = mission_control_get_account_for_tpconnection (mc, - priv->connection, - NULL); - g_object_unref (mc); + priv->connection = empathy_account_get_connection (priv->account); + g_object_ref (priv->connection); tp_cli_connection_call_request_channel (priv->connection, -1, TP_IFACE_CHANNEL_TYPE_ROOM_LIST, @@ -379,8 +375,8 @@ tp_roomlist_get_property (GObject *object, EmpathyTpRoomlistPriv *priv = GET_PRIV (object); switch (param_id) { - case PROP_CONNECTION: - g_value_set_object (value, priv->connection); + case PROP_ACCOUNT: + g_value_set_object (value, priv->account); break; case PROP_IS_LISTING: g_value_set_boolean (value, priv->is_listing); @@ -400,8 +396,8 @@ tp_roomlist_set_property (GObject *object, EmpathyTpRoomlistPriv *priv = GET_PRIV (object); switch (param_id) { - case PROP_CONNECTION: - priv->connection = g_object_ref (g_value_get_object (value)); + case PROP_ACCOUNT: + priv->account = g_value_dup_object (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); @@ -420,11 +416,11 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass) object_class->set_property = tp_roomlist_set_property; g_object_class_install_property (object_class, - PROP_CONNECTION, - g_param_spec_object ("connection", - "The Connection", - "The connection on which it lists rooms", - TP_TYPE_CONNECTION, + PROP_ACCOUNT, + g_param_spec_object ("account", + "The Account", + "The account on which it lists rooms", + EMPATHY_TYPE_ACCOUNT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (object_class, @@ -480,24 +476,14 @@ empathy_tp_roomlist_init (EmpathyTpRoomlist *list) } EmpathyTpRoomlist * -empathy_tp_roomlist_new (McAccount *account) +empathy_tp_roomlist_new (EmpathyAccount *account) { EmpathyTpRoomlist *list; - MissionControl *mc; - TpConnection *connection; - - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); - - mc = empathy_mission_control_dup_singleton (); - connection = mission_control_get_tpconnection (mc, account, NULL); list = g_object_new (EMPATHY_TYPE_TP_ROOMLIST, - "connection", connection, + "account", account, NULL); - g_object_unref (mc); - g_object_unref (connection); - return list; } diff --git a/libempathy/empathy-tp-roomlist.h b/libempathy/empathy-tp-roomlist.h index 9f45b7f5c..801e5c69f 100644 --- a/libempathy/empathy-tp-roomlist.h +++ b/libempathy/empathy-tp-roomlist.h @@ -25,7 +25,7 @@ #include <glib.h> #include <telepathy-glib/connection.h> -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> G_BEGIN_DECLS @@ -49,7 +49,7 @@ struct _EmpathyTpRoomlistClass { }; GType empathy_tp_roomlist_get_type (void) G_GNUC_CONST; -EmpathyTpRoomlist *empathy_tp_roomlist_new (McAccount *account); +EmpathyTpRoomlist *empathy_tp_roomlist_new (EmpathyAccount *account); gboolean empathy_tp_roomlist_is_listing (EmpathyTpRoomlist *list); void empathy_tp_roomlist_start (EmpathyTpRoomlist *list); void empathy_tp_roomlist_stop (EmpathyTpRoomlist *list); diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index fca7fcb5f..fd54c9a98 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -230,25 +230,16 @@ empathy_xml_node_find_child_prop_value (xmlNodePtr node, guint empathy_account_hash (gconstpointer key) { - g_return_val_if_fail (MC_IS_ACCOUNT (key), 0); + g_return_val_if_fail (EMPATHY_IS_ACCOUNT (key), 0); - return g_str_hash (mc_account_get_unique_name (MC_ACCOUNT (key))); + return g_str_hash (empathy_account_get_unique_name (EMPATHY_ACCOUNT (key))); } gboolean empathy_account_equal (gconstpointer a, gconstpointer b) { - const gchar *name_a; - const gchar *name_b; - - g_return_val_if_fail (MC_IS_ACCOUNT (a), FALSE); - g_return_val_if_fail (MC_IS_ACCOUNT (b), FALSE); - - name_a = mc_account_get_unique_name (MC_ACCOUNT (a)); - name_b = mc_account_get_unique_name (MC_ACCOUNT (b)); - - return g_str_equal (name_a, name_b); + return a == b; } MissionControl * diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index de1437b9d..42acbc8e3 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -32,7 +32,6 @@ #include <libxml/parser.h> #include <libxml/tree.h> -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mission-control.h> #include "empathy-contact.h" diff --git a/megaphone/src/megaphone-applet.c b/megaphone/src/megaphone-applet.c index 0879e75a5..132e8b74f 100644 --- a/megaphone/src/megaphone-applet.c +++ b/megaphone/src/megaphone-applet.c @@ -32,10 +32,10 @@ #include <gconf/gconf-client.h> #include <libmissioncontrol/mission-control.h> -#include <libmissioncontrol/mc-account.h> #include <libempathy/empathy-tp-contact-factory.h> #include <libempathy/empathy-account-manager.h> +#include <libempathy/empathy-dispatcher.h> #include <libempathy/empathy-contact.h> #include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-contact-manager.h> @@ -55,7 +55,7 @@ typedef struct { EmpathyTpContactFactory *factory; EmpathyAccountManager *account_manager; - McAccount *account; + EmpathyAccount *account; gchar *id; GtkWidget *image; gint image_size; @@ -194,7 +194,7 @@ megaphone_applet_got_contact_cb (EmpathyTpContactFactory *factory, static void megaphone_applet_new_connection_cb (EmpathyAccountManager *manager, TpConnection *connection, - McAccount *account, + EmpathyAccount *account, MegaphoneApplet *applet) { MegaphoneAppletPriv *priv = GET_PRIV (applet); @@ -223,13 +223,13 @@ megaphone_applet_preferences_response_cb (GtkWidget *dialog, contact_list = g_object_get_data (G_OBJECT (dialog), "contact-list"); contact = empathy_contact_list_view_dup_selected (contact_list); if (contact) { - McAccount *account; + EmpathyAccount *account; const gchar *account_id; const gchar *contact_id; gchar *str; account = empathy_contact_get_account (contact); - account_id = mc_account_get_unique_name (account); + account_id = empathy_account_get_unique_name (account); contact_id = empathy_contact_get_id (contact); str = g_strconcat (account_id, "/", contact_id, NULL); @@ -282,7 +282,7 @@ megaphone_applet_show_preferences (MegaphoneApplet *applet) gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 500); scroll = gtk_scrolled_window_new (NULL, NULL); gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (contact_list)); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), scroll); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll); gtk_widget_show (scroll); g_object_set_data (G_OBJECT (dialog), "contact-list", contact_list); @@ -300,7 +300,6 @@ megaphone_applet_button_press_event_cb (GtkWidget *widget, MegaphoneApplet *applet) { MegaphoneAppletPriv *priv = GET_PRIV (applet); - MissionControl *mc; /* Only react on left-clicks */ if (event->button != 1 || event->type != GDK_BUTTON_PRESS) { @@ -317,15 +316,8 @@ megaphone_applet_button_press_event_cb (GtkWidget *widget, empathy_contact_get_id (priv->contact), empathy_contact_get_handle (priv->contact)); - mc = empathy_mission_control_dup_singleton (); - mission_control_request_channel (mc, - empathy_contact_get_account (priv->contact), - TP_IFACE_CHANNEL_TYPE_TEXT, - empathy_contact_get_handle (priv->contact), - TP_HANDLE_TYPE_CONTACT, - NULL, NULL); - g_object_unref (mc); - + empathy_dispatcher_chat_with_contact (priv->contact, NULL, NULL); + return TRUE; } @@ -453,15 +445,15 @@ megaphone_applet_set_contact (MegaphoneApplet *applet, /* Lookup the new contact */ if (str) { strv = g_strsplit (str, "/", 2); - priv->account = mc_account_lookup (strv[0]); + priv->account = empathy_account_manager_lookup (priv->account_manager, + strv[0]); priv->id = strv[1]; g_free (strv[0]); g_free (strv); } if (priv->account) { - connection = empathy_account_manager_get_connection ( - priv->account_manager, priv->account); + connection = empathy_account_get_connection (priv->account); if (connection) { megaphone_applet_new_connection_cb (priv->account_manager, connection, priv->account, applet); diff --git a/po/LINGUAS b/po/LINGUAS index 039fa077c..b1de6b5a5 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -41,6 +41,7 @@ nb ne nl oc +or pa pl ps diff --git a/po/POTFILES.in b/po/POTFILES.in index e80a29c67..cfd921533 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -40,6 +40,7 @@ libempathy-gtk/empathy-log-window.c [type: gettext/glade]libempathy-gtk/empathy-log-window.ui [type: gettext/glade]libempathy-gtk/empathy-new-message-dialog.ui libempathy-gtk/empathy-presence-chooser.c +libempathy-gtk/empathy-sound.c libempathy-gtk/empathy-status-preset-dialog.c [type: gettext/glade]libempathy-gtk/empathy-status-preset-dialog.ui libempathy-gtk/empathy-theme-boxes.c @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: empathy.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&component=general\n" -"POT-Creation-Date: 2009-06-19 13:18+0000\n" -"PO-Revision-Date: 2009-06-21 12:05+0200\n" +"POT-Creation-Date: 2009-07-02 19:42+0000\n" +"PO-Revision-Date: 2009-07-05 11:38+0200\n" "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "MIME-Version: 1.0\n" @@ -176,76 +176,83 @@ msgstr "" "Mostrar notificaciones emergentes si la ventana de chat no tiene el foco" #: ../data/empathy.schemas.in.h:36 +msgid "Popup notifications when a contact sign in" +msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta." + +#: ../data/empathy.schemas.in.h:37 +msgid "Popup notifications when a contact sign out" +msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta." + +#: ../data/empathy.schemas.in.h:38 msgid "Salut account is created" msgstr "Se creó la cuenta Salut" -#: ../data/empathy.schemas.in.h:37 +#: ../data/empathy.schemas.in.h:39 msgid "Show avatars" msgstr "Mostrar avatares" -#: ../data/empathy.schemas.in.h:38 -#| msgid "_Show Contact List" +#: ../data/empathy.schemas.in.h:40 msgid "Show contact list in rooms" msgstr "Mostrar lista de contactos en salas" -#: ../data/empathy.schemas.in.h:39 +#: ../data/empathy.schemas.in.h:41 msgid "Show hint about closing the main window" msgstr "Mostrar consejo sobre cómo cerrar la ventana principal" -#: ../data/empathy.schemas.in.h:40 +#: ../data/empathy.schemas.in.h:42 msgid "Show offline contacts" msgstr "Mostrar contactos no conectados" -#: ../data/empathy.schemas.in.h:41 +#: ../data/empathy.schemas.in.h:43 msgid "Spell checking languages" msgstr "Idiomas para revisión ortográfica" -#: ../data/empathy.schemas.in.h:42 +#: ../data/empathy.schemas.in.h:44 msgid "The default folder to save file transfers in." msgstr "La carpeta predeterminada donde guardar los archivos transferidos." -#: ../data/empathy.schemas.in.h:43 +#: ../data/empathy.schemas.in.h:45 msgid "The last directory that an avatar image was chosen from." msgstr "Último directorio del que fue elegido un avatar." -#: ../data/empathy.schemas.in.h:44 +#: ../data/empathy.schemas.in.h:46 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/empathy.schemas.in.h:45 +#: ../data/empathy.schemas.in.h:47 msgid "Use graphical smileys" msgstr "Usar emoticonos gráficos" -#: ../data/empathy.schemas.in.h:46 +#: ../data/empathy.schemas.in.h:48 msgid "Use notification sounds" msgstr "Usar sonidos de notificación" -#: ../data/empathy.schemas.in.h:47 +#: ../data/empathy.schemas.in.h:49 msgid "Use theme for chat rooms" msgstr "Usar tema para salas de chat" -#: ../data/empathy.schemas.in.h:48 +#: ../data/empathy.schemas.in.h:50 msgid "Whether or not Empathy can publish the user's location to his contacts." msgstr "" "Indica si Empathy puede publicar la ubicación del usuario a sus contactos." -#: ../data/empathy.schemas.in.h:49 +#: ../data/empathy.schemas.in.h:51 msgid "Whether or not Empathy can use the GPS to guess the location." msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación." -#: ../data/empathy.schemas.in.h:50 +#: ../data/empathy.schemas.in.h:52 msgid "" "Whether or not 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/empathy.schemas.in.h:51 +#: ../data/empathy.schemas.in.h:53 msgid "Whether or not Empathy can use the network to guess the location." msgstr "Indica si Empathy puede usar la red para deducir la ubicación." -#: ../data/empathy.schemas.in.h:52 +#: ../data/empathy.schemas.in.h:54 msgid "" "Whether or not Empathy has asked about importing accounts from other " "programs." @@ -253,7 +260,7 @@ msgstr "" "Indica si Empathy ha preguntado acerca de importar cuentas de otros " "programas." -#: ../data/empathy.schemas.in.h:53 +#: ../data/empathy.schemas.in.h:55 msgid "" "Whether or not Empathy should automatically log in to your accounts on " "startup." @@ -261,7 +268,7 @@ msgstr "" "Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al " "inicio." -#: ../data/empathy.schemas.in.h:54 +#: ../data/empathy.schemas.in.h:56 msgid "" "Whether or not Empathy should reduce the location's accuracy for privacy " "reasons." @@ -269,7 +276,7 @@ msgstr "" "Indica si Empathy deberÃa reducir la precisión de la ubicación por motivos " "de privacidad." -#: ../data/empathy.schemas.in.h:55 +#: ../data/empathy.schemas.in.h:57 msgid "" "Whether or not Empathy should use the avatar of the contact as the chat " "window icon." @@ -277,14 +284,14 @@ msgstr "" "Indica si Empathy deberÃa usar el avatar del contacto como el icono de la " "ventana de chat." -#: ../data/empathy.schemas.in.h:56 +#: ../data/empathy.schemas.in.h:58 msgid "" "Whether or not the Salut account has been created on the first Empathy run." msgstr "" "Indica si la cuenta Salut se ha creado cuando ejecutó por primera vez " "Empathy." -#: ../data/empathy.schemas.in.h:57 +#: ../data/empathy.schemas.in.h:59 msgid "" "Whether or not the network manager should be used to automatically " "disconnect/reconnect." @@ -292,7 +299,7 @@ msgstr "" "Indica si se debe usar el gestor de la red para desconectarse/reconectarse " "automáticamente." -#: ../data/empathy.schemas.in.h:58 +#: ../data/empathy.schemas.in.h:60 msgid "" "Whether or not to check words typed against the languages you want to check " "with." @@ -300,21 +307,21 @@ msgstr "" "Indica si se deben revisar las palabras tecleadas con respecto a los idiomas " "con los que quiere comprobarlo." -#: ../data/empathy.schemas.in.h:59 +#: ../data/empathy.schemas.in.h:61 msgid "" "Whether or not 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/empathy.schemas.in.h:60 +#: ../data/empathy.schemas.in.h:62 msgid "" "Whether or not to play a sound to notify for contacts logging in the network." msgstr "" "Indica si se debe reproducir un sonido para notificar los inicios de sesión " "de los contactos en la red." -#: ../data/empathy.schemas.in.h:61 +#: ../data/empathy.schemas.in.h:63 msgid "" "Whether or not to play a sound to notify for contacts logging off the " "network." @@ -322,40 +329,52 @@ msgstr "" "Indica si se debe reproducir un sonido para notificar las finalizaciones de " "sesión de los contactos en la red." -#: ../data/empathy.schemas.in.h:62 +#: ../data/empathy.schemas.in.h:64 msgid "Whether or not to play a sound to notify for events." msgstr "Indica si se debe reproducir un sonido para notificar eventos." -#: ../data/empathy.schemas.in.h:63 +#: ../data/empathy.schemas.in.h:65 msgid "Whether or not to play a sound to notify for incoming messages." msgstr "" "Indica si se debe reproducir un sonido para notificar mensajes entrantes." -#: ../data/empathy.schemas.in.h:64 +#: ../data/empathy.schemas.in.h:66 msgid "Whether or not to play a sound to notify for new conversations." msgstr "" "Indica si se debe reproducir un sonido para notificar conversaciones nuevas." -#: ../data/empathy.schemas.in.h:65 +#: ../data/empathy.schemas.in.h:67 msgid "Whether or not to play a sound to notify for outgoing messages." msgstr "" "Indica si se debe reproducir un sonido para notificar mensajes salientes." -#: ../data/empathy.schemas.in.h:66 +#: ../data/empathy.schemas.in.h:68 msgid "Whether or not to play a sound when logging in a network." msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red." -#: ../data/empathy.schemas.in.h:67 +#: ../data/empathy.schemas.in.h:69 msgid "Whether or not to play a sound when logging off a network." msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red." -#: ../data/empathy.schemas.in.h:68 +#: ../data/empathy.schemas.in.h:70 msgid "Whether or not to play sound notifications when away or busy." msgstr "" "Indica si se deben reproducir sonidos de notificaciones cuando se esté " "ausente u ocupado." -#: ../data/empathy.schemas.in.h:69 +#: ../data/empathy.schemas.in.h:71 +msgid "" +"Whether or not 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/empathy.schemas.in.h:72 +msgid "Whether or not to show a popup notification when a contact goes online." +msgstr "" +"Indica si se deben mostrar las notificaciones emergentes cuando se conecta." + +#: ../data/empathy.schemas.in.h:73 msgid "" "Whether or not to show a popup notification when receiving a new message " "even if the chat is already opened, but not focused." @@ -363,14 +382,14 @@ 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/empathy.schemas.in.h:70 +#: ../data/empathy.schemas.in.h:74 msgid "" "Whether or not to show a popup notification when receiving a new message." msgstr "" "Indica si se deben mostrar notificaciones emergentes al recibir un mensaje " "nuevo." -#: ../data/empathy.schemas.in.h:71 +#: ../data/empathy.schemas.in.h:75 msgid "" "Whether or not to show avatars for contacts in the contact list and chat " "windows." @@ -378,24 +397,23 @@ msgstr "" "Indica si se debe mostrar los avatares para los contactos en la lista de " "contactos y ventanas de chat." -#: ../data/empathy.schemas.in.h:72 +#: ../data/empathy.schemas.in.h:76 msgid "Whether or not 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/empathy.schemas.in.h:73 +#: ../data/empathy.schemas.in.h:77 msgid "Whether or not to show popup notifications when away or busy." msgstr "" "Indica si se deben mostrar las notificaciones emergentes cuando se esté " "ausente u ocupado." -#: ../data/empathy.schemas.in.h:74 -#| msgid "Whether to show the contact list in compact mode or not." +#: ../data/empathy.schemas.in.h:78 msgid "Whether or not to show the contact list in chat rooms." msgstr "Indica si se debe mostrar la lista de contactos en salas de chat." -#: ../data/empathy.schemas.in.h:75 +#: ../data/empathy.schemas.in.h:79 msgid "" "Whether or not to show the message dialog about closing the main window with " "the 'x' button in the title bar." @@ -403,15 +421,15 @@ 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/empathy.schemas.in.h:76 +#: ../data/empathy.schemas.in.h:80 msgid "Whether to show the contact list in compact mode or not." msgstr "Indica si se debe mostrar la lista de contactos en modo compacto." -#: ../data/empathy.schemas.in.h:77 +#: ../data/empathy.schemas.in.h:81 msgid "Whether to use the theme for chat rooms or not." msgstr "Indica si se debe usar el tema para salas de chat." -#: ../data/empathy.schemas.in.h:78 +#: ../data/empathy.schemas.in.h:82 msgid "" "Which criterium to use when sorting the contact list. Default is to use sort " "by the contact's name with the value \"name\". A value of \"state\" will " @@ -437,7 +455,7 @@ msgstr "El archivo seleccionado no es un archivo regular" msgid "The selected file is empty" msgstr "El archivo seleccionado está vacÃo" -#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:287 +#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:289 msgid "People nearby" msgstr "Gente cerca" @@ -473,23 +491,23 @@ msgstr "El otro participante no puede transferir el archivo" msgid "Unknown reason" msgstr "Razón desconocida" -#: ../libempathy/empathy-utils.c:274 +#: ../libempathy/empathy-utils.c:265 msgid "Available" msgstr "Disponible" -#: ../libempathy/empathy-utils.c:276 +#: ../libempathy/empathy-utils.c:267 msgid "Busy" msgstr "Ocupado" -#: ../libempathy/empathy-utils.c:279 +#: ../libempathy/empathy-utils.c:270 msgid "Away" msgstr "Ausente" -#: ../libempathy/empathy-utils.c:281 +#: ../libempathy/empathy-utils.c:272 msgid "Hidden" msgstr "Oculto" -#: ../libempathy/empathy-utils.c:283 +#: ../libempathy/empathy-utils.c:274 msgid "Offline" msgstr "Desconectado" @@ -523,8 +541,6 @@ msgstr[1] "hace %d dÃas" #: ../libempathy/empathy-time.c:157 #, c-format -#| msgid "%d second ago" -#| msgid_plural "%d seconds ago" msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "hace %d semana" @@ -560,7 +576,6 @@ msgstr "%s:" #: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -#| msgid "<b>Advanced</b>" msgid "Advanced" msgstr "Avanzado" @@ -612,7 +627,7 @@ msgstr "_UIN ICQ:" msgid "_Charset:" msgstr "Conjunto de _caracteres:" -#: ../libempathy-gtk/empathy-account-widget-irc.c:241 +#: ../libempathy-gtk/empathy-account-widget-irc.c:240 msgid "New Network" msgstr "Red nueva" @@ -645,12 +660,10 @@ msgid "Real name:" msgstr "Nombre real:" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 -#| msgid "Server" msgid "Servers" msgstr "Servidores" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 -#| msgid "<b>Override server settings</b>" msgid "Override server settings" msgstr "Sobreescribir los ajustes del servidor" @@ -816,7 +829,7 @@ msgstr "Insertar emoticono" #. send button #: ../libempathy-gtk/empathy-chat.c:1031 -#: ../libempathy-gtk/empathy-ui-utils.c:1476 +#: ../libempathy-gtk/empathy-ui-utils.c:1475 msgid "_Send" msgstr "E_nviar" @@ -824,30 +837,66 @@ msgstr "E_nviar" msgid "_Spelling Suggestions" msgstr "_Sugerencias ortográficas" -#: ../libempathy-gtk/empathy-chat.c:1179 +#: ../libempathy-gtk/empathy-chat.c:1180 #, c-format -msgid "%s has joined the room" -msgstr "%s ha entrado en la sala" +#| msgid "Contact disconnected" +msgid "%s has disconnected" +msgstr "%s se ha desconectado" -#: ../libempathy-gtk/empathy-chat.c:1182 +#: ../libempathy-gtk/empathy-chat.c:1184 +#, c-format +msgid "%s was kicked by %s" +msgstr "%s fue expulsado por %s" + +#: ../libempathy-gtk/empathy-chat.c:1187 +#, c-format +msgid "%s was kicked" +msgstr "%s fue expulsado" + +#: ../libempathy-gtk/empathy-chat.c:1192 +#, c-format +msgid "%s was banned by %s" +msgstr "%s fue vetado por %s" + +#: ../libempathy-gtk/empathy-chat.c:1195 +#, c-format +msgid "%s was banned" +msgstr "%s fue vetado" + +#: ../libempathy-gtk/empathy-chat.c:1199 #, c-format msgid "%s has left the room" msgstr "%s ha dejado la sala" -#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1199 +#. Note to translators: this string is appended to +#. * notifications like "foo has left the room", with the message +#. * given by the user living the room. If this poses a problem, +#. * please let us know. :-) +#. +#: ../libempathy-gtk/empathy-chat.c:1208 +#, c-format +msgid " (%s)" +msgstr " (%s)" + +#: ../libempathy-gtk/empathy-chat.c:1231 +#, c-format +msgid "%s has joined the room" +msgstr "%s ha entrado en la sala" + +#: ../libempathy-gtk/empathy-chat.c:1364 ../src/empathy-call-window.c:1226 msgid "Disconnected" msgstr "Desconectado" -#: ../libempathy-gtk/empathy-chat.c:1742 +#: ../libempathy-gtk/empathy-chat.c:1793 msgid "Connected" msgstr "Conectado" -#: ../libempathy-gtk/empathy-chat.c:1792 -#: ../libempathy-gtk/empathy-log-window.c:501 +#: ../libempathy-gtk/empathy-chat.c:1843 +#: ../libempathy-gtk/empathy-log-window.c:502 msgid "Conversation" msgstr "Conversación" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471 +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472 msgid "Topic:" msgstr "Tema:" @@ -861,7 +910,7 @@ msgstr "_Abrir enlace" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:421 msgid "%A %B %d %Y" msgstr "%A %d %B %Y" @@ -874,7 +923,7 @@ msgstr "Editar información del contacto" msgid "Personal Information" msgstr "Información personal" -#: ../libempathy-gtk/empathy-contact-dialogs.c:392 +#: ../libempathy-gtk/empathy-contact-dialogs.c:384 msgid "New Contact" msgstr "Contacto nuevo" @@ -886,26 +935,26 @@ msgstr "Decidir _luego" msgid "Subscription Request" msgstr "Petición de suscripción" -#: ../libempathy-gtk/empathy-contact-list-view.c:1378 +#: ../libempathy-gtk/empathy-contact-list-view.c:1375 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "¿Realmente quiere quitar el grupo «%s»?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1380 +#: ../libempathy-gtk/empathy-contact-list-view.c:1377 msgid "Removing group" msgstr "Quitando grupo" -#: ../libempathy-gtk/empathy-contact-list-view.c:1427 -#: ../libempathy-gtk/empathy-contact-list-view.c:1505 +#: ../libempathy-gtk/empathy-contact-list-view.c:1424 +#: ../libempathy-gtk/empathy-contact-list-view.c:1502 msgid "_Remove" msgstr "_Quitar" -#: ../libempathy-gtk/empathy-contact-list-view.c:1457 +#: ../libempathy-gtk/empathy-contact-list-view.c:1454 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "¿Realmente quiere quitar el contacto «%s»?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1459 +#: ../libempathy-gtk/empathy-contact-list-view.c:1456 msgid "Removing contact" msgstr "Quitando el contacto" @@ -966,7 +1015,7 @@ msgid "Select" msgstr "Seleccionar" #: ../libempathy-gtk/empathy-contact-widget.c:988 -#: ../src/empathy-main-window.c:905 +#: ../src/empathy-main-window.c:903 msgid "Group" msgstr "Grupo" @@ -1098,7 +1147,6 @@ msgid "Birthday:" msgstr "Cumpleaños:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:5 -#| msgid "<b>Client Information</b>" msgid "Client Information" msgstr "Información del cliente" @@ -1107,12 +1155,11 @@ msgid "Client:" msgstr "Cliente:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:7 -#: ../src/empathy-main-window.c:888 +#: ../src/empathy-main-window.c:886 msgid "Contact" msgstr "Contacto" #: ../libempathy-gtk/empathy-contact-widget.ui.h:8 -#| msgid "<b>Contact Details</b>" msgid "Contact Details" msgstr "Detalles del contacto" @@ -1125,7 +1172,6 @@ msgid "Fullname:" msgstr "Nombre completo:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:11 -#| msgid "Group" msgid "Groups" msgstr "Grupos" @@ -1178,12 +1224,12 @@ msgstr "Puerto" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:494 -#: ../src/empathy-import-dialog.c:281 +#: ../libempathy-gtk/empathy-log-window.c:495 +#: ../src/empathy-import-dialog.c:285 msgid "Account" msgstr "Cuenta" -#: ../libempathy-gtk/empathy-log-window.c:511 +#: ../libempathy-gtk/empathy-log-window.c:512 msgid "Date" msgstr "Fecha" @@ -1254,6 +1300,46 @@ msgstr "Establecer su presencia y estado actual" msgid "Custom messages..." msgstr "Mensajes personalizados…" +#: ../libempathy-gtk/empathy-sound.c:51 +msgid "Received an instant message" +msgstr "Mensaje instantáneo recibido" + +#: ../libempathy-gtk/empathy-sound.c:53 +msgid "Sent an instant message" +msgstr "Enviar un mensaje instantáneo" + +#: ../libempathy-gtk/empathy-sound.c:55 +msgid "Incoming chat request" +msgstr "Solicitud de chat entrante" + +#: ../libempathy-gtk/empathy-sound.c:57 +msgid "Contact connected" +msgstr "Contacto conectado" + +#: ../libempathy-gtk/empathy-sound.c:59 +msgid "Contact disconnected" +msgstr "Contacto desconectado" + +#: ../libempathy-gtk/empathy-sound.c:61 +msgid "Connected to server" +msgstr "Conectado con el servidor" + +#: ../libempathy-gtk/empathy-sound.c:63 +msgid "Disconnected from server" +msgstr "Desconectado del servidor" + +#: ../libempathy-gtk/empathy-sound.c:65 +msgid "Incoming voice call" +msgstr "Llamada de voz entrante" + +#: ../libempathy-gtk/empathy-sound.c:67 +msgid "Outgoing voice call" +msgstr "Llamada de voz saliente" + +#: ../libempathy-gtk/empathy-sound.c:69 +msgid "Voice call ended" +msgstr "Finalizó la llamada de vz" + #: ../libempathy-gtk/empathy-status-preset-dialog.c:362 msgid "Enter Custom Message" msgstr "Introducir mensaje personalizado" @@ -1278,78 +1364,34 @@ msgstr "gtk-add" msgid "gtk-remove" msgstr "gtk-remove" -#: ../libempathy-gtk/empathy-theme-manager.c:66 +#: ../libempathy-gtk/empathy-theme-manager.c:67 msgid "Classic" msgstr "Clásico" -#: ../libempathy-gtk/empathy-theme-manager.c:67 +#: ../libempathy-gtk/empathy-theme-manager.c:68 msgid "Simple" msgstr "Simple" -#: ../libempathy-gtk/empathy-theme-manager.c:68 +#: ../libempathy-gtk/empathy-theme-manager.c:69 msgid "Clean" msgstr "Limpio" -#: ../libempathy-gtk/empathy-theme-manager.c:69 +#: ../libempathy-gtk/empathy-theme-manager.c:70 msgid "Blue" msgstr "Azul" -#: ../libempathy-gtk/empathy-theme-manager.c:71 -msgid "Adium" -msgstr "Adium" - -#: ../libempathy-gtk/empathy-ui-utils.c:1378 +#: ../libempathy-gtk/empathy-ui-utils.c:1377 msgid "Unable to open URI" msgstr "No se pudo abrir el URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1468 +#: ../libempathy-gtk/empathy-ui-utils.c:1467 msgid "Select a file" msgstr "Seleccionar un archivo" -#: ../libempathy-gtk/empathy-ui-utils.c:1526 +#: ../libempathy-gtk/empathy-ui-utils.c:1525 msgid "Select a destination" msgstr "Seleccionar un destino" -#: ../libempathy-gtk/empathy-ui-utils.c:1555 -msgid "Received an instant message" -msgstr "Mensaje instantáneo recibido" - -#: ../libempathy-gtk/empathy-ui-utils.c:1557 -msgid "Sent an instant message" -msgstr "Enviar un mensaje instantáneo" - -#: ../libempathy-gtk/empathy-ui-utils.c:1559 -msgid "Incoming chat request" -msgstr "Solicitud de chat entrante" - -#: ../libempathy-gtk/empathy-ui-utils.c:1561 -msgid "Contact connected" -msgstr "Contacto conectado" - -#: ../libempathy-gtk/empathy-ui-utils.c:1563 -msgid "Contact disconnected" -msgstr "Contacto desconectado" - -#: ../libempathy-gtk/empathy-ui-utils.c:1565 -msgid "Connected to server" -msgstr "Conectado con el servidor" - -#: ../libempathy-gtk/empathy-ui-utils.c:1567 -msgid "Disconnected from server" -msgstr "Desconectado del servidor" - -#: ../libempathy-gtk/empathy-ui-utils.c:1569 -msgid "Incoming voice call" -msgstr "Llamada de voz entrante" - -#: ../libempathy-gtk/empathy-ui-utils.c:1571 -msgid "Outgoing voice call" -msgstr "Llamada de voz saliente" - -#: ../libempathy-gtk/empathy-ui-utils.c:1573 -msgid "Voice call ended" -msgstr "Finalizó la llamada de vz" - #: ../libempathy-gtk/totem-subtitle-encoding.c:158 msgid "Current Locale" msgstr "Configuración regional actual" @@ -1536,7 +1578,7 @@ msgid "Megaphone" msgstr "Megáfono" #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2 -#: ../megaphone/src/megaphone-applet.c:527 +#: ../megaphone/src/megaphone-applet.c:519 msgid "Talk!" msgstr "Hablar" @@ -1571,19 +1613,19 @@ msgstr "Presencia" msgid "Set your own presence" msgstr "Establezca su propia presencia" -#: ../src/empathy.c:478 +#: ../src/empathy.c:506 msgid "Don't connect on startup" msgstr "No conectarse automáticamente al inicio" -#: ../src/empathy.c:482 +#: ../src/empathy.c:510 msgid "Don't show the contact list on startup" msgstr "No mostrar la lista de contactos al inicio" -#: ../src/empathy.c:486 +#: ../src/empathy.c:514 msgid "Show the accounts dialog" msgstr "Mostrar el diálogo de las cuentas" -#: ../src/empathy.c:498 +#: ../src/empathy.c:526 msgid "- Empathy Instant Messenger" msgstr "- MensajerÃa instantánea Empathy" @@ -1629,11 +1671,11 @@ msgstr "Un cliente de mensajerÃa instantánea para GNOME" msgid "translator-credits" msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2007-2009" -#: ../src/empathy-accounts-dialog.c:393 +#: ../src/empathy-accounts-dialog.c:392 msgid "Enabled" msgstr "Activado" -#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-accounts-dialog.ui.h:1 +#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1 msgid "Accounts" msgstr "Cuentas" @@ -1666,7 +1708,6 @@ msgstr "" "Si decidiera volver a añadir la cuenta más tarde, estarán aún disponibles." #: ../src/empathy-accounts-dialog.ui.h:2 -#| msgid "Account" msgid "Add Account" msgstr "Añadir cuenta" @@ -1675,7 +1716,6 @@ msgid "Cr_eate" msgstr "Cr_ear" #: ../src/empathy-accounts-dialog.ui.h:4 -#| msgid "Email:" msgid "Gmail" msgstr "Gmail" @@ -1684,12 +1724,10 @@ msgid "Import Accounts..." msgstr "Importar cuentas…" #: ../src/empathy-accounts-dialog.ui.h:6 -#| msgid "<b>No protocol installed</b>" msgid "No protocol installed" msgstr "No hay protocolos instalados" #: ../src/empathy-accounts-dialog.ui.h:7 -#| msgid "<b>Settings</b>" msgid "Settings" msgstr "Ajustes" @@ -1717,53 +1755,53 @@ msgstr "_Crear una cuenta nueva" msgid "_Reuse an existing account" msgstr "_Usar una cuenta ya existente" -#: ../src/empathy-call-window.c:63 -msgid "Connecting..." -msgstr "Conectando…" - -#: ../src/empathy-call-window.c:415 +#: ../src/empathy-call-window.c:420 msgid "Contrast" msgstr "Contraste" -#: ../src/empathy-call-window.c:418 +#: ../src/empathy-call-window.c:423 msgid "Brightness" msgstr "Brillo" -#: ../src/empathy-call-window.c:421 +#: ../src/empathy-call-window.c:426 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-call-window.c:526 +#: ../src/empathy-call-window.c:531 msgid "Volume" msgstr "Volumen" -#: ../src/empathy-call-window.c:728 +#: ../src/empathy-call-window.c:662 +msgid "Connecting..." +msgstr "Conectando…" + +#: ../src/empathy-call-window.c:746 msgid "_Sidebar" msgstr "Barra _lateral" -#: ../src/empathy-call-window.c:747 +#: ../src/empathy-call-window.c:765 msgid "Dialpad" msgstr "Teclado de llamada" -#: ../src/empathy-call-window.c:753 +#: ../src/empathy-call-window.c:771 msgid "Audio input" msgstr "Entrada de sonido" -#: ../src/empathy-call-window.c:757 +#: ../src/empathy-call-window.c:775 msgid "Video input" msgstr "Entrada de vÃdeo" -#: ../src/empathy-call-window.c:820 +#: ../src/empathy-call-window.c:836 #, c-format msgid "Call with %s" msgstr "Llamar con %s" -#: ../src/empathy-call-window.c:889 +#: ../src/empathy-call-window.c:905 msgid "Call" msgstr "Llamar" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1308 +#: ../src/empathy-call-window.c:1336 #, c-format msgid "Connected — %d:%02dm" msgstr "Conectado — %d:%02dm" @@ -1796,12 +1834,12 @@ msgstr "_Llamar" msgid "_View" msgstr "_Ver" -#: ../src/empathy-chat-window.c:343 +#: ../src/empathy-chat-window.c:344 #, c-format msgid "Conversations (%d)" msgstr "Conversaciones (%d)" -#: ../src/empathy-chat-window.c:475 +#: ../src/empathy-chat-window.c:476 msgid "Typing a message." msgstr "Tecleando un mensaje." @@ -1821,75 +1859,75 @@ msgstr "Autoconectar" msgid "Manage Favorite Rooms" msgstr "Gestionar salas favoritas" -#: ../src/empathy-event-manager.c:377 +#: ../src/empathy-event-manager.c:321 msgid "Incoming call" msgstr "Llamada entrante" -#: ../src/empathy-event-manager.c:380 +#: ../src/empathy-event-manager.c:324 #, c-format msgid "%s is calling you, do you want to answer?" msgstr "%s le está llamando, ¿quiere responder?" -#: ../src/empathy-event-manager.c:387 +#: ../src/empathy-event-manager.c:331 msgid "_Reject" msgstr "_Rechazar" -#: ../src/empathy-event-manager.c:393 +#: ../src/empathy-event-manager.c:337 msgid "_Answer" msgstr "Re_spuesta" -#: ../src/empathy-event-manager.c:505 +#: ../src/empathy-event-manager.c:452 #, c-format msgid "Incoming call from %s" msgstr "Llamada entrante de %s" -#: ../src/empathy-event-manager.c:545 +#: ../src/empathy-event-manager.c:496 #, c-format msgid "%s is offering you an invitation" msgstr "%s le está ofreciendo una invitación" -#: ../src/empathy-event-manager.c:551 +#: ../src/empathy-event-manager.c:502 msgid "An external application will be started to handle it." msgstr "Se iniciará una aplicación externa para manejarla." -#: ../src/empathy-event-manager.c:556 +#: ../src/empathy-event-manager.c:507 msgid "You don't have the needed external application to handle it." msgstr "No tiene la aplicación externa necesaria para manejarla." -#: ../src/empathy-event-manager.c:683 +#: ../src/empathy-event-manager.c:634 msgid "Room invitation" msgstr "Invitación a una sala" -#: ../src/empathy-event-manager.c:686 +#: ../src/empathy-event-manager.c:637 #, c-format msgid "%s is inviting you to join %s" msgstr "%s le está invitando a unirse a %s" -#: ../src/empathy-event-manager.c:694 +#: ../src/empathy-event-manager.c:645 msgid "_Decline" msgstr "_Rechazar" -#: ../src/empathy-event-manager.c:699 +#: ../src/empathy-event-manager.c:650 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Unirse" -#: ../src/empathy-event-manager.c:738 +#: ../src/empathy-event-manager.c:689 #, c-format msgid "%s invited you to join %s" msgstr "%s le ha invitado a unirse a %s" -#: ../src/empathy-event-manager.c:764 +#: ../src/empathy-event-manager.c:715 #, c-format msgid "Incoming file transfer from %s" msgstr "Transferencia de archivo entrante de %s" -#: ../src/empathy-event-manager.c:944 +#: ../src/empathy-event-manager.c:895 #, c-format msgid "Subscription requested by %s" msgstr "Petición de suscripción de %s" -#: ../src/empathy-event-manager.c:948 +#: ../src/empathy-event-manager.c:899 #, c-format msgid "" "\n" @@ -1898,6 +1936,18 @@ msgstr "" "\n" "Mensaje: %s" +#. someone is logging off +#: ../src/empathy-event-manager.c:935 +#, c-format +msgid "%s is now offline." +msgstr "Ahora %s está desconectado." + +#. someone is logging in +#: ../src/empathy-event-manager.c:951 +#, c-format +msgid "%s is now online." +msgstr "Ahora %s está conectado." + #. Translators: time left, when it is more than one hour #: ../src/empathy-ft-manager.c:101 #, c-format @@ -2002,7 +2052,6 @@ msgid "Remaining" msgstr "Restantes" #: ../src/empathy-ft-manager.ui.h:1 -#| msgid "_File Transfers" msgid "File Transfers" msgstr "Transferencias de archivos" @@ -2013,19 +2062,19 @@ msgstr "" "lista" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-dialog.c:259 +#: ../src/empathy-import-dialog.c:263 msgid "Import" msgstr "Importar" -#: ../src/empathy-import-dialog.c:268 +#: ../src/empathy-import-dialog.c:272 msgid "Protocol" msgstr "Protocolo" -#: ../src/empathy-import-dialog.c:294 +#: ../src/empathy-import-dialog.c:298 msgid "Source" msgstr "Origen" -#: ../src/empathy-import-dialog.c:388 +#: ../src/empathy-import-dialog.c:392 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -2037,71 +2086,71 @@ msgstr "" msgid "Import Accounts" msgstr "Importar cuentas" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-main-window.c:396 msgid "_Edit account" msgstr "_Editar cuenta" -#: ../src/empathy-main-window.c:498 +#: ../src/empathy-main-window.c:499 msgid "No error specified" msgstr "No se especificó el error" -#: ../src/empathy-main-window.c:501 +#: ../src/empathy-main-window.c:502 msgid "Network error" msgstr "Error de red" -#: ../src/empathy-main-window.c:504 +#: ../src/empathy-main-window.c:505 msgid "Authentication failed" msgstr "Falló la autenticación" -#: ../src/empathy-main-window.c:507 +#: ../src/empathy-main-window.c:508 msgid "Encryption error" msgstr "Error de cifrado" -#: ../src/empathy-main-window.c:510 +#: ../src/empathy-main-window.c:511 msgid "Name in use" msgstr "Nombre en uso" -#: ../src/empathy-main-window.c:513 +#: ../src/empathy-main-window.c:514 msgid "Certificate not provided" msgstr "No se proporcionó el certificado" -#: ../src/empathy-main-window.c:516 +#: ../src/empathy-main-window.c:517 msgid "Certificate untrusted" msgstr "Certificado sin confianza" -#: ../src/empathy-main-window.c:519 +#: ../src/empathy-main-window.c:520 msgid "Certificate expired" msgstr "El certificado ha expirado" -#: ../src/empathy-main-window.c:522 +#: ../src/empathy-main-window.c:523 msgid "Certificate not activated" msgstr "El certificado no está activado" -#: ../src/empathy-main-window.c:525 +#: ../src/empathy-main-window.c:526 msgid "Certificate hostname mismatch" msgstr "El nombre del equipo del certificado no coincide" -#: ../src/empathy-main-window.c:528 +#: ../src/empathy-main-window.c:529 msgid "Certificate fingerprint mismatch" msgstr "La huella del certificado no coincide" -#: ../src/empathy-main-window.c:531 +#: ../src/empathy-main-window.c:532 msgid "Certificate self-signed" msgstr "Certificado firmado consigo mismo" -#: ../src/empathy-main-window.c:534 +#: ../src/empathy-main-window.c:535 msgid "Certificate error" msgstr "Error del certificado" -#: ../src/empathy-main-window.c:537 +#: ../src/empathy-main-window.c:538 msgid "Unknown error" msgstr "Error desconocido" -#: ../src/empathy-main-window.c:1220 +#: ../src/empathy-main-window.c:1218 msgid "Show and edit accounts" msgstr "Mostrar y editar cuentas" -#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10 +#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:9 msgid "Contact List" msgstr "Lista de contactos" @@ -2169,15 +2218,15 @@ msgstr "Conversaciones an_teriores" msgid "_Room" msgstr "_Sala" -#: ../src/empathy-new-chatroom-dialog.c:332 +#: ../src/empathy-new-chatroom-dialog.c:331 msgid "Chat Room" msgstr "Sala de chat" -#: ../src/empathy-new-chatroom-dialog.c:348 +#: ../src/empathy-new-chatroom-dialog.c:347 msgid "Members" msgstr "Miembros" -#: ../src/empathy-new-chatroom-dialog.c:492 +#: ../src/empathy-new-chatroom-dialog.c:496 #, c-format msgctxt "" "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no " @@ -2193,21 +2242,21 @@ msgstr "" "Contraseña necesaria: %s\n" "Miembros: %s" -#: ../src/empathy-new-chatroom-dialog.c:494 -#: ../src/empathy-new-chatroom-dialog.c:495 +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 msgid "Yes" msgstr "SÃ" -#: ../src/empathy-new-chatroom-dialog.c:494 -#: ../src/empathy-new-chatroom-dialog.c:495 +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 msgid "No" msgstr "No" -#: ../src/empathy-new-chatroom-dialog.c:522 +#: ../src/empathy-new-chatroom-dialog.c:526 msgid "Could not start room listing" msgstr "No se pudo iniciar la lista de la sala" -#: ../src/empathy-new-chatroom-dialog.c:532 +#: ../src/empathy-new-chatroom-dialog.c:536 msgid "Could not stop room listing" msgstr "No se pudo parar la lista de la sala" @@ -2242,119 +2291,113 @@ msgstr "Lista de salas" msgid "_Room:" msgstr "_Sala:" -#: ../src/empathy-preferences.c:159 +#: ../src/empathy-preferences.c:161 msgid "Message received" msgstr "Mensaje recibido" -#: ../src/empathy-preferences.c:160 +#: ../src/empathy-preferences.c:162 msgid "Message sent" msgstr "Mensaje enviado" -#: ../src/empathy-preferences.c:161 +#: ../src/empathy-preferences.c:163 msgid "New conversation" msgstr "Conversación nueva" -#: ../src/empathy-preferences.c:162 +#: ../src/empathy-preferences.c:164 msgid "Contact goes online" msgstr "El contacto se conecta" -#: ../src/empathy-preferences.c:163 +#: ../src/empathy-preferences.c:165 msgid "Contact goes offline" msgstr "El contacto se desconecta" -#: ../src/empathy-preferences.c:164 +#: ../src/empathy-preferences.c:166 msgid "Account connected" msgstr "Cuenta conectada" -#: ../src/empathy-preferences.c:165 +#: ../src/empathy-preferences.c:167 msgid "Account disconnected" msgstr "Cuenta desconectada" -#: ../src/empathy-preferences.c:432 +#: ../src/empathy-preferences.c:446 msgid "Language" msgstr "Idioma" #: ../src/empathy-preferences.ui.h:1 -msgid "Adium theme to use:" -msgstr "Tema adium que usar:" - -#: ../src/empathy-preferences.ui.h:2 msgid "Allow _GPS usage" msgstr "Permitir el usso de _GPS" -#: ../src/empathy-preferences.ui.h:3 +#: ../src/empathy-preferences.ui.h:2 msgid "Allow _cellphone usage" msgstr "Permitir el uso de teléfono _móvil" -#: ../src/empathy-preferences.ui.h:4 +#: ../src/empathy-preferences.ui.h:3 msgid "Allow _network usage" msgstr "Permitir el uso de la _red" -#: ../src/empathy-preferences.ui.h:5 -#| msgid "<b>Appearance</b>" +#: ../src/empathy-preferences.ui.h:4 msgid "Appearance" msgstr "Apariencia" -#: ../src/empathy-preferences.ui.h:6 +#: ../src/empathy-preferences.ui.h:5 msgid "Automatically _connect on startup " msgstr "_Conectarse automáticamente al inicio" -#: ../src/empathy-preferences.ui.h:7 +#: ../src/empathy-preferences.ui.h:6 msgid "Avatars are user chosen images shown in the contact list" msgstr "" "Los avatares son imágenes elegidas por el usuario que se muestran en la " "lista de contactos" -#: ../src/empathy-preferences.ui.h:8 -#| msgid "<b>Behavior</b>" +#: ../src/empathy-preferences.ui.h:7 msgid "Behavior" msgstr "Comportamiento" -#: ../src/empathy-preferences.ui.h:9 +#: ../src/empathy-preferences.ui.h:8 msgid "Chat Th_eme:" msgstr "_Tema del chat:" -#: ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-preferences.ui.h:10 msgid "Disable notifications when _away or busy" msgstr "Desactivar notificaciones al _ausentarse o estar ocupado" -#: ../src/empathy-preferences.ui.h:12 +#: ../src/empathy-preferences.ui.h:11 msgid "Disable sounds when _away or busy" msgstr "Desactivar sonidos al _ausentarse o estar ocupado" +#: ../src/empathy-preferences.ui.h:12 +msgid "Enable notifications when a contact comes online" +msgstr "Activar notificaciones cuando un contacto se conecta" + #: ../src/empathy-preferences.ui.h:13 +msgid "Enable notifications when a contact goes offline" +msgstr "Activar notificaciones cuando un contacto se desconecta" + +#: ../src/empathy-preferences.ui.h:14 msgid "Enable notifications when the _chat is not focused" msgstr "Activar notificaciones cuando el _chat no tenga el foco" -#: ../src/empathy-preferences.ui.h:14 -#| msgid "<b>Enable spell checking for languages:</b>" +#: ../src/empathy-preferences.ui.h:15 msgid "Enable spell checking for languages:" msgstr "Activar la revisión ortográfica para idiomas:" -#: ../src/empathy-preferences.ui.h:15 +#: ../src/empathy-preferences.ui.h:16 msgid "General" msgstr "General" -#: ../src/empathy-preferences.ui.h:16 -#| msgid "<b>Geoclue Settings</b>" +#: ../src/empathy-preferences.ui.h:17 msgid "Geoclue Settings" msgstr "Configuración de Geoclue" -#: ../src/empathy-preferences.ui.h:17 +#: ../src/empathy-preferences.ui.h:18 msgid "Location" msgstr "Ubicación" -#: ../src/empathy-preferences.ui.h:18 -#| msgid "<span foreground=\"red\">Not a valid adium theme</span>" -msgid "Not a valid adium theme" -msgstr "No es un tema adium válido" - #: ../src/empathy-preferences.ui.h:19 msgid "Notifications" msgstr "Notificaciones" #: ../src/empathy-preferences.ui.h:20 -#| msgid "<b>Play sound for events</b>" msgid "Play sound for events" msgstr "Reproducir sonido para eventos" @@ -2363,15 +2406,10 @@ msgid "Preferences" msgstr "Preferencias" #: ../src/empathy-preferences.ui.h:22 -#| msgid "<b>Privacy</b>" msgid "Privacy" msgstr "Privacidad" #: ../src/empathy-preferences.ui.h:23 -#| msgid "" -#| "<small>Reduced location accuracy means that nothing more precise than " -#| "your city, state and country will be published. GPS coordinates will " -#| "have a random value added (±0.25°).</small>" msgid "" "Reduced location accuracy means that nothing more precise than your city, " "state and country will be published. GPS coordinates will have a random " @@ -2394,7 +2432,6 @@ msgid "Show co_mpact contact list" msgstr "Mostrar lista de contactos co_mpacta" #: ../src/empathy-preferences.ui.h:27 -#| msgid "_Show Contact List" msgid "Show contact _list in rooms" msgstr "Mostrar _lista de contactos en salas" @@ -2415,9 +2452,6 @@ msgid "Spell Checking" msgstr "Revisión ortográfica" #: ../src/empathy-preferences.ui.h:32 -#| msgid "" -#| "<small>The list of languages reflects only the languages for which you " -#| "have a dictionary installed.</small>" msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." @@ -2483,64 +2517,64 @@ msgstr "gtk-leave-fullscreen" msgid "Contact Map View" msgstr "Vista del mapa de contactos" -#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1075 +#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083 msgid "Error" msgstr "Error" -#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1069 +#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077 msgid "Critical" msgstr "CrÃtico" -#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1063 +#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071 msgid "Warning" msgstr "Advertencia" -#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1057 -#: ../src/empathy-debug-dialog.c:1105 +#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065 +#: ../src/empathy-debug-dialog.c:1113 msgid "Message" msgstr "Mensaje" -#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1051 +#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059 msgid "Info" msgstr "Información" -#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1045 +#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053 msgid "Debug" msgstr "Depurar" -#: ../src/empathy-debug-dialog.c:837 +#: ../src/empathy-debug-dialog.c:845 msgid "Save" msgstr "Guardar" -#: ../src/empathy-debug-dialog.c:940 +#: ../src/empathy-debug-dialog.c:948 msgid "Debug Window" msgstr "Depurar ventana" -#: ../src/empathy-debug-dialog.c:1013 +#: ../src/empathy-debug-dialog.c:1021 msgid "Pause" msgstr "Pausar" -#: ../src/empathy-debug-dialog.c:1025 +#: ../src/empathy-debug-dialog.c:1033 msgid "Level " msgstr "Nivel " -#: ../src/empathy-debug-dialog.c:1094 +#: ../src/empathy-debug-dialog.c:1102 msgid "Time" msgstr "Hora" -#: ../src/empathy-debug-dialog.c:1096 +#: ../src/empathy-debug-dialog.c:1104 msgid "Domain" msgstr "Dominio" -#: ../src/empathy-debug-dialog.c:1098 +#: ../src/empathy-debug-dialog.c:1106 msgid "Category" msgstr "CategorÃa" -#: ../src/empathy-debug-dialog.c:1100 +#: ../src/empathy-debug-dialog.c:1108 msgid "Level" msgstr "Nivel" -#: ../src/empathy-debug-dialog.c:1132 +#: ../src/empathy-debug-dialog.c:1140 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -2548,6 +2582,15 @@ msgstr "" "El gestor de conexiones seleccionado no soporta la extensión de depuración " "remota." +#~ msgid "Adium" +#~ msgstr "Adium" + +#~ msgid "Adium theme to use:" +#~ msgstr "Tema adium que usar:" + +#~ msgid "Not a valid adium theme" +#~ msgstr "No es un tema adium válido" + #~ msgid "<b>Network</b>" #~ msgstr "<b>Red</b>" @@ -15,16 +15,17 @@ # Frederic Peters <fpeters@0d.be>, 2007-2008. # Laurent Bigonville <bigon@bigon.be>, 2007. # Stéphane Raimbault <stephane.raimbault@gmail.com>, 2007. -# Christophe Benz <christophe.benz@gmail.com>, 2007. +# Christophe Benz <christophe.benz@gmail.com>, 2007-2009. # Yannick Tailliez <ytdispatch-libre@yahoo.com>, 2008. # Laurent Coudeur <laurentc@iol.ie>, 2009. # msgid "" msgstr "" "Project-Id-Version: empathy HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-17 21:38+0100\n" -"PO-Revision-Date: 2009-02-17 21:43+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=empathy&component=general\n" +"POT-Creation-Date: 2009-07-02 19:42+0000\n" +"PO-Revision-Date: 2009-07-06 12:06+0200\n" "Last-Translator: Claude Paroz <claude@2xlibre.net>\n" "Language-Team: GNOME French Team <gnomefr@traduc.org>\n" "MIME-Version: 1.0\n" @@ -87,128 +88,189 @@ msgid "Disable sounds when away" msgstr "Désactiver les sons en mode absent" #: ../data/empathy.schemas.in.h:10 +msgid "Empathy can publish the user's location" +msgstr "Empathy peut publier l'emplacement de l'utilisateur" + +#: ../data/empathy.schemas.in.h:11 +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy peut utiliser le GPS pour découvrir l'emplacement" + +#: ../data/empathy.schemas.in.h:12 +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy peut utiliser le réseau cellulaire pour découvrir l'emplacement" + +#: ../data/empathy.schemas.in.h:13 +msgid "Empathy can use the network to guess the location" +msgstr "Empathy peut utiliser le réseau pour découvrir l'emplacement" + +#: ../data/empathy.schemas.in.h:14 msgid "Empathy default download folder" msgstr "Dossier de téléchargement par défaut d'Empathy" -#: ../data/empathy.schemas.in.h:11 +#: ../data/empathy.schemas.in.h:15 msgid "Empathy has asked about importing accounts" msgstr "Empathy a demandé à importer des comptes" -#: ../data/empathy.schemas.in.h:12 +#: ../data/empathy.schemas.in.h:16 msgid "Empathy should auto-connect on startup" msgstr "Empathy doit se connecter automatiquement au démarrage" -#: ../data/empathy.schemas.in.h:13 +#: ../data/empathy.schemas.in.h:17 +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy doit réduire la précision de l'emplacement" + +#: ../data/empathy.schemas.in.h:18 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "" "Empathy doit utiliser l'avatar du contact comme icône de fenêtre de " "discussion" -#: ../data/empathy.schemas.in.h:14 +#: ../data/empathy.schemas.in.h:19 msgid "Enable popup notifications for new messages" msgstr "Activer les bulles de notification pour les nouveaux messages" -#: ../data/empathy.schemas.in.h:15 +#: ../data/empathy.schemas.in.h:20 msgid "Enable spell checker" msgstr "Activer le correcteur orthographique" -#: ../data/empathy.schemas.in.h:16 +#: ../data/empathy.schemas.in.h:21 msgid "Hide main window" msgstr "Masquer la fenêtre principale" -#: ../data/empathy.schemas.in.h:17 +#: ../data/empathy.schemas.in.h:22 msgid "Hide the main window." msgstr "Masque la fenêtre principale." -#: ../data/empathy.schemas.in.h:18 +#: ../data/empathy.schemas.in.h:23 msgid "NetworkManager should be used" msgstr "NetworkManager devrait être utilisé" -#: ../data/empathy.schemas.in.h:19 +#: ../data/empathy.schemas.in.h:24 msgid "Nick completed character" msgstr "Caractère d'auto-complétion du pseudonyme" -#: ../data/empathy.schemas.in.h:20 +#: ../data/empathy.schemas.in.h:25 msgid "Open new chats in separate windows" msgstr "Ouvrir les nouvelles discussions dans des fenêtres séparées" -#: ../data/empathy.schemas.in.h:21 +#: ../data/empathy.schemas.in.h:26 +msgid "Path of the adium theme to use" +msgstr "Chemin vers le thème Adium à utiliser" + +#: ../data/empathy.schemas.in.h:27 +msgid "Path of the adium theme to use if the theme used for chat is adium." +msgstr "" +"Chemin vers le thème Adium à utiliser si un thème Adium est choisi pour les discussions." + +#: ../data/empathy.schemas.in.h:28 msgid "Play a sound for incoming messages" msgstr "Jouer un son lors de la réception des messages" -#: ../data/empathy.schemas.in.h:22 +#: ../data/empathy.schemas.in.h:29 msgid "Play a sound for new conversations" msgstr "Jouer un son lors de nouvelles discussions" -#: ../data/empathy.schemas.in.h:23 +#: ../data/empathy.schemas.in.h:30 msgid "Play a sound for outgoing messages" msgstr "Jouer un son lors de l'envoi des messages" -#: ../data/empathy.schemas.in.h:24 +#: ../data/empathy.schemas.in.h:31 msgid "Play a sound when a contact logs in" msgstr "Jouer un son lorsqu'un contact se connecte" -#: ../data/empathy.schemas.in.h:25 +#: ../data/empathy.schemas.in.h:32 msgid "Play a sound when a contact logs out" msgstr "Jouer un son lorsqu'un contact se déconnecte" -#: ../data/empathy.schemas.in.h:26 +#: ../data/empathy.schemas.in.h:33 msgid "Play a sound when we log in" msgstr "Jouer un son lors de la connexion" -#: ../data/empathy.schemas.in.h:27 +#: ../data/empathy.schemas.in.h:34 msgid "Play a sound when we log out" msgstr "Jouer un son lors de la déconnexion" -#: ../data/empathy.schemas.in.h:28 +#: ../data/empathy.schemas.in.h:35 msgid "Popup notifications if the chat isn't focused" msgstr "Bulles de notification si la discussion n'a pas le focus" -#: ../data/empathy.schemas.in.h:29 +#: ../data/empathy.schemas.in.h:36 +msgid "Popup notifications when a contact sign in" +msgstr "Bulles de notification lorsqu'un contact se connecte" + +#: ../data/empathy.schemas.in.h:37 +msgid "Popup notifications when a contact sign out" +msgstr "Bulles de notification lorsqu'un contact se déconnecte" + +#: ../data/empathy.schemas.in.h:38 msgid "Salut account is created" msgstr "Le compte Salut est créé" -#: ../data/empathy.schemas.in.h:30 +#: ../data/empathy.schemas.in.h:39 msgid "Show avatars" msgstr "Afficher les avatars" -#: ../data/empathy.schemas.in.h:31 +#: ../data/empathy.schemas.in.h:40 +msgid "Show contact list in rooms" +msgstr "Afficher la liste des contacts dans les salles" + +#: ../data/empathy.schemas.in.h:41 msgid "Show hint about closing the main window" msgstr "Afficher une astuce sur la fermeture de la fenêtre principale" -#: ../data/empathy.schemas.in.h:32 +#: ../data/empathy.schemas.in.h:42 msgid "Show offline contacts" msgstr "Afficher les contacts déconnectés" -#: ../data/empathy.schemas.in.h:33 +#: ../data/empathy.schemas.in.h:43 msgid "Spell checking languages" msgstr "Langues de la correction orthographique" -#: ../data/empathy.schemas.in.h:34 +#: ../data/empathy.schemas.in.h:44 msgid "The default folder to save file transfers in." msgstr "Le dossier par défaut pour enregistrer les transferts de fichiers." -#: ../data/empathy.schemas.in.h:35 +#: ../data/empathy.schemas.in.h:45 msgid "The last directory that an avatar image was chosen from." msgstr "Dernier répertoire où un avatar a été choisi." -#: ../data/empathy.schemas.in.h:36 +#: ../data/empathy.schemas.in.h:46 msgid "The theme that is used to display the conversation in chat windows." msgstr "Le thème utilisé pour l'affichage dans les fenêtres de discussion." -#: ../data/empathy.schemas.in.h:37 +#: ../data/empathy.schemas.in.h:47 msgid "Use graphical smileys" msgstr "Utiliser des frimousses graphiques" -#: ../data/empathy.schemas.in.h:38 +#: ../data/empathy.schemas.in.h:48 msgid "Use notification sounds" msgstr "Utiliser des sons de notification" -#: ../data/empathy.schemas.in.h:39 +#: ../data/empathy.schemas.in.h:49 msgid "Use theme for chat rooms" msgstr "Utiliser des thèmes pour les salles de discussion" -#: ../data/empathy.schemas.in.h:40 +#: ../data/empathy.schemas.in.h:50 +msgid "Whether or not Empathy can publish the user's location to his contacts." +msgstr "" +"Indique si Empathy peut publier l'emplacement de l'utilisateur à ses contacts." + +#: ../data/empathy.schemas.in.h:51 +msgid "Whether or not Empathy can use the GPS to guess the location." +msgstr "Indique si Empathy peut utiliser le GPS pour découvrir l'emplacement." + +#: ../data/empathy.schemas.in.h:52 +msgid "" +"Whether or not Empathy can use the cellular network to guess the location." +msgstr "" +"Indique si Empathy peut utiliser le réseau cellulaire pour découvrir l'emplacement." + +#: ../data/empathy.schemas.in.h:53 +msgid "Whether or not Empathy can use the network to guess the location." +msgstr "" +"Indique si Empathy peut utiliser le réseau pour découvrir l'emplacement." + +#: ../data/empathy.schemas.in.h:54 msgid "" "Whether or not Empathy has asked about importing accounts from other " "programs." @@ -216,7 +278,7 @@ msgstr "" "Indique si Empathy a demandé l'importation de comptes provenant d'autres " "logiciels." -#: ../data/empathy.schemas.in.h:41 +#: ../data/empathy.schemas.in.h:55 msgid "" "Whether or not Empathy should automatically log in to your accounts on " "startup." @@ -224,7 +286,15 @@ msgstr "" "Indique si Empathy doit se connecter automatiquement à vos comptes au " "démarrage." -#: ../data/empathy.schemas.in.h:42 +#: ../data/empathy.schemas.in.h:56 +msgid "" +"Whether or not Empathy should reduce the location's accuracy for privacy " +"reasons." +msgstr "" +"Indique si Empathy doit réduire la précision de l'emplacement pour des raisons " +"de confidentialité." + +#: ../data/empathy.schemas.in.h:57 msgid "" "Whether or not Empathy should use the avatar of the contact as the chat " "window icon." @@ -232,12 +302,12 @@ msgstr "" "Indique si Empathy doit utiliser l'avatar des contacts comme icône de " "fenêtre de discussion." -#: ../data/empathy.schemas.in.h:43 +#: ../data/empathy.schemas.in.h:58 msgid "" "Whether or not the Salut account has been created on the first Empathy run." msgstr "Indique si le compte Salut a été créé au premier lancement d'Empathy." -#: ../data/empathy.schemas.in.h:44 +#: ../data/empathy.schemas.in.h:59 msgid "" "Whether or not the network manager should be used to automatically " "disconnect/reconnect." @@ -245,7 +315,7 @@ msgstr "" "Indique si NetworkManager doit être utilisé pour se déconnecter ou se " "reconnecter automatiquement." -#: ../data/empathy.schemas.in.h:45 +#: ../data/empathy.schemas.in.h:60 msgid "" "Whether or not to check words typed against the languages you want to check " "with." @@ -253,21 +323,21 @@ msgstr "" "Indique s'il faut vérifier l'orthographe des mots saisis selon les langues " "choisies." -#: ../data/empathy.schemas.in.h:46 +#: ../data/empathy.schemas.in.h:61 msgid "" "Whether or not to convert smileys into graphical images in conversations." msgstr "" "Indique s'il faut changer les frimousses en images graphiques dans les " "conversations." -#: ../data/empathy.schemas.in.h:47 +#: ../data/empathy.schemas.in.h:62 msgid "" "Whether or not to play a sound to notify for contacts logging in the network." msgstr "" "Indique s'il faut jouer un son pour avertir lorsque des contacts se " "connectent au réseau." -#: ../data/empathy.schemas.in.h:48 +#: ../data/empathy.schemas.in.h:63 msgid "" "Whether or not to play a sound to notify for contacts logging off the " "network." @@ -275,37 +345,48 @@ msgstr "" "Indique s'il faut jouer un son pour avertir lorsque des contacts se " "déconnectent du réseau." -#: ../data/empathy.schemas.in.h:49 +#: ../data/empathy.schemas.in.h:64 msgid "Whether or not to play a sound to notify for events." msgstr "Indique s'il faut jouer un son pour signaler des événements." -#: ../data/empathy.schemas.in.h:50 +#: ../data/empathy.schemas.in.h:65 msgid "Whether or not to play a sound to notify for incoming messages." msgstr "Indique s'il faut jouer un son pour avertir de l'arrivée de messages." -#: ../data/empathy.schemas.in.h:51 +#: ../data/empathy.schemas.in.h:66 msgid "Whether or not to play a sound to notify for new conversations." msgstr "" "Indique s'il faut jouer un son pour signaler de nouvelles conversations." -#: ../data/empathy.schemas.in.h:52 +#: ../data/empathy.schemas.in.h:67 msgid "Whether or not to play a sound to notify for outgoing messages." msgstr "Indique s'il faut jouer un son pour signaler qu'un message est envoyé." -#: ../data/empathy.schemas.in.h:53 +#: ../data/empathy.schemas.in.h:68 msgid "Whether or not to play a sound when logging in a network." msgstr "Indique s'il faut jouer un son lors de la connexion à un réseau." -#: ../data/empathy.schemas.in.h:54 +#: ../data/empathy.schemas.in.h:69 msgid "Whether or not to play a sound when logging off a network." msgstr "Indique s'il faut jouer un son lors de la déconnexion d'un réseau." -#: ../data/empathy.schemas.in.h:55 +#: ../data/empathy.schemas.in.h:70 msgid "Whether or not to play sound notifications when away or busy." msgstr "" "Indique s'il faut émettre des sons en cas d'absence ou d'indisponibilité." -#: ../data/empathy.schemas.in.h:56 +#: ../data/empathy.schemas.in.h:71 +msgid "" +"Whether or not to show a popup notification when a contact goes offline." +msgstr "" +"Indique s'il faut afficher des notifications lorsqu'un contact se déconnecte." + +#: ../data/empathy.schemas.in.h:72 +msgid "Whether or not to show a popup notification when a contact goes online." +msgstr "" +"Indique s'il faut afficher des notifications lorsqu'un contact se connecte." + +#: ../data/empathy.schemas.in.h:73 msgid "" "Whether or not to show a popup notification when receiving a new message " "even if the chat is already opened, but not focused." @@ -313,14 +394,14 @@ msgstr "" "Indique s'il faut afficher une bulle de notification lorsqu'un message est " "reçu, même si la discussion est ouverte, mais sans disposer du focus." -#: ../data/empathy.schemas.in.h:57 +#: ../data/empathy.schemas.in.h:74 msgid "" "Whether or not to show a popup notification when receiving a new message." msgstr "" "Indique s'il faut afficher une bulle de notification lorsqu'un message est " "reçu." -#: ../data/empathy.schemas.in.h:58 +#: ../data/empathy.schemas.in.h:75 msgid "" "Whether or not to show avatars for contacts in the contact list and chat " "windows." @@ -328,19 +409,23 @@ msgstr "" "Indique s'il faut afficher les avatars des contacts dans la liste des " "contacts et les fenêtres de discussion." -#: ../data/empathy.schemas.in.h:59 +#: ../data/empathy.schemas.in.h:76 msgid "Whether or not to show contacts that are offline in the contact list." msgstr "" "Indique s'il faut afficher les contacts qui sont déconnectés dans la liste " "des contacts." -#: ../data/empathy.schemas.in.h:60 +#: ../data/empathy.schemas.in.h:77 msgid "Whether or not to show popup notifications when away or busy." msgstr "" "Indique s'il faut afficher des notifications en cas d'absence ou " "d'indisponibilité." -#: ../data/empathy.schemas.in.h:61 +#: ../data/empathy.schemas.in.h:78 +msgid "Whether or not to show the contact list in chat rooms." +msgstr "Indique s'il faut afficher la liste des contacts dans les salles de discussion." + +#: ../data/empathy.schemas.in.h:79 msgid "" "Whether or not to show the message dialog about closing the main window with " "the 'x' button in the title bar." @@ -348,15 +433,15 @@ msgstr "" "Indique s'il faut afficher la boîte de dialogue au sujet de la fermeture de " "la fenêtre principale avec le bouton « x » dans la barre de titre." -#: ../data/empathy.schemas.in.h:62 +#: ../data/empathy.schemas.in.h:80 msgid "Whether to show the contact list in compact mode or not." msgstr "Indique s'il faut afficher la liste des contacts en mode compact." -#: ../data/empathy.schemas.in.h:63 +#: ../data/empathy.schemas.in.h:81 msgid "Whether to use the theme for chat rooms or not." msgstr "Indique s'il faut utiliser les thèmes pour les salles de discussion." -#: ../data/empathy.schemas.in.h:64 +#: ../data/empathy.schemas.in.h:82 msgid "" "Which criterium to use when sorting the contact list. Default is to use sort " "by the contact's name with the value \"name\". A value of \"state\" will " @@ -366,542 +451,757 @@ msgstr "" "par défaut est de trier selon le nom du contact (valeur: « name »). Une " "valeur « state » triera la liste des contacts selon leur état." -#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269 +#: ../libempathy/empathy-ft-handler.c:838 +msgid "The hash of the received file and the sent one do not match" +msgstr "" +"La somme de contrôle du fichier reçu ne correspond pas à celle du fichier envoyé" + +#: ../libempathy/empathy-ft-handler.c:1098 +msgid "File transfer not supported by remote contact" +msgstr "Le transfert de fichier n'est pas pris en charge par le contact distant" + +#: ../libempathy/empathy-ft-handler.c:1156 +msgid "The selected file is not a regular file" +msgstr "Le fichier sélectionné n'est pas un fichier conventionnel" + +#: ../libempathy/empathy-ft-handler.c:1165 +msgid "The selected file is empty" +msgstr "Le fichier sélectionné est vide" + +#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:289 msgid "People nearby" msgstr "Personnes à proximité" -#: ../libempathy/empathy-utils.c:252 +#: ../libempathy/empathy-tp-file.c:279 +msgid "Socket type not supported" +msgstr "Le type de connecteur réseau (socket) n'est pas pris en charge" + +#: ../libempathy/empathy-tp-file.c:398 +msgid "No reason was specified" +msgstr "Aucune raison n'a été indiquée" + +#: ../libempathy/empathy-tp-file.c:401 +msgid "The change in state was requested" +msgstr "Le changement d'état a été demandé" + +#: ../libempathy/empathy-tp-file.c:404 +msgid "You canceled the file transfer" +msgstr "Vous avez annulé le transfert de fichiers" + +#: ../libempathy/empathy-tp-file.c:407 +msgid "The other participant canceled the file transfer" +msgstr "Le correspondant a annulé le transfert de fichiers" + +#: ../libempathy/empathy-tp-file.c:410 +msgid "Error while trying to transfer the file" +msgstr "Erreur lors du téléchargement du fichier" + +#: ../libempathy/empathy-tp-file.c:413 +msgid "The other participant is unable to transfer the file" +msgstr "Le correspondant n'est pas capable de transférer le fichier" + +#: ../libempathy/empathy-tp-file.c:416 +msgid "Unknown reason" +msgstr "Raison inconnue" + +#: ../libempathy/empathy-utils.c:265 msgid "Available" msgstr "Disponible" -#: ../libempathy/empathy-utils.c:254 +#: ../libempathy/empathy-utils.c:267 msgid "Busy" msgstr "Occupé" -#: ../libempathy/empathy-utils.c:257 +#: ../libempathy/empathy-utils.c:270 msgid "Away" msgstr "Absent" -#: ../libempathy/empathy-utils.c:259 +#: ../libempathy/empathy-utils.c:272 msgid "Hidden" msgstr "Masqué" -#: ../libempathy/empathy-utils.c:262 +#: ../libempathy/empathy-utils.c:274 msgid "Offline" msgstr "Déconnecté" -#: ../libempathy-gtk/empathy-account-chooser.c:326 +#: ../libempathy/empathy-time.c:137 +#, c-format +msgid "%d second ago" +msgid_plural "%d seconds ago" +msgstr[0] "il y a %d seconde" +msgstr[1] "il y a %d secondes" + +#: ../libempathy/empathy-time.c:142 +#, c-format +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "il y a %d minute" +msgstr[1] "il y a %d minutes" + +#: ../libempathy/empathy-time.c:147 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "il y a %d heure" +msgstr[1] "il y a %d heures" + +#: ../libempathy/empathy-time.c:152 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "il y a %d jour" +msgstr[1] "il y a %d jours" + +#: ../libempathy/empathy-time.c:157 +#, c-format +msgid "%d week ago" +msgid_plural "%d weeks ago" +msgstr[0] "il y a %d semaine" +msgstr[1] "il y a %d semaines" + +#: ../libempathy/empathy-time.c:162 +#, c-format +msgid "%d month ago" +msgid_plural "%d months ago" +msgstr[0] "il y a %d mois" +msgstr[1] "il y a %d mois" + +#: ../libempathy/empathy-time.c:167 +msgid "in the future" +msgstr "dans le futur" + +#: ../libempathy-gtk/empathy-account-chooser.c:419 msgid "All" msgstr "Toutes" #: ../libempathy-gtk/empathy-account-widget.c:302 -#: ../libempathy-gtk/empathy-account-widget.c:347 +#: ../libempathy-gtk/empathy-account-widget.c:354 #, c-format msgid "%s:" msgstr "%s :" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1 -msgid "<b>Advanced</b>" -msgstr "<b>Avancé</b>" - -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2 -msgid "Forget password and clear the entry." -msgstr "Oublier le mot de passe et effacer la zone." - -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Advanced" +msgstr "Avancé" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 msgid "Pass_word:" msgstr "_Mot de passe :" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 msgid "Screen _Name:" msgstr "_Nom de l'écran :" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "_Port:" msgstr "_Port :" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10 -#: ../src/empathy-new-chatroom-dialog.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 msgid "_Server:" msgstr "_Serveur :" -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "I_dentifiant de connexion :" -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 msgid "ICQ _UIN:" msgstr "_UIN ICQ :" -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "_Charset:" msgstr "Jeu de _caractères :" -#: ../libempathy-gtk/empathy-account-widget-irc.c:245 +#: ../libempathy-gtk/empathy-account-widget-irc.c:240 msgid "New Network" msgstr "Nouveau réseau" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1 -msgid "<b>Network</b>" -msgstr "<b>Réseau</b>" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2 -msgid "<b>Servers</b>" -msgstr "<b>Serveurs</b>" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 msgid "Charset:" msgstr "Jeu de caractères :" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4 -msgid "Create a new IRC network" -msgstr "Crée un nouveau réseau IRC" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5 -msgid "Edit the selected IRC network" -msgstr "Modifie le réseau IRC sélectionné" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 msgid "Network" msgstr "Réseau" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Network:" msgstr "Réseau :" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 msgid "Nickname:" msgstr "Pseudonyme :" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "Password:" msgstr "Mot de passe :" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Quit message:" msgstr "Message de départ :" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Real name:" msgstr "Nom réel :" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12 -msgid "Remove the selected IRC network" -msgstr "Supprime le réseau IRC sélectionné" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +msgid "Servers" +msgstr "Serveurs" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2 -msgid "<b>Override server settings</b>" -msgstr "<b>Outrepasser les paramètres du serveur</b>" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 +msgid "Override server settings" +msgstr "Outrepasser les paramètres du serveur" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 msgid "Pri_ority:" msgstr "Pri_orité :" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "Reso_urce:" msgstr "Resso_urce :" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 msgid "Use old SS_L" msgstr "Utiliser l'ancien SS_L" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "_Encryption required (TLS/SSL)" msgstr "Chiffr_ement requis (TLS/SSL)" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 msgid "_Ignore SSL certificate errors" msgstr "_Ignorer les erreurs de certificat SSL" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2 msgid "_Email:" msgstr "_Adresse électronique :" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3 msgid "_First Name:" msgstr "_Prénom :" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4 msgid "_Jabber ID:" msgstr "_Identifiant Jabber :" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5 msgid "_Last Name:" msgstr "_Nom :" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6 -#: ../src/empathy-chatrooms-window.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6 msgid "_Nickname:" msgstr "_Pseudonyme :" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7 msgid "_Published Name:" msgstr "Nom _publié :" #. look up the DNS SRV record at the service's domain for the host name of a STUN server. -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Discover STUN" msgstr "Découvrir STUN" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 msgid "STUN Server:" msgstr "Serveur STUN :" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 msgid "STUN port:" msgstr "Port STUN :" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 msgid "_Username:" msgstr "_Nom d'utilisateur :" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 msgid "Use _Yahoo Japan" msgstr "Utiliser _Yahoo Japan" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 msgid "Yahoo I_D:" msgstr "I_dentifiant Yahoo :" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 msgid "_Ignore conference and chatroom invitations" msgstr "_Ignorer les invitations à des réunions ou à des salles de discussion" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 msgid "_Room List locale:" msgstr "Locale de la liste des _salles :" -#: ../libempathy-gtk/empathy-avatar-chooser.c:462 -#: ../libempathy-gtk/empathy-avatar-chooser.c:537 +#: ../libempathy-gtk/empathy-avatar-chooser.c:449 +#: ../libempathy-gtk/empathy-avatar-chooser.c:525 msgid "Couldn't convert image" msgstr "Impossible de convertir l'image" -#: ../libempathy-gtk/empathy-avatar-chooser.c:463 +#: ../libempathy-gtk/empathy-avatar-chooser.c:450 msgid "None of the accepted image formats is supported on your system" msgstr "" "Aucun des formats d'image acceptés n'est pris en charge par votre système" -#: ../libempathy-gtk/empathy-avatar-chooser.c:956 +#: ../libempathy-gtk/empathy-avatar-chooser.c:933 msgid "Select Your Avatar Image" msgstr "Sélection de l'image d'avatar" -#: ../libempathy-gtk/empathy-avatar-chooser.c:959 +#: ../libempathy-gtk/empathy-avatar-chooser.c:936 msgid "No Image" msgstr "Aucune image" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1021 +#: ../libempathy-gtk/empathy-avatar-chooser.c:998 msgid "Images" msgstr "Images" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1025 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1002 msgid "All Files" msgstr "Tous les fichiers" -#: ../libempathy-gtk/empathy-avatar-image.c:294 +#: ../libempathy-gtk/empathy-avatar-image.c:324 msgid "Click to enlarge" msgstr "Cliquer pour agrandir" -#: ../libempathy-gtk/empathy-chat.c:507 +#: ../libempathy-gtk/empathy-chat.c:186 +msgid "Failed to reconnect this chat" +msgstr "Échec de reconnexion à cette discussion" + +#: ../libempathy-gtk/empathy-chat.c:404 +msgid "Unsupported command" +msgstr "Commande non prise en charge" + +#: ../libempathy-gtk/empathy-chat.c:539 msgid "offline" msgstr "déconnecté" -#: ../libempathy-gtk/empathy-chat.c:510 +#: ../libempathy-gtk/empathy-chat.c:542 msgid "invalid contact" msgstr "contact non valide" -#: ../libempathy-gtk/empathy-chat.c:513 +#: ../libempathy-gtk/empathy-chat.c:545 msgid "permission denied" msgstr "permission refusée" -#: ../libempathy-gtk/empathy-chat.c:516 +#: ../libempathy-gtk/empathy-chat.c:548 msgid "too long message" msgstr "message trop long" -#: ../libempathy-gtk/empathy-chat.c:519 +#: ../libempathy-gtk/empathy-chat.c:551 msgid "not implemented" msgstr "non implémenté" -#: ../libempathy-gtk/empathy-chat.c:522 +#: ../libempathy-gtk/empathy-chat.c:554 msgid "unknown" msgstr "inconnu" -#: ../libempathy-gtk/empathy-chat.c:526 +#: ../libempathy-gtk/empathy-chat.c:558 #, c-format msgid "Error sending message '%s': %s" msgstr "Erreur à l'envoi du message « %s » : %s" -#: ../libempathy-gtk/empathy-chat.c:556 +#: ../libempathy-gtk/empathy-chat.c:588 #, c-format msgid "Topic set to: %s" msgstr "Sujet défini : %s" -#: ../libempathy-gtk/empathy-chat.c:558 +#: ../libempathy-gtk/empathy-chat.c:590 msgid "No topic defined" msgstr "Pas de sujet défini" -#: ../libempathy-gtk/empathy-chat.c:973 +#: ../libempathy-gtk/empathy-chat.c:959 +msgid "(No Suggestions)" +msgstr "(aucune suggestion)" + +#: ../libempathy-gtk/empathy-chat.c:1013 msgid "Insert Smiley" msgstr "Insérer une frimousse" #. send button -#: ../libempathy-gtk/empathy-chat.c:991 -#: ../libempathy-gtk/empathy-ui-utils.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1031 +#: ../libempathy-gtk/empathy-ui-utils.c:1475 msgid "_Send" msgstr "_Envoyer" -#: ../libempathy-gtk/empathy-chat.c:1025 -msgid "_Check Word Spelling..." -msgstr "_Vérifier l'orthographe..." +#: ../libempathy-gtk/empathy-chat.c:1065 +msgid "_Spelling Suggestions" +msgstr "_Suggestions orthographiques" -#: ../libempathy-gtk/empathy-chat.c:1131 +#: ../libempathy-gtk/empathy-chat.c:1180 #, c-format -msgid "%s has joined the room" -msgstr "%s a rejoint la salle" +msgid "%s has disconnected" +msgstr "%s s'est déconnecté" + +#: ../libempathy-gtk/empathy-chat.c:1184 +#, c-format +msgid "%s was kicked by %s" +msgstr "%s a été expulsé par %s" + +#: ../libempathy-gtk/empathy-chat.c:1187 +#, c-format +msgid "%s was kicked" +msgstr "%s a été expulsé" + +#: ../libempathy-gtk/empathy-chat.c:1192 +#, c-format +msgid "%s was banned by %s" +msgstr "%s a été banni par %s" + +#: ../libempathy-gtk/empathy-chat.c:1195 +#, c-format +msgid "%s was banned" +msgstr "%s a été banni" -#: ../libempathy-gtk/empathy-chat.c:1134 +#: ../libempathy-gtk/empathy-chat.c:1199 #, c-format msgid "%s has left the room" msgstr "%s a quitté la salle" -#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548 +#. Note to translators: this string is appended to +#. * notifications like "foo has left the room", with the message +#. * given by the user living the room. If this poses a problem, +#. * please let us know. :-) +#. +#: ../libempathy-gtk/empathy-chat.c:1208 +#, c-format +msgid " (%s)" +msgstr " (%s)" + +#: ../libempathy-gtk/empathy-chat.c:1231 +#, c-format +msgid "%s has joined the room" +msgstr "%s a rejoint la salle" + +#: ../libempathy-gtk/empathy-chat.c:1364 ../src/empathy-call-window.c:1226 msgid "Disconnected" msgstr "Déconnecté" -#: ../libempathy-gtk/empathy-chat.c:1644 +#: ../libempathy-gtk/empathy-chat.c:1793 msgid "Connected" msgstr "Connecté" -#: ../libempathy-gtk/empathy-chat.c:1694 -#: ../libempathy-gtk/empathy-log-window.c:505 +#: ../libempathy-gtk/empathy-chat.c:1843 +#: ../libempathy-gtk/empathy-log-window.c:502 msgid "Conversation" msgstr "Conversation" -#: ../libempathy-gtk/empathy-chat.glade.h:1 -msgid "<b>Topic:</b>" -msgstr "<b>Sujet :</b>" - -#: ../libempathy-gtk/empathy-chat.glade.h:2 -msgid "Group Chat" -msgstr "Groupe de discussion" +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472 +msgid "Topic:" +msgstr "Sujet :" -#: ../libempathy-gtk/empathy-chat-text-view.c:340 +#: ../libempathy-gtk/empathy-chat-text-view.c:316 msgid "_Copy Link Address" msgstr "_Copier l'adresse du lien" -#: ../libempathy-gtk/empathy-chat-text-view.c:348 +#: ../libempathy-gtk/empathy-chat-text-view.c:323 msgid "_Open Link" msgstr "_Ouvrir le lien" -#: ../libempathy-gtk/empathy-chat-text-view.c:439 +#. Translators: timestamp displayed between conversations in +#. * chat windows (strftime format string) +#: ../libempathy-gtk/empathy-chat-text-view.c:421 msgid "%A %B %d %Y" msgstr "%A %d %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:180 -msgid "Personal Information" -msgstr "Informations personnelles" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:183 +#: ../libempathy-gtk/empathy-contact-dialogs.c:179 +#: ../libempathy-gtk/empathy-contact-dialogs.c:238 msgid "Edit Contact Information" msgstr "Modifier les informations du contact" -#: ../libempathy-gtk/empathy-contact-dialogs.c:186 -msgid "Contact Information" -msgstr "Informations du contact" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:267 -msgid "I would like to add you to my contact list." -msgstr "Je voudrais vous ajouter à ma liste de contacts." +#: ../libempathy-gtk/empathy-contact-dialogs.c:289 +msgid "Personal Information" +msgstr "Informations personnelles" -#: ../libempathy-gtk/empathy-contact-dialogs.c:291 +#: ../libempathy-gtk/empathy-contact-dialogs.c:384 msgid "New Contact" msgstr "Nouveau contact" -#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 msgid "Decide _Later" msgstr "Décider plus _tard" -#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "Requête d'abonnement" -#: ../libempathy-gtk/empathy-contact-list-view.c:1249 +#: ../libempathy-gtk/empathy-contact-list-view.c:1375 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Voulez-vous réellement supprimer le groupe « %s » ?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1251 +#: ../libempathy-gtk/empathy-contact-list-view.c:1377 msgid "Removing group" msgstr "Suppression du groupe" -#: ../libempathy-gtk/empathy-contact-list-view.c:1298 -#: ../libempathy-gtk/empathy-contact-list-view.c:1377 +#: ../libempathy-gtk/empathy-contact-list-view.c:1424 +#: ../libempathy-gtk/empathy-contact-list-view.c:1502 msgid "_Remove" msgstr "_Supprimer" -#: ../libempathy-gtk/empathy-contact-list-view.c:1328 +#: ../libempathy-gtk/empathy-contact-list-view.c:1454 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Voulez-vous réellement supprimer le contact « %s » ?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1330 +#: ../libempathy-gtk/empathy-contact-list-view.c:1456 msgid "Removing contact" msgstr "Suppression du contact" -#: ../libempathy-gtk/empathy-contact-list-view.c:1335 -msgid "Sorry, I don't want you in my contact list anymore." -msgstr "Désolé, je ne te veux plus dans ma liste de contacts." - -#: ../libempathy-gtk/empathy-contact-menu.c:130 -#: ../src/empathy-main-window.glade.h:9 +#: ../libempathy-gtk/empathy-contact-menu.c:135 +#: ../src/empathy-main-window.ui.h:8 msgid "_Chat" msgstr "Dis_cussion" -#: ../libempathy-gtk/empathy-contact-menu.c:161 -#: ../src/empathy-call-window.glade.h:5 -msgid "_Call" -msgstr "_Appeler" +#: ../libempathy-gtk/empathy-contact-menu.c:166 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "Appel _audio" + +#: ../libempathy-gtk/empathy-contact-menu.c:198 +msgctxt "menu item" +msgid "_Video Call" +msgstr "Appel _vidéo" -#: ../libempathy-gtk/empathy-contact-menu.c:200 -#: ../src/empathy-main-window.glade.h:17 +#: ../libempathy-gtk/empathy-contact-menu.c:237 msgid "_View Previous Conversations" msgstr "_Afficher les conversations précédentes" -#: ../libempathy-gtk/empathy-contact-menu.c:222 +#: ../libempathy-gtk/empathy-contact-menu.c:259 msgid "Send file" msgstr "Envoyer un fichier" -#: ../libempathy-gtk/empathy-contact-menu.c:250 +#: ../libempathy-gtk/empathy-contact-menu.c:287 msgid "Infor_mation" msgstr "Infor_mations" -#: ../libempathy-gtk/empathy-contact-menu.c:277 -#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11 +#: ../libempathy-gtk/empathy-contact-menu.c:314 +#: ../src/empathy-main-window.ui.h:11 msgid "_Edit" msgstr "É_dition" -#: ../libempathy-gtk/empathy-contact-menu.c:336 +#: ../libempathy-gtk/empathy-contact-menu.c:372 msgid "Inviting to this room" msgstr "Inviter à ce salon" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:403 msgid "_Invite to chatroom" msgstr "_Inviter à un salon de discussion" -#: ../libempathy-gtk/empathy-contact-selector.c:111 +#: ../libempathy-gtk/empathy-contact-selector.c:129 msgid "Select a contact" msgstr "Sélectionner un contact" -#: ../libempathy-gtk/empathy-contact-widget.c:358 +#: ../libempathy-gtk/empathy-contact-widget.c:440 msgid "Save Avatar" msgstr "Enregistrer l'avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:414 +#: ../libempathy-gtk/empathy-contact-widget.c:496 msgid "Unable to save avatar" msgstr "Impossible d'enregistrer l'avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:895 +#: ../libempathy-gtk/empathy-contact-widget.c:979 msgid "Select" msgstr "Sélectionner" -#: ../libempathy-gtk/empathy-contact-widget.c:904 -#: ../src/empathy-main-window.c:991 +#: ../libempathy-gtk/empathy-contact-widget.c:988 +#: ../src/empathy-main-window.c:903 msgid "Group" msgstr "Groupe" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:1 -msgid "<b>Client Information</b>" -msgstr "<b>Informations du client</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1239 +msgid "Country ISO Code:" +msgstr "Code ISO du pays :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1241 +msgid "Country:" +msgstr "Pays :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1243 +msgid "State:" +msgstr "État :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1245 +msgid "City:" +msgstr "Ville :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1247 +msgid "Area:" +msgstr "Région :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1249 +msgid "Postal Code:" +msgstr "Code postal :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1251 +msgid "Street:" +msgstr "Rue :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1253 +msgid "Building:" +msgstr "Bâtiment :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1255 +msgid "Floor:" +msgstr "Étage :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1257 +msgid "Room:" +msgstr "Salle :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1259 +msgid "Text:" +msgstr "Texte :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1261 +msgid "Description:" +msgstr "Description :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1263 +msgid "URI:" +msgstr "URI :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1265 +msgid "Accuracy Level:" +msgstr "Niveau de précision :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1267 +msgid "Error:" +msgstr "Erreur :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1269 +msgid "Vertical Error (meters):" +msgstr "Erreur verticale (mètres) :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1271 +msgid "Horizontal Error (meters):" +msgstr "Erreur horizontale (mètres) :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1273 +msgid "Speed:" +msgstr "Vitesse :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1275 +msgid "Bearing:" +msgstr "Relèvement :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:2 -msgid "<b>Contact Details</b>" -msgstr "<b>Détails sur le contact</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1277 +msgid "Climb Speed:" +msgstr "Vitesse ascensionnelle :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:3 -msgid "<b>Contact</b>" -msgstr "<b>Contact</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1279 +msgid "Last Updated on:" +msgstr "Dernière mise à jour le :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:4 -msgid "<b>Groups</b>" -msgstr "<b>Groupes</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1281 +msgid "Longitude:" +msgstr "Longitude :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:5 -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1 -#: ../src/empathy-chatrooms-window.glade.h:1 -#: ../src/empathy-new-chatroom-dialog.glade.h:1 +#: ../libempathy-gtk/empathy-contact-widget.c:1283 +msgid "Latitude:" +msgstr "Latitude :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1285 +msgid "Altitude:" +msgstr "Altitude :" + +#: ../libempathy-gtk/empathy-contact-widget.c:1332 +msgid "<b>Location</b>" +msgstr "<b>Emplacement</b>" + +#: ../libempathy-gtk/empathy-contact-widget.c:1345 +msgid "<b>Location</b>, " +msgstr "<b>Emplacement</b>, " + +#: ../libempathy-gtk/empathy-contact-widget.c:1395 +msgid "%B %e, %Y at %R UTC" +msgstr "%e %B %Y à %R UTC" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +msgid "<b>Location</b> at (date)\t" +msgstr "<b>Emplacement</b> le (date)\t" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 +#: ../src/empathy-chatrooms-window.ui.h:1 +#: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" msgstr "Compte :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:6 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 msgid "Alias:" msgstr "Alias :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:7 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 msgid "Birthday:" msgstr "Anniversaire :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:8 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Client Information" +msgstr "Informations du client" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 msgid "Client:" msgstr "Client :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:9 -msgid "Contact information" -msgstr "Informations sur le contact" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../src/empathy-main-window.c:886 +msgid "Contact" +msgstr "Contact" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Contact Details" +msgstr "Détails sur le contact" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "Email:" msgstr "Adresse électronique :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Fullname:" msgstr "Nom complet :" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Groups" +msgstr "Groupes" + #. Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.glade.h:13 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:13 msgid "Identifier:" msgstr "Identifiant :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:14 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:14 msgid "Information requested..." msgstr "Demande des informations en cours..." -#: ../libempathy-gtk/empathy-contact-widget.glade.h:15 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:15 msgid "OS:" msgstr "OS :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:16 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:16 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -909,181 +1209,204 @@ msgstr "" "Sélectionnez les groupes auxquels ce contact appartiendra ; vous pouvez " "sélectionner plus d'un groupe ou aucun groupe." -#: ../libempathy-gtk/empathy-contact-widget.glade.h:17 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:17 msgid "Version:" msgstr "Version :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:18 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:18 msgid "Web site:" msgstr "Site Web :" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:19 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:19 msgid "_Add Group" msgstr "_Ajouter un groupe" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:284 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:283 msgid "new server" msgstr "nouveau serveur" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:513 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:510 msgid "Server" msgstr "Serveur" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:528 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:525 msgid "Port" msgstr "Port" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:541 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:538 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:498 -#: ../src/empathy-import-dialog.c:277 +#: ../libempathy-gtk/empathy-log-window.c:495 +#: ../src/empathy-import-dialog.c:285 msgid "Account" msgstr "Compte" -#: ../libempathy-gtk/empathy-log-window.c:515 +#: ../libempathy-gtk/empathy-log-window.c:512 msgid "Date" msgstr "Date" -#. Tab Label -#: ../libempathy-gtk/empathy-log-window.glade.h:2 +#: ../libempathy-gtk/empathy-log-window.ui.h:1 msgid "Conversations" msgstr "Conversations" -#: ../libempathy-gtk/empathy-log-window.glade.h:3 +#: ../libempathy-gtk/empathy-log-window.ui.h:2 msgid "Previous Conversations" msgstr "Conversations précédentes" -#. Tab Label -#: ../libempathy-gtk/empathy-log-window.glade.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Search" msgstr "Rechercher" # Search est le titre de l'onglet, et est suivi de _For placé devant la zone de # texte à rechercher, j'ai donc essayé d'adapter au mieux. -#. Searching *for* something -#: ../libempathy-gtk/empathy-log-window.glade.h:7 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "_For:" msgstr "ce _terme :" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2 msgid "C_all" msgstr "_Appeler" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3 msgid "C_hat" msgstr "_Discuter" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4 msgid "Contact ID:" msgstr "Identifiant du contact :" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5 msgid "New Conversation" msgstr "Nouvelle conversation" -#. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:685 -msgid "Custom messages..." -msgstr "Messages personnalisés..." - -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1 -msgid "Custom message" -msgstr "Message personnalisé" +#. COL_STATE_ICON_NAME +#. COL_STATE +#. COL_STATUS_TEXT +#. COL_DISPLAY_MARKUP +#. COL_STATUS_CUSTOMISABLE +#. COL_TYPE +#: ../libempathy-gtk/empathy-presence-chooser.c:172 +msgid "Custom Message..." +msgstr "Message personnalisé..." -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2 -msgid "Message:" -msgstr "Message :" +#: ../libempathy-gtk/empathy-presence-chooser.c:227 +msgid "Edit Custom Messages..." +msgstr "Modifier les messages personnalisés..." -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3 -msgid "Save message" -msgstr "Enregistrer le message" - -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4 -msgid "Status:" -msgstr "État :" +#: ../libempathy-gtk/empathy-presence-chooser.c:326 +msgid "Click to remove this status as a favorite" +msgstr "Cliquez pour enlever cet état des favoris" -#: ../libempathy-gtk/empathy-spell-dialog.c:88 -msgid "Word" -msgstr "Mot" +#: ../libempathy-gtk/empathy-presence-chooser.c:335 +msgid "Click to make this status a favorite" +msgstr "Cliquez pour ajouter cet état aux favoris" -#: ../libempathy-gtk/empathy-spell-dialog.c:265 -msgid "Suggestions for the word" -msgstr "Suggestions pour le mot" +#: ../libempathy-gtk/empathy-presence-chooser.c:369 +msgid "Set status" +msgstr "Changer l'état" -#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1 -msgid "Spell Checker" -msgstr "Correcteur orthographique" - -#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2 -msgid "Suggestions for the word:" -msgstr "Suggestions pour le mot :" - -#: ../libempathy-gtk/empathy-theme-manager.c:60 -msgid "Classic" -msgstr "Classique" - -#: ../libempathy-gtk/empathy-theme-manager.c:61 -msgid "Simple" -msgstr "Simple" - -#: ../libempathy-gtk/empathy-theme-manager.c:62 -msgid "Clean" -msgstr "Propre" - -#: ../libempathy-gtk/empathy-theme-manager.c:63 -msgid "Blue" -msgstr "Bleu" - -#: ../libempathy-gtk/empathy-ui-utils.c:1385 -msgid "Unable to open URI" -msgstr "Impossible d'ouvrir l'URI" +#: ../libempathy-gtk/empathy-presence-chooser.c:782 +msgid "Set your presence and current status" +msgstr "Définit votre état de présence actuel" -#: ../libempathy-gtk/empathy-ui-utils.c:1530 -msgid "Select a file" -msgstr "Sélectionner un fichier" +#. Custom messages +#: ../libempathy-gtk/empathy-presence-chooser.c:1017 +msgid "Custom messages..." +msgstr "Messages personnalisés..." -#: ../libempathy-gtk/empathy-ui-utils.c:1566 +#: ../libempathy-gtk/empathy-sound.c:51 msgid "Received an instant message" msgstr "Réception d'un message instantané" -#: ../libempathy-gtk/empathy-ui-utils.c:1568 +#: ../libempathy-gtk/empathy-sound.c:53 msgid "Sent an instant message" msgstr "Envoi d'un message instantané" -#: ../libempathy-gtk/empathy-ui-utils.c:1570 +#: ../libempathy-gtk/empathy-sound.c:55 msgid "Incoming chat request" msgstr "Réception d'une demande de discussion" -#: ../libempathy-gtk/empathy-ui-utils.c:1572 +#: ../libempathy-gtk/empathy-sound.c:57 msgid "Contact connected" msgstr "Contact connecté" -#: ../libempathy-gtk/empathy-ui-utils.c:1574 +#: ../libempathy-gtk/empathy-sound.c:59 msgid "Contact disconnected" msgstr "Contact déconnecté" -#: ../libempathy-gtk/empathy-ui-utils.c:1576 +#: ../libempathy-gtk/empathy-sound.c:61 msgid "Connected to server" msgstr "Connecté au serveur" -#: ../libempathy-gtk/empathy-ui-utils.c:1578 +#: ../libempathy-gtk/empathy-sound.c:63 msgid "Disconnected from server" msgstr "Déconnecté du serveur" -#: ../libempathy-gtk/empathy-ui-utils.c:1580 +#: ../libempathy-gtk/empathy-sound.c:65 msgid "Incoming voice call" msgstr "Appel vocal entrant" -#: ../libempathy-gtk/empathy-ui-utils.c:1582 +#: ../libempathy-gtk/empathy-sound.c:67 msgid "Outgoing voice call" msgstr "Appel vocal sortant" -#: ../libempathy-gtk/empathy-ui-utils.c:1584 +#: ../libempathy-gtk/empathy-sound.c:69 msgid "Voice call ended" msgstr "Appel vocal terminé" +#: ../libempathy-gtk/empathy-status-preset-dialog.c:362 +msgid "Enter Custom Message" +msgstr "Saisissez un message personnalisé" + +#: ../libempathy-gtk/empathy-status-preset-dialog.c:521 +msgid "Edit Custom Messages" +msgstr "Édition des messages personnalisés" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 +msgid "Add _New Preset" +msgstr "Ajouter _nouveau message prédéfini" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2 +msgid "Saved Presets" +msgstr "Messages prédéfinis enregistrés" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3 +msgid "gtk-add" +msgstr "gtk-add" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4 +msgid "gtk-remove" +msgstr "gtk-remove" + +#: ../libempathy-gtk/empathy-theme-manager.c:67 +msgid "Classic" +msgstr "Classique" + +#: ../libempathy-gtk/empathy-theme-manager.c:68 +msgid "Simple" +msgstr "Simple" + +#: ../libempathy-gtk/empathy-theme-manager.c:69 +msgid "Clean" +msgstr "Propre" + +#: ../libempathy-gtk/empathy-theme-manager.c:70 +msgid "Blue" +msgstr "Bleu" + +#: ../libempathy-gtk/empathy-ui-utils.c:1377 +msgid "Unable to open URI" +msgstr "Impossible d'ouvrir l'URI" + +#: ../libempathy-gtk/empathy-ui-utils.c:1467 +msgid "Select a file" +msgstr "Sélectionner un fichier" + +#: ../libempathy-gtk/empathy-ui-utils.c:1525 +msgid "Select a destination" +msgstr "Sélectionner une destination" + #: ../libempathy-gtk/totem-subtitle-encoding.c:158 msgid "Current Locale" msgstr "Locale actuelle" @@ -1272,7 +1595,7 @@ msgid "Megaphone" msgstr "Mégaphone" #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2 -#: ../megaphone/src/megaphone-applet.c:417 +#: ../megaphone/src/megaphone-applet.c:519 msgid "Talk!" msgstr "Parlez !" @@ -1286,15 +1609,15 @@ msgid "_Information" msgstr "_Informations" #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3 -#: ../src/empathy-main-window.glade.h:15 +#: ../src/empathy-main-window.ui.h:18 msgid "_Preferences" msgstr "_Préférences" -#: ../megaphone/src/megaphone-applet.c:255 +#: ../megaphone/src/megaphone-applet.c:168 msgid "Please configure a contact." msgstr "Veuillez configurer un contact." -#: ../megaphone/src/megaphone-applet.c:348 +#: ../megaphone/src/megaphone-applet.c:258 msgid "Select contact..." msgstr "Sélectionner le contact..." @@ -1307,23 +1630,23 @@ msgstr "Présence" msgid "Set your own presence" msgstr "Définissez votre présence" -#: ../src/empathy.c:426 +#: ../src/empathy.c:506 msgid "Don't connect on startup" msgstr "Ne pas se connecter au démarrage" -#: ../src/empathy.c:430 +#: ../src/empathy.c:510 msgid "Don't show the contact list on startup" msgstr "Ne pas afficher la liste des contacts au démarrage" -#: ../src/empathy.c:434 +#: ../src/empathy.c:514 msgid "Show the accounts dialog" msgstr "Afficher la boîte de dialogue des comptes" -#: ../src/empathy.c:446 +#: ../src/empathy.c:526 msgid "- Empathy Instant Messenger" msgstr "- Messagerie instantanée Empathy" -#: ../src/empathy-about-dialog.c:84 +#: ../src/empathy-about-dialog.c:83 msgid "" "Empathy is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -1335,7 +1658,7 @@ msgstr "" "publiée par la Free Software Foundation ; version 2 de la licence ou (à " "votre discrétion) toute version ultérieure." -#: ../src/empathy-about-dialog.c:88 +#: ../src/empathy-about-dialog.c:87 msgid "" "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -1347,7 +1670,7 @@ msgstr "" "D'ADÉQUATION À UN BESOIN PARTICULIER. Pour plus de détails, voir la Licence " "Publique Générale GNU." -#: ../src/empathy-about-dialog.c:92 +#: ../src/empathy-about-dialog.c:91 msgid "" "You should have received a copy of the GNU General Public License along with " "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " @@ -1357,11 +1680,11 @@ msgstr "" "Empathy ; si ce n'est pas le cas, écrivez à la Free Software Foundation, " "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:120 +#: ../src/empathy-about-dialog.c:119 msgid "An Instant Messaging client for GNOME" msgstr "Un client de messagerie instantanée pour GNOME" -#: ../src/empathy-about-dialog.c:126 +#: ../src/empathy-about-dialog.c:125 msgid "translator-credits" msgstr "" "Frédéric Brin <duckx@mezimail.com>\n" @@ -1379,22 +1702,21 @@ msgstr "" "Stéphane Raimbault <stephane.raimbault@gmail.com>\n" "Christophe Benz <christophe.benz@gmail.com>" -#: ../src/empathy-accounts-dialog.c:391 +#: ../src/empathy-accounts-dialog.c:392 msgid "Enabled" msgstr "Activé" -#: ../src/empathy-accounts-dialog.c:401 -#: ../src/empathy-accounts-dialog.glade.h:4 +#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1 msgid "Accounts" msgstr "Comptes" #. To translator: %s is the protocol name -#: ../src/empathy-accounts-dialog.c:833 +#: ../src/empathy-accounts-dialog.c:837 #, c-format msgid "New %s account" msgstr "Nouveau compte %s" -#: ../src/empathy-accounts-dialog.c:943 +#: ../src/empathy-accounts-dialog.c:950 #, c-format msgid "" "You are about to remove your %s account!\n" @@ -1403,7 +1725,7 @@ msgstr "" "Vous êtes sur le point de supprimer votre compte %s !\n" "Voulez-vous vraiment continuer ?" -#: ../src/empathy-accounts-dialog.c:949 +#: ../src/empathy-accounts-dialog.c:956 msgid "" "Any associated conversations and chat rooms will NOT be removed if you " "decide to proceed.\n" @@ -1417,31 +1739,31 @@ msgstr "" "Si vous décidez de recréer ce compte plus tard, elles seront toujours " "disponibles." -#: ../src/empathy-accounts-dialog.glade.h:1 -msgid "<b>New Account</b>" -msgstr "<b>Nouveau compte</b>" +#: ../src/empathy-accounts-dialog.ui.h:2 +msgid "Add Account" +msgstr "Ajouter un compte" -#: ../src/empathy-accounts-dialog.glade.h:2 -msgid "<b>No protocol installed</b>" -msgstr "<b>Aucun protocole installé</b>" - -#: ../src/empathy-accounts-dialog.glade.h:3 -msgid "<b>Settings</b>" -msgstr "<b>Paramètres</b>" - -#: ../src/empathy-accounts-dialog.glade.h:5 +#: ../src/empathy-accounts-dialog.ui.h:3 msgid "Cr_eate" msgstr "C_réer" -#: ../src/empathy-accounts-dialog.glade.h:6 -msgid "I already have an account I want to use" -msgstr "Je possède déjà un compte que je souhaite utiliser" +#: ../src/empathy-accounts-dialog.ui.h:4 +msgid "Gmail" +msgstr "Gmail" -#: ../src/empathy-accounts-dialog.glade.h:7 +#: ../src/empathy-accounts-dialog.ui.h:5 msgid "Import Accounts..." msgstr "Importer des comptes..." -#: ../src/empathy-accounts-dialog.glade.h:8 +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "Aucun protocole installé" + +#: ../src/empathy-accounts-dialog.ui.h:7 +msgid "Settings" +msgstr "Paramètres" + +#: ../src/empathy-accounts-dialog.ui.h:8 msgid "" "To add a new account, you first have to install a backend for each protocol " "you want to use." @@ -1449,273 +1771,195 @@ msgstr "" "Pour ajouter un nouveau compte, vous devez d'abord installer le moteur " "correspondant à chaque protocole que vous voulez utiliser." -#: ../src/empathy-accounts-dialog.glade.h:9 +#: ../src/empathy-accounts-dialog.ui.h:9 msgid "Type:" msgstr "Type :" -#: ../src/empathy-call-window.c:258 +#: ../src/empathy-accounts-dialog.ui.h:10 +msgid "_Add..." +msgstr "A_jouter..." + +#: ../src/empathy-accounts-dialog.ui.h:11 +msgid "_Create a new account" +msgstr "_Créer un nouveau compte" + +#: ../src/empathy-accounts-dialog.ui.h:12 +msgid "_Reuse an existing account" +msgstr "Ré_utiliser un compte existant" + +#: ../src/empathy-call-window.c:420 msgid "Contrast" msgstr "Contraste" -#: ../src/empathy-call-window.c:258 +#: ../src/empathy-call-window.c:423 msgid "Brightness" msgstr "Luminosité" -#: ../src/empathy-call-window.c:258 +#: ../src/empathy-call-window.c:426 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-call-window.c:290 +#: ../src/empathy-call-window.c:531 msgid "Volume" msgstr "Volume" -#: ../src/empathy-call-window.c:366 +#: ../src/empathy-call-window.c:662 +msgid "Connecting..." +msgstr "Connexion en cours ..." + +#: ../src/empathy-call-window.c:746 msgid "_Sidebar" msgstr "Barre _latérale" -#: ../src/empathy-call-window.c:384 +#: ../src/empathy-call-window.c:765 msgid "Dialpad" msgstr "Numéroteur" -#: ../src/empathy-call-window.c:390 +#: ../src/empathy-call-window.c:771 msgid "Audio input" msgstr "Entrée audio" -#: ../src/empathy-call-window.c:394 +#: ../src/empathy-call-window.c:775 msgid "Video input" msgstr "Entrée vidéo" -#: ../src/empathy-call-window.c:407 -msgid "Connecting..." -msgstr "Connexion en cours ..." +#: ../src/empathy-call-window.c:836 +#, c-format +msgid "Call with %s" +msgstr "Conversation avec %s" -#: ../src/empathy-call-window.c:572 +#: ../src/empathy-call-window.c:905 +msgid "Call" +msgstr "Appeler" + +#. Translators: number of minutes:seconds the caller has been connected +#: ../src/empathy-call-window.c:1336 #, c-format -msgid "Connected -- %d:%02dm" -msgstr "Connecté -- %d:%02dm" +msgid "Connected — %d:%02dm" +msgstr "Connecté — %d:%02dm" -#: ../src/empathy-call-window.glade.h:1 +#: ../src/empathy-call-window.ui.h:1 msgid "Hang up" msgstr "Raccrocher" -#: ../src/empathy-call-window.glade.h:2 +#: ../src/empathy-call-window.ui.h:2 +msgid "Redial" +msgstr "Rappeler" + +#: ../src/empathy-call-window.ui.h:3 msgid "Send Audio" msgstr "Envoyer le son" -#: ../src/empathy-call-window.glade.h:3 +#: ../src/empathy-call-window.ui.h:4 msgid "Send video" msgstr "Envoyer la vidéo" -#: ../src/empathy-call-window.glade.h:4 +#: ../src/empathy-call-window.ui.h:5 msgid "Video preview" msgstr "Aperçu de la vidéo" -#: ../src/empathy-call-window.glade.h:6 +#: ../src/empathy-call-window.ui.h:6 +msgid "_Call" +msgstr "_Appeler" + +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21 msgid "_View" msgstr "_Affichage" -#: ../src/empathy-chat-window.c:313 +#: ../src/empathy-chat-window.c:344 #, c-format msgid "Conversations (%d)" msgstr "Conversations (%d)" -#: ../src/empathy-chat-window.c:418 -msgid "Topic:" -msgstr "Sujet :" - -#: ../src/empathy-chat-window.c:423 +#: ../src/empathy-chat-window.c:476 msgid "Typing a message." msgstr "Saisie d'un message." -#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424 -#, c-format -msgid "New message from %s" -msgstr "Nouveau message de %s" - -#: ../src/empathy-chat-window.glade.h:1 -msgid "C_lear" -msgstr "_Nettoyer" - -#: ../src/empathy-chat-window.glade.h:2 -msgid "Chat" -msgstr "Discuter" - -#: ../src/empathy-chat-window.glade.h:3 -msgid "Insert _Smiley" -msgstr "Insérer une _frimousse" - -#: ../src/empathy-chat-window.glade.h:4 -msgid "Invitation _message:" -msgstr "_Message d'invitation :" - -#: ../src/empathy-chat-window.glade.h:5 -msgid "Invite" -msgstr "Inviter" - -#: ../src/empathy-chat-window.glade.h:6 -msgid "Move Tab _Left" -msgstr "Déplacer l'onglet à _gauche" - -#: ../src/empathy-chat-window.glade.h:7 -msgid "Move Tab _Right" -msgstr "Déplacer l'onglet à _droite" - -#: ../src/empathy-chat-window.glade.h:8 -msgid "Select who would you like to invite:" -msgstr "Sélectionnez la personne à inviter :" - -#: ../src/empathy-chat-window.glade.h:9 -msgid "You have been invited to join a chat conference." -msgstr "Vous avez été invité(e) à joindre une salle de discussion" - -#: ../src/empathy-chat-window.glade.h:10 -msgid "_Contact" -msgstr "_Contact" - -#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10 -msgid "_Contents" -msgstr "_Sommaire" - -#: ../src/empathy-chat-window.glade.h:12 -msgid "_Conversation" -msgstr "_Conversation" - -#: ../src/empathy-chat-window.glade.h:13 -msgid "_Detach Tab" -msgstr "_Détacher l'onglet" - -#: ../src/empathy-chat-window.glade.h:15 -msgid "_Favorite Chatroom" -msgstr "Salles de discussion _favorites" - -#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12 -msgid "_Help" -msgstr "Aid_e" - -#: ../src/empathy-chat-window.glade.h:17 -msgid "_Next Tab" -msgstr "Onglet _suivant" - -#: ../src/empathy-chat-window.glade.h:18 -msgid "_Previous Tab" -msgstr "Onglet _précédent" - -#: ../src/empathy-chat-window.glade.h:19 -msgid "_Tabs" -msgstr "_Onglets" - -#: ../src/empathy-chatrooms-window.c:262 +#: ../src/empathy-chatrooms-window.c:258 msgid "Name" msgstr "Nom" -#: ../src/empathy-chatrooms-window.c:280 +#: ../src/empathy-chatrooms-window.c:276 msgid "Room" msgstr "Salle" -#: ../src/empathy-chatrooms-window.c:289 +#: ../src/empathy-chatrooms-window.c:285 msgid "Auto-Connect" msgstr "Connexion automatique" -#: ../src/empathy-chatrooms-window.glade.h:2 -msgid "Edit Favorite Room" -msgstr "Modifier les salles favorites" - -#: ../src/empathy-chatrooms-window.glade.h:3 -msgid "Join room on start_up" -msgstr "Joindre la salle au _démarrage" - -#: ../src/empathy-chatrooms-window.glade.h:4 -msgid "Join this chat room when Empathy starts and you are connected" -msgstr "" -"Joindre cette salle de discussion quand Empathy démarre et que vous êtes " -"connecté" - -#: ../src/empathy-chatrooms-window.glade.h:5 +#: ../src/empathy-chatrooms-window.ui.h:2 msgid "Manage Favorite Rooms" msgstr "Gérer les salles favorites" -#: ../src/empathy-chatrooms-window.glade.h:6 -msgid "N_ame:" -msgstr "_Nom :" - -#: ../src/empathy-chatrooms-window.glade.h:7 -msgid "S_erver:" -msgstr "_Serveur :" - -#: ../src/empathy-chatrooms-window.glade.h:9 -#: ../src/empathy-new-chatroom-dialog.glade.h:9 -msgid "_Room:" -msgstr "Sall_e :" - -#: ../src/empathy-event-manager.c:372 +#: ../src/empathy-event-manager.c:321 msgid "Incoming call" msgstr "Appel entrant" -#: ../src/empathy-event-manager.c:375 +#: ../src/empathy-event-manager.c:324 #, c-format msgid "%s is calling you, do you want to answer?" msgstr "%s vous appelle, souhaitez-vous répondre ?" -#: ../src/empathy-event-manager.c:382 +#: ../src/empathy-event-manager.c:331 msgid "_Reject" msgstr "Re_fuser" -#: ../src/empathy-event-manager.c:388 +#: ../src/empathy-event-manager.c:337 msgid "_Answer" msgstr "_Répondre" -#: ../src/empathy-event-manager.c:511 +#: ../src/empathy-event-manager.c:452 #, c-format msgid "Incoming call from %s" msgstr "Appel entrant de %s" -#: ../src/empathy-event-manager.c:559 +#: ../src/empathy-event-manager.c:496 #, c-format msgid "%s is offering you an invitation" msgstr "%s vous invite" -#: ../src/empathy-event-manager.c:565 +#: ../src/empathy-event-manager.c:502 msgid "An external application will be started to handle it." msgstr "Une application externe sera lancée pour la gérer." -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:507 msgid "You don't have the needed external application to handle it." msgstr "Vous ne disposez pas de l'application externe nécessaire." -#: ../src/empathy-event-manager.c:692 +#: ../src/empathy-event-manager.c:634 msgid "Room invitation" msgstr "Invitation dans une salle" -#: ../src/empathy-event-manager.c:695 +#: ../src/empathy-event-manager.c:637 #, c-format msgid "%s is inviting you to join %s" msgstr "%s vous invite à rejoindre %s" -#. Decline button -#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021 +#: ../src/empathy-event-manager.c:645 msgid "_Decline" msgstr "_Refuser" -#: ../src/empathy-event-manager.c:708 +#: ../src/empathy-event-manager.c:650 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Joindre" -#: ../src/empathy-event-manager.c:738 +#: ../src/empathy-event-manager.c:689 #, c-format msgid "%s invited you to join %s" msgstr "%s vous a invité à rejoindre %s" -#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-event-manager.c:715 #, c-format msgid "Incoming file transfer from %s" msgstr "Transfert de fichier entrant de %s" -#: ../src/empathy-event-manager.c:954 +#: ../src/empathy-event-manager.c:895 #, c-format msgid "Subscription requested by %s" msgstr "Demande d'abonnement de %s" -#: ../src/empathy-event-manager.c:958 +#: ../src/empathy-event-manager.c:899 #, c-format msgid "" "\n" @@ -1724,173 +1968,143 @@ msgstr "" "\n" "Message : %s" -#: ../src/empathy-ft-manager.c:113 +#. someone is logging off +#: ../src/empathy-event-manager.c:935 +#, c-format +msgid "%s is now offline." +msgstr "%s s'est déconnecté." + +#. someone is logging in +#: ../src/empathy-event-manager.c:951 +#, c-format +msgid "%s is now online." +msgstr "%s s'est connecté." + +#. Translators: time left, when it is more than one hour +#: ../src/empathy-ft-manager.c:101 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" -#: ../src/empathy-ft-manager.c:115 +#. Translators: time left, when is is less than one hour +#: ../src/empathy-ft-manager.c:104 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:164 -msgid "No reason was specified" -msgstr "Aucune raison n'a été indiquée" - -#: ../src/empathy-ft-manager.c:166 -msgid "The change in state was requested" -msgstr "Le changement d'état a été demandé" - -#: ../src/empathy-ft-manager.c:168 -msgid "You canceled the file transfer" -msgstr "Vous avez annulé le transfert de fichiers" - -#: ../src/empathy-ft-manager.c:170 -msgid "The other participant canceled the file transfer" -msgstr "Le correspondant a annulé le transfert de fichiers" - -#: ../src/empathy-ft-manager.c:172 -msgid "Error while trying to transfer the file" -msgstr "Erreur lors du téléchargement du fichier" +#: ../src/empathy-ft-manager.c:180 +msgctxt "file transfer percent" +msgid "Unknown" +msgstr "Inconnu" -#: ../src/empathy-ft-manager.c:174 -msgid "The other participant is unable to transfer the file" -msgstr "Le correspondant n'est pas capable de transférer le fichier" +#: ../src/empathy-ft-manager.c:275 +#, c-format +msgid "%s of %s at %s/s" +msgstr "%s sur %s à %s/s" -#: ../src/empathy-ft-manager.c:176 -msgid "Unknown reason" -msgstr "Raison inconnue" +#: ../src/empathy-ft-manager.c:276 +#, c-format +msgid "%s of %s" +msgstr "%s sur %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:224 +#: ../src/empathy-ft-manager.c:307 #, c-format msgid "Receiving \"%s\" from %s" -msgstr "Réception de « %s » de %s" +msgstr "Réception de « %s » de la part de %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:227 +#: ../src/empathy-ft-manager.c:310 #, c-format msgid "Sending \"%s\" to %s" msgstr "Envoi de « %s » à %s" -#: ../src/empathy-ft-manager.c:237 -msgctxt "file size" -msgid "Unknown" -msgstr "Inconnue" +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:340 +#, c-format +msgid "Error receiving \"%s\" from %s" +msgstr "Erreur lors de la réception de « %s » de la part de %s" -#. translators: first %s is the transferred size, second %s is -#. * the total file size -#: ../src/empathy-ft-manager.c:245 +#: ../src/empathy-ft-manager.c:343 +msgid "Error receiving a file" +msgstr "Erreur de réception de fichier" + +#: ../src/empathy-ft-manager.c:348 #, c-format -msgid "%s of %s" -msgstr "%s sur %s" +msgid "Error sending \"%s\" to %s" +msgstr "Erreur lors de l'envoi de « %s » à %s" -#: ../src/empathy-ft-manager.c:252 -msgid "Waiting the other participant's response" -msgstr "Attente de la réponse du correspondant" +#: ../src/empathy-ft-manager.c:351 +msgid "Error sending a file" +msgstr "Erreur d'envoi de fichier" -#: ../src/empathy-ft-manager.c:262 +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:490 #, c-format msgid "\"%s\" received from %s" msgstr "« %s » reçu de %s" -#: ../src/empathy-ft-manager.c:268 +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:495 #, c-format msgid "\"%s\" sent to %s" msgstr "« %s » envoyé à %s" -#: ../src/empathy-ft-manager.c:271 +#: ../src/empathy-ft-manager.c:498 msgid "File transfer completed" msgstr "Transfert de fichier terminé" -#: ../src/empathy-ft-manager.c:280 -#, c-format -msgid "\"%s\" receiving from %s" -msgstr "Réception de « %s » de %s" +#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784 +msgid "Waiting for the other participant's response" +msgstr "Attente de la réponse du correspondant" -#: ../src/empathy-ft-manager.c:286 +#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681 #, c-format -msgid "\"%s\" sending to %s" -msgstr "Envoi de « %s » à %s" +msgid "Checking integrity of \"%s\"" +msgstr "Vérification de l'intégrité de « %s »" -#: ../src/empathy-ft-manager.c:289 +#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684 #, c-format -msgid "File transfer canceled: %s" -msgstr "Transfert de fichier annulé : %s" - -# remaining time -#: ../src/empathy-ft-manager.c:304 -msgctxt "remaining time" -msgid "Unknown" -msgstr "Inconnu" - -#: ../src/empathy-ft-manager.c:364 -msgctxt "file transfer percent" -msgid "Unknown" -msgstr "Inconnu" +msgid "Hashing \"%s\"" +msgstr "Création de la somme de contrôle pour « %s »" -#: ../src/empathy-ft-manager.c:700 +#: ../src/empathy-ft-manager.c:1024 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:712 +#: ../src/empathy-ft-manager.c:1036 msgid "File" msgstr "Fichier" -#: ../src/empathy-ft-manager.c:734 +#: ../src/empathy-ft-manager.c:1058 msgid "Remaining" msgstr "Restant" -#: ../src/empathy-ft-manager.c:885 -msgid "Cannot save file to this location" -msgstr "Impossible d'enregistrer ce fichier à cet emplacement" - -#: ../src/empathy-ft-manager.c:931 -msgid "Save file as..." -msgstr "Enregistrer le fichier sous..." - -#: ../src/empathy-ft-manager.c:1001 -msgid "unknown size" -msgstr "taille inconnue" - -#: ../src/empathy-ft-manager.c:1007 -#, c-format -msgid "%s would like to send you a file" -msgstr "%s souhaite vous envoyer un fichier" - -#: ../src/empathy-ft-manager.c:1012 -#, c-format -msgid "Do you want to accept the file \"%s\" (%s)?" -msgstr "Voulez-vous accepter le fichier « %s » (%s) ?" - -#. Accept button -#: ../src/empathy-ft-manager.c:1030 -msgid "_Accept" -msgstr "_Accepter" - -#: ../src/empathy-ft-manager.glade.h:1 -msgid "File transfers" +#: ../src/empathy-ft-manager.ui.h:1 +msgid "File Transfers" msgstr "Transferts de fichiers" -#: ../src/empathy-ft-manager.glade.h:2 +#: ../src/empathy-ft-manager.ui.h:2 msgid "Remove completed, canceled and failed file transfers from the list" msgstr "Enlever les transferts terminés, annulés et non réussis de la liste" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-dialog.c:255 +#: ../src/empathy-import-dialog.c:263 msgid "Import" msgstr "Importer" -#: ../src/empathy-import-dialog.c:264 +#: ../src/empathy-import-dialog.c:272 msgid "Protocol" msgstr "Protocole" -#: ../src/empathy-import-dialog.c:290 +#: ../src/empathy-import-dialog.c:298 msgid "Source" msgstr "Source" -#: ../src/empathy-import-dialog.c:378 +#: ../src/empathy-import-dialog.c:392 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -1898,138 +2112,196 @@ msgstr "" "Aucun compte à importer n'a été trouvé. Empathy n'est actuellement capable " "d'importer des comptes que de Pidgin." -#: ../src/empathy-import-dialog.glade.h:1 +#: ../src/empathy-import-dialog.ui.h:1 msgid "Import Accounts" msgstr "Importer des comptes" -#: ../src/empathy-main-window.c:391 +#: ../src/empathy-main-window.c:396 +msgid "_Edit account" +msgstr "Mo_difier le compte" + +#: ../src/empathy-main-window.c:499 msgid "No error specified" msgstr "Aucune erreur indiquée" -#: ../src/empathy-main-window.c:394 +#: ../src/empathy-main-window.c:502 msgid "Network error" msgstr "Erreur réseau" -#: ../src/empathy-main-window.c:397 +#: ../src/empathy-main-window.c:505 msgid "Authentication failed" msgstr "L'authentification a échoué" -#: ../src/empathy-main-window.c:400 +#: ../src/empathy-main-window.c:508 msgid "Encryption error" msgstr "Erreur de chiffrement" -#: ../src/empathy-main-window.c:403 +#: ../src/empathy-main-window.c:511 msgid "Name in use" msgstr "Nom déjà utilisé" -#: ../src/empathy-main-window.c:406 +#: ../src/empathy-main-window.c:514 msgid "Certificate not provided" msgstr "Certificat non fourni" -#: ../src/empathy-main-window.c:409 +#: ../src/empathy-main-window.c:517 msgid "Certificate untrusted" msgstr "Certificat non validé" -#: ../src/empathy-main-window.c:412 +#: ../src/empathy-main-window.c:520 msgid "Certificate expired" msgstr "Le certificat a expiré" -#: ../src/empathy-main-window.c:415 +#: ../src/empathy-main-window.c:523 msgid "Certificate not activated" msgstr "Certificat non activé" -#: ../src/empathy-main-window.c:418 +#: ../src/empathy-main-window.c:526 msgid "Certificate hostname mismatch" msgstr "Le nom de l'hôte du certificat ne correspond pas" -#: ../src/empathy-main-window.c:421 +#: ../src/empathy-main-window.c:529 msgid "Certificate fingerprint mismatch" msgstr "L'empreinte du certificat ne correspond pas" -#: ../src/empathy-main-window.c:424 +#: ../src/empathy-main-window.c:532 msgid "Certificate self-signed" msgstr "Certificat auto-signé" -#: ../src/empathy-main-window.c:427 +#: ../src/empathy-main-window.c:535 msgid "Certificate error" msgstr "Erreur de certificat" -#: ../src/empathy-main-window.c:430 +#: ../src/empathy-main-window.c:538 msgid "Unknown error" msgstr "Erreur inconnue" -#: ../src/empathy-main-window.c:594 +#: ../src/empathy-main-window.c:1218 msgid "Show and edit accounts" msgstr "Afficher et modifier les comptes" -#: ../src/empathy-main-window.c:974 -msgid "Contact" -msgstr "Contact" - -#: ../src/empathy-main-window.c:1176 -msgid "_Edit account" -msgstr "Mo_difier le compte" - -#: ../src/empathy-main-window.glade.h:1 +#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:9 msgid "Contact List" msgstr "Liste des contacts" -#: ../src/empathy-main-window.glade.h:2 +#: ../src/empathy-main-window.ui.h:2 +msgid "Contacts on a _Map" +msgstr "Contacts sur une _carte" + +#: ../src/empathy-main-window.ui.h:3 msgid "Context" msgstr "Contexte" -#: ../src/empathy-main-window.glade.h:3 +#: ../src/empathy-main-window.ui.h:4 msgid "Join _Favorites" msgstr "Joindre les _favoris" -#: ../src/empathy-main-window.glade.h:4 -msgid "Join _New..." -msgstr "Rejoindre _nouveau" - -#: ../src/empathy-main-window.glade.h:5 +#: ../src/empathy-main-window.ui.h:5 msgid "Manage Favorites" msgstr "Gérer les favoris" -#: ../src/empathy-main-window.glade.h:6 -msgid "Show _Offline Contacts" -msgstr "Afficher les contacts _déconnectés" - -#: ../src/empathy-main-window.glade.h:7 +#: ../src/empathy-main-window.ui.h:6 msgid "_Accounts" msgstr "_Comptes" -#: ../src/empathy-main-window.glade.h:8 +#: ../src/empathy-main-window.ui.h:7 msgid "_Add Contact..." msgstr "A_jouter un contact..." -#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2 +#: ../src/empathy-main-window.ui.h:9 +msgid "_Contents" +msgstr "_Sommaire" + +#: ../src/empathy-main-window.ui.h:10 +msgid "_Debug" +msgstr "_Débogage" + +#: ../src/empathy-main-window.ui.h:12 +msgid "_File Transfers" +msgstr "Transferts de _fichiers" + +#: ../src/empathy-main-window.ui.h:13 +msgid "_Help" +msgstr "Aid_e" + +#: ../src/empathy-main-window.ui.h:14 +msgid "_Join..." +msgstr "_Joindre..." + +#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2 msgid "_New Conversation..." msgstr "_Nouvelle conversation..." -#: ../src/empathy-main-window.glade.h:14 +#: ../src/empathy-main-window.ui.h:16 +msgid "_Offline Contacts" +msgstr "Contacts _déconnectés" + +#: ../src/empathy-main-window.ui.h:17 msgid "_Personal Information" msgstr "_Informations personnelles" -#: ../src/empathy-main-window.glade.h:16 +#: ../src/empathy-main-window.ui.h:19 +msgid "_Previous Conversations" +msgstr "Conversations _précédentes" + +#: ../src/empathy-main-window.ui.h:20 msgid "_Room" msgstr "_Salle" -#: ../src/empathy-new-chatroom-dialog.c:291 -msgid "Chat Rooms" -msgstr "Salles de discussion" +#: ../src/empathy-new-chatroom-dialog.c:331 +msgid "Chat Room" +msgstr "Salle de discussion" -#: ../src/empathy-new-chatroom-dialog.glade.h:2 -msgid "Browse:" -msgstr "Parcourir :" +#: ../src/empathy-new-chatroom-dialog.c:347 +msgid "Members" +msgstr "Membres" -#: ../src/empathy-new-chatroom-dialog.glade.h:3 +#: ../src/empathy-new-chatroom-dialog.c:496 +#, c-format +msgctxt "" +"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no " +"and a number." +msgid "" +"<b>%s</b>\n" +"Invite required: %s\n" +"Password required: %s\n" +"Members: %s" +msgstr "" +"<b>%s</b>\n" +"Invitation nécessaire : %s\n" +"Mot de passe nécessaire : %s\n" +"Membres : %s" + +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 +msgid "Yes" +msgstr "Oui" + +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 +msgid "No" +msgstr "Non" + +#: ../src/empathy-new-chatroom-dialog.c:526 +msgid "Could not start room listing" +msgstr "Impossible de lancer la liste des salles" + +#: ../src/empathy-new-chatroom-dialog.c:536 +msgid "Could not stop room listing" +msgstr "Impossible d'arrêter la liste des salles" + +#: ../src/empathy-new-chatroom-dialog.ui.h:2 +msgid "Couldn't load room list" +msgstr "Le chargement de la liste des salles de discussion a échoué" + +#: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "" "Enter the room name to join here or click on one or more rooms in the list." msgstr "" "Saisissez le nom de salle à rejoindre ou cliquez sur une ou plusieurs salles " "dans la liste." -#: ../src/empathy-new-chatroom-dialog.glade.h:4 +#: ../src/empathy-new-chatroom-dialog.ui.h:4 msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" @@ -2037,186 +2309,229 @@ msgstr "" "Saisissez le serveur qui héberge la salle ou laissez-le vide si la salle est " "sur le même serveur que le compte actuel" -#: ../src/empathy-new-chatroom-dialog.glade.h:5 -msgid "Join" -msgstr "Joindre" - -#: ../src/empathy-new-chatroom-dialog.glade.h:6 -msgid "Join New" -msgstr "Joindre une nouvelle salle" +#: ../src/empathy-new-chatroom-dialog.ui.h:5 +msgid "Join Room" +msgstr "Joindre la salle" -#: ../src/empathy-new-chatroom-dialog.glade.h:7 -msgid "Re_fresh" -msgstr "_Actualiser" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "Room List" +msgstr "Liste des salles" -#: ../src/empathy-new-chatroom-dialog.glade.h:8 -msgid "" -"This list represents all chat rooms hosted on the server you have entered." -msgstr "" -"Cette liste représente toutes les salles de discussion hébergées sur le " -"serveur actuel." +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "_Room:" +msgstr "Sall_e :" -#: ../src/empathy-preferences.c:157 +#: ../src/empathy-preferences.c:161 msgid "Message received" msgstr "Message reçu" -#: ../src/empathy-preferences.c:158 +#: ../src/empathy-preferences.c:162 msgid "Message sent" msgstr "Message envoyé" -#: ../src/empathy-preferences.c:159 +#: ../src/empathy-preferences.c:163 msgid "New conversation" msgstr "Nouvelle conversation" -#: ../src/empathy-preferences.c:160 +#: ../src/empathy-preferences.c:164 msgid "Contact goes online" msgstr "Le contact est en ligne" -#: ../src/empathy-preferences.c:161 +#: ../src/empathy-preferences.c:165 msgid "Contact goes offline" msgstr "Le contact est hors ligne" -#: ../src/empathy-preferences.c:162 +#: ../src/empathy-preferences.c:166 msgid "Account connected" msgstr "Compte connecté" -#: ../src/empathy-preferences.c:163 +#: ../src/empathy-preferences.c:167 msgid "Account disconnected" msgstr "Compte déconnecté" -#: ../src/empathy-preferences.c:397 +#: ../src/empathy-preferences.c:446 msgid "Language" msgstr "Langue" -#: ../src/empathy-preferences.glade.h:1 -msgid "<b>Appearance</b>" -msgstr "<b>Apparence</b>" - -#: ../src/empathy-preferences.glade.h:2 -msgid "<b>Behavior</b>" -msgstr "<b>Comportement</b>" +#: ../src/empathy-preferences.ui.h:1 +msgid "Allow _GPS usage" +msgstr "Autoriser l'utilisation du _GPS" -#: ../src/empathy-preferences.glade.h:3 -msgid "<b>Contact List</b>" -msgstr "<b>Liste des contacts</b>" +#: ../src/empathy-preferences.ui.h:2 +msgid "Allow _cellphone usage" +msgstr "Autoriser l'utilisation du téléphone _cellulaire" -#: ../src/empathy-preferences.glade.h:4 -msgid "<b>Enable spell checking for languages:</b>" -msgstr "<b>Activer la correction orthographique pour les langues :</b>" +#: ../src/empathy-preferences.ui.h:3 +msgid "Allow _network usage" +msgstr "Autoriser l'utilisation du _réseau" -#: ../src/empathy-preferences.glade.h:5 -msgid "<b>Play sound for events</b>" -msgstr "<b>Jouer un son lors des événements</b>" +#: ../src/empathy-preferences.ui.h:4 +msgid "Appearance" +msgstr "Apparence" -#: ../src/empathy-preferences.glade.h:6 -msgid "" -"<small>The list of languages reflects only the languages for which you have " -"a dictionary installed.</small>" -msgstr "" -"<small>La liste de langues ne contient que les langues pour lesquelles vous " -"avez un dictionnaire installé.</small>" - -#: ../src/empathy-preferences.glade.h:7 +#: ../src/empathy-preferences.ui.h:5 msgid "Automatically _connect on startup " msgstr "Se _connecter automatiquement au démarrage" -#: ../src/empathy-preferences.glade.h:8 +#: ../src/empathy-preferences.ui.h:6 msgid "Avatars are user chosen images shown in the contact list" msgstr "" "Les avatars sont des images choisies par l'utilisateur et visibles dans la " "liste de contacts" -#: ../src/empathy-preferences.glade.h:9 +#: ../src/empathy-preferences.ui.h:7 +msgid "Behavior" +msgstr "Comportement" + +#: ../src/empathy-preferences.ui.h:8 msgid "Chat Th_eme:" msgstr "_Thème de la fenêtre de discussion :" -#: ../src/empathy-preferences.glade.h:10 +#: ../src/empathy-preferences.ui.h:10 msgid "Disable notifications when _away or busy" msgstr "Désactiver les notifications lorsque vous êtes _absent ou occupé" -#: ../src/empathy-preferences.glade.h:11 +#: ../src/empathy-preferences.ui.h:11 msgid "Disable sounds when _away or busy" msgstr "Désactiver les sons lorsque vous êtes _absent ou occupé" -#: ../src/empathy-preferences.glade.h:12 +#: ../src/empathy-preferences.ui.h:12 +msgid "Enable notifications when a contact comes online" +msgstr "Afficher des notifications quand un contact se connecte" + +#: ../src/empathy-preferences.ui.h:13 +msgid "Enable notifications when a contact goes offline" +msgstr "Afficher des notifications quand un contact se déconnecte" + +#: ../src/empathy-preferences.ui.h:14 msgid "Enable notifications when the _chat is not focused" msgstr "" "Afficher des notifications quand la discussion n'est pas au premier plan" -#: ../src/empathy-preferences.glade.h:13 +#: ../src/empathy-preferences.ui.h:15 +msgid "Enable spell checking for languages:" +msgstr "Activer la correction orthographique pour les langues :" + +#: ../src/empathy-preferences.ui.h:16 msgid "General" msgstr "Général" -#: ../src/empathy-preferences.glade.h:14 +#: ../src/empathy-preferences.ui.h:17 +msgid "Geoclue Settings" +msgstr "Paramètres Geoclue" + +#: ../src/empathy-preferences.ui.h:18 +msgid "Location" +msgstr "Emplacement" + +#: ../src/empathy-preferences.ui.h:19 msgid "Notifications" msgstr "Notifications" -#: ../src/empathy-preferences.glade.h:15 +#: ../src/empathy-preferences.ui.h:20 +msgid "Play sound for events" +msgstr "Jouer un son lors des événements" + +#: ../src/empathy-preferences.ui.h:21 msgid "Preferences" msgstr "Préférences" -#: ../src/empathy-preferences.glade.h:16 +#: ../src/empathy-preferences.ui.h:22 +msgid "Privacy" +msgstr "Confidentialité" + +#: ../src/empathy-preferences.ui.h:23 +msgid "" +"Reduced location accuracy means that nothing more precise than your city, " +"state and country will be published. GPS coordinates will have a random " +"value added (±0.25°)." +msgstr "" +"Lorsque la précision de l'emplacement est réduite, les informations de " +"géolocalisation publiées se limitent au pays, à la région ou à la ville. " +"Une valeur aléatoire est appliquée aux coordonnées GPS (±0.25°)." + +#: ../src/empathy-preferences.ui.h:24 msgid "Show _avatars" msgstr "Afficher les _avatars" -#: ../src/empathy-preferences.glade.h:17 +#: ../src/empathy-preferences.ui.h:25 msgid "Show _smileys as images" msgstr "Convertir les _frimousses en images" -#: ../src/empathy-preferences.glade.h:18 +#: ../src/empathy-preferences.ui.h:26 msgid "Show co_mpact contact list" msgstr "Afficher la liste co_mpacte des contacts" -#: ../src/empathy-preferences.glade.h:19 +#: ../src/empathy-preferences.ui.h:27 +msgid "Show contact _list in rooms" +msgstr "Afficher la _liste des contacts dans les salles" + +#: ../src/empathy-preferences.ui.h:28 msgid "Sort by _name" msgstr "Trié par _nom" -#: ../src/empathy-preferences.glade.h:20 +#: ../src/empathy-preferences.ui.h:29 msgid "Sort by s_tate" msgstr "Trié par é_tat" -#: ../src/empathy-preferences.glade.h:21 +#: ../src/empathy-preferences.ui.h:30 msgid "Sounds" msgstr "Sons" -#: ../src/empathy-preferences.glade.h:22 +#: ../src/empathy-preferences.ui.h:31 msgid "Spell Checking" msgstr "Correction orthographique" -#: ../src/empathy-preferences.glade.h:23 +#: ../src/empathy-preferences.ui.h:32 +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "" +"La liste de langues ne contient que les langues pour lesquelles vous " +"avez un dictionnaire installé." + +#: ../src/empathy-preferences.ui.h:33 msgid "Themes" msgstr "Thèmes" -#: ../src/empathy-preferences.glade.h:24 +#: ../src/empathy-preferences.ui.h:34 msgid "_Enable bubble notifications" msgstr "_Activer les bulles de notification" -#: ../src/empathy-preferences.glade.h:25 +#: ../src/empathy-preferences.ui.h:35 msgid "_Enable sound notifications" msgstr "_Activer les notifications sonores" -#: ../src/empathy-preferences.glade.h:26 +#: ../src/empathy-preferences.ui.h:36 msgid "_Open new chats in separate windows" msgstr "_Ouvrir les nouvelles discussions dans des fenêtres séparées" -#: ../src/empathy-status-icon.glade.h:1 +#: ../src/empathy-preferences.ui.h:37 +msgid "_Publish location to my contacts" +msgstr "_Publier mon emplacement pour mes contacts" + +#: ../src/empathy-preferences.ui.h:38 +msgid "_Reduce location accuracy" +msgstr "Réduire la précision de l'_emplacement" + +#: ../src/empathy-status-icon.ui.h:1 msgid "Status" msgstr "État" -#: ../src/empathy-status-icon.glade.h:3 +#: ../src/empathy-status-icon.ui.h:3 msgid "_Quit" msgstr "_Quitter" -#: ../src/empathy-status-icon.glade.h:4 +#: ../src/empathy-status-icon.ui.h:4 msgid "_Show Contact List" msgstr "_Afficher la liste des contacts" -#: ../src/empathy-tube-dispatch.c:364 +#: ../src/empathy-tube-dispatch.c:375 #, c-format msgid "Unable to start application for service %s: %s" msgstr "Impossible de démarrer l'application pour le service %s : %s" -#: ../src/empathy-tube-dispatch.c:435 +#: ../src/empathy-tube-dispatch.c:446 #, c-format msgid "" "An invitation was offered for service %s, but you don't have the needed " @@ -2224,3 +2539,239 @@ msgid "" msgstr "" "Vous avez reçu une invitation pour le service %s, mais vous ne disposez pas " "de l'application nécessaire pour le gérer" + +#: ../src/empathy-call-window-fullscreen.ui.h:1 +msgid "gtk-leave-fullscreen" +msgstr "gtk-leave-fullscreen" + +#: ../src/empathy-map-view.ui.h:1 +msgid "Contact Map View" +msgstr "Carte des contacts" + +#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083 +msgid "Error" +msgstr "Erreur" + +#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077 +msgid "Critical" +msgstr "Critique" + +#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071 +msgid "Warning" +msgstr "Avertissement" + +#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065 +#: ../src/empathy-debug-dialog.c:1113 +msgid "Message" +msgstr "Message" + +#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059 +msgid "Info" +msgstr "Information" + +#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053 +msgid "Debug" +msgstr "Débogage" + +# Titre de fenêtre +#: ../src/empathy-debug-dialog.c:845 +msgid "Save" +msgstr "Enregistrer" + +#: ../src/empathy-debug-dialog.c:948 +msgid "Debug Window" +msgstr "Fenêtre de débogage" + +#: ../src/empathy-debug-dialog.c:1021 +msgid "Pause" +msgstr "Pause" + +#: ../src/empathy-debug-dialog.c:1033 +msgid "Level " +msgstr "Niveau " + +#: ../src/empathy-debug-dialog.c:1102 +msgid "Time" +msgstr "Heure" + +#: ../src/empathy-debug-dialog.c:1104 +msgid "Domain" +msgstr "Domaine" + +#: ../src/empathy-debug-dialog.c:1106 +msgid "Category" +msgstr "Catégorie" + +#: ../src/empathy-debug-dialog.c:1108 +msgid "Level" +msgstr "Niveau" + +#: ../src/empathy-debug-dialog.c:1140 +msgid "" +"The selected connection manager does not support the remote debugging " +"extension." +msgstr "" +"Le gestionnaire de connexions sélectionné ne prend pas en charge l'extension " +"de débogage distant." + +#~ msgid "New message from %s" +#~ msgstr "Nouveau message de %s" + +#~ msgctxt "file size" +#~ msgid "Unknown" +#~ msgstr "Inconnue" + +#~ msgctxt "remaining time" +#~ msgid "Stalled" +#~ msgstr "Bloqué" + +# remaining time +#~ msgctxt "remaining time" +#~ msgid "Unknown" +#~ msgstr "Inconnu" + +#~ msgid "Cannot save file to this location" +#~ msgstr "Impossible d'enregistrer ce fichier à cet emplacement" + +#~ msgid "Save file as..." +#~ msgstr "Enregistrer le fichier sous..." + +#~ msgid "unknown size" +#~ msgstr "taille inconnue" + +#~ msgid "%s would like to send you a file" +#~ msgstr "%s souhaite vous envoyer un fichier" + +#~ msgid "Do you want to accept the file \"%s\" (%s)?" +#~ msgstr "Voulez-vous accepter le fichier « %s » (%s) ?" + +#~ msgid "_Accept" +#~ msgstr "_Accepter" + +#~ msgid "Show _File Transfers" +#~ msgstr "Afficher les transferts de _fichiers" + +#~ msgid "Forget password and clear the entry." +#~ msgstr "Oublier le mot de passe et effacer la zone." + +#~ msgid "Edit the selected IRC network" +#~ msgstr "Modifie le réseau IRC sélectionné" + +#~ msgid "Remove the selected IRC network" +#~ msgstr "Supprime le réseau IRC sélectionné" + +#~ msgid "_Check Word Spelling..." +#~ msgstr "_Vérifier l'orthographe..." + +#~ msgid "Group Chat" +#~ msgstr "Groupe de discussion" + +#~ msgid "Contact Information" +#~ msgstr "Informations du contact" + +#~ msgid "I would like to add you to my contact list." +#~ msgstr "Je voudrais vous ajouter à ma liste de contacts." + +#~ msgid "Sorry, I don't want you in my contact list anymore." +#~ msgstr "Désolé, je ne te veux plus dans ma liste de contacts." + +#~ msgid "Contact information" +#~ msgstr "Informations sur le contact" + +#~ msgid "Word" +#~ msgstr "Mot" + +#~ msgid "Suggestions for the word" +#~ msgstr "Suggestions pour le mot" + +#~ msgid "Spell Checker" +#~ msgstr "Correcteur orthographique" + +#~ msgid "Suggestions for the word:" +#~ msgstr "Suggestions pour le mot :" + +#~ msgid "C_lear" +#~ msgstr "_Nettoyer" + +#~ msgid "Chat" +#~ msgstr "Discuter" + +#~ msgid "Insert _Smiley" +#~ msgstr "Insérer une _frimousse" + +#~ msgid "Invitation _message:" +#~ msgstr "_Message d'invitation :" + +#~ msgid "Invite" +#~ msgstr "Inviter" + +#~ msgid "Move Tab _Left" +#~ msgstr "Déplacer l'onglet à _gauche" + +#~ msgid "Move Tab _Right" +#~ msgstr "Déplacer l'onglet à _droite" + +#~ msgid "Select who would you like to invite:" +#~ msgstr "Sélectionnez la personne à inviter :" + +#~ msgid "You have been invited to join a chat conference." +#~ msgstr "Vous avez été invité(e) à joindre une salle de discussion" + +#~ msgid "_Contact" +#~ msgstr "_Contact" + +#~ msgid "_Conversation" +#~ msgstr "_Conversation" + +#~ msgid "_Detach Tab" +#~ msgstr "_Détacher l'onglet" + +#~ msgid "_Favorite Chatroom" +#~ msgstr "Salles de discussion _favorites" + +#~ msgid "_Next Tab" +#~ msgstr "Onglet _suivant" + +#~ msgid "_Previous Tab" +#~ msgstr "Onglet _précédent" + +#~ msgid "_Tabs" +#~ msgstr "_Onglets" + +#~ msgid "Edit Favorite Room" +#~ msgstr "Modifier les salles favorites" + +#~ msgid "Join room on start_up" +#~ msgstr "Joindre la salle au _démarrage" + +#~ msgid "Join this chat room when Empathy starts and you are connected" +#~ msgstr "" +#~ "Joindre cette salle de discussion quand Empathy démarre et que vous êtes " +#~ "connecté" + +#~ msgid "N_ame:" +#~ msgstr "_Nom :" + +#~ msgid "S_erver:" +#~ msgstr "_Serveur :" + +#~ msgid "Join _New..." +#~ msgstr "Rejoindre _nouveau" + +#~ msgid "Browse:" +#~ msgstr "Parcourir :" + +#~ msgid "Join" +#~ msgstr "Joindre" + +#~ msgid "Join New" +#~ msgstr "Joindre une nouvelle salle" + +#~ msgid "Re_fresh" +#~ msgstr "_Actualiser" + +#~ msgid "" +#~ "This list represents all chat rooms hosted on the server you have entered." +#~ msgstr "" +#~ "Cette liste représente toutes les salles de discussion hébergées sur le " +#~ "serveur actuel." @@ -1,30 +1,28 @@ # translation of empathy to Lithuanian -# Copyright (C) 2004-2007, 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the gossip package. +# Copyright (C) 2004-2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the empathy package. # # # Justina KlingaitÄ— <justina.klingaite@gmail.com>, 2006. # Gintautas Miliauskas <gintas@akl.lt>, 2006. -# Žygimantas BeruÄka <zygis@gnome.org>, 2004-2007. +# Žygimantas BeruÄka <zygis@gnome.org>, 2004-2007, 2009. # Saulius <saulius.shopaga@gmail.com>, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: empathy.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-07 17:07+0200\n" -"PO-Revision-Date: 2009-03-07 17:07+0200\n" -"Last-Translator: Saulius <saulius.shopaga@gmail.com>\n" -"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" +"POT-Creation-Date: 2009-06-29 14:20+0300\n" +"PO-Revision-Date: 2009-06-29 20:10+0300\n" +"Last-Translator: Žygimantas BeruÄka <zygis@gnome.org>\n" +"Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 0.2\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../data/empathy.desktop.in.in.h:1 msgid "Empathy Instant Messenger" -msgstr "Bendravimas žinutÄ—mis" +msgstr "Pokalbių programa Empathy" #: ../data/empathy.desktop.in.in.h:2 msgid "Send and receive instant messages" @@ -39,8 +37,8 @@ msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." msgstr "" -"Simbolis po slapyvardžio naudojant slapyvardžio užbaigimÄ… (tab) grupÄ—s " -"pokalbiuose" +"Po slapyvardžio pridÄ—tinas simbolis, naudojant slapyvardžio užbaigimÄ… (tab) " +"grupÄ—s pokalbiuose." #: ../data/empathy.schemas.in.h:3 msgid "Chat window theme" @@ -54,251 +52,332 @@ msgstr "" #: ../data/empathy.schemas.in.h:5 msgid "Compact contact list" -msgstr "KompaktiÅ¡kas biÄiulių sÄ…raÅ¡as" +msgstr "KompaktiÅ¡kas adresatų sÄ…raÅ¡as" #: ../data/empathy.schemas.in.h:6 msgid "Contact list sort criterium" -msgstr "BiÄiulių sÄ…raÅ¡o rikiavimo požymis" +msgstr "Adresatų sÄ…raÅ¡o rikiavimo kriterijus" #: ../data/empathy.schemas.in.h:7 msgid "Default directory to select an avatar image from" -msgstr "Numatytasis aplankas, iÅ¡ kurio renkamas paveikslÄ—lis" +msgstr "" +"Numatytasis aplankas, iÅ¡ kurio pasirinktinas pseudoportreto paveikslÄ—lis" #: ../data/empathy.schemas.in.h:8 msgid "Disable popup notifications when away" -msgstr "IÅ¡jungti praneÅ¡imų iÅ¡kylanÄius langus, kai manÄ™s nÄ—ra" +msgstr "IÅ¡jungti iÅ¡kylanÄius praneÅ¡imų langus, kai manÄ™s nÄ—ra" #: ../data/empathy.schemas.in.h:9 msgid "Disable sounds when away" msgstr "IÅ¡jungti garsus, kai manÄ™s nÄ—ra" #: ../data/empathy.schemas.in.h:10 -msgid "Empathy default download folder" -msgstr "Numatytasis aplankas atsisiuntimams" +msgid "Empathy can publish the user's location" +msgstr "Empathy gali rodyti naudotojo vietovÄ™" #: ../data/empathy.schemas.in.h:11 -msgid "Empathy has asked about importing accounts" -msgstr "Programa užklausÄ— dÄ—l paskyrų importo" +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy gali naudoti GPS, siekiant atspÄ—ti vietovÄ™" #: ../data/empathy.schemas.in.h:12 -msgid "Empathy should auto-connect on startup" -msgstr "Prie kurios paskyros prisijungti paleidimo metu" +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy naudoti mobiliojo ryÅ¡io tinklÄ…, siekiant atspÄ—ti vietovÄ™" #: ../data/empathy.schemas.in.h:13 -msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "BiÄiulio paveikslÄ—lis bus ir pokalbio lango ženkliuku" +msgid "Empathy can use the network to guess the location" +msgstr "Empathy gali naudoti tinklÄ…, siekiant atspÄ—ti vietovÄ™" #: ../data/empathy.schemas.in.h:14 -msgid "Enable popup notifications for new messages" -msgstr "Ä®jungti iÅ¡kylanÄius langus praneÅ¡imams apie naujas žinutes" +msgid "Empathy default download folder" +msgstr "Numatytasis Empathy atsiuntimo aplankas" #: ../data/empathy.schemas.in.h:15 +msgid "Empathy has asked about importing accounts" +msgstr "Empathy klausÄ— apie paskyrų importavimÄ…" + +#: ../data/empathy.schemas.in.h:16 +msgid "Empathy should auto-connect on startup" +msgstr "Paleidus Empathy, ji turÄ—tų automatiÅ¡kai prisijungti" + +#: ../data/empathy.schemas.in.h:17 +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy turÄ—tų sumažinti vietovÄ—s tikslumÄ…" + +#: ../data/empathy.schemas.in.h:18 +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "" +"Empathy turÄ—tų naudoti adresato pseudoportretÄ… pokalbio lango piktogramai" + +#: ../data/empathy.schemas.in.h:19 +msgid "Enable popup notifications for new messages" +msgstr "Ä®jungti iÅ¡kylanÄius praneÅ¡imus apie naujas žinutes" + +#: ../data/empathy.schemas.in.h:20 msgid "Enable spell checker" msgstr "Ä®jungti raÅ¡ybos tikrinimÄ…" -#: ../data/empathy.schemas.in.h:16 +#: ../data/empathy.schemas.in.h:21 msgid "Hide main window" msgstr "PaslÄ—pti pagrindinį langÄ…" -#: ../data/empathy.schemas.in.h:17 +#: ../data/empathy.schemas.in.h:22 msgid "Hide the main window." msgstr "PaslÄ—pti pagrindinį langÄ…." -#: ../data/empathy.schemas.in.h:18 +#: ../data/empathy.schemas.in.h:23 msgid "NetworkManager should be used" msgstr "Naudoti NetworkManager" -#: ../data/empathy.schemas.in.h:19 +#: ../data/empathy.schemas.in.h:24 msgid "Nick completed character" msgstr "Slapyvardžio užbaigimo simbolis" -#: ../data/empathy.schemas.in.h:20 +#: ../data/empathy.schemas.in.h:25 msgid "Open new chats in separate windows" -msgstr "Atverti pokalbius atskiruose languose" +msgstr "Atverti naujus pokalbius atskiruose languose" -#: ../data/empathy.schemas.in.h:21 +#: ../data/empathy.schemas.in.h:26 +msgid "Path of the adium theme to use" +msgstr "Naudotinos adium temos kelias" + +#: ../data/empathy.schemas.in.h:27 +msgid "Path of the adium theme to use if the theme used for chat is adium." +msgstr "Naudotinos adium temos kelias, jei pokalbiui naudojama tema yra adium." + +#: ../data/empathy.schemas.in.h:28 msgid "Play a sound for incoming messages" msgstr "Gavus žinutÄ™ sugroti garsÄ…" -#: ../data/empathy.schemas.in.h:22 +#: ../data/empathy.schemas.in.h:29 msgid "Play a sound for new conversations" -msgstr "Pradedant pokalbį sugroti garsÄ…" +msgstr "Pradedant naujÄ… pokalbį sugroti garsÄ…" -#: ../data/empathy.schemas.in.h:23 +#: ../data/empathy.schemas.in.h:30 msgid "Play a sound for outgoing messages" -msgstr "IÅ¡siunÄiant žinutÄ™ sugroti garsÄ…" +msgstr "IÅ¡siunÄiant žinutes sugroti garsÄ…" -#: ../data/empathy.schemas.in.h:24 +#: ../data/empathy.schemas.in.h:31 msgid "Play a sound when a contact logs in" -msgstr "Prisijungus biÄiuliui sugroti garsÄ…" +msgstr "Prisijungus adresatui sugroti garsÄ…" -#: ../data/empathy.schemas.in.h:25 +#: ../data/empathy.schemas.in.h:32 msgid "Play a sound when a contact logs out" -msgstr "Atsijungus biÄiuliui sugroti garsÄ…" +msgstr "Atsijungus adresatui sugroti garsÄ…" -#: ../data/empathy.schemas.in.h:26 +#: ../data/empathy.schemas.in.h:33 msgid "Play a sound when we log in" -msgstr "Prisijungus sugroti garsÄ…" +msgstr "Jums prisijungus sugroti garsÄ…" -#: ../data/empathy.schemas.in.h:27 +#: ../data/empathy.schemas.in.h:34 msgid "Play a sound when we log out" -msgstr "Atsijungus sugroti garsÄ…" +msgstr "Jums atsijungus sugroti garsÄ…" -#: ../data/empathy.schemas.in.h:28 +#: ../data/empathy.schemas.in.h:35 msgid "Popup notifications if the chat isn't focused" -msgstr "IÅ¡kylanÄio lango praneÅ¡imas apie pokalbį neaktyviame lange" +msgstr "Rodyti iÅ¡kylanÄius praneÅ¡imus, jei pokalbio langas nesuaktyvintas" -#: ../data/empathy.schemas.in.h:29 +#: ../data/empathy.schemas.in.h:36 +msgid "Popup notifications when a contact sign in" +msgstr "Rodyti iÅ¡kylanÄius praneÅ¡imus, kai adresatas prisijungia" + +#: ../data/empathy.schemas.in.h:37 +msgid "Popup notifications when a contact sign out" +msgstr "Rodyti iÅ¡kylanÄius praneÅ¡imus, kai adresatas atsijungia" + +#: ../data/empathy.schemas.in.h:38 msgid "Salut account is created" msgstr "Salut paskyra sukurta" -#: ../data/empathy.schemas.in.h:30 +#: ../data/empathy.schemas.in.h:39 msgid "Show avatars" -msgstr "Rodyti biÄiulių paveikslÄ—lius" +msgstr "Rodyti pseudoportretus" -#: ../data/empathy.schemas.in.h:31 +#: ../data/empathy.schemas.in.h:40 +msgid "Show contact list in rooms" +msgstr "Rodyti adresatų sÄ…raÅ¡Ä… kambariuose" + +#: ../data/empathy.schemas.in.h:41 msgid "Show hint about closing the main window" msgstr "PerspÄ—ti apie pagrindinio lango užvÄ—rimÄ…" -#: ../data/empathy.schemas.in.h:32 +#: ../data/empathy.schemas.in.h:42 msgid "Show offline contacts" -msgstr "Rodyti atsijungusius biÄiulius" +msgstr "Rodyti atsijungusius adresatus" -#: ../data/empathy.schemas.in.h:33 +#: ../data/empathy.schemas.in.h:43 msgid "Spell checking languages" -msgstr "Kalbų raÅ¡ybos tikrinimas" +msgstr "Kalbos, kurių raÅ¡yba tikrinama" -#: ../data/empathy.schemas.in.h:34 +#: ../data/empathy.schemas.in.h:44 msgid "The default folder to save file transfers in." -msgstr "Numatytasis aplankas atsisiunÄiamiems failams" +msgstr "Numatytasis aplankas, kuriame įraÅ¡omi atsiųsti failai." -#: ../data/empathy.schemas.in.h:35 +#: ../data/empathy.schemas.in.h:45 msgid "The last directory that an avatar image was chosen from." -msgstr "Aplankas, iÅ¡ kurio praeitÄ… kartÄ… buvo pasirinktas paveikslÄ—lis." +msgstr "Aplankas, kuriame praeitÄ… kartÄ… buvo pasirinktas pseudoportretas." -#: ../data/empathy.schemas.in.h:36 +#: ../data/empathy.schemas.in.h:46 msgid "The theme that is used to display the conversation in chat windows." -msgstr "Tema naudojama pokalbio rodymui pokalbių lange." +msgstr "Tema, naudojama pokalbio rodymui pokalbių languose." -#: ../data/empathy.schemas.in.h:37 +#: ../data/empathy.schemas.in.h:47 msgid "Use graphical smileys" msgstr "Naudoti grafines Å¡ypsenÄ—les" -#: ../data/empathy.schemas.in.h:38 +#: ../data/empathy.schemas.in.h:48 msgid "Use notification sounds" -msgstr "Naudoti įspÄ—jimo garsus" +msgstr "Naudoti praneÅ¡imų garsus" -#: ../data/empathy.schemas.in.h:39 +#: ../data/empathy.schemas.in.h:49 msgid "Use theme for chat rooms" msgstr "Naudoti temÄ… pokalbių kambariams" -#: ../data/empathy.schemas.in.h:40 +#: ../data/empathy.schemas.in.h:50 +msgid "Whether or not Empathy can publish the user's location to his contacts." +msgstr "Ar Empathy gali rodyti naudotojo vietovÄ™ jo adresatams." + +#: ../data/empathy.schemas.in.h:51 +msgid "Whether or not Empathy can use the GPS to guess the location." +msgstr "Ar Empathy gali naudoti GPS vietovÄ—s spÄ—jimui." + +#: ../data/empathy.schemas.in.h:52 +msgid "" +"Whether or not Empathy can use the cellular network to guess the location." +msgstr "Ar Empathy gali naudoti mobiliojo ryÅ¡io tinklÄ… vietovÄ—s spÄ—jimui." + +#: ../data/empathy.schemas.in.h:53 +msgid "Whether or not Empathy can use the network to guess the location." +msgstr "Ar Empathy gali naudoti tinklÄ… vietovÄ—s spÄ—jimui." + +#: ../data/empathy.schemas.in.h:54 msgid "" "Whether or not Empathy has asked about importing accounts from other " "programs." -msgstr "Ar buvo užklausta dÄ—l paskyrų importo iÅ¡ kitų programų." +msgstr "Ar Empathy klausÄ— apie paskyrų importavimÄ… iÅ¡ kitų programų." -#: ../data/empathy.schemas.in.h:41 +#: ../data/empathy.schemas.in.h:55 msgid "" "Whether or not Empathy should automatically log in to your accounts on " "startup." -msgstr "Ar prisijungti prie paskyrų pradedant darbÄ…" +msgstr "" +"Ar Empathy turÄ—tų automatiÅ¡kai prisijungti prie paskyrų jÄ… paleidus." -#: ../data/empathy.schemas.in.h:42 +#: ../data/empathy.schemas.in.h:56 +msgid "" +"Whether or not Empathy should reduce the location's accuracy for privacy " +"reasons." +msgstr "" +"Ar Empathy turÄ—tų sumažinti vietovÄ—s rodymo tikslumÄ… privatumo sumetimais." + +#: ../data/empathy.schemas.in.h:57 msgid "" "Whether or not Empathy should use the avatar of the contact as the chat " "window icon." -msgstr "Ar paÅ¡nekovo paveikslÄ—lį naudoti ir kaip pokalbio lango ženkliukÄ… ." +msgstr "Ar naudoti adresato pseudoportretÄ… kaip pokalbio lango piktogramÄ…." -#: ../data/empathy.schemas.in.h:43 +#: ../data/empathy.schemas.in.h:58 msgid "" "Whether or not the Salut account has been created on the first Empathy run." -msgstr "Ar pirmos paleisties metu sukurti Salut paskyrÄ…" +msgstr "Ar pirmÄ…kart paleidus Empathy buvo sukurta Salut paskyra." -#: ../data/empathy.schemas.in.h:44 +#: ../data/empathy.schemas.in.h:59 msgid "" "Whether or not the network manager should be used to automatically " "disconnect/reconnect." -msgstr "Ar naudoti tinklo tvarkyklÄ™ automatiÅ¡kai atjungiant/vÄ—l prijungiant" +msgstr "Ar naudoti tinklo valdyklÄ™ automatiÅ¡kai atsijungiant/vÄ—l prisijungiant." -#: ../data/empathy.schemas.in.h:45 +#: ../data/empathy.schemas.in.h:60 msgid "" "Whether or not to check words typed against the languages you want to check " "with." -msgstr "Ar tikrinti žodžių raÅ¡ybÄ… pagal pasirinktÄ… kalbÄ…." +msgstr "" +"Ar tikrinti įvedamų žodžių raÅ¡ybÄ… pasirenkant jÅ«sų pageidaujamas kalbas." -#: ../data/empathy.schemas.in.h:46 +#: ../data/empathy.schemas.in.h:61 msgid "" "Whether or not to convert smileys into graphical images in conversations." -msgstr "Ar pokalbiuose paversti Å¡ypsenÄ—les į grafinius paveiksliukus." +msgstr "Ar pokalbiuose versti Å¡ypsenÄ—les į grafinius paveikslÄ—lius." -#: ../data/empathy.schemas.in.h:47 +#: ../data/empathy.schemas.in.h:62 msgid "" "Whether or not to play a sound to notify for contacts logging in the network." -msgstr "Ar groti garsÄ… prisijungiant biÄiuliams." +msgstr "Ar sugroti garsÄ… adresatams prisijungiant prie tinklo." -#: ../data/empathy.schemas.in.h:48 +#: ../data/empathy.schemas.in.h:63 msgid "" "Whether or not to play a sound to notify for contacts logging off the " "network." -msgstr "Ar groti garsÄ… atsijungiant biÄiuliams." +msgstr "Ar sugroti garsÄ… adresatams atsijungiant nuo tinklo." -#: ../data/empathy.schemas.in.h:49 +#: ../data/empathy.schemas.in.h:64 msgid "Whether or not to play a sound to notify for events." msgstr "Ar sugroti garsÄ… praneÅ¡ant apie įvykius." -#: ../data/empathy.schemas.in.h:50 +#: ../data/empathy.schemas.in.h:65 msgid "Whether or not to play a sound to notify for incoming messages." msgstr "Ar sugroti garsÄ…, kai atsiunÄiama nauja žinutÄ—." -#: ../data/empathy.schemas.in.h:51 +#: ../data/empathy.schemas.in.h:66 msgid "Whether or not to play a sound to notify for new conversations." msgstr "Ar sugroti garsÄ… praneÅ¡ant apie naujÄ… pokalbį." -#: ../data/empathy.schemas.in.h:52 +#: ../data/empathy.schemas.in.h:67 msgid "Whether or not to play a sound to notify for outgoing messages." msgstr "Ar sugroti garsÄ…, kai iÅ¡siunÄiama žinutÄ—." -#: ../data/empathy.schemas.in.h:53 +#: ../data/empathy.schemas.in.h:68 msgid "Whether or not to play a sound when logging in a network." -msgstr "Ar groti garsÄ… prisijungiant." +msgstr "Ar groti garsÄ… prisijungiant prie tinklo." -#: ../data/empathy.schemas.in.h:54 +#: ../data/empathy.schemas.in.h:69 msgid "Whether or not to play a sound when logging off a network." -msgstr "Ar groti garsÄ… atsijungiant." +msgstr "Ar groti garsÄ… atsijungiant nuo tinklo." -#: ../data/empathy.schemas.in.h:55 +#: ../data/empathy.schemas.in.h:70 msgid "Whether or not to play sound notifications when away or busy." -msgstr "Ar groti garsinius praneÅ¡imus, kai tavÄ™s nÄ—ra ar užsiÄ—mÄ™s." +msgstr "Ar groti garsinius praneÅ¡imus, kai esate pasitraukÄ™ ar užsiÄ—mÄ™." -#: ../data/empathy.schemas.in.h:56 +#: ../data/empathy.schemas.in.h:71 +msgid "" +"Whether or not to show a popup notification when a contact goes offline." +msgstr "Ar rodyti iÅ¡keliamÄ… praneÅ¡imÄ…, kai adresatas atsijungia." + +#: ../data/empathy.schemas.in.h:72 +msgid "Whether or not to show a popup notification when a contact goes online." +msgstr "Ar rodyti iÅ¡keliamÄ… praneÅ¡imÄ…, kai adresatas prisijungia." + +#: ../data/empathy.schemas.in.h:73 msgid "" "Whether or not to show a popup notification when receiving a new message " "even if the chat is already opened, but not focused." msgstr "" -"Ar rodyti iÅ¡kylantį praneÅ¡imo langÄ… gauvus žinutÄ™ pradÄ—tame pokalbyje, jei " -"pokalbio langas neaktyvuotas." +"Ar rodyti iÅ¡kylantį praneÅ¡imo langÄ…, kai gaunama nauja žinutÄ—, net jei " +"pokalbio langas yra jau atvertas, taÄiau nesuaktyvintas." -#: ../data/empathy.schemas.in.h:57 +#: ../data/empathy.schemas.in.h:74 msgid "" "Whether or not to show a popup notification when receiving a new message." -msgstr "Ar rodyti iÅ¡kylantį praneÅ¡imo langÄ… gavus naujÄ… žinutÄ™." +msgstr "Ar rodyti iÅ¡kylantį praneÅ¡imÄ… gavus naujÄ… žinutÄ™." -#: ../data/empathy.schemas.in.h:58 +#: ../data/empathy.schemas.in.h:75 msgid "" "Whether or not to show avatars for contacts in the contact list and chat " "windows." -msgstr "Ar rodyti biÄiulių paveikslÄ—lius kontaktų sÄ…raÅ¡e ir pokalbių languose." +msgstr "Ar rodyti adresatų sÄ…raÅ¡e ir pokalbių languose pseudoportretus." -#: ../data/empathy.schemas.in.h:59 +#: ../data/empathy.schemas.in.h:76 msgid "Whether or not to show contacts that are offline in the contact list." -msgstr "Ar biÄiulių sÄ…raÅ¡e rodyti biÄiulius, kurie yra atsijungÄ™." +msgstr "Ar adresatų sÄ…raÅ¡e rodyti adresatus, kurie yra atsijungÄ™." -#: ../data/empathy.schemas.in.h:60 +#: ../data/empathy.schemas.in.h:77 msgid "Whether or not to show popup notifications when away or busy." -msgstr "Ar rodyti iÅ¡kylanÄius praneÅ¡imo langus, kai tavÄ™s nÄ—ra ar užsiÄ—mÄ™s." +msgstr "Ar rodyti iÅ¡kylanÄius praneÅ¡imus, kai esate pasitraukÄ™ ar užsiÄ—mÄ™." -#: ../data/empathy.schemas.in.h:61 +#: ../data/empathy.schemas.in.h:78 +msgid "Whether or not to show the contact list in chat rooms." +msgstr "Ar rodyti adresatų sÄ…raÅ¡Ä… pokalbių kambariuose." + +#: ../data/empathy.schemas.in.h:79 msgid "" "Whether or not to show the message dialog about closing the main window with " "the 'x' button in the title bar." @@ -306,740 +385,950 @@ msgstr "" "Ar rodyti praneÅ¡imo apie pagrindinio lango uždarymÄ… dialogÄ… su mygtuku „x“ " "antraÅ¡tÄ—s juostoje." -#: ../data/empathy.schemas.in.h:62 +#: ../data/empathy.schemas.in.h:80 msgid "Whether to show the contact list in compact mode or not." -msgstr "Ar biÄiulių sÄ…raÅ¡Ä… rodyti glaudintÄ…." +msgstr "Ar adresatų sÄ…raÅ¡Ä… rodyti glaudintÄ…." -#: ../data/empathy.schemas.in.h:63 +#: ../data/empathy.schemas.in.h:81 msgid "Whether to use the theme for chat rooms or not." msgstr "Ar naudoti temÄ… pokalbių kambariams." -#: ../data/empathy.schemas.in.h:64 +#: ../data/empathy.schemas.in.h:82 msgid "" "Which criterium to use when sorting the contact list. Default is to use sort " "by the contact's name with the value \"name\". A value of \"state\" will " "sort the contact list by state." msgstr "" -"Pagal kurį požymį rikiuoti biÄiulių sÄ…raÅ¡Ä…. Numatytasis požymis yra biÄiulio " -"vardas (reikÅ¡mÄ— „vardas“). ReikÅ¡mÄ— „bÅ«sena“ rikiuos biÄiulių sÄ…raÅ¡Ä… pagal " +"Pagal kurį kriterijų rikiuoti adresatų sÄ…raÅ¡Ä…. Numatytasis yra adresato " +"vardas (reikÅ¡mÄ— „name“). ReikÅ¡mÄ— „state“ rikiuoja adresatų sÄ…raÅ¡Ä… pagal " "bÅ«senÄ…." -#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:270 +#: ../libempathy/empathy-ft-handler.c:838 +msgid "The hash of the received file and the sent one do not match" +msgstr "Gautojo ir iÅ¡siųstojo failo maiÅ¡os kodai nesutampa" + +#: ../libempathy/empathy-ft-handler.c:1098 +msgid "File transfer not supported by remote contact" +msgstr "NutolÄ™s adresatas nepalaiko failų siuntimo" + +#: ../libempathy/empathy-ft-handler.c:1156 +msgid "The selected file is not a regular file" +msgstr "Pasirinktas failas nÄ—ra normalus failas" + +#: ../libempathy/empathy-ft-handler.c:1165 +msgid "The selected file is empty" +msgstr "Pasirinktas failas yra tuÅ¡Äias" + +#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:288 msgid "People nearby" msgstr "ŽmonÄ—s netoliese" -#: ../libempathy/empathy-utils.c:252 +#: ../libempathy/empathy-tp-file.c:279 +msgid "Socket type not supported" +msgstr "Nepalaikomas lizdo tipas" + +#: ../libempathy/empathy-tp-file.c:398 +msgid "No reason was specified" +msgstr "Nenurodyta priežastis" + +#: ../libempathy/empathy-tp-file.c:401 +msgid "The change in state was requested" +msgstr "BÅ«senos keitimo užklausa" + +#: ../libempathy/empathy-tp-file.c:404 +msgid "You canceled the file transfer" +msgstr "AtÅ¡aukÄ—te failo siuntimÄ…" + +#: ../libempathy/empathy-tp-file.c:407 +msgid "The other participant canceled the file transfer" +msgstr "Kitas dalyvis atÅ¡aukÄ— failo siuntimÄ…" + +#: ../libempathy/empathy-tp-file.c:410 +msgid "Error while trying to transfer the file" +msgstr "Klaida bandant persiųsti failÄ…" + +#: ../libempathy/empathy-tp-file.c:413 +msgid "The other participant is unable to transfer the file" +msgstr "Kitas dalyvis negali persiųsti failo" + +#: ../libempathy/empathy-tp-file.c:416 +msgid "Unknown reason" +msgstr "Nežinoma priežastis" + +#: ../libempathy/empathy-utils.c:274 msgid "Available" msgstr "Esu" -#: ../libempathy/empathy-utils.c:254 +#: ../libempathy/empathy-utils.c:276 msgid "Busy" -msgstr "UžsiÄ—mÄ™s" +msgstr "UžsiÄ—mÄ™s(-usi)" -#: ../libempathy/empathy-utils.c:257 +#: ../libempathy/empathy-utils.c:279 msgid "Away" -msgstr "ManÄ™s nÄ—ra." +msgstr "PasitraukÄ™s(-usi)" -#: ../libempathy/empathy-utils.c:259 +#: ../libempathy/empathy-utils.c:281 msgid "Hidden" -msgstr "Nematomas" +msgstr "PasislÄ—pÄ™s(-usi)" -#: ../libempathy/empathy-utils.c:262 +#: ../libempathy/empathy-utils.c:283 msgid "Offline" -msgstr "AtsijungÄ™s" +msgstr "AtsijungÄ™s(-usi)" + +#: ../libempathy/empathy-time.c:137 +#, c-format +msgid "%d second ago" +msgid_plural "%d seconds ago" +msgstr[0] "prieÅ¡ %d sekundÄ™" +msgstr[1] "prieÅ¡ %d sekundes" +msgstr[2] "prieÅ¡ %d sekundžių" + +#: ../libempathy/empathy-time.c:142 +#, c-format +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "prieÅ¡ %d minutÄ™" +msgstr[1] "prieÅ¡ %d minutes" +msgstr[2] "prieÅ¡ %d minuÄių" + +#: ../libempathy/empathy-time.c:147 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "prieÅ¡ %d valandÄ…" +msgstr[1] "prieÅ¡ %d valandas" +msgstr[2] "prieÅ¡ %d valandų" + +#: ../libempathy/empathy-time.c:152 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "prieÅ¡ %d dienÄ…" +msgstr[1] "prieÅ¡ %d dienas" +msgstr[2] "prieÅ¡ %d dienų" + +#: ../libempathy/empathy-time.c:157 +#, c-format +msgid "%d week ago" +msgid_plural "%d weeks ago" +msgstr[0] "prieÅ¡ %d savaitÄ™" +msgstr[1] "prieÅ¡ %d savaites" +msgstr[2] "prieÅ¡ %d savaiÄių" + +#: ../libempathy/empathy-time.c:162 +#, c-format +msgid "%d month ago" +msgid_plural "%d months ago" +msgstr[0] "prieÅ¡ %d mÄ—nesį" +msgstr[1] "prieÅ¡ %d mÄ—nesius" +msgstr[2] "prieÅ¡ %d mÄ—nesių" -#: ../libempathy-gtk/empathy-account-chooser.c:326 +#: ../libempathy/empathy-time.c:167 +msgid "in the future" +msgstr "ateityje" + +#: ../libempathy-gtk/empathy-account-chooser.c:419 msgid "All" msgstr "Visi" #: ../libempathy-gtk/empathy-account-widget.c:302 -#: ../libempathy-gtk/empathy-account-widget.c:347 +#: ../libempathy-gtk/empathy-account-widget.c:354 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1 -msgid "<b>Advanced</b>" -msgstr "<b>SudÄ—tingesnÄ—s parinktys</b>" - -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2 -msgid "Forget password and clear the entry." -msgstr "UžmirÅ¡ti slaptažodį ir iÅ¡valyti įraÅ¡Ä…." - -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Advanced" +msgstr "Papildomi" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 msgid "Pass_word:" msgstr "S_laptažodis:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 msgid "Screen _Name:" -msgstr "_Rodomas Vardas:" - -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8 +msgstr "_Rodomas vardas:" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "_Port:" msgstr "_Prievadas:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10 -#: ../src/empathy-new-chatroom-dialog.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 msgid "_Server:" msgstr "_Serveris:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "Prisijungimo I_D:" -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 msgid "ICQ _UIN:" msgstr "ICQ _UIN:" -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "_Charset:" -msgstr "K_oduotÄ—:" +msgstr "_KoduotÄ—:" -#: ../libempathy-gtk/empathy-account-widget-irc.c:245 +#: ../libempathy-gtk/empathy-account-widget-irc.c:241 msgid "New Network" -msgstr "Naujas Tinklas" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1 -msgid "<b>Network</b>" -msgstr "<b>Tinklas</b>" +msgstr "Naujas tinklas" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2 -msgid "<b>Servers</b>" -msgstr "<b>Serveriai</b>" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 msgid "Charset:" msgstr "KoduotÄ—:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4 -msgid "Create a new IRC network" -msgstr "Sukurti naujÄ… IRC tinklÄ…" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5 -msgid "Edit the selected IRC network" -msgstr "Redaguoti pasirinktÄ… IRC tinklÄ…" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 msgid "Network" msgstr "Tinklas" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Network:" msgstr "Tinklas:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 msgid "Nickname:" msgstr "Slapyvardis:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "Password:" msgstr "Slaptažodis:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Quit message:" msgstr "IÅ¡Ä—jimo žinutÄ—:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Real name:" msgstr "Tikrasis vardas:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12 -msgid "Remove the selected IRC network" -msgstr "PaÅ¡alinti pasirinktÄ… IRC tinklÄ…" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +msgid "Servers" +msgstr "Serveriai" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2 -msgid "<b>Override server settings</b>" -msgstr "<b>Pakeisti serverio nustatymus</b>" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 +msgid "Override server settings" +msgstr "Nepaisyti serverio parametrų" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 msgid "Pri_ority:" msgstr "Pri_oritetas:" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "Reso_urce:" -msgstr "Res_ursas:" +msgstr "IÅ¡tekli_us:" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 msgid "Use old SS_L" -msgstr "Naudoti Å¡ifravimÄ… (SS_L)" +msgstr "Naudoti senÄ…jį SS_L" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "_Encryption required (TLS/SSL)" -msgstr "R_eikalingas Å¡ifravimas (TLS/SSL)" +msgstr "_Reikalingas Å¡ifravimas (TLS/SSL)" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 msgid "_Ignore SSL certificate errors" -msgstr "_Ignoruoti SSL sertifikato klaidas" +msgstr "_Nepaisyti SSL liudijimo klaidų" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2 msgid "_Email:" msgstr "_El. paÅ¡tas:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3 msgid "_First Name:" msgstr "_Vardas:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4 msgid "_Jabber ID:" msgstr "_Jabber ID:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5 msgid "_Last Name:" msgstr "_PavardÄ—:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6 -#: ../src/empathy-chatrooms-window.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6 msgid "_Nickname:" msgstr "_Slapyvardis:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7 msgid "_Published Name:" msgstr "_Prisistatymo vardas:" #. look up the DNS SRV record at the service's domain for the host name of a STUN server. -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Discover STUN" -msgstr "Rasti STUN" +msgstr "Aptikti STUN" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 msgid "STUN Server:" -msgstr "STUN Serveris:" +msgstr "STUN serveris:" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 msgid "STUN port:" msgstr "STUN prievadas:" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 msgid "_Username:" -msgstr "Naudotojo _Vardas:" +msgstr "_Naudotojo vardas:" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 msgid "Use _Yahoo Japan" msgstr "Naudoti _Yahoo Japan" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 msgid "Yahoo I_D:" msgstr "Yahoo I_D:" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 msgid "_Ignore conference and chatroom invitations" -msgstr "_Ignoruoti grupių ir pokalbių kambarių kvietimus" +msgstr "_Nepaisyti konferencijų ir pokalbių kambarių kvietimų" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 msgid "_Room List locale:" -msgstr "_Kambarių SÄ…raÅ¡o kalbos kodas" +msgstr "_Kambarių sÄ…raÅ¡o lokalÄ—:" -#: ../libempathy-gtk/empathy-avatar-chooser.c:462 -#: ../libempathy-gtk/empathy-avatar-chooser.c:537 +#: ../libempathy-gtk/empathy-avatar-chooser.c:449 +#: ../libempathy-gtk/empathy-avatar-chooser.c:525 msgid "Couldn't convert image" -msgstr "Nepavyko sukonvertuoti paveikslÄ—lio" +msgstr "Nepavyko konvertuoti paveikslÄ—lio" -#: ../libempathy-gtk/empathy-avatar-chooser.c:463 +#: ../libempathy-gtk/empathy-avatar-chooser.c:450 msgid "None of the accepted image formats is supported on your system" -msgstr "Nei vienas iÅ¡ priimtinų paveikslÄ—lio formatų sistemoje neregistruotas" +msgstr "Jokie priimti paveikslÄ—lių formatai jÅ«sų sistemoje nepalaikomi" -#: ../libempathy-gtk/empathy-avatar-chooser.c:956 +#: ../libempathy-gtk/empathy-avatar-chooser.c:933 msgid "Select Your Avatar Image" -msgstr "Pasirinkite savo paveikslÄ—lį" +msgstr "Pasirinkite savo pseudoportretÄ…" -#: ../libempathy-gtk/empathy-avatar-chooser.c:959 +#: ../libempathy-gtk/empathy-avatar-chooser.c:936 msgid "No Image" msgstr "PaveikslÄ—lio nÄ—ra" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1021 +#: ../libempathy-gtk/empathy-avatar-chooser.c:998 msgid "Images" msgstr "PaveikslÄ—liai" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1025 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1002 msgid "All Files" -msgstr "Visi Failai" +msgstr "Visi failai" -#: ../libempathy-gtk/empathy-avatar-image.c:294 +#: ../libempathy-gtk/empathy-avatar-image.c:324 msgid "Click to enlarge" -msgstr "SpustelÄ—kite, kad padidinti" +msgstr "NorÄ—dami padidinti, spustelÄ—kite" + +#: ../libempathy-gtk/empathy-chat.c:186 +msgid "Failed to reconnect this chat" +msgstr "Nepavyko iÅ¡ naujo prisijungti prie Å¡io pokalbio" + +#: ../libempathy-gtk/empathy-chat.c:404 +msgid "Unsupported command" +msgstr "Nepalaikoma komanda" -#: ../libempathy-gtk/empathy-chat.c:498 +#: ../libempathy-gtk/empathy-chat.c:539 msgid "offline" msgstr "atsijungÄ™s" -#: ../libempathy-gtk/empathy-chat.c:501 +#: ../libempathy-gtk/empathy-chat.c:542 msgid "invalid contact" -msgstr "duomenys netinkami" +msgstr "netinkamas adresatas" -#: ../libempathy-gtk/empathy-chat.c:504 +#: ../libempathy-gtk/empathy-chat.c:545 msgid "permission denied" msgstr "prieeiga uždrausta" -#: ../libempathy-gtk/empathy-chat.c:507 +#: ../libempathy-gtk/empathy-chat.c:548 msgid "too long message" -msgstr "žinutÄ— per ilga" +msgstr "per ilga žinutÄ—" -#: ../libempathy-gtk/empathy-chat.c:510 +#: ../libempathy-gtk/empathy-chat.c:551 msgid "not implemented" -msgstr "Å i funkcija dar nerealizuota" +msgstr "Å¡i funkcija dar nerealizuota" -#: ../libempathy-gtk/empathy-chat.c:513 +#: ../libempathy-gtk/empathy-chat.c:554 msgid "unknown" msgstr "nežinoma" -#: ../libempathy-gtk/empathy-chat.c:517 +#: ../libempathy-gtk/empathy-chat.c:558 #, c-format msgid "Error sending message '%s': %s" msgstr "Klaida siunÄiant žinutÄ™ „%s“: %s" -#: ../libempathy-gtk/empathy-chat.c:547 +#: ../libempathy-gtk/empathy-chat.c:588 #, c-format msgid "Topic set to: %s" -msgstr "Tema: %s" +msgstr "Tema nustatyta į: %s" -#: ../libempathy-gtk/empathy-chat.c:549 +#: ../libempathy-gtk/empathy-chat.c:590 msgid "No topic defined" -msgstr "Nenurodyta tema" +msgstr "Nenurodyta jokia tema" -#: ../libempathy-gtk/empathy-chat.c:964 +#: ../libempathy-gtk/empathy-chat.c:959 +msgid "(No Suggestions)" +msgstr "(NÄ—ra pasiÅ«lymų)" + +#: ../libempathy-gtk/empathy-chat.c:1013 msgid "Insert Smiley" msgstr "Ä®terpti Å¡ypsenÄ—lÄ™" #. send button -#: ../libempathy-gtk/empathy-chat.c:982 -#: ../libempathy-gtk/empathy-ui-utils.c:1559 +#: ../libempathy-gtk/empathy-chat.c:1031 +#: ../libempathy-gtk/empathy-ui-utils.c:1475 msgid "_Send" msgstr "_Siųsti" -#: ../libempathy-gtk/empathy-chat.c:1016 -msgid "_Check Word Spelling..." -msgstr "_Tikrinti žodžių raÅ¡ybÄ…..." +#: ../libempathy-gtk/empathy-chat.c:1065 +msgid "_Spelling Suggestions" +msgstr "_RaÅ¡ybos pasiÅ«lymai" -#: ../libempathy-gtk/empathy-chat.c:1134 +#: ../libempathy-gtk/empathy-chat.c:1179 #, c-format msgid "%s has joined the room" msgstr "%s prisijungÄ— prie pokalbių kambario" -#: ../libempathy-gtk/empathy-chat.c:1137 +#: ../libempathy-gtk/empathy-chat.c:1182 #, c-format msgid "%s has left the room" msgstr "%s paliko pokalbių kambarį" -#: ../libempathy-gtk/empathy-chat.c:1251 ../src/empathy-call-window.c:721 +#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1226 msgid "Disconnected" -msgstr "NeprisijungÄ™s" +msgstr "AtsijungÄ™s(-usi)" -#: ../libempathy-gtk/empathy-chat.c:1647 +#: ../libempathy-gtk/empathy-chat.c:1742 msgid "Connected" -msgstr "PrisijungÄ™s" +msgstr "PrisijungÄ™s(-usi)" -#: ../libempathy-gtk/empathy-chat.c:1697 -#: ../libempathy-gtk/empathy-log-window.c:505 +#: ../libempathy-gtk/empathy-chat.c:1792 +#: ../libempathy-gtk/empathy-log-window.c:501 msgid "Conversation" msgstr "Pokalbis" -#: ../libempathy-gtk/empathy-chat.glade.h:1 -msgid "<b>Topic:</b>" -msgstr "<b>Tema:</b>" - -#: ../libempathy-gtk/empathy-chat.glade.h:2 -msgid "Group Chat" -msgstr "Grupinis pokalbis" +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472 +msgid "Topic:" +msgstr "Tema:" -#: ../libempathy-gtk/empathy-chat-text-view.c:331 +#: ../libempathy-gtk/empathy-chat-text-view.c:316 msgid "_Copy Link Address" msgstr "_Kopijuoti nuorodos adresÄ…" -#: ../libempathy-gtk/empathy-chat-text-view.c:339 +#: ../libempathy-gtk/empathy-chat-text-view.c:323 msgid "_Open Link" msgstr "_Atverti nuorodÄ…" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:432 +#: ../libempathy-gtk/empathy-chat-text-view.c:421 msgid "%A %B %d %Y" -msgstr "%Y-%b-%d (%A)" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:180 -msgid "Personal Information" -msgstr "AsmeninÄ— informacija" +msgstr "%Y %B %d (%A)" -#: ../libempathy-gtk/empathy-contact-dialogs.c:183 +#: ../libempathy-gtk/empathy-contact-dialogs.c:179 +#: ../libempathy-gtk/empathy-contact-dialogs.c:238 msgid "Edit Contact Information" -msgstr "Keisti biÄiulio info" +msgstr "Taisyti adresato informacijÄ…" -#: ../libempathy-gtk/empathy-contact-dialogs.c:186 -msgid "Contact Information" -msgstr "BiÄiulio Info" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:267 -msgid "I would like to add you to my contact list." -msgstr "NorÄ—Äiau Jus įtraukti į savo biÄiulių sÄ…raÅ¡Ä…." +#: ../libempathy-gtk/empathy-contact-dialogs.c:289 +msgid "Personal Information" +msgstr "AsmeninÄ— informacija" -#: ../libempathy-gtk/empathy-contact-dialogs.c:291 +#: ../libempathy-gtk/empathy-contact-dialogs.c:392 msgid "New Contact" -msgstr "BiÄiulis" +msgstr "Naujas adresatas" -#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 msgid "Decide _Later" -msgstr "NusprÄ™sti vÄ—_liau" +msgstr "NusprÄ™sti _vÄ—liau" -#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "Prenumeratos praÅ¡ymas" -#: ../libempathy-gtk/empathy-contact-list-view.c:1249 +#: ../libempathy-gtk/empathy-contact-list-view.c:1378 #, c-format msgid "Do you really want to remove the group '%s'?" -msgstr "Ar norite paÅ¡alinti grupÄ™ „%s“?" +msgstr "Ar tikrai norite paÅ¡alinti grupÄ™ „%s“?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1251 +#: ../libempathy-gtk/empathy-contact-list-view.c:1380 msgid "Removing group" msgstr "Å alinama grupÄ—" -#: ../libempathy-gtk/empathy-contact-list-view.c:1298 -#: ../libempathy-gtk/empathy-contact-list-view.c:1377 +#: ../libempathy-gtk/empathy-contact-list-view.c:1427 +#: ../libempathy-gtk/empathy-contact-list-view.c:1505 msgid "_Remove" msgstr "_PaÅ¡alinti" -#: ../libempathy-gtk/empathy-contact-list-view.c:1328 +#: ../libempathy-gtk/empathy-contact-list-view.c:1457 #, c-format msgid "Do you really want to remove the contact '%s'?" -msgstr "Ar norite paÅ¡alinti biÄiulį „%s“ iÅ¡ sÄ…raÅ¡o?" +msgstr "Ar tikrai norite paÅ¡alinti adresatÄ… „%s“?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1330 +#: ../libempathy-gtk/empathy-contact-list-view.c:1459 msgid "Removing contact" -msgstr "Å alinamas biÄiulis" - -#: ../libempathy-gtk/empathy-contact-list-view.c:1335 -msgid "Sorry, I don't want you in my contact list anymore." -msgstr "Atleiskite, bet esate nepageidaujamas mano adresatų sÄ…raÅ¡e." +msgstr "Å alinamas adresatas" -#: ../libempathy-gtk/empathy-contact-menu.c:130 -#: ../src/empathy-main-window.glade.h:9 +#: ../libempathy-gtk/empathy-contact-menu.c:135 +#: ../src/empathy-main-window.ui.h:8 msgid "_Chat" -msgstr "P_okalbis" +msgstr "_Pokalbis" -#: ../libempathy-gtk/empathy-contact-menu.c:161 -#: ../src/empathy-call-window.glade.h:5 -msgid "_Call" -msgstr "_Kvietimas" +#: ../libempathy-gtk/empathy-contact-menu.c:166 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Garsinis skambutis" + +#: ../libempathy-gtk/empathy-contact-menu.c:198 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Vaizdinis skambutis" -#: ../libempathy-gtk/empathy-contact-menu.c:200 -#: ../src/empathy-main-window.glade.h:17 +#: ../libempathy-gtk/empathy-contact-menu.c:237 msgid "_View Previous Conversations" -msgstr "ŽiÅ«rÄ—_ti ankstesnius pokalbius" +msgstr "_ŽiÅ«rÄ—ti ankstesnius pokalbius" -#: ../libempathy-gtk/empathy-contact-menu.c:222 +#: ../libempathy-gtk/empathy-contact-menu.c:259 msgid "Send file" msgstr "Siųsti failÄ…" -#: ../libempathy-gtk/empathy-contact-menu.c:250 +#: ../libempathy-gtk/empathy-contact-menu.c:287 msgid "Infor_mation" msgstr "Infor_macija" -#: ../libempathy-gtk/empathy-contact-menu.c:277 -#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11 +#: ../libempathy-gtk/empathy-contact-menu.c:314 +#: ../src/empathy-main-window.ui.h:11 msgid "_Edit" -msgstr "_Keisti" +msgstr "_Taisyti" -#: ../libempathy-gtk/empathy-contact-menu.c:336 +#: ../libempathy-gtk/empathy-contact-menu.c:372 msgid "Inviting to this room" msgstr "KvieÄiamas į šį kambarį" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:403 msgid "_Invite to chatroom" msgstr "_Pakviesti į pokalbių kambarį" -#: ../libempathy-gtk/empathy-contact-selector.c:111 +#: ../libempathy-gtk/empathy-contact-selector.c:129 msgid "Select a contact" -msgstr "IÅ¡rinkti biÄiulį" +msgstr "Pasirinkti adresatÄ…" -#: ../libempathy-gtk/empathy-contact-widget.c:358 +#: ../libempathy-gtk/empathy-contact-widget.c:440 msgid "Save Avatar" -msgstr "IÅ¡saugoti paveikslÄ—lį" +msgstr "IÅ¡saugoti pseudoportretÄ…" -#: ../libempathy-gtk/empathy-contact-widget.c:414 +#: ../libempathy-gtk/empathy-contact-widget.c:496 msgid "Unable to save avatar" -msgstr "Nepavyko iÅ¡saugoti paveikslÄ—lio" +msgstr "Nepavyko iÅ¡saugoti pseudoportreto" -#: ../libempathy-gtk/empathy-contact-widget.c:895 +#: ../libempathy-gtk/empathy-contact-widget.c:979 msgid "Select" -msgstr "Rinktis" +msgstr "Pasirinkti" -#: ../libempathy-gtk/empathy-contact-widget.c:904 -#: ../src/empathy-main-window.c:991 +#: ../libempathy-gtk/empathy-contact-widget.c:988 +#: ../src/empathy-main-window.c:906 msgid "Group" msgstr "GrupÄ—" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:1 -msgid "<b>Client Information</b>" -msgstr "<b>Kliento info</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1239 +msgid "Country ISO Code:" +msgstr "Å alies ISO kodas:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1241 +msgid "Country:" +msgstr "Å alis:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1243 +msgid "State:" +msgstr "BÅ«sena:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1245 +msgid "City:" +msgstr "Miestas:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1247 +msgid "Area:" +msgstr "Sritis:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1249 +msgid "Postal Code:" +msgstr "PaÅ¡to kodas:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1251 +msgid "Street:" +msgstr "GatvÄ—:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:2 -msgid "<b>Contact Details</b>" -msgstr "<b>IÅ¡sami info</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1253 +msgid "Building:" +msgstr "Pastatas:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:3 -msgid "<b>Contact</b>" -msgstr "<b>BiÄiulis</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1255 +msgid "Floor:" +msgstr "AukÅ¡tas:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:4 -msgid "<b>Groups</b>" -msgstr "<b>GrupÄ—s</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1257 +msgid "Room:" +msgstr "Kambarys:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1259 +msgid "Text:" +msgstr "Tekstas:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1261 +msgid "Description:" +msgstr "ApraÅ¡ymas:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1263 +msgid "URI:" +msgstr "URI:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1265 +msgid "Accuracy Level:" +msgstr "Tikslumo lygis:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1267 +msgid "Error:" +msgstr "Paklaida:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1269 +msgid "Vertical Error (meters):" +msgstr "Vertikali paklaida (metrais):" + +#: ../libempathy-gtk/empathy-contact-widget.c:1271 +msgid "Horizontal Error (meters):" +msgstr "Horizontali paklaida (metrais):" + +#: ../libempathy-gtk/empathy-contact-widget.c:1273 +msgid "Speed:" +msgstr "Greitis:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1275 +msgid "Bearing:" +msgstr "Azimutas:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1277 +msgid "Climb Speed:" +msgstr "Kilimo greitis:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1279 +msgid "Last Updated on:" +msgstr "Paskutinįkart atnaujinta:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1281 +msgid "Longitude:" +msgstr "Ilguma:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1283 +msgid "Latitude:" +msgstr "Platuma:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:5 -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1 -#: ../src/empathy-chatrooms-window.glade.h:1 -#: ../src/empathy-new-chatroom-dialog.glade.h:1 +#: ../libempathy-gtk/empathy-contact-widget.c:1285 +msgid "Altitude:" +msgstr "AltitudÄ—:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1332 +msgid "<b>Location</b>" +msgstr "<b>VietovÄ—</b>" + +#: ../libempathy-gtk/empathy-contact-widget.c:1345 +msgid "<b>Location</b>, " +msgstr "<b>VietovÄ—</b>, " + +#: ../libempathy-gtk/empathy-contact-widget.c:1395 +msgid "%B %e, %Y at %R UTC" +msgstr "%Y %B %e, %R UTC" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +msgid "<b>Location</b> at (date)\t" +msgstr "<b>VietovÄ—</b> (data)\t" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 +#: ../src/empathy-chatrooms-window.ui.h:1 +#: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" msgstr "Paskyra:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:6 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 msgid "Alias:" -msgstr "Alternatyvus vardas:" +msgstr "Alternatyvusis vardas:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:7 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 msgid "Birthday:" msgstr "Gimtadienis:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:8 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Client Information" +msgstr "Kliento informacija" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 msgid "Client:" msgstr "Klientas:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:9 -msgid "Contact information" -msgstr "BiÄiulio info" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../src/empathy-main-window.c:889 +msgid "Contact" +msgstr "Adresatas" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Contact Details" +msgstr "Adresato informacija" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "Email:" msgstr "El. paÅ¡tas:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Fullname:" -msgstr "Pilnas vardas:" +msgstr "Visas vardas:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Groups" +msgstr "GrupÄ—s" #. Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.glade.h:13 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:13 msgid "Identifier:" msgstr "Identifikatorius:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:14 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:14 msgid "Information requested..." -msgstr "Informacija užklausta..." +msgstr "Informacijos užklausta..." -#: ../libempathy-gtk/empathy-contact-widget.glade.h:15 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:15 msgid "OS:" msgstr "OS:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:16 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:16 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." msgstr "" -"Pasirinkite grupes, į kurias norite įtraukti šį biÄiulį. Galite pasirinkti " -"daugiau nei vienÄ… grupÄ™ arba nei vienos grupÄ—s." +"Pasirinkite grupes, į kurias norite įtraukti šį adresatÄ…. Galite pasirinkti " +"daugiau nei vienÄ… grupÄ™ arba nepasirinkti nei vienos grupÄ—s." -#: ../libempathy-gtk/empathy-contact-widget.glade.h:17 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:17 msgid "Version:" msgstr "Versija:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:18 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:18 msgid "Web site:" -msgstr "Tinklapis:" +msgstr "Tinklalapis:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:19 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:19 msgid "_Add Group" -msgstr "PridÄ—ti grupÄ™" +msgstr "_PridÄ—ti grupÄ™" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:284 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:283 msgid "new server" -msgstr "serveris" +msgstr "naujas serveris" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:513 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:510 msgid "Server" msgstr "Serveris:" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:528 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:525 msgid "Port" msgstr "Prievadas:" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:541 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:538 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:498 -#: ../src/empathy-import-dialog.c:277 +#: ../libempathy-gtk/empathy-log-window.c:494 +#: ../src/empathy-import-dialog.c:281 msgid "Account" msgstr "Paskyra" -#: ../libempathy-gtk/empathy-log-window.c:515 +#: ../libempathy-gtk/empathy-log-window.c:511 msgid "Date" msgstr "Data" -#. Tab Label -#: ../libempathy-gtk/empathy-log-window.glade.h:2 +#: ../libempathy-gtk/empathy-log-window.ui.h:1 msgid "Conversations" msgstr "Pokalbiai" -#: ../libempathy-gtk/empathy-log-window.glade.h:3 +#: ../libempathy-gtk/empathy-log-window.ui.h:2 msgid "Previous Conversations" msgstr "Ankstesni pokalbiai" -#. Tab Label -#: ../libempathy-gtk/empathy-log-window.glade.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Search" msgstr "IeÅ¡koti" -#. Searching *for* something -#: ../libempathy-gtk/empathy-log-window.glade.h:7 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "_For:" -msgstr "Kam:" +msgstr "_Kam:" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2 msgid "C_all" -msgstr "Sk_ambinti" +msgstr "_Skambutis" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3 msgid "C_hat" -msgstr "Pokalbis" +msgstr "_Pokalbis" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4 msgid "Contact ID:" -msgstr "BiÄiulio ID:" +msgstr "Adresato ID:" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5 msgid "New Conversation" -msgstr "Pokalbis" +msgstr "Naujas pokalbis" + +#. COL_STATE_ICON_NAME +#. COL_STATE +#. COL_STATUS_TEXT +#. COL_DISPLAY_MARKUP +#. COL_STATUS_CUSTOMISABLE +#. COL_TYPE +#: ../libempathy-gtk/empathy-presence-chooser.c:172 +msgid "Custom Message..." +msgstr "PasirinktinÄ— žinutÄ—..." + +#: ../libempathy-gtk/empathy-presence-chooser.c:227 +msgid "Edit Custom Messages..." +msgstr "Taisyti pasirinktines žinutes..." + +#: ../libempathy-gtk/empathy-presence-chooser.c:326 +msgid "Click to remove this status as a favorite" +msgstr "SpustelÄ—kite, jei norite paÅ¡alinti Å¡iÄ… bÅ«senÄ… iÅ¡ mÄ—giamų" + +#: ../libempathy-gtk/empathy-presence-chooser.c:335 +msgid "Click to make this status a favorite" +msgstr "SpustelÄ—kite, jei norite padaryti Å¡iÄ… bÅ«sena mÄ—giama" + +#: ../libempathy-gtk/empathy-presence-chooser.c:369 +msgid "Set status" +msgstr "Nustatyti bÅ«senÄ…" + +#: ../libempathy-gtk/empathy-presence-chooser.c:782 +msgid "Set your presence and current status" +msgstr "Nurodykite savo buvimÄ… ir dabartinÄ™ bÅ«senÄ…" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:685 +#: ../libempathy-gtk/empathy-presence-chooser.c:1017 msgid "Custom messages..." -msgstr "Kita..." +msgstr "PasirinktinÄ—s žinutÄ—s..." + +#: ../libempathy-gtk/empathy-sound.c:51 +msgid "Received an instant message" +msgstr "Gauta žinutÄ—" -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1 -msgid "Custom message" -msgstr "Kitoks praneÅ¡imas" +#: ../libempathy-gtk/empathy-sound.c:53 +msgid "Sent an instant message" +msgstr "IÅ¡siųsta žinutÄ—" -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2 -msgid "Message:" -msgstr "PraneÅ¡imas:" +#: ../libempathy-gtk/empathy-sound.c:55 +msgid "Incoming chat request" +msgstr "Gautas kvietimas pokalbiui" -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3 -msgid "Save message" -msgstr "IÅ¡saugoti" +#: ../libempathy-gtk/empathy-sound.c:57 +msgid "Contact connected" +msgstr "Adresatas prisijungÄ™s" -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4 -msgid "Status:" -msgstr "BÅ«sena:" +#: ../libempathy-gtk/empathy-sound.c:59 +msgid "Contact disconnected" +msgstr "Adresatas atsijungÄ™s" -#: ../libempathy-gtk/empathy-spell-dialog.c:88 -msgid "Word" -msgstr "Žodis" +#: ../libempathy-gtk/empathy-sound.c:61 +msgid "Connected to server" +msgstr "PrisijungÄ—te prie serverio" -#: ../libempathy-gtk/empathy-spell-dialog.c:265 -msgid "Suggestions for the word" -msgstr "Žodžio pasiÅ«lymas" +#: ../libempathy-gtk/empathy-sound.c:63 +msgid "Disconnected from server" +msgstr "AtsijungÄ—te nuo serverio" -#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1 -msgid "Spell Checker" -msgstr "RaÅ¡ybos tikrinimas" +#: ../libempathy-gtk/empathy-sound.c:65 +msgid "Incoming voice call" +msgstr "Gaunamas garsinis skambutis" + +#: ../libempathy-gtk/empathy-sound.c:67 +msgid "Outgoing voice call" +msgstr "Atliekamas garsinis skambutis" + +#: ../libempathy-gtk/empathy-sound.c:69 +msgid "Voice call ended" +msgstr "Baigtas garsinis skambutis" + +#: ../libempathy-gtk/empathy-status-preset-dialog.c:362 +msgid "Enter Custom Message" +msgstr "Ä®veskite pasirinktinÄ™ žinutÄ™" + +#: ../libempathy-gtk/empathy-status-preset-dialog.c:521 +msgid "Edit Custom Messages" +msgstr "Taisykite pasirinktinÄ™ žinutÄ™" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 +msgid "Add _New Preset" +msgstr "PridÄ—ti _naujÄ… žinutÄ™" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2 +msgid "Saved Presets" +msgstr "IÅ¡saugoti žinutes" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3 +msgid "gtk-add" +msgstr "" -#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2 -msgid "Suggestions for the word:" -msgstr "Žodžio pasiÅ«lymai:" +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4 +msgid "gtk-remove" +msgstr "" -#: ../libempathy-gtk/empathy-theme-manager.c:60 +#: ../libempathy-gtk/empathy-theme-manager.c:66 msgid "Classic" msgstr "KlasikinÄ—" -#: ../libempathy-gtk/empathy-theme-manager.c:61 +#: ../libempathy-gtk/empathy-theme-manager.c:67 msgid "Simple" msgstr "Paprasta" -#: ../libempathy-gtk/empathy-theme-manager.c:62 +#: ../libempathy-gtk/empathy-theme-manager.c:68 msgid "Clean" msgstr "Tvarkinga" -#: ../libempathy-gtk/empathy-theme-manager.c:63 +#: ../libempathy-gtk/empathy-theme-manager.c:69 msgid "Blue" msgstr "MÄ—lyna" -#: ../libempathy-gtk/empathy-ui-utils.c:1406 +#: ../libempathy-gtk/empathy-theme-manager.c:71 +msgid "Adium" +msgstr "Adium" + +#: ../libempathy-gtk/empathy-ui-utils.c:1377 msgid "Unable to open URI" msgstr "Nepavyko atverti URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1551 +#: ../libempathy-gtk/empathy-ui-utils.c:1467 msgid "Select a file" msgstr "Pasirinkite failÄ…" -#: ../libempathy-gtk/empathy-ui-utils.c:1587 -msgid "Received an instant message" -msgstr "Gauta žinutÄ—" - -#: ../libempathy-gtk/empathy-ui-utils.c:1589 -msgid "Sent an instant message" -msgstr "IÅ¡siųsta žinutÄ—" - -#: ../libempathy-gtk/empathy-ui-utils.c:1591 -msgid "Incoming chat request" -msgstr "Kvietimas pokalbiui" - -#: ../libempathy-gtk/empathy-ui-utils.c:1593 -msgid "Contact connected" -msgstr "BiÄiulis prisijungÄ™s" - -#: ../libempathy-gtk/empathy-ui-utils.c:1595 -msgid "Contact disconnected" -msgstr "BiÄiulis atsijungÄ™s" - -#: ../libempathy-gtk/empathy-ui-utils.c:1597 -msgid "Connected to server" -msgstr "PrisijungÄ™s prie serverio" - -#: ../libempathy-gtk/empathy-ui-utils.c:1599 -msgid "Disconnected from server" -msgstr "AtsijungÄ™s nuo serverio" - -#: ../libempathy-gtk/empathy-ui-utils.c:1601 -msgid "Incoming voice call" -msgstr "Skambutis balso ryÅ¡iui" - -#: ../libempathy-gtk/empathy-ui-utils.c:1603 -msgid "Outgoing voice call" -msgstr "Skambinama balso ryÅ¡iui" - -#: ../libempathy-gtk/empathy-ui-utils.c:1605 -msgid "Voice call ended" -msgstr "Balso ryÅ¡ys baigtas" +#: ../libempathy-gtk/empathy-ui-utils.c:1525 +msgid "Select a destination" +msgstr "Pasirinkite paskirtį" #: ../libempathy-gtk/totem-subtitle-encoding.c:158 msgid "Current Locale" @@ -1120,7 +1409,7 @@ msgstr "Graikų" #: ../libempathy-gtk/totem-subtitle-encoding.c:242 msgid "Gujarati" -msgstr "Gujarati" +msgstr "Gudžaratų" #: ../libempathy-gtk/totem-subtitle-encoding.c:245 msgid "Gurmukhi" @@ -1160,7 +1449,7 @@ msgstr "KorÄ—jieÄių" #: ../libempathy-gtk/totem-subtitle-encoding.c:282 msgid "Nordic" -msgstr "Å iaurÄ—s Å¡alių" +msgstr "Å iaurÄ—s Europos" #: ../libempathy-gtk/totem-subtitle-encoding.c:285 msgid "Persian" @@ -1169,15 +1458,15 @@ msgstr "Persų" #: ../libempathy-gtk/totem-subtitle-encoding.c:288 #: ../libempathy-gtk/totem-subtitle-encoding.c:290 msgid "Romanian" -msgstr "Lotynų" +msgstr "Rumunų" #: ../libempathy-gtk/totem-subtitle-encoding.c:293 msgid "South European" -msgstr "Pietų Europos" +msgstr "PietinÄ—s Europos" #: ../libempathy-gtk/totem-subtitle-encoding.c:296 msgid "Thai" -msgstr "Thai" +msgstr "Tajų" #: ../libempathy-gtk/totem-subtitle-encoding.c:299 #: ../libempathy-gtk/totem-subtitle-encoding.c:301 @@ -1200,7 +1489,7 @@ msgstr "Unikodas" #: ../libempathy-gtk/totem-subtitle-encoding.c:325 #: ../libempathy-gtk/totem-subtitle-encoding.c:327 msgid "Western" -msgstr "Vakarų" +msgstr "VakarieÄių" #: ../libempathy-gtk/totem-subtitle-encoding.c:330 #: ../libempathy-gtk/totem-subtitle-encoding.c:332 @@ -1214,21 +1503,18 @@ msgstr "VietnamieÄių" #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1 msgid "" "The contact to display in the applet. Empty means no contact is displayed." -msgstr "" -"Kuris biÄiulis bus rodomas įskiepyje. Jei nepažymÄ—ta, joks nebus rodomas." +msgstr "Ä®taise rodytinas adresatas. Jei tuÅ¡Äia – joks." #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2 msgid "The contact's avatar token. Empty means contact has no avatar." -msgstr "" -"BiÄiuliui priskirtas paveikslÄ—lis. Jei tuÅ¡Äia, biÄiulis rodomas be " -"paveikslÄ—lio." +msgstr "Adresato pseudoportretas. Jei tuÅ¡Äia, adresatas yra be pseudoportreto." #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1 msgid "Megaphone" msgstr "Megafonas" #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2 -#: ../megaphone/src/megaphone-applet.c:417 +#: ../megaphone/src/megaphone-applet.c:527 msgid "Talk!" msgstr "KalbÄ—k!" @@ -1242,44 +1528,44 @@ msgid "_Information" msgstr "_Informacija" #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3 -#: ../src/empathy-main-window.glade.h:15 +#: ../src/empathy-main-window.ui.h:18 msgid "_Preferences" msgstr "_Nustatymai" -#: ../megaphone/src/megaphone-applet.c:255 +#: ../megaphone/src/megaphone-applet.c:168 msgid "Please configure a contact." -msgstr "Sutvarkykite biÄiulio sÄ…rankÄ…." +msgstr "SukonfigÅ«ruokite adresatÄ…." -#: ../megaphone/src/megaphone-applet.c:348 +#: ../megaphone/src/megaphone-applet.c:258 msgid "Select contact..." -msgstr "Pasirinkti biÄiulį..." +msgstr "Pasirinkti adresatÄ…..." #: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1 msgid "Presence" -msgstr "Dalyvavimas" +msgstr "Buvimas" #: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2 #: ../nothere/src/nothere-applet.c:106 msgid "Set your own presence" -msgstr "Nustatyti savo dalyvavimÄ…" +msgstr "Nustatyti savo buvimÄ…" -#: ../src/empathy.c:428 +#: ../src/empathy.c:504 msgid "Don't connect on startup" msgstr "Paleidimo metu neprisijungti" -#: ../src/empathy.c:432 +#: ../src/empathy.c:508 msgid "Don't show the contact list on startup" -msgstr "Pradedant darbÄ… nerodyti biÄiulių sÄ…raÅ¡o" +msgstr "Paleidus nerodyti adresatų sÄ…raÅ¡o" -#: ../src/empathy.c:436 +#: ../src/empathy.c:512 msgid "Show the accounts dialog" -msgstr "Rodyti ir taisyti paskyras" +msgstr "Rodyti paskyrų dialogÄ…" -#: ../src/empathy.c:448 +#: ../src/empathy.c:524 msgid "- Empathy Instant Messenger" -msgstr "- Greitų žinuÄių programa „Empathy“" +msgstr "– Pokalbių programa Empathy" -#: ../src/empathy-about-dialog.c:84 +#: ../src/empathy-about-dialog.c:83 msgid "" "Empathy is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -1291,7 +1577,7 @@ msgstr "" "programinÄ—s įrangos fondo; 2-osios arba (JÅ«sų pasirinkimu) bet kurios " "vÄ—lesnÄ—s licencijos versijos sÄ…lygomis." -#: ../src/empathy-about-dialog.c:88 +#: ../src/empathy-about-dialog.c:87 msgid "" "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -1302,7 +1588,7 @@ msgstr "" "netgi be numanomų PARDAVIMO arba TINKAMUMO TAM TIKRAM TIKSLUI garantijų. DÄ—l " "iÅ¡samesnÄ—s informacijos žiÅ«rÄ—kite GNU bendrÄ…jÄ… vieÅ¡Ä…jÄ… licencijÄ…." -#: ../src/empathy-about-dialog.c:92 +#: ../src/empathy-about-dialog.c:91 msgid "" "You should have received a copy of the GNU General Public License along with " "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " @@ -1312,42 +1598,41 @@ msgstr "" "Empathy; jeigu negavote, raÅ¡ykite Laisvosios programinÄ—s įrangos fondui, 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:120 +#: ../src/empathy-about-dialog.c:119 msgid "An Instant Messaging client for GNOME" -msgstr "Greitų žinuÄių klientas skirtas GNOME" +msgstr "SparÄių žinuÄių programa, skirta GNOME aplinkai" -#: ../src/empathy-about-dialog.c:126 +#: ../src/empathy-about-dialog.c:125 msgid "translator-credits" msgstr "" "Žygimantas BeruÄka\n" "Justina KlingaitÄ—\n" "Saulius Å opaga" -#: ../src/empathy-accounts-dialog.c:391 +#: ../src/empathy-accounts-dialog.c:393 msgid "Enabled" -msgstr "Ä®jungtas" +msgstr "Ä®jungta" -#: ../src/empathy-accounts-dialog.c:401 -#: ../src/empathy-accounts-dialog.glade.h:4 +#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-accounts-dialog.ui.h:1 msgid "Accounts" msgstr "Paskyros" #. To translator: %s is the protocol name -#: ../src/empathy-accounts-dialog.c:833 +#: ../src/empathy-accounts-dialog.c:838 #, c-format msgid "New %s account" msgstr "Nauja %s paskyra" -#: ../src/empathy-accounts-dialog.c:943 +#: ../src/empathy-accounts-dialog.c:951 #, c-format msgid "" "You are about to remove your %s account!\n" "Are you sure you want to proceed?" msgstr "" -"IÅ¡trinsite paskyrÄ… %s!\n" +"IÅ¡trinsite savo paskyrÄ… %s!\n" "Ar tikrai norite tÄ™sti?" -#: ../src/empathy-accounts-dialog.c:949 +#: ../src/empathy-accounts-dialog.c:957 msgid "" "Any associated conversations and chat rooms will NOT be removed if you " "decide to proceed.\n" @@ -1355,309 +1640,231 @@ msgid "" "Should you decide to add the account back at a later time, they will still " "be available." msgstr "" -"Jei nusprÄ™site tÄ™sti, susijÄ™ pokalbiai bei pokalbių kambariai nebus " -"iÅ¡trinti.\n" +"Jei nusprÄ™site tÄ™sti, susijÄ™ pokalbiai ir pokalbių kambariai NEBUS iÅ¡trinti.\n" "\n" -"Jei vÄ—liau vÄ—l pridÄ—site paskyrÄ…, jie vis dar bus prieinami." - -#: ../src/empathy-accounts-dialog.glade.h:1 -msgid "<b>New Account</b>" -msgstr "<b>Paskyra</b>" - -#: ../src/empathy-accounts-dialog.glade.h:2 -msgid "<b>No protocol installed</b>" -msgstr "<b>Neįdiegtas joks protokolas</b>" +"Jei vÄ—liau vÄ—l pridÄ—site Å¡iÄ… paskyrÄ…, jie tebebus prieinami." -#: ../src/empathy-accounts-dialog.glade.h:3 -msgid "<b>Settings</b>" -msgstr "<b>Nustatymai</b>" +#: ../src/empathy-accounts-dialog.ui.h:2 +msgid "Add Account" +msgstr "PridÄ—ti paskyrÄ…" -#: ../src/empathy-accounts-dialog.glade.h:5 +#: ../src/empathy-accounts-dialog.ui.h:3 msgid "Cr_eate" -msgstr "Sukurti" +msgstr "Su_kurti" -#: ../src/empathy-accounts-dialog.glade.h:6 -msgid "I already have an account I want to use" -msgstr "Jau turiu paskyrÄ…, kuria norÄ—Äiau naudotis" +#: ../src/empathy-accounts-dialog.ui.h:4 +msgid "Gmail" +msgstr "Gmail" -#: ../src/empathy-accounts-dialog.glade.h:7 +#: ../src/empathy-accounts-dialog.ui.h:5 msgid "Import Accounts..." -msgstr "Ä®kelti paskyras..." +msgstr "Ä®mportuoti paskyras..." -#: ../src/empathy-accounts-dialog.glade.h:8 +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "Neįdiegta jokių protokolų" + +#: ../src/empathy-accounts-dialog.ui.h:7 +msgid "Settings" +msgstr "Parametrai" + +#: ../src/empathy-accounts-dialog.ui.h:8 msgid "" "To add a new account, you first have to install a backend for each protocol " "you want to use." msgstr "" -"Norint sukurti naujÄ… paskyrÄ…, pirmiau reikia įdiegti programinÄ™ sÄ…sajÄ… " -"kiekvienam pageidaujamam protokolui." +"Norint sukurti naujÄ… paskyrÄ…, pirmiau reikia įdiegti kiekvieno pagaudaujamo " +"naudoti protokolo posistemÄ™." -#: ../src/empathy-accounts-dialog.glade.h:9 +#: ../src/empathy-accounts-dialog.ui.h:9 msgid "Type:" msgstr "Tipas:" -#: ../src/empathy-call-window.c:334 +#: ../src/empathy-accounts-dialog.ui.h:10 +msgid "_Add..." +msgstr "_PridÄ—ti..." + +#: ../src/empathy-accounts-dialog.ui.h:11 +msgid "_Create a new account" +msgstr "_Sukurti naujÄ… paskyrÄ…" + +#: ../src/empathy-accounts-dialog.ui.h:12 +msgid "_Reuse an existing account" +msgstr "_Panaudoti esanÄiÄ… paskyrÄ…" + +#: ../src/empathy-call-window.c:420 msgid "Contrast" msgstr "Kontrastas" -#: ../src/empathy-call-window.c:337 +#: ../src/empathy-call-window.c:423 msgid "Brightness" msgstr "Skaistis" -#: ../src/empathy-call-window.c:340 +#: ../src/empathy-call-window.c:426 msgid "Gamma" msgstr "Gama" -#: ../src/empathy-call-window.c:429 +#: ../src/empathy-call-window.c:531 msgid "Volume" msgstr "Garsumas" -#: ../src/empathy-call-window.c:520 +#: ../src/empathy-call-window.c:662 +msgid "Connecting..." +msgstr "Jungiamasi..." + +#: ../src/empathy-call-window.c:746 msgid "_Sidebar" -msgstr "ParankinÄ—" +msgstr "Å _oninÄ— juosta" -#: ../src/empathy-call-window.c:538 +#: ../src/empathy-call-window.c:765 msgid "Dialpad" msgstr "Tel. klaviatÅ«ra" -#: ../src/empathy-call-window.c:544 +#: ../src/empathy-call-window.c:771 msgid "Audio input" msgstr "Garso įvestis" -#: ../src/empathy-call-window.c:548 +#: ../src/empathy-call-window.c:775 msgid "Video input" msgstr "Vaizdo įvestis" -#: ../src/empathy-call-window.c:561 -msgid "Connecting..." -msgstr "Jungiama..." +#: ../src/empathy-call-window.c:836 +#, c-format +msgid "Call with %s" +msgstr "Skambinti su %s" + +#: ../src/empathy-call-window.c:905 +msgid "Call" +msgstr "Skambutis" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:792 +#: ../src/empathy-call-window.c:1336 #, c-format -msgid "Connected -- %d:%02dm" -msgstr "PrisijungÄ™s – %d:%02dm" +msgid "Connected — %d:%02dm" +msgstr "Prisijunta – %d:%02dm" -#: ../src/empathy-call-window.glade.h:1 +#: ../src/empathy-call-window.ui.h:1 msgid "Hang up" -msgstr "Atsijungti" +msgstr "PadÄ—ti ragelį" + +#: ../src/empathy-call-window.ui.h:2 +msgid "Redial" +msgstr "Rinkti iÅ¡ naujo" -#: ../src/empathy-call-window.glade.h:2 +#: ../src/empathy-call-window.ui.h:3 msgid "Send Audio" -msgstr "Siųsti audio" +msgstr "Siųsti garsÄ…" -#: ../src/empathy-call-window.glade.h:3 +#: ../src/empathy-call-window.ui.h:4 msgid "Send video" -msgstr "Siųsti video" +msgstr "Siųsti vaizdÄ…" -#: ../src/empathy-call-window.glade.h:4 +#: ../src/empathy-call-window.ui.h:5 msgid "Video preview" -msgstr "PeržiÅ«ra" +msgstr "Vaizdo peržiÅ«ra" -#: ../src/empathy-call-window.glade.h:6 +#: ../src/empathy-call-window.ui.h:6 +msgid "_Call" +msgstr "_Skambutis" + +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21 msgid "_View" msgstr "_Rodymas" -#: ../src/empathy-chat-window.c:313 +#: ../src/empathy-chat-window.c:344 #, c-format msgid "Conversations (%d)" msgstr "Pokalbiai (%d)" -#: ../src/empathy-chat-window.c:418 -msgid "Topic:" -msgstr "Tema:" - -#: ../src/empathy-chat-window.c:423 +#: ../src/empathy-chat-window.c:476 msgid "Typing a message." msgstr "RaÅ¡oma žinutÄ—." -#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:429 -#, c-format -msgid "New message from %s" -msgstr "Nauja žinutÄ— iÅ¡ %s" - -#: ../src/empathy-chat-window.glade.h:1 -msgid "C_lear" -msgstr "IÅ¡va_lyti" - -#: ../src/empathy-chat-window.glade.h:2 -msgid "Chat" -msgstr "Pokalbis" - -#: ../src/empathy-chat-window.glade.h:3 -msgid "Insert _Smiley" -msgstr "Ä®terpti _Å¡ypsniukÄ…" - -#: ../src/empathy-chat-window.glade.h:4 -msgid "Invitation _message:" -msgstr "Pakvietimo ži_nutÄ—:" - -#: ../src/empathy-chat-window.glade.h:5 -msgid "Invite" -msgstr "Pakviesti" - -#: ../src/empathy-chat-window.glade.h:6 -msgid "Move Tab _Left" -msgstr "Perkelti kortelÄ™ į _kairÄ™" - -#: ../src/empathy-chat-window.glade.h:7 -msgid "Move Tab _Right" -msgstr "Perkelti kortelÄ™ į _deÅ¡inÄ™" - -#: ../src/empathy-chat-window.glade.h:8 -msgid "Select who would you like to invite:" -msgstr "Pasirinkite kÄ… norite pakviesti:" - -#: ../src/empathy-chat-window.glade.h:9 -msgid "You have been invited to join a chat conference." -msgstr "Esate kvieÄiami prisijungti prie pokalbių konferencijos." - -#: ../src/empathy-chat-window.glade.h:10 -msgid "_Contact" -msgstr "_BiÄiulis" - -#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10 -msgid "_Contents" -msgstr "_Turinys" - -#: ../src/empathy-chat-window.glade.h:12 -msgid "_Conversation" -msgstr "_Pokalbis" - -#: ../src/empathy-chat-window.glade.h:13 -msgid "_Detach Tab" -msgstr "Atkabinti kortelÄ™" - -#: ../src/empathy-chat-window.glade.h:15 -msgid "_Favorite Chatroom" -msgstr "MÄ—gstamiausias kambarys" - -#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12 -msgid "_Help" -msgstr "Žinynas" - -#: ../src/empathy-chat-window.glade.h:17 -msgid "_Next Tab" -msgstr "_Kita kortelÄ—" - -#: ../src/empathy-chat-window.glade.h:18 -msgid "_Previous Tab" -msgstr "_AnkstesnÄ— kortelÄ—" - -#: ../src/empathy-chat-window.glade.h:19 -msgid "_Tabs" -msgstr "K_ortelÄ—s" - -#: ../src/empathy-chatrooms-window.c:262 +#: ../src/empathy-chatrooms-window.c:258 msgid "Name" msgstr "Vardas" -#: ../src/empathy-chatrooms-window.c:280 +#: ../src/empathy-chatrooms-window.c:276 msgid "Room" msgstr "Kambarys" -#: ../src/empathy-chatrooms-window.c:289 +#: ../src/empathy-chatrooms-window.c:285 msgid "Auto-Connect" msgstr "AutomatiÅ¡kai prisijungti" -#: ../src/empathy-chatrooms-window.glade.h:2 -msgid "Edit Favorite Room" -msgstr "Taisyti mÄ—giamÄ… kambarį" - -#: ../src/empathy-chatrooms-window.glade.h:3 -msgid "Join room on start_up" -msgstr "Prisijungti prie pokalbių kambario paleidimo metu" - -#: ../src/empathy-chatrooms-window.glade.h:4 -msgid "Join this chat room when Empathy starts and you are connected" -msgstr "Ä®eiti į šį pokalbių kambarį pradedant darbÄ… ir prisijungus." - -#: ../src/empathy-chatrooms-window.glade.h:5 +#: ../src/empathy-chatrooms-window.ui.h:2 msgid "Manage Favorite Rooms" msgstr "Tvarkyti mÄ—giamus kambarius" -#: ../src/empathy-chatrooms-window.glade.h:6 -msgid "N_ame:" -msgstr "V_ardas:" - -#: ../src/empathy-chatrooms-window.glade.h:7 -msgid "S_erver:" -msgstr "S_erveris:" - -#: ../src/empathy-chatrooms-window.glade.h:9 -#: ../src/empathy-new-chatroom-dialog.glade.h:9 -msgid "_Room:" -msgstr "Kambarys:" - -#: ../src/empathy-event-manager.c:377 +#: ../src/empathy-event-manager.c:321 msgid "Incoming call" msgstr "Skambutis jums" -#: ../src/empathy-event-manager.c:380 +#: ../src/empathy-event-manager.c:324 #, c-format msgid "%s is calling you, do you want to answer?" msgstr "%s jums skambina, ar atsiliepsite?" -#: ../src/empathy-event-manager.c:387 +#: ../src/empathy-event-manager.c:331 msgid "_Reject" -msgstr "Atmesti" +msgstr "A_tmesti" -#: ../src/empathy-event-manager.c:393 +#: ../src/empathy-event-manager.c:337 msgid "_Answer" -msgstr "_Atsakyti" +msgstr "_Atsiliepti" -#: ../src/empathy-event-manager.c:516 +#: ../src/empathy-event-manager.c:452 #, c-format msgid "Incoming call from %s" msgstr "Skambutis jums nuo %s" -#: ../src/empathy-event-manager.c:564 +#: ../src/empathy-event-manager.c:496 #, c-format msgid "%s is offering you an invitation" msgstr "%s siÅ«lo jums kvietimÄ…" -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:502 msgid "An external application will be started to handle it." msgstr "Jam priimti bus paleista iÅ¡orinÄ— programa." -#: ../src/empathy-event-manager.c:575 +#: ../src/empathy-event-manager.c:507 msgid "You don't have the needed external application to handle it." -msgstr "NÄ—ra įdiegta reikiama programa." +msgstr "NÄ—ra įdiegta tam reikalinga programa." -#: ../src/empathy-event-manager.c:698 +#: ../src/empathy-event-manager.c:634 msgid "Room invitation" -msgstr "Pakvietimas į pokalbių kambarį" +msgstr "Kvietimas į pokalbių kambarį" -#: ../src/empathy-event-manager.c:701 +#: ../src/empathy-event-manager.c:637 #, c-format msgid "%s is inviting you to join %s" msgstr "%s kvieÄia jus prisijungti prie %s" -#. Decline button -#: ../src/empathy-event-manager.c:709 ../src/empathy-ft-manager.c:1023 +#: ../src/empathy-event-manager.c:645 msgid "_Decline" msgstr "_Atmesti" -#: ../src/empathy-event-manager.c:714 +#: ../src/empathy-event-manager.c:650 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Prisijungti" -#: ../src/empathy-event-manager.c:744 +#: ../src/empathy-event-manager.c:689 #, c-format msgid "%s invited you to join %s" msgstr "%s pakvietÄ— jus prisijungti %s" -#: ../src/empathy-event-manager.c:867 +#: ../src/empathy-event-manager.c:715 #, c-format msgid "Incoming file transfer from %s" msgstr "Failo atsiuntimas iÅ¡ %s" -#: ../src/empathy-event-manager.c:961 +#: ../src/empathy-event-manager.c:895 #, c-format msgid "Subscription requested by %s" msgstr "Užsisakymo praÅ¡ymas iÅ¡ %s" -#: ../src/empathy-event-manager.c:965 +#: ../src/empathy-event-manager.c:899 #, c-format msgid "" "\n" @@ -1666,583 +1873,649 @@ msgstr "" "\n" "ŽinutÄ—: %s" +#. someone is logging off +#: ../src/empathy-event-manager.c:942 +#, c-format +msgid "%s is now offline." +msgstr "%s dabar atsijungÄ™s(-usi)." + +#. someone is logging in +#: ../src/empathy-event-manager.c:958 +#, c-format +msgid "%s is now online." +msgstr "%s dabar prisijungÄ™s(-usi)." + #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:114 +#: ../src/empathy-ft-manager.c:101 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" #. Translators: time left, when is is less than one hour -#: ../src/empathy-ft-manager.c:117 +#: ../src/empathy-ft-manager.c:104 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:166 -msgid "No reason was specified" -msgstr "Nenustatyta priežastis" - -#: ../src/empathy-ft-manager.c:168 -msgid "The change in state was requested" -msgstr "BÅ«senos keitimo užklausa" - -#: ../src/empathy-ft-manager.c:170 -msgid "You canceled the file transfer" -msgstr "AtÅ¡aukÄ—te failo persiuntimÄ…" - -#: ../src/empathy-ft-manager.c:172 -msgid "The other participant canceled the file transfer" -msgstr "Failo persiuntimÄ… atÅ¡aukÄ— kažkas iÅ¡ dalyvių" - -#: ../src/empathy-ft-manager.c:174 -msgid "Error while trying to transfer the file" -msgstr "Klaida bandant persiųsti failÄ…" +#: ../src/empathy-ft-manager.c:180 +msgctxt "file transfer percent" +msgid "Unknown" +msgstr "Nežinoma" -#: ../src/empathy-ft-manager.c:176 -msgid "The other participant is unable to transfer the file" -msgstr "Kažkas iÅ¡ dalyvių negali persiųsti failo" +#: ../src/empathy-ft-manager.c:275 +#, c-format +msgid "%s of %s at %s/s" +msgstr "%s iÅ¡ %s %s/s sparta" -#: ../src/empathy-ft-manager.c:178 -msgid "Unknown reason" -msgstr "Nenustatyta priežastis" +#: ../src/empathy-ft-manager.c:276 +#, c-format +msgid "%s of %s" +msgstr "%s iÅ¡ %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:226 +#: ../src/empathy-ft-manager.c:307 #, c-format msgid "Receiving \"%s\" from %s" -msgstr "Priimama „%s“ nuo %s" +msgstr "Priimama „%s“ iÅ¡ %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:229 +#: ../src/empathy-ft-manager.c:310 #, c-format msgid "Sending \"%s\" to %s" -msgstr "SiunÄiama „%s“. GavÄ—jas %s" +msgstr "SiunÄiama „%s“ adresatui %s" -#: ../src/empathy-ft-manager.c:239 -msgctxt "file size" -msgid "Unknown" -msgstr "Nežinoma" +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:340 +#, c-format +msgid "Error receiving \"%s\" from %s" +msgstr "Klaida priimant „%s“ iÅ¡ %s" + +#: ../src/empathy-ft-manager.c:343 +msgid "Error receiving a file" +msgstr "Klaida priimant failÄ…" -#. translators: first %s is the transferred size, second %s is -#. * the total file size -#: ../src/empathy-ft-manager.c:247 +#: ../src/empathy-ft-manager.c:348 #, c-format -msgid "%s of %s" -msgstr "%s iÅ¡ %s" +msgid "Error sending \"%s\" to %s" +msgstr "Klaida siunÄiant „%s“ adresatui %s" -#: ../src/empathy-ft-manager.c:254 -msgid "Waiting the other participant's response" -msgstr "Laukiama kažkurio iÅ¡ dalyvių atsakymo" +#: ../src/empathy-ft-manager.c:351 +msgid "Error sending a file" +msgstr "Klaida siunÄiant failÄ…" -#: ../src/empathy-ft-manager.c:264 +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:490 #, c-format msgid "\"%s\" received from %s" -msgstr "„%s“ priÄ—mÄ— iÅ¡ %s" +msgstr "„%s“ gautas iÅ¡ %s" -#: ../src/empathy-ft-manager.c:270 +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:495 #, c-format msgid "\"%s\" sent to %s" -msgstr "„%s“ iÅ¡siųstas. GavÄ—jas – %s" +msgstr "„%s“ iÅ¡siųstas gavÄ—jui %s" -#: ../src/empathy-ft-manager.c:273 +#: ../src/empathy-ft-manager.c:498 msgid "File transfer completed" -msgstr "Failo persiuntimas baigtas" +msgstr "Failo siuntimas baigtas" -#: ../src/empathy-ft-manager.c:282 -#, c-format -msgid "\"%s\" receiving from %s" -msgstr "„%s“ priimama iÅ¡ %s" +#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784 +msgid "Waiting for the other participant's response" +msgstr "Laukiama kito dalyvio atsakymo" -#: ../src/empathy-ft-manager.c:288 +#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681 #, c-format -msgid "\"%s\" sending to %s" -msgstr "„%s“ siunÄiama. GavÄ—jas – %s" +msgid "Checking integrity of \"%s\"" +msgstr "Tikrinamas „%s“ vientisumas" -#: ../src/empathy-ft-manager.c:291 +#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684 #, c-format -msgid "File transfer canceled: %s" -msgstr "Failo persiuntimas atÅ¡auktas: %s" - -#: ../src/empathy-ft-manager.c:306 -msgctxt "remaining time" -msgid "Unknown" -msgstr "Nežinoma" - -#: ../src/empathy-ft-manager.c:366 -msgctxt "file transfer percent" -msgid "Unknown" -msgstr "Nežinoma" +msgid "Hashing \"%s\"" +msgstr "Kuriama „%s“ maiÅ¡a" -#: ../src/empathy-ft-manager.c:702 +#: ../src/empathy-ft-manager.c:1024 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:714 +#: ../src/empathy-ft-manager.c:1036 msgid "File" msgstr "Failas" -#: ../src/empathy-ft-manager.c:736 +#: ../src/empathy-ft-manager.c:1058 msgid "Remaining" msgstr "Liko" -#: ../src/empathy-ft-manager.c:887 -msgid "Cannot save file to this location" -msgstr "ÄŒia failo įraÅ¡yti negalima" - -#: ../src/empathy-ft-manager.c:933 -msgid "Save file as..." -msgstr "Ä®raÅ¡yti taip..." - -#: ../src/empathy-ft-manager.c:1003 -msgid "unknown size" -msgstr "nežinomas dydis" - -#: ../src/empathy-ft-manager.c:1009 -#, c-format -msgid "%s would like to send you a file" -msgstr "%s norÄ—tų jums persiųsti failÄ…" - -#: ../src/empathy-ft-manager.c:1014 -#, c-format -msgid "Do you want to accept the file \"%s\" (%s)?" -msgstr "Ar sutinkate priimti failÄ… „%s“ (%s)?" - -#. Accept button -#: ../src/empathy-ft-manager.c:1032 -msgid "_Accept" -msgstr "_Priimti" - -#: ../src/empathy-ft-manager.glade.h:1 -msgid "File transfers" -msgstr "Failų persiuntimai" +#: ../src/empathy-ft-manager.ui.h:1 +msgid "File Transfers" +msgstr "Failų siuntimai" -#: ../src/empathy-ft-manager.glade.h:2 +#: ../src/empathy-ft-manager.ui.h:2 msgid "Remove completed, canceled and failed file transfers from the list" -msgstr "" -"PaÅ¡alinti įvykdytus, atÅ¡auktus ir nepavykusius failų persiuntimo apraÅ¡us iÅ¡ " -"sÄ…raÅ¡o" +msgstr "PaÅ¡alinti baigtus, atÅ¡auktus ir nepavykusius failų siuntimus iÅ¡ sÄ…raÅ¡o" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-dialog.c:255 +#: ../src/empathy-import-dialog.c:259 msgid "Import" -msgstr "Importas" +msgstr "Importuoti" -#: ../src/empathy-import-dialog.c:264 +#: ../src/empathy-import-dialog.c:268 msgid "Protocol" msgstr "Protokolas" -#: ../src/empathy-import-dialog.c:290 +#: ../src/empathy-import-dialog.c:294 msgid "Source" msgstr "Å altinis" -#: ../src/empathy-import-dialog.c:378 +#: ../src/empathy-import-dialog.c:388 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." msgstr "" -"NÄ—ra tinkamų importui paskyrų. Kol kas palaikomas tik paskyrų importas iÅ¡ " -"Pidgin." +"NÄ—rasta importuotinų paskyrų. Kol kas Empathy gali importuoti paskyras tik " +"iÅ¡ Pidgin." -#: ../src/empathy-import-dialog.glade.h:1 +#: ../src/empathy-import-dialog.ui.h:1 msgid "Import Accounts" -msgstr "Paskyrų importas" +msgstr "Paskyrų importavimas" + +#: ../src/empathy-main-window.c:396 +msgid "_Edit account" +msgstr "_Taisyti paskyrÄ…" -#: ../src/empathy-main-window.c:391 +#: ../src/empathy-main-window.c:499 msgid "No error specified" -msgstr "Nenustatyta klaida" +msgstr "Nenurodyta klaida" -#: ../src/empathy-main-window.c:394 +#: ../src/empathy-main-window.c:502 msgid "Network error" msgstr "Tinklo klaida" -#: ../src/empathy-main-window.c:397 +#: ../src/empathy-main-window.c:505 msgid "Authentication failed" -msgstr "Atpažinimas nepavyko." +msgstr "Nepavyko nustatyti tapatybÄ—s" -#: ../src/empathy-main-window.c:400 +#: ../src/empathy-main-window.c:508 msgid "Encryption error" msgstr "Å ifravimo klaida" -#: ../src/empathy-main-window.c:403 +#: ../src/empathy-main-window.c:511 msgid "Name in use" -msgstr "Toks vardas jau yra" +msgstr "Vardas jau naudojamas" -#: ../src/empathy-main-window.c:406 +#: ../src/empathy-main-window.c:514 msgid "Certificate not provided" -msgstr "Nepateiktas sertifikatas" +msgstr "Nepateiktas liudijimas" -#: ../src/empathy-main-window.c:409 +#: ../src/empathy-main-window.c:517 msgid "Certificate untrusted" -msgstr "Sertifikatas nepatikimas" +msgstr "Liudijimas nepatikimas" -#: ../src/empathy-main-window.c:412 +#: ../src/empathy-main-window.c:520 msgid "Certificate expired" -msgstr "Nebegaliojantis sertifikatas" +msgstr "Nebegaliojantis liudijimas" -#: ../src/empathy-main-window.c:415 +#: ../src/empathy-main-window.c:523 msgid "Certificate not activated" -msgstr "Sertifikatas neaktyvuotas" +msgstr "Liudijimas neaktyvuotas" -#: ../src/empathy-main-window.c:418 +#: ../src/empathy-main-window.c:526 msgid "Certificate hostname mismatch" -msgstr "Sertifikato mazgo pavadinimo neatitiktis" +msgstr "Neatitinka liudijimo kompiuterio vardas" -#: ../src/empathy-main-window.c:421 +#: ../src/empathy-main-window.c:529 msgid "Certificate fingerprint mismatch" -msgstr "Sertifikato atpažinimo požymio neatitikimas" +msgstr "Neatitinka liudijimo kontrolinis kodas" -#: ../src/empathy-main-window.c:424 +#: ../src/empathy-main-window.c:532 msgid "Certificate self-signed" -msgstr "Paties pasiraÅ¡ytas sertifikatas" +msgstr "Paties pasiraÅ¡ytas liudijimas" -#: ../src/empathy-main-window.c:427 +#: ../src/empathy-main-window.c:535 msgid "Certificate error" -msgstr "Sertifikato klaida" +msgstr "Liudijimo klaida" -#: ../src/empathy-main-window.c:430 +#: ../src/empathy-main-window.c:538 msgid "Unknown error" -msgstr "Nenustatyta klaida" +msgstr "Nežinoma klaida" -#: ../src/empathy-main-window.c:594 +#: ../src/empathy-main-window.c:1221 msgid "Show and edit accounts" msgstr "Rodyti ir taisyti paskyras" -#: ../src/empathy-main-window.c:974 -msgid "Contact" -msgstr "BiÄiulis" - -#: ../src/empathy-main-window.c:1176 -msgid "_Edit account" -msgstr "_Taisyti paskyrÄ…" - -#: ../src/empathy-main-window.glade.h:1 +#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10 msgid "Contact List" -msgstr "BiÄiulių sÄ…raÅ¡as" +msgstr "Adresatų sÄ…raÅ¡as" + +#: ../src/empathy-main-window.ui.h:2 +msgid "Contacts on a _Map" +msgstr "Adresatai že_mÄ—lapyje" -#: ../src/empathy-main-window.glade.h:2 +#: ../src/empathy-main-window.ui.h:3 msgid "Context" msgstr "Kontekstas" -#: ../src/empathy-main-window.glade.h:3 +#: ../src/empathy-main-window.ui.h:4 msgid "Join _Favorites" -msgstr "Prisijungti prie _mÄ—gstamų" +msgstr "Prisijungti prie _mÄ—giamų" -#: ../src/empathy-main-window.glade.h:4 -msgid "Join _New..." -msgstr "Prisijungti prie naujo..." - -#: ../src/empathy-main-window.glade.h:5 +#: ../src/empathy-main-window.ui.h:5 msgid "Manage Favorites" -msgstr "Tvarkyti Žymeles" - -#: ../src/empathy-main-window.glade.h:6 -msgid "Show _Offline Contacts" -msgstr "Rodyti atsijungusius biÄiulius" +msgstr "Tvarkyti mÄ—giamus" -#: ../src/empathy-main-window.glade.h:7 +#: ../src/empathy-main-window.ui.h:6 msgid "_Accounts" msgstr "P_askyros" -#: ../src/empathy-main-window.glade.h:8 +#: ../src/empathy-main-window.ui.h:7 msgid "_Add Contact..." -msgstr "PridÄ—ti biÄiulį..." +msgstr "_PridÄ—ti adresatÄ…..." + +#: ../src/empathy-main-window.ui.h:9 +msgid "_Contents" +msgstr "_Turinys" + +#: ../src/empathy-main-window.ui.h:10 +msgid "_Debug" +msgstr "_Derinti" + +#: ../src/empathy-main-window.ui.h:12 +msgid "_File Transfers" +msgstr "_Failų siuntimai" -#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2 +#: ../src/empathy-main-window.ui.h:13 +msgid "_Help" +msgstr "_Žinynas" + +#: ../src/empathy-main-window.ui.h:14 +msgid "_Join..." +msgstr "_Prisijungti..." + +#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2 msgid "_New Conversation..." -msgstr "_Pokalbis" +msgstr "_Naujas pokalbis..." -#: ../src/empathy-main-window.glade.h:14 +#: ../src/empathy-main-window.ui.h:16 +msgid "_Offline Contacts" +msgstr "_AtsijungÄ™ adresatai" + +#: ../src/empathy-main-window.ui.h:17 msgid "_Personal Information" msgstr "_AsmeninÄ— informacija" -#: ../src/empathy-main-window.glade.h:16 +#: ../src/empathy-main-window.ui.h:19 +msgid "_Previous Conversations" +msgstr "_Ankstesni pokalbiai" + +#: ../src/empathy-main-window.ui.h:20 msgid "_Room" -msgstr "Kambarys" +msgstr "_Kambarys" -#: ../src/empathy-new-chatroom-dialog.c:291 -msgid "Chat Rooms" -msgstr "Pokalbių kambariai" +#: ../src/empathy-new-chatroom-dialog.c:332 +msgid "Chat Room" +msgstr "Pokalbių kambarys" -#: ../src/empathy-new-chatroom-dialog.glade.h:2 -msgid "Browse:" -msgstr "NarÅ¡yti:" +#: ../src/empathy-new-chatroom-dialog.c:348 +msgid "Members" +msgstr "Nariai" -#: ../src/empathy-new-chatroom-dialog.glade.h:3 +#: ../src/empathy-new-chatroom-dialog.c:492 +#, c-format +msgctxt "" +"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no " +"and a number." +msgid "" +"<b>%s</b>\n" +"Invite required: %s\n" +"Password required: %s\n" +"Members: %s" +msgstr "" +"<b>%s</b>\n" +"Reikia pakvietimo: %s\n" +"Reikia slaptažodžio: %s\n" +"Nariai: %s" + +#: ../src/empathy-new-chatroom-dialog.c:494 +#: ../src/empathy-new-chatroom-dialog.c:495 +msgid "Yes" +msgstr "Taip" + +#: ../src/empathy-new-chatroom-dialog.c:494 +#: ../src/empathy-new-chatroom-dialog.c:495 +msgid "No" +msgstr "Ne" + +#: ../src/empathy-new-chatroom-dialog.c:522 +msgid "Could not start room listing" +msgstr "Nepavyko paleisti kambarių sÄ…raÅ¡o" + +#: ../src/empathy-new-chatroom-dialog.c:532 +msgid "Could not stop room listing" +msgstr "Nepavyko sustabdyti kambarių rodymo" + +#: ../src/empathy-new-chatroom-dialog.ui.h:2 +msgid "Couldn't load room list" +msgstr "Nepavyko įkelti kambarių sÄ…raÅ¡o" + +#: ../src/empathy-new-chatroom-dialog.ui.h:3 msgid "" "Enter the room name to join here or click on one or more rooms in the list." msgstr "" -"Ä®veskite kambario pavadinimÄ… arba spustelÄ—kite vienÄ… ar daugiau kambarių " -"sÄ…raÅ¡e." +"Ä®veskite kambario, į kurį norite įeiti, pavadinimÄ… arba spustelÄ—kite vienÄ… " +"ar daugiau kambarių sÄ…raÅ¡e." -#: ../src/empathy-new-chatroom-dialog.glade.h:4 +#: ../src/empathy-new-chatroom-dialog.ui.h:4 msgid "" "Enter the server which hosts the room, or leave it empty if the room is on " "the current account's server" msgstr "" -"Ä®raÅ¡ykite serverio vardÄ…, kuris aptarnauja pokalbių kambarį, arba " -"neįraÅ¡ykite nieko, jei pokalbių kambarys palaikomas esamos sÄ…skaitos " -"serverio." - -#: ../src/empathy-new-chatroom-dialog.glade.h:5 -msgid "Join" -msgstr "Prisijungti" +"Ä®raÅ¡ykite serverio vardÄ…, kuriame yra pokalbių kambarys, arba neįraÅ¡ykite " +"nieko, jei pokalbių kambarys yra dabartinÄ—s paskyros serveryje." -#: ../src/empathy-new-chatroom-dialog.glade.h:6 -msgid "Join New" -msgstr "Prisijungti prie naujo" +#: ../src/empathy-new-chatroom-dialog.ui.h:5 +msgid "Join Room" +msgstr "Prisijungti prie kambario" -#: ../src/empathy-new-chatroom-dialog.glade.h:7 -msgid "Re_fresh" -msgstr "Atnaujinti" +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "Room List" +msgstr "Kambarių sÄ…raÅ¡as" -#: ../src/empathy-new-chatroom-dialog.glade.h:8 -msgid "" -"This list represents all chat rooms hosted on the server you have entered." -msgstr "" -"Å iame sÄ…raÅ¡e pateikiami visi pokalbių kambariai esantys Å¡iame serveryje." +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "_Room:" +msgstr "_Kambarys:" -#: ../src/empathy-preferences.c:157 +#: ../src/empathy-preferences.c:161 msgid "Message received" msgstr "Gauta žinutÄ—" -#: ../src/empathy-preferences.c:158 +#: ../src/empathy-preferences.c:162 msgid "Message sent" msgstr "ŽinutÄ— iÅ¡siųsta" -#: ../src/empathy-preferences.c:159 +#: ../src/empathy-preferences.c:163 msgid "New conversation" msgstr "Naujas pokalbis" -#: ../src/empathy-preferences.c:160 +#: ../src/empathy-preferences.c:164 msgid "Contact goes online" -msgstr "BiÄiulis prisijungÄ—" +msgstr "Adresatas prisijungÄ—" -#: ../src/empathy-preferences.c:161 +#: ../src/empathy-preferences.c:165 msgid "Contact goes offline" -msgstr "BiÄiulis atsijungÄ—" +msgstr "Adresatas atsijungÄ—" -#: ../src/empathy-preferences.c:162 +#: ../src/empathy-preferences.c:166 msgid "Account connected" -msgstr "Prisijungta pagal paskyrÄ…" +msgstr "Paskyra prijungta" -#: ../src/empathy-preferences.c:163 +#: ../src/empathy-preferences.c:167 msgid "Account disconnected" -msgstr "Atsijungta pagal paskyrÄ…" +msgstr "Paskyra atjungta" -#: ../src/empathy-preferences.c:397 +#: ../src/empathy-preferences.c:446 msgid "Language" msgstr "Kalba" -#: ../src/empathy-preferences.glade.h:1 -msgid "<b>Appearance</b>" -msgstr "<b>IÅ¡vaizda</b>" - -#: ../src/empathy-preferences.glade.h:2 -msgid "<b>Behavior</b>" -msgstr "<b>Elgsena</b>" +#: ../src/empathy-preferences.ui.h:1 +msgid "Adium theme to use:" +msgstr "Naudotina Adium tema:" -#: ../src/empathy-preferences.glade.h:3 -msgid "<b>Contact List</b>" -msgstr "<b>BiÄiulių sÄ…raÅ¡as</b>" +#: ../src/empathy-preferences.ui.h:2 +msgid "Allow _GPS usage" +msgstr "Leisti naudoti _GPS" -#: ../src/empathy-preferences.glade.h:4 -msgid "<b>Enable spell checking for languages:</b>" -msgstr "<b>Ä®galinti Å¡ių kalbų raÅ¡ybos tikrinimÄ…:</b>" +#: ../src/empathy-preferences.ui.h:3 +msgid "Allow _cellphone usage" +msgstr "Leisti naudoti _mobilųjį telefonÄ…" -#: ../src/empathy-preferences.glade.h:5 -msgid "<b>Play sound for events</b>" -msgstr "<b>Groti melodijÄ… įvykiams</b>" +#: ../src/empathy-preferences.ui.h:4 +msgid "Allow _network usage" +msgstr "Leisti naudoti _tinklÄ…" -#: ../src/empathy-preferences.glade.h:6 -msgid "" -"<small>The list of languages reflects only the languages for which you have " -"a dictionary installed.</small>" -msgstr "" -"<small>Å iame kalbų sÄ…raÅ¡e yra tik tos kalbos, kurių žodynus turite įdiegÄ™.</" -"small>" +#: ../src/empathy-preferences.ui.h:5 +msgid "Appearance" +msgstr "IÅ¡vaizda" -#: ../src/empathy-preferences.glade.h:7 +#: ../src/empathy-preferences.ui.h:6 msgid "Automatically _connect on startup " -msgstr "Paleisties metu automatiÅ¡kai prisijungti" +msgstr "Paleidus, automatiÅ¡kai _prisijungti" -#: ../src/empathy-preferences.glade.h:8 +#: ../src/empathy-preferences.ui.h:7 msgid "Avatars are user chosen images shown in the contact list" -msgstr "PaveikslÄ—liai, pasirinkti naudotojų, rodomi biÄiulių sÄ…raÅ¡e." +msgstr "" +"Pseudoportretai – tai adresatų sÄ…raÅ¡e rodomi naudotojų pasirinkti " +"paveikslÄ—liai" + +#: ../src/empathy-preferences.ui.h:8 +msgid "Behavior" +msgstr "Elgsena" -#: ../src/empathy-preferences.glade.h:9 +#: ../src/empathy-preferences.ui.h:9 msgid "Chat Th_eme:" msgstr "Pokalbio t_ema:" -#: ../src/empathy-preferences.glade.h:10 +#: ../src/empathy-preferences.ui.h:11 msgid "Disable notifications when _away or busy" -msgstr "IÅ¡jungti praneÅ¡imus, kai manÄ™s nÄ—ra ar užimtas" +msgstr "IÅ¡jungti praneÅ¡imus, kai manÄ™s _nÄ—ra ar užsiÄ—mÄ™s(-usi)" -#: ../src/empathy-preferences.glade.h:11 +#: ../src/empathy-preferences.ui.h:12 msgid "Disable sounds when _away or busy" -msgstr "IÅ¡jungti garsus, kai manÄ™s nÄ—ra ar užimtas" +msgstr "IÅ¡jungti garsus, kai manÄ™s _nÄ—ra ar užsiÄ—mÄ™s(-usi)" -#: ../src/empathy-preferences.glade.h:12 +#: ../src/empathy-preferences.ui.h:13 +msgid "Enable notifications when a contact comes online" +msgstr "Ä®jungti praneÅ¡imus, kai prisijungia adresatas" + +#: ../src/empathy-preferences.ui.h:14 +msgid "Enable notifications when a contact goes offline" +msgstr "Ä®jungti praneÅ¡imus, kai atsijungia adresatas" + +#: ../src/empathy-preferences.ui.h:15 msgid "Enable notifications when the _chat is not focused" -msgstr "Ä®jungti praneÅ¡imus, kai pokalbio langas neaktyvuotas" +msgstr "Ä®jungti praneÅ¡imus, kai _pokalbio langas nesuaktyvintas" + +#: ../src/empathy-preferences.ui.h:16 +msgid "Enable spell checking for languages:" +msgstr "Ä®jungti Å¡ių kalbų raÅ¡ybos tikrinimÄ…:" -#: ../src/empathy-preferences.glade.h:13 +#: ../src/empathy-preferences.ui.h:17 msgid "General" msgstr "Bendra" -#: ../src/empathy-preferences.glade.h:14 +#: ../src/empathy-preferences.ui.h:18 +msgid "Geoclue Settings" +msgstr "Geoclue parametrai" + +#: ../src/empathy-preferences.ui.h:19 +msgid "Location" +msgstr "VietovÄ—" + +#: ../src/empathy-preferences.ui.h:20 +msgid "Not a valid adium theme" +msgstr "Tai nÄ—ra tinkama adium tema" + +#: ../src/empathy-preferences.ui.h:21 msgid "Notifications" msgstr "PraneÅ¡imai" -#: ../src/empathy-preferences.glade.h:15 +#: ../src/empathy-preferences.ui.h:22 +msgid "Play sound for events" +msgstr "Groti garsus įvykiams" + +#: ../src/empathy-preferences.ui.h:23 msgid "Preferences" msgstr "Nustatymai" -#: ../src/empathy-preferences.glade.h:16 +#: ../src/empathy-preferences.ui.h:24 +msgid "Privacy" +msgstr "Privatumas" + +#: ../src/empathy-preferences.ui.h:25 +msgid "" +"Reduced location accuracy means that nothing more precise than your city, " +"state and country will be published. GPS coordinates will have a random " +"value added (±0.25°)." +msgstr "" +"Sumažinus vietovÄ—s tikslumÄ…, bus rodomas tik jÅ«sų miestas, sritis ir Å¡alis. " +"GPS koordinatÄ—ms bus pridedama atsitiktinÄ— reikÅ¡mÄ— (±0.25°)." + +#: ../src/empathy-preferences.ui.h:26 msgid "Show _avatars" -msgstr "Rodyti paveikslÄ—lius" +msgstr "Rodyti _pseudoportretus" -#: ../src/empathy-preferences.glade.h:17 +#: ../src/empathy-preferences.ui.h:27 msgid "Show _smileys as images" -msgstr "Versti Å¡ypsenÄ—les į grafinius paveiksliukus" +msgstr "Rodyti Å¡_ypsenelÄ—s kaip paveikslÄ—lius" -#: ../src/empathy-preferences.glade.h:18 +#: ../src/empathy-preferences.ui.h:28 msgid "Show co_mpact contact list" -msgstr "Rodyti kompaktiÅ¡kÄ… biÄiulių sÄ…raÅ¡Ä…" +msgstr "Rodyti _kompaktiÅ¡kÄ… adresatų sÄ…raÅ¡Ä…" + +#: ../src/empathy-preferences.ui.h:29 +msgid "Show contact _list in rooms" +msgstr "Rodyti adresatų _sÄ…raÅ¡Ä… kambariuose" -#: ../src/empathy-preferences.glade.h:19 +#: ../src/empathy-preferences.ui.h:30 msgid "Sort by _name" -msgstr "Rikiuoti pagal vardÄ…" +msgstr "Rikiuoti pagal _vardÄ…" -#: ../src/empathy-preferences.glade.h:20 +#: ../src/empathy-preferences.ui.h:31 msgid "Sort by s_tate" -msgstr "Rikiuoti pagal bÅ«senÄ…" +msgstr "Rikiuoti pagal _bÅ«senÄ…" -#: ../src/empathy-preferences.glade.h:21 +#: ../src/empathy-preferences.ui.h:32 msgid "Sounds" msgstr "Garsai" -#: ../src/empathy-preferences.glade.h:22 +#: ../src/empathy-preferences.ui.h:33 msgid "Spell Checking" msgstr "RaÅ¡ybos tikrinimas" -#: ../src/empathy-preferences.glade.h:23 +#: ../src/empathy-preferences.ui.h:34 +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "" +"Å iame kalbų sÄ…raÅ¡e yra tik tos kalbos, kurių žodynus turite įdiegÄ™." + +#: ../src/empathy-preferences.ui.h:35 msgid "Themes" msgstr "Temos" -#: ../src/empathy-preferences.glade.h:24 +#: ../src/empathy-preferences.ui.h:36 msgid "_Enable bubble notifications" -msgstr "Ä®jungti burbulinius praneÅ¡imus" +msgstr "Ä®_jungti burbulinius praneÅ¡imus" -#: ../src/empathy-preferences.glade.h:25 +#: ../src/empathy-preferences.ui.h:37 msgid "_Enable sound notifications" -msgstr "Ä®jungti garsinius praneÅ¡imus" +msgstr "Ä®_jungti garsinius praneÅ¡imus" -#: ../src/empathy-preferences.glade.h:26 +#: ../src/empathy-preferences.ui.h:38 msgid "_Open new chats in separate windows" -msgstr "Atverti naujus pokalbius atskiruose languose" +msgstr "_Atverti naujus pokalbius atskiruose languose" + +#: ../src/empathy-preferences.ui.h:39 +msgid "_Publish location to my contacts" +msgstr "_Rodyti vietovÄ™ mano adresatams" -#: ../src/empathy-status-icon.glade.h:1 +#: ../src/empathy-preferences.ui.h:40 +msgid "_Reduce location accuracy" +msgstr "_Sumažinti vietovÄ—s tikslumÄ…" + +#: ../src/empathy-status-icon.ui.h:1 msgid "Status" msgstr "BÅ«sena" -#: ../src/empathy-status-icon.glade.h:3 +#: ../src/empathy-status-icon.ui.h:3 msgid "_Quit" -msgstr "IÅ¡eiti" +msgstr "IÅ¡_eiti" -#: ../src/empathy-status-icon.glade.h:4 +#: ../src/empathy-status-icon.ui.h:4 msgid "_Show Contact List" -msgstr "Rodyti BiÄiulių SÄ…raÅ¡Ä…" +msgstr "_Rodyti adresatų sÄ…raÅ¡Ä…" -#: ../src/empathy-tube-dispatch.c:364 +#: ../src/empathy-tube-dispatch.c:375 #, c-format msgid "Unable to start application for service %s: %s" -msgstr "Nepavyko paleisti programos %s tarnybai: %s" +msgstr "Nepavyko paleisti programos tarnybai %s: %s" -#: ../src/empathy-tube-dispatch.c:435 +#: ../src/empathy-tube-dispatch.c:446 #, c-format msgid "" "An invitation was offered for service %s, but you don't have the needed " "application to handle it" -msgstr "Pasiųstas kvietimas į tarnybÄ… %s, bet nÄ—ra įdiegta reikiama programa." - -#~ msgid "Enable popup when contact is available" -#~ msgstr "Ä®jungti iÅ¡Å¡okantį langÄ…, rodomÄ… biÄiuliui prisijungus" - -#~ msgid "Enable sound when busy" -#~ msgstr "Ä®jungti garsus, kai aÅ¡ užsiÄ—mÄ™s" - -#~ msgid "Closed" -#~ msgstr "Užvertas" - -#~ msgid "End this call?" -#~ msgstr "Nutraukti skambutį?" - -#~ msgid "Closing this window will end the call in progress." -#~ msgstr "Uždarius langÄ…, bus nutraukta skambinimo eiga." - -#~ msgid "_End Call" -#~ msgstr "_Baigti" - -#~ msgid "Empathy Call" -#~ msgstr "Kvietimas" - -#~ msgid "Readying" -#~ msgstr "RuoÅ¡iama" - -#~ msgid "%s - Empathy Call" -#~ msgstr "%s - Skambina" - -#~ msgid "" -#~ "Incoming call from %s rejected because there is already a running call." -#~ msgstr "Ä®einantis ryÅ¡ys su %s atmestas, nes kalbamasi kita linija." +msgstr "" +"Pasiųstas kvietimas į tarnybÄ… %s, taÄiau neįdiegta jai reikalinga programa" -#~ msgid "#" -#~ msgstr "#" +#: ../src/empathy-call-window-fullscreen.ui.h:1 +msgid "gtk-leave-fullscreen" +msgstr "" -#~ msgid "*" -#~ msgstr "*" +#: ../src/empathy-map-view.ui.h:1 +msgid "Contact Map View" +msgstr "Adresatų žemÄ—lapio rodinys" -#~ msgid "0" -#~ msgstr "0" +#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083 +msgid "Error" +msgstr "Klaida" -#~ msgid "1" -#~ msgstr "1" +#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077 +msgid "Critical" +msgstr "KritinÄ—" -#~ msgid "2" -#~ msgstr "2" +#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071 +msgid "Warning" +msgstr "PerspÄ—jimas" -#~ msgid "3" -#~ msgstr "3" +#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065 +#: ../src/empathy-debug-dialog.c:1113 +msgid "Message" +msgstr "PraneÅ¡imas" -#~ msgid "4" -#~ msgstr "4" +#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059 +msgid "Info" +msgstr "Informacija" -#~ msgid "5" -#~ msgstr "5" +#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053 +msgid "Debug" +msgstr "Derinimas" -#~ msgid "6" -#~ msgstr "6" +#: ../src/empathy-debug-dialog.c:845 +msgid "Save" +msgstr "IraÅ¡yti" -#~ msgid "7" -#~ msgstr "7" +#: ../src/empathy-debug-dialog.c:948 +msgid "Debug Window" +msgstr "Derinimo langas" -#~ msgid "8" -#~ msgstr "8" +#: ../src/empathy-debug-dialog.c:1021 +msgid "Pause" +msgstr "PauzÄ—" -#~ msgid "9" -#~ msgstr "9" +#: ../src/empathy-debug-dialog.c:1033 +msgid "Level " +msgstr "Lygis " -#~ msgid "<b>Keypad</b>" -#~ msgstr "<b>SkaiÄių klaviatÅ«ra</b>" +#: ../src/empathy-debug-dialog.c:1102 +msgid "Time" +msgstr "Laikas" -#~ msgid "Invitation Error" -#~ msgstr "Pakvietimo Klaida:" +#: ../src/empathy-debug-dialog.c:1104 +msgid "Domain" +msgstr "Sritis" -#~ msgid "<b>Audio</b>" -#~ msgstr "<b>Garsai</b>" +#: ../src/empathy-debug-dialog.c:1106 +msgid "Category" +msgstr "Kategorija" -#~ msgid "<b>Visual</b>" -#~ msgstr "<b>Vaizdas</b>" +#: ../src/empathy-debug-dialog.c:1108 +msgid "Level" +msgstr "Lygis" -#~ msgid "Enable sounds when _busy" -#~ msgstr "Ä®jungti garsus, kai aÅ¡ _užsiÄ—mÄ™s" +#: ../src/empathy-debug-dialog.c:1140 +msgid "" +"The selected connection manager does not support the remote debugging " +"extension." +msgstr "Pasirinktoji ryÅ¡ių valdyklÄ— nepalaiko nuotolinio derinimo plÄ—tinio." diff --git a/po/or.po b/po/or.po new file mode 100644 index 000000000..d89ee2e2a --- /dev/null +++ b/po/or.po @@ -0,0 +1,2490 @@ +# translation of empathy.po.master.or.po to Oriya +# Oriya translation of empathy. +# Copyright (C) 2009 empathy's COPYRIGHT HOLDER +# This file is distributed under the same license as the empathy package. +# +# Manoj Kumar Giri <mgiri@redhat.com>, 2009. +msgid "" +msgstr "" +"Project-Id-Version: empathy.po.master.or\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n" +"POT-Creation-Date: 2009-07-01 13:43+0000\n" +"PO-Revision-Date: 2009-07-01 19:21+0530\n" +"Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n" +"Language-Team: Oriya <oriya-it@googlegroups.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../data/empathy.desktop.in.in.h:1 +msgid "Empathy Instant Messenger" +msgstr "Empathy ତà€à¬¬àର ସନàଦà‡à¬¶ ବାହକ" + +#: ../data/empathy.desktop.in.in.h:2 +msgid "Send and receive instant messages" +msgstr "ତàରନàତ ସନàଦà‡à¬¶à¬—àଡ଼ିକà ପଠାନàତà à¬à¬¬à¬‚ ଗàରହଣ କରନàତà" + +#: ../data/empathy.schemas.in.h:1 +msgid "Always open a separate chat window for new chats." +msgstr "ନà‚ତନ ଚାରàଟ ପାଇଠସରàବଦା à¬à¬¿à¬¨àନ à¬à¬¿à¬¨àନ ଚାରàଟ à±à¬¿à¬£àà¬¡à‹ à¬–à‹à¬²à¬¨àତà।" + +#: ../data/empathy.schemas.in.h:2 +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "ଉପନାମ à¬ªà¬°à‡ à¬¯à‹à¬¡à¬¼à¬¿à¬¬à¬¾à¬•à ଥିବା ଅକàଷର ଯà‡à¬¤à‡à¬¬à‡à¬³à‡ ସମà‚ହ ଚାରàà¬Ÿà¬°à‡ à¬‰à¬ªà¬¨à¬¾à¬® ସମàପà‚ରàଣàଣ ଟààŸà¬¾à¬¬ ବààŸà¬¬à¬¹à¬¾à¬° କରିଥାà¬à¥¤" + +#: ../data/empathy.schemas.in.h:3 +msgid "Chat window theme" +msgstr "ଚାରàଟ à±à¬¿à¬£àà¬¡à‹ à¬ªàରସଂଗ" + +#: ../data/empathy.schemas.in.h:4 +msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)." +msgstr "" +"ବààŸà¬¬à¬¹à¬¾à¬° କରିବା ପାଇଠବନାନ ଯାଞàà¬šà¬•à¬¾à¬°à€ à¬à¬¾à¬·à¬¾à¬—àଡ଼ିକର କମା ଦàà±à¬¾à¬°à¬¾ ପàƒà¬¥à¬• ତାଲିକା (ଉଦାହରଣ en, fr, " +"nl)।" + +#: ../data/empathy.schemas.in.h:5 +msgid "Compact contact list" +msgstr "ସàସଂଗତ ସମàପରàକ ତାଲିକା" + +#: ../data/empathy.schemas.in.h:6 +msgid "Contact list sort criterium" +msgstr "ସମàପରàକ ତାଲିକା ସଜାàœà¬¿à¬¬à¬¾ ମାନଦଣàଡ" + +#: ../data/empathy.schemas.in.h:7 +msgid "Default directory to select an avatar image from" +msgstr "ଅବତାର ଚିତàର ଚàŸà¬¨ କରିବା ପାଇଠପà‚ରàବ ନିରàଦàଧାରିତ ଡ଼ିରà‡à¬•àଟରà€" + +#: ../data/empathy.schemas.in.h:8 +msgid "Disable popup notifications when away" +msgstr "ଦà‚à¬°à¬°à‡ à¬¥à¬¿à¬¬à¬¾ ସମàŸà¬°à‡ ପପଅପ à±à¬¿à¬£àà¬¡à‹ à¬¬à¬¿à¬œàଞପàତିଗàଡ଼ିକà ନିଷàକàà¬°à¬¿àŸ à¬•à¬°à¬¨àତà" + +#: ../data/empathy.schemas.in.h:9 +msgid "Disable sounds when away" +msgstr "ଦà‚à¬°à¬°à‡ à¬¥à¬¿à¬¬à¬¾ ସମàŸà¬°à‡ ଧàà±à¬¨à¬¿à¬•à ନିଷàକàà¬°à¬¿àŸ à¬•à¬°à¬¨àତà" + +#: ../data/empathy.schemas.in.h:10 +msgid "Empathy can publish the user's location" +msgstr "" + +#: ../data/empathy.schemas.in.h:11 +msgid "Empathy can use the GPS to guess the location" +msgstr "" + +#: ../data/empathy.schemas.in.h:12 +msgid "Empathy can use the cellular network to guess the location" +msgstr "" + +#: ../data/empathy.schemas.in.h:13 +msgid "Empathy can use the network to guess the location" +msgstr "" + +#: ../data/empathy.schemas.in.h:14 +msgid "Empathy default download folder" +msgstr "Empathy ପà‚ରàବନିରàଦàଧାରିତ ଆହରଣ ଫà‹à¬²à¬¡à¬°" + +#: ../data/empathy.schemas.in.h:15 +msgid "Empathy has asked about importing accounts" +msgstr "Empathy ଖାତାଗàଡ଼ିକà ରପàତାନି କରିବା ବିଷàŸà¬°à‡ ପଚାରିଥାà¬" + +#: ../data/empathy.schemas.in.h:16 +msgid "Empathy should auto-connect on startup" +msgstr "Empathy ଆରମàà¬à¬°à‡ ପଚାରିବା ଉଚିତ" + +#: ../data/empathy.schemas.in.h:17 +msgid "Empathy should reduce the location's accuracy" +msgstr "" + +#: ../data/empathy.schemas.in.h:18 +msgid "Empathy should use the avatar of the contact as the chat window icon" +msgstr "Empathy ଚାରàଟ à±à¬¿à¬£àà¬¡à‹ à¬šà¬¿à¬¤àର ସଂକà‡à¬¤ ପରି ସମàପରàକର ଅବତାରକà ବààŸà¬¬à¬¹à¬¾à¬° କରିବା ଉଚିତ" + +#: ../data/empathy.schemas.in.h:19 +msgid "Enable popup notifications for new messages" +msgstr "ନà‚ତନ ସନàଦà‡à¬¶à¬—àଡ଼ିକ ପାଇଠପପଅପ ବିଜàଞପàତିଗàଡ଼ିକà ସକàà¬°à¬¿àŸ à¬•à¬°à¬¨àତà" + +#: ../data/empathy.schemas.in.h:20 +msgid "Enable spell checker" +msgstr "ବନାନ ଯାଞàଚକରàତàତାକà ସକàà¬°à¬¿àŸ à¬•à¬°à¬¨àତà" + +#: ../data/empathy.schemas.in.h:21 +msgid "Hide main window" +msgstr "ମàଖàଯ à±à¬¿à¬£àà¬¡à‹ à¬²àଚାନàତà" + +#: ../data/empathy.schemas.in.h:22 +msgid "Hide the main window." +msgstr "ମàଖàଯ à±à¬¿à¬£àà¬¡à‹ à¬²àଚାନàତà" + +#: ../data/empathy.schemas.in.h:23 +msgid "NetworkManager should be used" +msgstr "ନà‡à¬Ÿà±à¬°àକ ପରିଚାଳକଙàକà ବààŸà¬¬à¬¹à¬¾à¬° କରିବା ଉଚିତ" + +#: ../data/empathy.schemas.in.h:24 +msgid "Nick completed character" +msgstr "ଉପନାମ ସମàପà‚ରàଣàଣ ଅକàଷର" + +#: ../data/empathy.schemas.in.h:25 +msgid "Open new chats in separate windows" +msgstr "ନàଆ ଚାଟଗààœà¬¿à¬• ଅଲଗା à±à¬¿à¬£àଡà‹à¬°à‡ ଖà‹à¬²à¬¨àତà" + +#: ../data/empathy.schemas.in.h:26 +msgid "Path of the adium theme to use" +msgstr "" + +#: ../data/empathy.schemas.in.h:27 +msgid "Path of the adium theme to use if the theme used for chat is adium." +msgstr "" + +#: ../data/empathy.schemas.in.h:28 +msgid "Play a sound for incoming messages" +msgstr "ଆଗତ ସନàଦà‡à¬¶ ପାଇଠà¬à¬• ଶବàଦ ଚଲାନàତà" + +#: ../data/empathy.schemas.in.h:29 +msgid "Play a sound for new conversations" +msgstr "ନà‚ତନ ବାରàତàତାଳାପ ପାଇଠଧàà±à¬¨à¬¿ ଚଲାନàତà" + +#: ../data/empathy.schemas.in.h:30 +msgid "Play a sound for outgoing messages" +msgstr "ଯାଉଥିବା ସନàଦà‡à¬¶à¬—àଡ଼ିକ ପାଇଠଧàà±à¬¨à¬¿ ଚଲାନàତà" + +#: ../data/empathy.schemas.in.h:31 +msgid "Play a sound when a contact logs in" +msgstr "ଗà‹à¬Ÿà¬¿à¬ ସମàପରàକ ଲଗ ଇନ ହà‹à¬‡à¬¸à¬¾à¬°à¬¿à¬¬à¬¾ à¬ªà¬°à‡ à¬§àà±à¬¨à¬¿ ଚଲାନàତà" + +#: ../data/empathy.schemas.in.h:32 +msgid "Play a sound when a contact logs out" +msgstr "ଗà‹à¬Ÿà¬¿à¬ ସମàପରàକ ଲଗ ଆଉଟ ହà‹à¬‡à¬¸à¬¾à¬°à¬¿à¬¬à¬¾ à¬ªà¬°à‡ à¬§àà±à¬¨à¬¿ ଚଲାନàତà" + +#: ../data/empathy.schemas.in.h:33 +msgid "Play a sound when we log in" +msgstr "ଆମàà¬à‡ ଲଗଇନà କରିବାବà‡à¬³à‡ à¬à¬• ଶବàଦ ଚଲାନàତà" + +#: ../data/empathy.schemas.in.h:34 +msgid "Play a sound when we log out" +msgstr "ଆମàà¬à‡ ଲଗଆଉଟ କରିବାବà‡à¬³à‡ à¬à¬• ଶବàଦ ଚଲାନàତà" + +#: ../data/empathy.schemas.in.h:35 +msgid "Popup notifications if the chat isn't focused" +msgstr "ପପଅପ ବିଜàଞପàତି ଯଦି ଚାରàଟ ଲକàଷààŸ à¬¹à‹à¬‡à¬¨à¬¾à¬¹à¬¿à¬" + +#: ../data/empathy.schemas.in.h:36 +msgid "Popup notifications when a contact sign in" +msgstr "" + +#: ../data/empathy.schemas.in.h:37 +msgid "Popup notifications when a contact sign out" +msgstr "" + +#: ../data/empathy.schemas.in.h:38 +msgid "Salut account is created" +msgstr "ସà‡à¬²ààŸàଟ ଖାତା ନିରàମିତ ହà‹à¬‡à¬›à¬¿" + +#: ../data/empathy.schemas.in.h:39 +msgid "Show avatars" +msgstr "ଅବତାର ଦà‡à¬–ାନàତà" + +#: ../data/empathy.schemas.in.h:40 +msgid "Show contact list in rooms" +msgstr "" + +#: ../data/empathy.schemas.in.h:41 +msgid "Show hint about closing the main window" +msgstr "ମàଖàଯ à±à¬¿à¬£àà¬¡à‹ à¬¬à¬¨àଦ କରିବା ପାଇଠଆà¬à¬¾à¬¸ ଦିଅନàତà" + +#: ../data/empathy.schemas.in.h:42 +msgid "Show offline contacts" +msgstr "ଅଫଲାଇନ ସମàପରàକ ଦà‡à¬–ାଅ" + +#: ../data/empathy.schemas.in.h:43 +msgid "Spell checking languages" +msgstr "ବନାନ ଯାଞàà¬šà¬•à¬¾à¬°à€ à¬à¬¾à¬·à¬¾à¬—àଡ଼ିକ" + +#: ../data/empathy.schemas.in.h:44 +msgid "The default folder to save file transfers in." +msgstr "ଫାଇଲ ପରିବହନକà ସଂରକàଷଣ କରିବା ପାଇଠପà‚ରàବନିରàଦàଧାରିତ ଫà‹à¬²à¬¡à¬°à¥¤" + +#: ../data/empathy.schemas.in.h:45 +msgid "The last directory that an avatar image was chosen from." +msgstr "ଅà¬à¬¤à¬¾à¬° ପàରତିଛବି ଦàà±à¬¾à¬°à¬¾ ବଛାଯାଇଥିବା ଶà‡à¬· ଡିରà‡à¬•àଟà‹à¬°à€à¥¤" + +#: ../data/empathy.schemas.in.h:46 +msgid "The theme that is used to display the conversation in chat windows." +msgstr "ଚାରàଟ à±à¬¿à¬£àଡà‹à¬°à‡ ବାରàତàତାଳାପକà ଦରàଶାଯାଇବା ପାଇଠବààŸà¬¬à¬¹àƒà¬¤ ପàରସଙàଗ।" + +#: ../data/empathy.schemas.in.h:47 +msgid "Use graphical smileys" +msgstr "ଆଲà‡à¬–à€ à¬¸àମାଇଲିଗàଡ଼ିକà ବààŸà¬¬à¬¹à¬¾à¬° କରନàତà" + +#: ../data/empathy.schemas.in.h:48 +msgid "Use notification sounds" +msgstr "ବିଜàଞପàତ ଶବàଦ ଉପଯà‹à¬— କରନàତà" + +#: ../data/empathy.schemas.in.h:49 +msgid "Use theme for chat rooms" +msgstr "ଚାଟ ଘରଗààœà¬¿à¬• ପାଇଠପàରସଙàଗ ଉପଯà‹à¬— କରନàତà" + +#: ../data/empathy.schemas.in.h:50 +msgid "Whether or not Empathy can publish the user's location to his contacts." +msgstr "" + +#: ../data/empathy.schemas.in.h:51 +msgid "Whether or not Empathy can use the GPS to guess the location." +msgstr "" + +#: ../data/empathy.schemas.in.h:52 +msgid "Whether or not Empathy can use the cellular network to guess the location." +msgstr "" + +#: ../data/empathy.schemas.in.h:53 +msgid "Whether or not Empathy can use the network to guess the location." +msgstr "" + +#: ../data/empathy.schemas.in.h:54 +msgid "" +"Whether or not Empathy has asked about importing accounts from other " +"programs." +msgstr "Empathy ଅନààŸ à¬ªàରଗàରାମଗàଡ଼ିକରà ଖାତା à¬†à¬®à¬¦à¬¾à¬¨à€ à¬ªà¬¾à¬‡à¬ à¬…à¬¨àରà‹à¬§ କରିବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:55 +msgid "" +"Whether or not Empathy should automatically log in to your accounts on " +"startup." +msgstr "ଆରମàà¬à¬°à‡ Empathy ସàà±àŸà¬‚ଚାଳିତ à¬à¬¾à¬¬à¬°à‡ ଆପଣଙàକ à¬–à¬¾à¬¤à¬¾à¬°à‡ à¬²à¬—à¬‡à¬¨ ହà‡à¬¬à¬¾ ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:56 +msgid "" +"Whether or not Empathy should reduce the location's accuracy for privacy " +"reasons." +msgstr "" + +#: ../data/empathy.schemas.in.h:57 +msgid "" +"Whether or not Empathy should use the avatar of the contact as the chat " +"window icon." +msgstr "Empathy ସମàପରàକର ଅà¬à¬¤à¬¾à¬°à¬•à ଚାରàଟ à±à¬¿à¬£àà¬¡à‹ à¬šà¬¿à¬¤àରସଂକà‡à¬¤ à¬à¬¾à¬¬à¬°à‡ ବààŸà¬¬à¬¹à¬¾à¬° କରିବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:58 +msgid "Whether or not the Salut account has been created on the first Empathy run." +msgstr "ପàରଥମ Empathy à¬šà¬¾à¬³à¬¨à¬¾à¬°à‡ à¬¸à‡à¬²ààŸàଟ ଖାତା ନିରàମାଣ କରିବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:59 +msgid "" +"Whether or not the network manager should be used to automatically " +"disconnect/reconnect." +msgstr "ନà‡à¬Ÿà±à¬°àକ ପରିଚାଳକ ସàà±àŸà¬‚ଚାଳିତ à¬à¬¾à¬¬à¬°à‡ ସଂଯà‹à¬— ବିଚàଛିନàନ/ସଂଯà‹à¬— ସàଥାପନ କରିବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:60 +msgid "" +"Whether or not to check words typed against the languages you want to check " +"with." +msgstr "ଆପଣ ଯାଞàଚ କରିବାକà ଚାହàà¬à¬¥à¬¿à¬¬à¬¾ à¬à¬¾à¬·à¬¾à¬° ଶବàଦ ପàରକାରକà ଯାଞàଚ କରିବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:61 +msgid "Whether or not to convert smileys into graphical images in conversations." +msgstr "ବାରàତàà¬¤à¬¾à¬³à¬¾à¬ªà¬°à‡ à¬†à¬²à‡à¬–à€ à¬ªàରତିଛବିଗàଡ଼ିକà ସàମାଇଲି ପରିବରàତàତନ କରିବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:62 +msgid "Whether or not to play a sound to notify for contacts logging in the network." +msgstr "ନà‡à¬Ÿà±à¬°àà¬•à¬°à‡ à¬²à¬—à¬‡à¬¨ ହà‡à¬‰à¬¥à¬¿à¬¬à¬¾ ସମàପରàକଗàଡ଼ିକà ବିଜàଞପàତି ଦà‡à¬¬à¬¾ ପାଇଠଧàà±à¬¨à¬¿ ଚଲାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:63 +msgid "" +"Whether or not to play a sound to notify for contacts logging off the " +"network." +msgstr "ନà‡à¬Ÿà±à¬°àà¬•à¬°à‡ à¬²à¬—à¬…à¬« ହà‡à¬‰à¬¥à¬¿à¬¬à¬¾ ସମàପରàକଗàଡ଼ିକà ବିଜàଞପàତି ଦà‡à¬¬à¬¾ ପାଇଠଧàà±à¬¨à¬¿ ଚଲାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:64 +msgid "Whether or not to play a sound to notify for events." +msgstr "ଘଟଣାଗàଡ଼ିକ ପାଇଠବିଜàଞପàତି ଦà‡à¬¬à¬¾à¬•à ଧàà±à¬¨à¬¿ ଚାଲାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:65 +msgid "Whether or not to play a sound to notify for incoming messages." +msgstr "ଆସàଥିବା ସନàଦà‡à¬¶à¬—àଡ଼ିକ ପାଇଠବିଜàଞପàତି ଦà‡à¬¬à¬¾à¬•à ଧàà±à¬¨à¬¿ ଚାଲାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:66 +msgid "Whether or not to play a sound to notify for new conversations." +msgstr "ନà‚ତନ ବାରàତàତାଳାପ ପାଇଠବିଜàଞପàତି ଦà‡à¬¬à¬¾à¬•à ଧàà±à¬¨à¬¿ ଚାଲାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:67 +msgid "Whether or not to play a sound to notify for outgoing messages." +msgstr "ପଠାଯାଉଥିବା ସନàଦà‡à¬¶à¬—àଡ଼ିକ ପାଇଠବିଜàଞପàତି ଦà‡à¬¬à¬¾à¬•à ଧàà±à¬¨à¬¿ ଚାଲାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:68 +msgid "Whether or not to play a sound when logging in a network." +msgstr "ନà‡à¬Ÿà±à¬°àà¬•à¬°à‡ à¬²à¬—à¬‡à¬¨ ହà‡à¬¬à¬¾ ସମàŸà¬°à‡ ବିଜàଞପàତି ଦà‡à¬¬à¬¾à¬•à ଧàà±à¬¨à¬¿ ଚାଲାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:69 +msgid "Whether or not to play a sound when logging off a network." +msgstr "ନà‡à¬Ÿà±à¬°àà¬•à¬°à‡ à¬²à¬—à¬…à¬« ହà‡à¬¬à¬¾ ସମàŸà¬°à‡ ବିଜàଞପàତି ଦà‡à¬¬à¬¾à¬•à ଧàà±à¬¨à¬¿ ଚାଲାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:70 +msgid "Whether or not to play sound notifications when away or busy." +msgstr "ଦà‚à¬°à¬°à‡ à¬¥à¬¿à¬¬à¬¾ ସମàŸà¬°à‡ କିମàବା ବààŸà¬¸àତ ଥିବା ସମàŸà¬°à‡ ବିଜàଞପàତି ଦà‡à¬¬à¬¾à¬•à ଧàà±à¬¨à¬¿ ଚାଲାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:71 +msgid "Whether or not to show a popup notification when a contact goes offline." +msgstr "" + +#: ../data/empathy.schemas.in.h:72 +msgid "Whether or not to show a popup notification when a contact goes online." +msgstr "" + +#: ../data/empathy.schemas.in.h:73 +msgid "" +"Whether or not to show a popup notification when receiving a new message " +"even if the chat is already opened, but not focused." +msgstr "" +"ଗà‹à¬Ÿà¬¿à¬ ନà‚ତନ ସନàଦà‡à¬¶ ଗàରହଣ କରିସାରିବା à¬ªà¬°à‡ à¬—à‹à¬Ÿà¬¿à¬ ପପଅପ ବିଜàଞପàତି ଦରàଶାଇବା ଉଚିତ କି ନàହଠ" +"ଯଦି ଚାଟଟି ପà‚ରàବରà ଖà‹à¬²à¬¾à¬…ଛି, କିନàତà ଲକàଷààŸ à¬•à¬°à¬¾à¬¯à¬¾à¬‡à¬¨à¬¾à¬¹à¬¿à¬à¥¤" + +#: ../data/empathy.schemas.in.h:74 +msgid "Whether or not to show a popup notification when receiving a new message." +msgstr "ନà‚ତନ ସନàଦà‡à¬¶ ଗàରହଣ କରିବା ସମàŸà¬°à‡ ପପଅପ ବିଜàଞପàତି ଦରàଶାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:75 +msgid "" +"Whether or not to show avatars for contacts in the contact list and chat " +"windows." +msgstr "ସମàପରàକ ତାଲିକା à¬à¬¬à¬‚ ଚାରàଟ à±à¬¿à¬£àଡà‹à¬°à‡ ସମàପରàକଗàଡ଼ିକ ପାଇଠଅà¬à¬¤à¬¾à¬°à¬—àଡ଼ିକà ଦରàଶାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:76 +msgid "Whether or not to show contacts that are offline in the contact list." +msgstr "ସମàପରàକ à¬¤à¬¾à¬²à¬¿à¬•à¬¾à¬°à‡ à¬…à¬«à¬²à¬¾à¬‡à¬¨ ଥିବା ସମàପରàକଗàଡ଼ିକà ଦରàଶାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:77 +msgid "Whether or not to show popup notifications when away or busy." +msgstr "ଦà‚à¬°à¬°à‡ à¬¥à¬¿à¬¬à¬¾ ସମàŸà¬°à‡ କିମàବା ବààŸà¬¸àତ ଥିବା ସମàŸà¬°à‡ ପପଅପ ବିଜàଞପàତିକà ଦରàଶାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:78 +msgid "Whether or not to show the contact list in chat rooms." +msgstr "" + +#: ../data/empathy.schemas.in.h:79 +msgid "" +"Whether or not to show the message dialog about closing the main window with " +"the 'x' button in the title bar." +msgstr "" +"ଶà€à¬°àଷକ à¬ªà¬Ÿà¬¿à¬°à‡ 'x' ବଟନ ସହିତ ମà‚ଖààŸ à±à¬¿à¬£àଡà‹à¬•à ବନàଦ କରିବା à¬ªà¬°à‡ à¬¸à¬¨àଦà‡à¬¶ ସଂଳାପକà " +"ଦରàଶାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:80 +msgid "Whether to show the contact list in compact mode or not." +msgstr "ସମàପରàକ ତାଲିକାକà ସଂଗàପàତ à¬§à¬¾à¬°à¬¾à¬°à‡ à¬¦à¬°àଶାଇବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:81 +msgid "Whether to use the theme for chat rooms or not." +msgstr "ଚାରàଟରàମ ପାଇଠପàରସଙàଗକà ବààŸà¬¬à¬¹à¬¾à¬° କରିବା ଉଚିତ କି ନàହà¬à¥¤" + +#: ../data/empathy.schemas.in.h:82 +msgid "" +"Which criterium to use when sorting the contact list. Default is to use sort " +"by the contact's name with the value \"name\". A value of \"state\" will " +"sort the contact list by state." +msgstr "" +"ଯà‹à¬—ାଯà‹à¬— ତାଲିକାକà ସଜାଡ଼ିବା ସମàŸà¬°à‡ କà‡à¬‰à¬ ମାନଦଣàଡକà ବààŸà¬¬à¬¹à¬¾à¬° କରିବା ଉଚିତ। ପà‚ରàବନିରàଦàଧାରିତଟି ହà‡à¬‰à¬›à¬¿ " +"ସମàପରàକନାମ ସହିତ ମà‚ଲààŸ \"ନାମ\"କà ସଜାଡ଼ିବା। \"state\" ର ଗà‹à¬Ÿà¬¿à¬ ମà‚ଲààŸà¬•à ଅବସàଥା ଦàà±à¬¾à¬°à¬¾ ଯà‹à¬—ାଯà‹à¬— ତାଲିକା " +"ଅନàà¬¸à¬¾à¬°à‡ à¬¸à¬œà¬¾à¬¡à¬¼à¬¿à¬¬à¬¾à¥¤" + +#: ../libempathy/empathy-ft-handler.c:838 +msgid "The hash of the received file and the sent one do not match" +msgstr "" + +#: ../libempathy/empathy-ft-handler.c:1098 +msgid "File transfer not supported by remote contact" +msgstr "" + +#: ../libempathy/empathy-ft-handler.c:1156 +msgid "The selected file is not a regular file" +msgstr "" + +#: ../libempathy/empathy-ft-handler.c:1165 +msgid "The selected file is empty" +msgstr "" + +#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:289 +msgid "People nearby" +msgstr "ନିକଟବରàà¬¤à€ à¬²à‹à¬•" + +#: ../libempathy/empathy-tp-file.c:279 +msgid "Socket type not supported" +msgstr "" + +#: ../libempathy/empathy-tp-file.c:398 +msgid "No reason was specified" +msgstr "କàŒà¬£à¬¸à¬¿ କାରଣ ଉଲàଲà‡à¬– କରାଯାଇନାହିà¬" + +#: ../libempathy/empathy-tp-file.c:401 +msgid "The change in state was requested" +msgstr "ଅବସàଥିତିର ପରିବରàତàତନକà ଅନàରà‹à¬§ କରାଯାଇଥିଲା" + +#: ../libempathy/empathy-tp-file.c:404 +msgid "You canceled the file transfer" +msgstr "ଆପଣ ଫାଇଲ ପରିବହନକà ବାତିଲ କରିଛନàତି" + +#: ../libempathy/empathy-tp-file.c:407 +msgid "The other participant canceled the file transfer" +msgstr "ଅନààŸ à¬…à¬‚à¬¶à¬¦à¬¾à¬¤à¬¾ ଫାଇଲ ପରିବହନକà ବାତିଲ କରିଛନàତି" + +#: ../libempathy/empathy-tp-file.c:410 +msgid "Error while trying to transfer the file" +msgstr "ଫାଇଲକà ପରିବହନ କରିବା ସମàŸà¬°à‡ ତàରàଟି" + +#: ../libempathy/empathy-tp-file.c:413 +msgid "The other participant is unable to transfer the file" +msgstr "ଅନààŸ à¬…à¬‚à¬¶à¬—àà¬°à¬¹à¬£à¬•à¬¾à¬°à€ à¬à¬¹à¬¿ ଫାଇଲକà ସàଥାନାନàତରଣ à¬•à¬°à¬¿à¬¬à¬¾à¬°à‡ à¬…à¬¸à¬®à¬°àଥ" + +#: ../libempathy/empathy-tp-file.c:416 +msgid "Unknown reason" +msgstr "ଅଜàଞାତ କାରଣ" + +#: ../libempathy/empathy-utils.c:265 +msgid "Available" +msgstr "ଉପଲବàଧ" + +#: ../libempathy/empathy-utils.c:267 +msgid "Busy" +msgstr "ବàଯସàତ" + +#: ../libempathy/empathy-utils.c:270 +msgid "Away" +msgstr "ଅନàପସàଥିତ" + +#: ../libempathy/empathy-utils.c:272 +msgid "Hidden" +msgstr "ଲàକàକାଇତ" + +#: ../libempathy/empathy-utils.c:274 +msgid "Offline" +msgstr "ଅଫଲାଇନ" + +#: ../libempathy/empathy-time.c:137 +#, c-format +msgid "%d second ago" +msgid_plural "%d seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: ../libempathy/empathy-time.c:142 +#, c-format +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "%d ମିନଟ ପà‚ରàବà‡" +msgstr[1] "%d ମିନଟ ପà‚ରàବà‡" + +#: ../libempathy/empathy-time.c:147 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "" +msgstr[1] "" + +#: ../libempathy/empathy-time.c:152 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d ଦିନ ପà‚ରàବà‡" +msgstr[1] "%d ଦିନ ପà‚ରàବà‡" + +#: ../libempathy/empathy-time.c:157 +#, c-format +msgid "%d week ago" +msgid_plural "%d weeks ago" +msgstr[0] "" +msgstr[1] "" + +#: ../libempathy/empathy-time.c:162 +#, c-format +msgid "%d month ago" +msgid_plural "%d months ago" +msgstr[0] "%d ମାସ ପà‚ରàବà‡" +msgstr[1] "%d ମାସ ପà‚ରàବà‡" + +#: ../libempathy/empathy-time.c:167 +msgid "in the future" +msgstr "à¬à¬¬à¬¿à¬·ààŸà¬¤à¬°à‡" + +#: ../libempathy-gtk/empathy-account-chooser.c:419 +msgid "All" +msgstr "ସମସàତ" + +#: ../libempathy-gtk/empathy-account-widget.c:302 +#: ../libempathy-gtk/empathy-account-widget.c:354 +#, c-format +msgid "%s:" +msgstr "%s:" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Advanced" +msgstr "ଉନàନତ" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 +msgid "Pass_word:" +msgstr "ପàରବà‡à¬¶ ସଙàକà‡à¬¤ (_w):" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 +msgid "Screen _Name:" +msgstr "ପରଦା ନାମ (_N):" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 +msgid "_Port:" +msgstr "ସଂଯà‹à¬—à¬¿à¬•à€ (_P):" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 +msgid "_Server:" +msgstr "ସà‡à¬¬à¬• (_S):" + +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 +msgid "Login I_D:" +msgstr "ଲଗଇନà I_D: " + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +msgid "ICQ _UIN:" +msgstr "ICS_UIN:" + +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 +msgid "_Charset:" +msgstr "ଅକàଷରମାଳା (_C):" + +#: ../libempathy-gtk/empathy-account-widget-irc.c:240 +msgid "New Network" +msgstr "ନàଆ ଜାଲକ" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +msgid "Charset:" +msgstr "ଅକàଷରମାଳା:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +msgid "Network" +msgstr "ନà‡à¬Ÿà±à¬°àକ" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +msgid "Network:" +msgstr "ନà‡à¬Ÿà¬“àବାରàକ:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +msgid "Nickname:" +msgstr "ଡାକ ନାମ:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 +msgid "Password:" +msgstr "ପàରବà‡à¬¶ ସଙàକà‡à¬¤:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 +msgid "Quit message:" +msgstr "à¬¬à¬¿à¬¦à¬¾àŸ à¬¸à¬¨àଦà‡à¬¶" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 +msgid "Real name:" +msgstr "ପàରକàରàତ ନାମ:" + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +msgid "Servers" +msgstr "ସà‡à¬¬à¬• ମାନà‡" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 +msgid "Override server settings" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 +msgid "Pri_ority:" +msgstr "ଅଗàରାଧିକାର (_o):" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 +msgid "Reso_urce:" +msgstr "ସମàବଳ (_u):" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 +msgid "Use old SS_L" +msgstr "ପàରàଣା SSL ଉପଯà‹à¬— କରନàତà (_L)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 +msgid "_Encryption required (TLS/SSL)" +msgstr "ସଂଗàପàତ ଆବଶààŸà¬• (TLS/SSL) (_E)" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "_Ignore SSL certificate errors" +msgstr "SSL ପàରମାଣପତàର ତàରàଟିଗàଡ଼ିକà ଅଗàରାହààŸ à¬•à¬°à¬¨àତà (_I)" + +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2 +msgid "_Email:" +msgstr "ଇ-ମà‡à¬² (_E):" + +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3 +msgid "_First Name:" +msgstr "ପàରଥମ ନାମ (_F):" + +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4 +msgid "_Jabber ID:" +msgstr "ଜବàବର ID (_J):" + +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5 +msgid "_Last Name:" +msgstr "ଶà‡à¬· ନାମ (_L):" + +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6 +msgid "_Nickname:" +msgstr "ଡାକ ନାମ (_N):" + +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7 +msgid "_Published Name:" +msgstr "ପàରକାଶିତ ନାମ (_P):" + +#. look up the DNS SRV record at the service's domain for the host name of a STUN server. +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 +msgid "Discover STUN" +msgstr "STUN କà ଆବିଷàକାର କରନàତà" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 +msgid "STUN Server:" +msgstr " STUN ସରàà¬à¬°" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 +msgid "STUN port:" +msgstr "STUN ସଂଯà‹à¬—ିକà€:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 +msgid "_Username:" +msgstr "ଚାଳକ ନାମ (_U):" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 +msgid "Use _Yahoo Japan" +msgstr "Yahoo ଜାପାନ ଉପଯà‹à¬— କରନàତà (_Y)" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 +msgid "Yahoo I_D:" +msgstr "Yahoo I_D:" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 +msgid "_Ignore conference and chatroom invitations" +msgstr "ସମàମà‡à¬³à¬¨ à¬à¬¬à¬‚ ଚାରàଟକକàଷ ଆମନàତàରଣଗàଡ଼ିକà ଅଗàରାହààŸ à¬•à¬°à¬¨àତà (_I)" + +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 +msgid "_Room List locale:" +msgstr "କକàଷ ତାଲିକା ଲà‹à¬•à‡à¬² (_R):" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:449 +#: ../libempathy-gtk/empathy-avatar-chooser.c:525 +msgid "Couldn't convert image" +msgstr "ଚିତàର ରà‚ପାନàତର କରିହà‡à¬²à¬¾ ନାହିà¬" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:450 +msgid "None of the accepted image formats is supported on your system" +msgstr "ଗàରହଣ କରାଯାଇଥିବା ପàରତିଛବି ସଜàଜିକରଣ ଶàˆà¬³à€ ମଧàଯରà କà‡à¬¹à¬¿ ମଧàଯ ଆପଣଙàକ ତନàତàà¬°à¬°à‡ à¬¸à¬®à¬°àଥିତ ନàହà¬" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:933 +msgid "Select Your Avatar Image" +msgstr "ନିଜର ଅବତାର ପàରତିଛବି ଚàŸà¬¨ କରନàତà" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:936 +msgid "No Image" +msgstr "କàŒà¬£à¬¸à¬¿ ପàରତିଛବି ନାହିà¬" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:998 +msgid "Images" +msgstr "ପàରତିଛବି" + +#: ../libempathy-gtk/empathy-avatar-chooser.c:1002 +msgid "All Files" +msgstr "ସମସàତ ଫାଇଲ" + +#: ../libempathy-gtk/empathy-avatar-image.c:324 +msgid "Click to enlarge" +msgstr "ବଡ଼କରିବା ପାଇଠକàଲିକ କରନàତà" + +#: ../libempathy-gtk/empathy-chat.c:186 +msgid "Failed to reconnect this chat" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:404 +msgid "Unsupported command" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:539 +msgid "offline" +msgstr "ଅଫ ଲାଇନ" + +#: ../libempathy-gtk/empathy-chat.c:542 +msgid "invalid contact" +msgstr "ତàରàଟିପàରàଣàଣ ସମàପରàକ" + +#: ../libempathy-gtk/empathy-chat.c:545 +msgid "permission denied" +msgstr "ଅନàମତି ନାହିà¬" + +#: ../libempathy-gtk/empathy-chat.c:548 +msgid "too long message" +msgstr "ଅତàଯାଧିକ ଲମàବା ସନàଦà‡à¬¶" + +#: ../libempathy-gtk/empathy-chat.c:551 +msgid "not implemented" +msgstr "ନିଷàପାଦନ କରାଯାଇ ନାହିà¬" + +#: ../libempathy-gtk/empathy-chat.c:554 +msgid "unknown" +msgstr "ଅଜଣା" + +#: ../libempathy-gtk/empathy-chat.c:558 +#, c-format +msgid "Error sending message '%s': %s" +msgstr "ସନàଦà‡à¬¶ à¬ªà¬ à¬¾à¬‡à¬¬à¬¾à¬°à‡ à¬¤àରàଟି '%s': %s" + +#: ../libempathy-gtk/empathy-chat.c:588 +#, c-format +msgid "Topic set to: %s" +msgstr "à¬°à‡ à¬¬à¬¿à¬·àŸ à¬¸à‡à¬Ÿ କରାଯାଇଥାà¬: %s" + +#: ../libempathy-gtk/empathy-chat.c:590 +msgid "No topic defined" +msgstr "କàŒà¬£à¬¸à¬¿ à¬¬à¬¿à¬·àŸ à¬¬ààŸà¬¾à¬–ààŸà¬¾ କରାଯାଇନାହିà¬" + +#: ../libempathy-gtk/empathy-chat.c:959 +msgid "(No Suggestions)" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:1013 +msgid "Insert Smiley" +msgstr "Smiley କà à¬à¬°àତàତି କରନàତà" + +#. send button +#: ../libempathy-gtk/empathy-chat.c:1031 +#: ../libempathy-gtk/empathy-ui-utils.c:1475 +msgid "_Send" +msgstr "ପଠାନàତà (_S)" + +#: ../libempathy-gtk/empathy-chat.c:1065 +msgid "_Spelling Suggestions" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:1179 +#, c-format +msgid "%s has joined the room" +msgstr "%s କଠà‹à¬°à¬¿à¬°à‡ ଯà‹à¬—ଦାନ କରିଛନàତି" + +#: ../libempathy-gtk/empathy-chat.c:1182 +#, c-format +msgid "%s has left the room" +msgstr "%s କଠà‹à¬°à¬¿à¬•à ପàରସàଥାନ କରିସାରିଛନàତି" + +#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1226 +msgid "Disconnected" +msgstr "ଅସଂଯà‹à¬œà¬¿à¬¤" + +#: ../libempathy-gtk/empathy-chat.c:1742 +msgid "Connected" +msgstr "ସଂଯà‹à¬—ିତ" + +#: ../libempathy-gtk/empathy-chat.c:1792 +#: ../libempathy-gtk/empathy-log-window.c:502 +msgid "Conversation" +msgstr "କଥà‹à¬ªà¬•à¬¥à¬¨" + +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472 +msgid "Topic:" +msgstr "ବିଷàŸ:" + +#: ../libempathy-gtk/empathy-chat-text-view.c:316 +msgid "_Copy Link Address" +msgstr "ସଂଯà‹à¬— ଠିକଣାକà ନକଲ କରନàତà (_C)" + +#: ../libempathy-gtk/empathy-chat-text-view.c:323 +msgid "_Open Link" +msgstr "ସଂଯà‹à¬—କà ଖà‹à¬²à¬¨àତà (_O)" + +#. Translators: timestamp displayed between conversations in +#. * chat windows (strftime format string) +#: ../libempathy-gtk/empathy-chat-text-view.c:421 +msgid "%A %B %d %Y" +msgstr "%A %B %d %Y" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:179 +#: ../libempathy-gtk/empathy-contact-dialogs.c:238 +msgid "Edit Contact Information" +msgstr "ସମàପରàକ ସà‚ଚନା ସମàପାଦିତ କରନàତà" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:289 +msgid "Personal Information" +msgstr "ବàଯକàତିଗତ ସà‚ଚନା" + +#: ../libempathy-gtk/empathy-contact-dialogs.c:384 +msgid "New Contact" +msgstr "ନà‚ତନ ସମàପରàକ" + +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 +msgid "Decide _Later" +msgstr "à¬ªà¬°à‡ à¬¸à¬¿à¬¦àଧାନàତ କରନàତà (_L)" + +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 +msgid "Subscription Request" +msgstr "କàà¬°àŸ à¬…à¬¨àରà‹à¬§" + +#: ../libempathy-gtk/empathy-contact-list-view.c:1375 +#, c-format +msgid "Do you really want to remove the group '%s'?" +msgstr "ଆପଣ ପàରକàƒà¬¤à¬°à‡ ସà‡à¬¹à¬¿ ଶàରà‡à¬£à€ '%s'କà କାଢ଼ିବାକà ଚାହàà¬à¬›à¬¨àତି କି?" + +#: ../libempathy-gtk/empathy-contact-list-view.c:1377 +msgid "Removing group" +msgstr "ସମà‚ହ କàାହà‡à¬‰à¬›à¬¿" + +#: ../libempathy-gtk/empathy-contact-list-view.c:1424 +#: ../libempathy-gtk/empathy-contact-list-view.c:1502 +msgid "_Remove" +msgstr "ଅପସାରଣ କରନàତà (_R)" + +#: ../libempathy-gtk/empathy-contact-list-view.c:1454 +#, c-format +msgid "Do you really want to remove the contact '%s'?" +msgstr "ଆପଣ ପàରକàƒà¬¤à¬°à‡ ସà‡à¬¹à¬¿ ସମàପରàକ '%s'କà କାଢ଼ିବାକà ଚାହàà¬à¬›à¬¨àତି କି?" + +#: ../libempathy-gtk/empathy-contact-list-view.c:1456 +msgid "Removing contact" +msgstr "ସମàପରàକ କàାହà‡à¬‰à¬›à¬¿" + +#: ../libempathy-gtk/empathy-contact-menu.c:135 +#: ../src/empathy-main-window.ui.h:8 +msgid "_Chat" +msgstr "ଆଳାପ (_C)" + +#: ../libempathy-gtk/empathy-contact-menu.c:166 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-menu.c:198 +msgctxt "menu item" +msgid "_Video Call" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-menu.c:237 +msgid "_View Previous Conversations" +msgstr "ପàରàବତନ କଥà‹à¬ªà¬•à¬¥à¬¨ ଦà‡à¬–ନàତà (_V)" + +#: ../libempathy-gtk/empathy-contact-menu.c:259 +msgid "Send file" +msgstr "ଫାଇଲ ପଠାନàତà" + +#: ../libempathy-gtk/empathy-contact-menu.c:287 +msgid "Infor_mation" +msgstr "ସà‚ଚନା (_m)" + +#: ../libempathy-gtk/empathy-contact-menu.c:314 +#: ../src/empathy-main-window.ui.h:11 +msgid "_Edit" +msgstr "ସମàପାଦନ କରନàତà (_E)" + +#: ../libempathy-gtk/empathy-contact-menu.c:372 +msgid "Inviting to this room" +msgstr "à¬à¬¹à¬¿ କଠà‹à¬°à¬¿à¬•à ଆମନàତàରଣ କରàଅଛି" + +#: ../libempathy-gtk/empathy-contact-menu.c:403 +msgid "_Invite to chatroom" +msgstr "ଚାରàଟ କଠà‹à¬°à¬¿à¬•à ଆମନàତàରଣ କରàଅଛି (_I)" + +#: ../libempathy-gtk/empathy-contact-selector.c:129 +msgid "Select a contact" +msgstr "à¬à¬• ସମàପରàକ ଚàŸà¬¨ କରନàତà" + +#: ../libempathy-gtk/empathy-contact-widget.c:440 +msgid "Save Avatar" +msgstr "ଅବତାର ସଂରକàଷଣ କରନàତà" + +#: ../libempathy-gtk/empathy-contact-widget.c:496 +msgid "Unable to save avatar" +msgstr "ଅବତାର ସଂରକàଷଣ à¬•à¬°à¬¿à¬¬à¬¾à¬°à‡ à¬¬à¬¿à¬«à¬³" + +#: ../libempathy-gtk/empathy-contact-widget.c:979 +msgid "Select" +msgstr "ମନà‹à¬¨à€à¬¤ କର" + +#: ../libempathy-gtk/empathy-contact-widget.c:988 +#: ../src/empathy-main-window.c:903 +msgid "Group" +msgstr "ସମà‚ହ" + +#: ../libempathy-gtk/empathy-contact-widget.c:1239 +msgid "Country ISO Code:" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1241 +msgid "Country:" +msgstr "ଦà‡à¬¶:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1243 +msgid "State:" +msgstr "ସàଥିତି:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1245 +msgid "City:" +msgstr "ମହାନଗର:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1247 +msgid "Area:" +msgstr "ଅଂଚଳ:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1249 +msgid "Postal Code:" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1251 +msgid "Street:" +msgstr "ସାହି:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1253 +msgid "Building:" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1255 +msgid "Floor:" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1257 +msgid "Room:" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1259 +msgid "Text:" +msgstr "ଟà‡à¬•àସଟ: " + +#: ../libempathy-gtk/empathy-contact-widget.c:1261 +msgid "Description:" +msgstr "ବରàଣàଣନା:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1263 +msgid "URI:" +msgstr "àŸà.ଆର.ଆଇ.:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1265 +msgid "Accuracy Level:" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1267 +msgid "Error:" +msgstr "ତàƒà¬Ÿà¬¿:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1269 +msgid "Vertical Error (meters):" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1271 +msgid "Horizontal Error (meters):" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1273 +msgid "Speed:" +msgstr "ବà‡à¬—:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1275 +msgid "Bearing:" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1277 +msgid "Climb Speed:" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1279 +msgid "Last Updated on:" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1281 +msgid "Longitude:" +msgstr "ଦàରାଘିମା:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1283 +msgid "Latitude:" +msgstr "ଅକàଷାଂଶ:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1285 +msgid "Altitude:" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1332 +msgid "<b>Location</b>" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1345 +msgid "<b>Location</b>, " +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.c:1395 +msgid "%B %e, %Y at %R UTC" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +msgid "<b>Location</b> at (date)\t" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 +#: ../src/empathy-chatrooms-window.ui.h:1 +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Account:" +msgstr "ଆକାଉଣàଟ:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 +msgid "Alias:" +msgstr "ଉପନାମ:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 +msgid "Birthday:" +msgstr "ଜନàମଦିନ:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Client Information" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +msgid "Client:" +msgstr "ଗàରାହକ:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../src/empathy-main-window.c:886 +msgid "Contact" +msgstr "ସମàପରàକ" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Contact Details" +msgstr "" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 +msgid "Email:" +msgstr "ଇ-ମà‡à¬²:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +msgid "Fullname:" +msgstr "ପàରା ନାମ:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Groups" +msgstr "ସମà‚ହଗàଡିକ" + +#. Identifier to connect to Instant Messaging network +#: ../libempathy-gtk/empathy-contact-widget.ui.h:13 +msgid "Identifier:" +msgstr "ପରିଚାàŸà¬•:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:14 +msgid "Information requested..." +msgstr "ସà‚ଚନା ପାଇଠଅନàରà‹à¬§ କରାଯାଇଛି..." + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:15 +msgid "OS:" +msgstr "ଓ.à¬à¬¸:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:16 +msgid "" +"Select the groups you want this contact to appear in. Note that you can " +"select more than one group or no groups." +msgstr "" +"ସà‡à¬¹à¬¿ ସମà‚ହକà ବାଛନàତà ଯà‡à¬‰à¬à¬¥à¬¿à¬°à‡ ଆପଣ à¬à¬¹à¬¾à¬•à ଦàƒà¬¶ààŸà¬®à¬¾à¬¨ କରିବାକà ଚାହàà¬à¬›à¬¨àତି। ମନà‡à¬°à¬–ନàତà à¬¯à‡ " +"ଆପଣ ଗà‹à¬Ÿà¬¿à¬à¬°à ଅଧିକ ଶàରà‡à¬£à€ ଅଥବା କàŒà¬£à¬¸à¬¿ ଶàରà‡à¬£à€ ବିନା ବାଛି ପାରିବà‡à¥¤" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:17 +msgid "Version:" +msgstr "ସଂସàକରଣ:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:18 +msgid "Web site:" +msgstr "ଉà¬à¬¬à¬¸à¬¾à¬‡à¬Ÿ:" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:19 +msgid "_Add Group" +msgstr "ସମà‚ହକà ଯà‹à¬— କରନàତà (_A)" + +#: ../libempathy-gtk/empathy-irc-network-dialog.c:283 +msgid "new server" +msgstr "ନàଆ ସରàà¬à¬°" + +#: ../libempathy-gtk/empathy-irc-network-dialog.c:510 +msgid "Server" +msgstr "ସà‡à¬¬à¬•" + +#: ../libempathy-gtk/empathy-irc-network-dialog.c:525 +msgid "Port" +msgstr "ସଂଯà‹à¬—ିକà€" + +#: ../libempathy-gtk/empathy-irc-network-dialog.c:538 +msgid "SSL" +msgstr "SSL" + +#: ../libempathy-gtk/empathy-log-window.c:495 +#: ../src/empathy-import-dialog.c:285 +msgid "Account" +msgstr "ହିସାବ ଖାତା" + +#: ../libempathy-gtk/empathy-log-window.c:512 +msgid "Date" +msgstr "ତାରିଖ" + +#: ../libempathy-gtk/empathy-log-window.ui.h:1 +msgid "Conversations" +msgstr "କଥà‹à¬ªà¬•à¬¥à¬¨" + +#: ../libempathy-gtk/empathy-log-window.ui.h:2 +msgid "Previous Conversations" +msgstr "ପàରàବତନ କଥà‹à¬ªà¬•à¬¥à¬¨à¬—ààœà¬¿à¬•" + +#: ../libempathy-gtk/empathy-log-window.ui.h:3 +msgid "Search" +msgstr "ଖà‹à¬œà¬¨àତà" + +#: ../libempathy-gtk/empathy-log-window.ui.h:4 +msgid "_For:" +msgstr "ପାଇଠ(_F):" + +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2 +msgid "C_all" +msgstr "କ_ଲ" + +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3 +msgid "C_hat" +msgstr "ଆଳାପ (_h)" + +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4 +msgid "Contact ID:" +msgstr "ସମàପରàକ ID:" + +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5 +msgid "New Conversation" +msgstr "ନàଆ କଥà‹à¬ªà¬•à¬¥à¬¨" + +#. COL_STATE_ICON_NAME +#. COL_STATE +#. COL_STATUS_TEXT +#. COL_DISPLAY_MARKUP +#. COL_STATUS_CUSTOMISABLE +#. COL_TYPE +#: ../libempathy-gtk/empathy-presence-chooser.c:172 +msgid "Custom Message..." +msgstr "" + +#: ../libempathy-gtk/empathy-presence-chooser.c:227 +msgid "Edit Custom Messages..." +msgstr "" + +#: ../libempathy-gtk/empathy-presence-chooser.c:326 +msgid "Click to remove this status as a favorite" +msgstr "" + +#: ../libempathy-gtk/empathy-presence-chooser.c:335 +msgid "Click to make this status a favorite" +msgstr "" + +#: ../libempathy-gtk/empathy-presence-chooser.c:369 +msgid "Set status" +msgstr "" + +#: ../libempathy-gtk/empathy-presence-chooser.c:782 +msgid "Set your presence and current status" +msgstr "" + +#. Custom messages +#: ../libempathy-gtk/empathy-presence-chooser.c:1017 +msgid "Custom messages..." +msgstr "ଇଚàଛାରà‚ପ ସନàଦà‡à¬¶à¬—ààœà¬¿à¬•..." + +#: ../libempathy-gtk/empathy-sound.c:51 +msgid "Received an instant message" +msgstr "ଗà‹à¬Ÿà¬¿à¬ ତàରନàତ ସନàଦà‡à¬¶ ଗàରହଣ କରିଛି" + +#: ../libempathy-gtk/empathy-sound.c:53 +msgid "Sent an instant message" +msgstr "ଗà‹à¬Ÿà¬¿à¬ ତàରନàତ ସନàଦà‡à¬¶ ପଠାଇଛି" + +#: ../libempathy-gtk/empathy-sound.c:55 +msgid "Incoming chat request" +msgstr "ଆସàଥିବା ଚାରàଟ ଅନàରà‹à¬§" + +#: ../libempathy-gtk/empathy-sound.c:57 +msgid "Contact connected" +msgstr "ସମàପରàକ ସàଥାପିତ" + +#: ../libempathy-gtk/empathy-sound.c:59 +msgid "Contact disconnected" +msgstr "ସମàପରàକ ବିଚàଛିନàନ" + +#: ../libempathy-gtk/empathy-sound.c:61 +msgid "Connected to server" +msgstr "ସରàà¬à¬° ସହ ସଂଯà‹à¬—ିତ" + +#: ../libempathy-gtk/empathy-sound.c:63 +msgid "Disconnected from server" +msgstr "ସରàà¬à¬°à¬°à ସଂଯà‹à¬— ଛିନàନ ହà‹à¬‡à¬›à¬¿" + +#: ../libempathy-gtk/empathy-sound.c:65 +msgid "Incoming voice call" +msgstr "ଆସàଥିବା ସàà±à¬° କଲ" + +#: ../libempathy-gtk/empathy-sound.c:67 +msgid "Outgoing voice call" +msgstr "ଯାଉଥିବା ସàà±à¬° କଲ" + +#: ../libempathy-gtk/empathy-sound.c:69 +msgid "Voice call ended" +msgstr "ସàà±à¬° କଲ ସମାପàତ ହà‹à¬‡à¬›à¬¿" + +#: ../libempathy-gtk/empathy-status-preset-dialog.c:362 +msgid "Enter Custom Message" +msgstr "" + +#: ../libempathy-gtk/empathy-status-preset-dialog.c:521 +msgid "Edit Custom Messages" +msgstr "" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 +msgid "Add _New Preset" +msgstr "" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2 +msgid "Saved Presets" +msgstr "" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3 +msgid "gtk-add" +msgstr "" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4 +msgid "gtk-remove" +msgstr "" + +#: ../libempathy-gtk/empathy-theme-manager.c:66 +msgid "Classic" +msgstr "ଚିରପàରତିଷàଠିତ" + +#: ../libempathy-gtk/empathy-theme-manager.c:67 +msgid "Simple" +msgstr "ସରଳ" + +#: ../libempathy-gtk/empathy-theme-manager.c:68 +msgid "Clean" +msgstr "ସଫା" + +#: ../libempathy-gtk/empathy-theme-manager.c:69 +msgid "Blue" +msgstr "ନà€à¬³" + +#: ../libempathy-gtk/empathy-theme-manager.c:71 +msgid "Adium" +msgstr "ଅଡିଅମ" + +#: ../libempathy-gtk/empathy-ui-utils.c:1377 +msgid "Unable to open URI" +msgstr "àŸà.ଆରà.ଆଇ. ଖà‹à¬²à¬¿à¬¬à¬¾à¬°à‡ ଅସମରàଥ" + +#: ../libempathy-gtk/empathy-ui-utils.c:1467 +msgid "Select a file" +msgstr "à¬à¬• ଫାଇଲ ମନà‹à¬¨à€à¬¤ କର" + +#: ../libempathy-gtk/empathy-ui-utils.c:1525 +msgid "Select a destination" +msgstr "" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +msgid "Current Locale" +msgstr "ପàରଚଳିତ ଲà‹à¬•à‡à¬²" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:161 +#: ../libempathy-gtk/totem-subtitle-encoding.c:163 +#: ../libempathy-gtk/totem-subtitle-encoding.c:165 +#: ../libempathy-gtk/totem-subtitle-encoding.c:167 +msgid "Arabic" +msgstr "ଆରବà€" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +msgid "Armenian" +msgstr "ଆରàମà‡à¬¨à¬¿àŸà¬¾à¬¨" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:173 +#: ../libempathy-gtk/totem-subtitle-encoding.c:175 +#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +msgid "Baltic" +msgstr "ବାଲଟିକ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +msgid "Celtic" +msgstr "କà‡à¬³àଟିକà" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:183 +#: ../libempathy-gtk/totem-subtitle-encoding.c:185 +#: ../libempathy-gtk/totem-subtitle-encoding.c:187 +#: ../libempathy-gtk/totem-subtitle-encoding.c:189 +msgid "Central European" +msgstr "କà‡à¬¨àଦàର àŸàରà‹à¬ªà€àŸ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:192 +#: ../libempathy-gtk/totem-subtitle-encoding.c:194 +#: ../libempathy-gtk/totem-subtitle-encoding.c:196 +#: ../libempathy-gtk/totem-subtitle-encoding.c:198 +msgid "Chinese Simplified" +msgstr "ଚà€à¬¨à€àŸ ସରଳ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:201 +#: ../libempathy-gtk/totem-subtitle-encoding.c:203 +#: ../libempathy-gtk/totem-subtitle-encoding.c:205 +msgid "Chinese Traditional" +msgstr "ଚà€à¬¨à€àŸ ପାରମàପରିକ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +msgid "Croatian" +msgstr "କàରà‹à¬à¬¸à¬¿à¬†à¬¨" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:211 +#: ../libempathy-gtk/totem-subtitle-encoding.c:213 +#: ../libempathy-gtk/totem-subtitle-encoding.c:215 +#: ../libempathy-gtk/totem-subtitle-encoding.c:217 +#: ../libempathy-gtk/totem-subtitle-encoding.c:219 +#: ../libempathy-gtk/totem-subtitle-encoding.c:221 +msgid "Cyrillic" +msgstr "ସିରà€à¬²à¬¿à¬•" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +msgid "Cyrillic/Russian" +msgstr "ସିରିଲିକ/ରàଷà€àŸ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:227 +#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +msgid "Cyrillic/Ukrainian" +msgstr "ସିରିଲିକ/ଇଉକàରà‡à¬¨à€àŸ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +msgid "Georgian" +msgstr "ଜàଯà‹à¬°àଜିàŸà¬¾à¬¨" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:235 +#: ../libempathy-gtk/totem-subtitle-encoding.c:237 +#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +msgid "Greek" +msgstr "ଗàରà€à¬•" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +msgid "Gujarati" +msgstr "ଗàଜàରାଟà€" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +msgid "Gurmukhi" +msgstr "ଗàରà‚ମà‚ଖà€" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:248 +#: ../libempathy-gtk/totem-subtitle-encoding.c:250 +#: ../libempathy-gtk/totem-subtitle-encoding.c:252 +#: ../libempathy-gtk/totem-subtitle-encoding.c:254 +msgid "Hebrew" +msgstr "ହିବàରà" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +msgid "Hebrew Visual" +msgstr "ହିବàରà ଚାକàଷàଷ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +msgid "Hindi" +msgstr "ହିନàଦà€" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +msgid "Icelandic" +msgstr "ଆଇସଲàଯାଣàଡିକ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:266 +#: ../libempathy-gtk/totem-subtitle-encoding.c:268 +#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +msgid "Japanese" +msgstr "ଜାପାନà€" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:273 +#: ../libempathy-gtk/totem-subtitle-encoding.c:275 +#: ../libempathy-gtk/totem-subtitle-encoding.c:277 +#: ../libempathy-gtk/totem-subtitle-encoding.c:279 +msgid "Korean" +msgstr "କà‹à¬°à¬¿à¬†à¬¨" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +msgid "Nordic" +msgstr "ନରàଡିକ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +msgid "Persian" +msgstr "ପାରàସà€" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:288 +#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +msgid "Romanian" +msgstr "ରà‹à¬®à¬¾à¬¨à€àŸà¬¾à¬¨" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +msgid "South European" +msgstr "ଦକàଷିଣ àŸàରà‹à¬ªà€àŸ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +msgid "Thai" +msgstr "ଥାଈ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:299 +#: ../libempathy-gtk/totem-subtitle-encoding.c:301 +#: ../libempathy-gtk/totem-subtitle-encoding.c:303 +#: ../libempathy-gtk/totem-subtitle-encoding.c:305 +msgid "Turkish" +msgstr "ତàରàକà€" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:308 +#: ../libempathy-gtk/totem-subtitle-encoding.c:310 +#: ../libempathy-gtk/totem-subtitle-encoding.c:312 +#: ../libempathy-gtk/totem-subtitle-encoding.c:314 +#: ../libempathy-gtk/totem-subtitle-encoding.c:316 +msgid "Unicode" +msgstr "àŸàନିକà‹à¬¡" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:319 +#: ../libempathy-gtk/totem-subtitle-encoding.c:321 +#: ../libempathy-gtk/totem-subtitle-encoding.c:323 +#: ../libempathy-gtk/totem-subtitle-encoding.c:325 +#: ../libempathy-gtk/totem-subtitle-encoding.c:327 +msgid "Western" +msgstr "ପାଶàଚାତàଯ" + +#: ../libempathy-gtk/totem-subtitle-encoding.c:330 +#: ../libempathy-gtk/totem-subtitle-encoding.c:332 +#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +msgid "Vietnamese" +msgstr "à¬à¬¿àŸà‡à¬¤à¬¨à¬¾à¬®à€" + +#. +#. * vim: sw=2 ts=8 cindent noai bs=2 +#. +#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1 +msgid "The contact to display in the applet. Empty means no contact is displayed." +msgstr "ଆପଲà‡à¬Ÿà¬°à‡ ଦରàଶାଇବାକà ଥିବା ସମàପରàକ। ଖାଲି à¬®à¬¾à¬¨à‡ à¬•àŒà¬£à¬¸à¬¿ ସମàପରàକ ଦରàଶାଯାଇନାହିà¬à¥¤" + +#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2 +msgid "The contact's avatar token. Empty means contact has no avatar." +msgstr "ସମàପରàକର ଅà¬à¬¤à¬¾à¬° ଟକà‡à¬¨à¥¤ ଖାଲି à¬®à¬¾à¬¨à‡ à¬¸à¬®àପରàà¬•à¬°à‡ à¬•àŒà¬£à¬¸à¬¿ ଅà¬à¬¤à¬¾à¬° ନାହିà¬à¥¤" + +#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1 +msgid "Megaphone" +msgstr "Megaphone" + +#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2 +#: ../megaphone/src/megaphone-applet.c:519 +msgid "Talk!" +msgstr "କàହନàତà!" + +#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1 +#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1 +msgid "_About" +msgstr "à¬¬à¬¿à¬¬à¬°à¬£à€ (_A)" + +#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2 +msgid "_Information" +msgstr "ସà‚ଚନା (_I)" + +#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3 +#: ../src/empathy-main-window.ui.h:18 +msgid "_Preferences" +msgstr "ପସନàଦ (_P)" + +#: ../megaphone/src/megaphone-applet.c:168 +msgid "Please configure a contact." +msgstr "ଦàŸà¬¾à¬•à¬°à¬¿ à¬à¬• ସମàପରàକକà ବିନààŸà¬¾à¬¸ କରନàତà" + +#: ../megaphone/src/megaphone-applet.c:258 +msgid "Select contact..." +msgstr "à¬à¬• ସମàପରàକ ଚàŸà¬¨ କରନàତà..." + +#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1 +msgid "Presence" +msgstr "ଉପସàଥିତି" + +#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2 +#: ../nothere/src/nothere-applet.c:106 +msgid "Set your own presence" +msgstr "ଆପଣଙàକର ନିଜର ଉପସàଥିତିକà ସà‡à¬Ÿà¬•à¬°à¬¨àତà" + +#: ../src/empathy.c:506 +msgid "Don't connect on startup" +msgstr "ଆରମàà¬à¬°à‡ ସଂଯà‹à¬— କରନàତà ନାହିà¬" + +#: ../src/empathy.c:510 +msgid "Don't show the contact list on startup" +msgstr "ଆରମàà¬à¬°à‡ ସମàପରàକ ତାଲିକା ଦରàଶାନàତà ନାହିà¬" + +#: ../src/empathy.c:514 +msgid "Show the accounts dialog" +msgstr "ଖାତା ସଂଳାପ ଦରàଶାନàତà" + +#: ../src/empathy.c:526 +msgid "- Empathy Instant Messenger" +msgstr "- Empathy ତà€à¬¬àର ସନàଦà‡à¬¶ ବାହକ" + +#: ../src/empathy-about-dialog.c:83 +msgid "" +"Empathy is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." +msgstr "" +"Empathy is free software; you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 2 of the License, or (at your option) any later " +"version." + +#: ../src/empathy-about-dialog.c:87 +msgid "" +"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." + +#: ../src/empathy-about-dialog.c:91 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " +"Street, Fifth Floor, Boston, MA 02110-130159 USA" +msgstr "" +"You should have received a copy of the GNU General Public License along with " +"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " +"Street, Fifth Floor, Boston, MA 02110-130159 USA" + +#: ../src/empathy-about-dialog.c:119 +msgid "An Instant Messaging client for GNOME" +msgstr "GNOME ପାଇଠଗà‹à¬Ÿà¬¿à¬ ତà€à¬¬àର ସନàଦà‡à¬¶ ବାହକ ଗàରାହକ" + +#: ../src/empathy-about-dialog.c:125 +msgid "translator-credits" +msgstr "ଶàà¬àରାଂଶà ବà‡à¬¹à‡à¬°à¬¾ <arya_subhransu@yahoo.co.in>" + +#: ../src/empathy-accounts-dialog.c:392 +msgid "Enabled" +msgstr "ସକàରିàŸ" + +#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1 +msgid "Accounts" +msgstr "ଆକାଉଣàଟଗàଡିକ" + +#. To translator: %s is the protocol name +#: ../src/empathy-accounts-dialog.c:837 +#, c-format +msgid "New %s account" +msgstr "ନàଆ %s ଖାତା" + +#: ../src/empathy-accounts-dialog.c:950 +#, c-format +msgid "" +"You are about to remove your %s account!\n" +"Are you sure you want to proceed?" +msgstr "" +"ଆପଣ ଆପଣଙàକର %s ଖାତାକà କାଢ଼ିବାକà ଯାଉଛନàତି!\n" +"ଆପଣ ନିଶàଚିତ କି ଆପଣ ଅଗàରସର ହà‡à¬¬à¬¾à¬•à ଚାହàà¬à¬›à¬¨àତି?" + +#: ../src/empathy-accounts-dialog.c:956 +msgid "" +"Any associated conversations and chat rooms will NOT be removed if you " +"decide to proceed.\n" +"\n" +"Should you decide to add the account back at a later time, they will still " +"be available." +msgstr "" +"ଯà‡à¬•àŒà¬£à¬¸à¬¿ ସଂଶàଳିଷàଟ ବାରàତàତାଳାପ à¬à¬¬à¬‚ ଚାରàଟରàମଗàଡ଼ିକà କଢ଼ାଯାଇପାରିବ ନାହିଠଯଦି ଆପଣ ଅଗàରସର ହà‡à¬¬à¬¾à¬•à ସିଦàଧାନàତ କରନàତି।\n" +"\n" +"ଆପଣ ସà‡à¬¹à¬¿ ଖାତାକà ପରବରàତàତି ସମàŸà¬°à‡ ଯà‹à¬— କରିବା ପାଇଠଉଚିତ à¬®à¬¨à‡ à¬•à¬²à‡, ସà‡à¬®à¬¾à¬¨à‡ ସà‡à¬ªà¬°àଯààŸà¬¨àତ " +"ଉପଲବàଧ ରହିବà‡à¥¤" + +#: ../src/empathy-accounts-dialog.ui.h:2 +msgid "Add Account" +msgstr "ଆକାଉଣàଟ àŸà‹à¬— କର" + +#: ../src/empathy-accounts-dialog.ui.h:3 +msgid "Cr_eate" +msgstr "ସàƒà¬·àଟି କରନàତà (_r)" + +#: ../src/empathy-accounts-dialog.ui.h:4 +msgid "Gmail" +msgstr "" + +#: ../src/empathy-accounts-dialog.ui.h:5 +msgid "Import Accounts..." +msgstr "ଖାତାଗàଡ଼ିକà ଆମଦାନି କରନàତà..." + +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "" + +#: ../src/empathy-accounts-dialog.ui.h:7 +msgid "Settings" +msgstr "ସà‡à¬Ÿà¬¿à¬™àଗଗàଡିକ" + +#: ../src/empathy-accounts-dialog.ui.h:8 +msgid "" +"To add a new account, you first have to install a backend for each protocol " +"you want to use." +msgstr "" +"ଗà‹à¬Ÿà¬¿à¬ ନà‚ତନ ଖାତା ଯà‹à¬— କରିବା ପାଇà¬, ଆପଣଙàକà ପàà¬°à¬¥à¬®à‡ à¬¬ààŸà¬¬à¬¹à¬¾à¬° କରିବାକà ଚାହàà¬à¬¥à¬¿à¬¬à¬¾ ପàରତààŸà‡à¬• ପàରà‹à¬Ÿà‹à¬•à¬² " +"ପାଇଠଗà‹à¬Ÿà¬¿à¬ ପàƒà¬·àଠà¬à‚ମି ସàଥାପନ କରିବାକà ହà‡à¬¬à¥¤" + +#: ../src/empathy-accounts-dialog.ui.h:9 +msgid "Type:" +msgstr "ପàରକାର:" + +#: ../src/empathy-accounts-dialog.ui.h:10 +msgid "_Add..." +msgstr "ଯà‹à¬— କରନàତà (_A)..." + +#: ../src/empathy-accounts-dialog.ui.h:11 +msgid "_Create a new account" +msgstr "" + +#: ../src/empathy-accounts-dialog.ui.h:12 +msgid "_Reuse an existing account" +msgstr "" + +#: ../src/empathy-call-window.c:420 +msgid "Contrast" +msgstr "ସàପଷàଟତା" + +#: ../src/empathy-call-window.c:423 +msgid "Brightness" +msgstr "ଉଜàଜàବଳତା" + +#: ../src/empathy-call-window.c:426 +msgid "Gamma" +msgstr "ଗାମା" + +#: ../src/empathy-call-window.c:531 +msgid "Volume" +msgstr "à¬à¬²àଯàମ" + +#: ../src/empathy-call-window.c:662 +msgid "Connecting..." +msgstr "ସଂଯà‹à¬— କରàଅଛି..." + +#: ../src/empathy-call-window.c:746 +msgid "_Sidebar" +msgstr "ପାରàଶàବ ପଟି (_S)" + +#: ../src/empathy-call-window.c:765 +msgid "Dialpad" +msgstr "ଡାà¬à¬² ପàଯାଡ" + +#: ../src/empathy-call-window.c:771 +msgid "Audio input" +msgstr "ଧàବନି ନିବà‡à¬¶" + +#: ../src/empathy-call-window.c:775 +msgid "Video input" +msgstr "à¬à¬¿àœà¬¿à¬“ ନିବà‡à¬¶" + +#: ../src/empathy-call-window.c:836 +#, c-format +msgid "Call with %s" +msgstr "" + +#: ../src/empathy-call-window.c:905 +msgid "Call" +msgstr "ଡାକରା" + +#. Translators: number of minutes:seconds the caller has been connected +#: ../src/empathy-call-window.c:1336 +#, c-format +msgid "Connected — %d:%02dm" +msgstr "" + +#: ../src/empathy-call-window.ui.h:1 +msgid "Hang up" +msgstr "ରଖିଦିଅ" + +#: ../src/empathy-call-window.ui.h:2 +msgid "Redial" +msgstr "" + +#: ../src/empathy-call-window.ui.h:3 +msgid "Send Audio" +msgstr "ଧàବନି ପଠାନàତà" + +#: ../src/empathy-call-window.ui.h:4 +msgid "Send video" +msgstr "à¬à¬¿àœà¬¿à¬“ ପଠାନàତà" + +#: ../src/empathy-call-window.ui.h:5 +msgid "Video preview" +msgstr "à¬à¬¿à¬¡à¬¿à¬“ ପà‚ରàବଦàƒà¬¶àଯ" + +#: ../src/empathy-call-window.ui.h:6 +msgid "_Call" +msgstr "_କଲ" + +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21 +msgid "_View" +msgstr "ଦàରàଶàଯ (_V)" + +#: ../src/empathy-chat-window.c:344 +#, c-format +msgid "Conversations (%d)" +msgstr "କଥà‹à¬ªà¬•à¬¥à¬¨ (%d)" + +#: ../src/empathy-chat-window.c:476 +msgid "Typing a message." +msgstr "à¬à¬• ସନàଦà‡à¬¶ ଟାଇପ କରàଅଛି." + +#: ../src/empathy-chatrooms-window.c:258 +msgid "Name" +msgstr "ନାମ" + +#: ../src/empathy-chatrooms-window.c:276 +msgid "Room" +msgstr "କକàଷ" + +#: ../src/empathy-chatrooms-window.c:285 +msgid "Auto-Connect" +msgstr "ସàବàŸà¬‚-ସଂଯà‹à¬—" + +#: ../src/empathy-chatrooms-window.ui.h:2 +msgid "Manage Favorite Rooms" +msgstr "ମନପସନàଦ କଠà‹à¬°à¬¿à¬—àଡ଼ିକà ପରିଚାଳନା କରନàତà" + +#: ../src/empathy-event-manager.c:321 +msgid "Incoming call" +msgstr "ଆଗତ କଲ" + +#: ../src/empathy-event-manager.c:324 +#, c-format +msgid "%s is calling you, do you want to answer?" +msgstr "%s ଆପଣଙàକà ଡାକàଅଛି, ଆପଣ ଉତàତର ଦà‡à¬¬à¬¾à¬•à ଚାହàà¬à¬›à¬¨àତି କି?" + +#: ../src/empathy-event-manager.c:331 +msgid "_Reject" +msgstr "ଅସàà±à€à¬•à¬¾à¬° କରନàତà (_R)" + +#: ../src/empathy-event-manager.c:337 +msgid "_Answer" +msgstr "ଉତàତର ଦିଅନàତà (_A)" + +#: ../src/empathy-event-manager.c:452 +#, c-format +msgid "Incoming call from %s" +msgstr "%s ଠାରà ଆଗତ କଲ" + +#: ../src/empathy-event-manager.c:496 +#, c-format +msgid "%s is offering you an invitation" +msgstr "%s ଆପଣଙàକà ଆମନàତàରଣ କରàଅଛି" + +#: ../src/empathy-event-manager.c:502 +msgid "An external application will be started to handle it." +msgstr "à¬à¬¹à¬¾à¬•à ନିàŸà¬¨àତàରଣ କରିବା ପାଇଠଗà‹à¬Ÿà¬¿à¬ ବାହààŸ à¬ªàରàŸà‹à¬—କà ଆରମàଠକରାଯିବ।" + +#: ../src/empathy-event-manager.c:507 +msgid "You don't have the needed external application to handle it." +msgstr "ଆପଣଙàକ à¬ªà¬¾à¬–à¬°à‡ à¬à¬¹à¬¾à¬•à ନିàŸà¬¨àତàରଣ କରିବା ପାଇଠଆବଶààŸà¬•à€àŸ ବାହààŸ à¬ªàରàŸà‹à¬— ନାହିà¬à¥¤" + +#: ../src/empathy-event-manager.c:634 +msgid "Room invitation" +msgstr "କଠà‹à¬°à¬¿ ଆମନàତàରଣ" + +#: ../src/empathy-event-manager.c:637 +#, c-format +msgid "%s is inviting you to join %s" +msgstr "%s ଆପଣଙàକà %s à¬°à‡ à¬¯à‹à¬—ଦାନ କରିବା ପାଇଠଆମନàତàରଣ କରàଛନàତି" + +#: ../src/empathy-event-manager.c:645 +msgid "_Decline" +msgstr "_ଅସàବà€à¬•à¬¾à¬°" + +#: ../src/empathy-event-manager.c:650 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 +msgid "_Join" +msgstr "ଯà‹à¬—ଦାନ କରନàତà (_J)" + +#: ../src/empathy-event-manager.c:689 +#, c-format +msgid "%s invited you to join %s" +msgstr "%s ଆପଣଙàକà %s à¬°à‡ à¬¯à‹à¬—ଦାନ କରିବା ପାଇଠଆମନàତàରଣ କରିଛନàତି" + +#: ../src/empathy-event-manager.c:715 +#, c-format +msgid "Incoming file transfer from %s" +msgstr "%sରà ଆସàଥିବା ଫାଇଲ ସàଥାନାନàତରଣ" + +#: ../src/empathy-event-manager.c:895 +#, c-format +msgid "Subscription requested by %s" +msgstr "%s ଦàà±à¬¾à¬°à¬¾ ଅନàରà‹à¬§ କରାଯାଇଥିବା ସଦସààŸà¬¤à¬¾" + +#: ../src/empathy-event-manager.c:899 +#, c-format +msgid "" +"\n" +"Message: %s" +msgstr "" +"\n" +"ସନàଦà‡à¬¶: %s" + +#. someone is logging off +#: ../src/empathy-event-manager.c:935 +#, c-format +msgid "%s is now offline." +msgstr "" + +#. someone is logging in +#: ../src/empathy-event-manager.c:951 +#, c-format +msgid "%s is now online." +msgstr "" + +#. Translators: time left, when it is more than one hour +#: ../src/empathy-ft-manager.c:101 +#, c-format +msgid "%u:%02u.%02u" +msgstr "%u:%02u.%02u" + +#. Translators: time left, when is is less than one hour +#: ../src/empathy-ft-manager.c:104 +#, c-format +msgid "%02u.%02u" +msgstr "%02u.%02u" + +#: ../src/empathy-ft-manager.c:180 +msgctxt "file transfer percent" +msgid "Unknown" +msgstr "ଅଜଣା" + +#: ../src/empathy-ft-manager.c:275 +#, c-format +msgid "%s of %s at %s/s" +msgstr "" + +#: ../src/empathy-ft-manager.c:276 +#, c-format +msgid "%s of %s" +msgstr "%s ରà %s" + +#. translators: first %s is filename, second %s is the contact name +#: ../src/empathy-ft-manager.c:307 +#, c-format +msgid "Receiving \"%s\" from %s" +msgstr "%sରà \"%s\"କà ଗàରହଣ କରàଅଛି" + +#. translators: first %s is filename, second %s is the contact name +#: ../src/empathy-ft-manager.c:310 +#, c-format +msgid "Sending \"%s\" to %s" +msgstr "\"%s\" କà %s ପାଖକà ପଠାଯାଉଛି" + +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:340 +#, c-format +msgid "Error receiving \"%s\" from %s" +msgstr "" + +#: ../src/empathy-ft-manager.c:343 +msgid "Error receiving a file" +msgstr "" + +#: ../src/empathy-ft-manager.c:348 +#, c-format +msgid "Error sending \"%s\" to %s" +msgstr "" + +#: ../src/empathy-ft-manager.c:351 +msgid "Error sending a file" +msgstr "" + +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:490 +#, c-format +msgid "\"%s\" received from %s" +msgstr "\"%s\" ଗàରହଣ କରାଗଲା %s ଠାରà" + +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:495 +#, c-format +msgid "\"%s\" sent to %s" +msgstr "\"%s\" ପଠାଗଲା %s କà" + +#: ../src/empathy-ft-manager.c:498 +msgid "File transfer completed" +msgstr "ଫାଇଲ ପରିବହନ ସମàପà‚ରàଣàଣ ହà‹à¬‡à¬…ଛି " + +#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784 +msgid "Waiting for the other participant's response" +msgstr "" + +#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681 +#, c-format +msgid "Checking integrity of \"%s\"" +msgstr "" + +#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684 +#, c-format +msgid "Hashing \"%s\"" +msgstr "" + +#: ../src/empathy-ft-manager.c:1024 +msgid "%" +msgstr "%" + +#: ../src/empathy-ft-manager.c:1036 +msgid "File" +msgstr "ଫାଇଲ" + +#: ../src/empathy-ft-manager.c:1058 +msgid "Remaining" +msgstr "ନାମ ପରିବରàତàତନ କରàଅଛି" + +#: ../src/empathy-ft-manager.ui.h:1 +msgid "File Transfers" +msgstr "ଫାଇଲ ସàଥାନାନàତରଣ" + +#: ../src/empathy-ft-manager.ui.h:2 +msgid "Remove completed, canceled and failed file transfers from the list" +msgstr "କାଢ଼ିବା ସମàପà‚ରàଣàଣ ହà‹à¬‡à¬›à¬¿, ତାଲିକାରà ବାତିଲ à¬à¬¬à¬‚ ବିଫଳ ଫାଇଲ ସàଥାନାନàତରଣ" + +#. Translators: this is the header of a treeview column +#: ../src/empathy-import-dialog.c:263 +msgid "Import" +msgstr "ଆàŸà¬¤ କରନàତà" + +#: ../src/empathy-import-dialog.c:272 +msgid "Protocol" +msgstr "ପàରà‹à¬Ÿà‹à¬•à¬²" + +#: ../src/empathy-import-dialog.c:298 +msgid "Source" +msgstr "ଉତàସ" + +#: ../src/empathy-import-dialog.c:392 +msgid "" +"No accounts to import could be found. Empathy currently only supports " +"importing accounts from Pidgin." +msgstr "" +"à¬†à¬®à¬¦à¬¾à¬¨à€ à¬•à¬°à¬¿à¬¬à¬¾ ପାଇଠକàŒà¬£à¬¸à¬¿ ଖାତା ମିଳàନାହିà¬à¥¤ Empathy ବରàତàତମାନ କà‡à¬¬à¬³ ଖାତାଗàଡ଼ିକà Pidginରà " +"à¬†à¬®à¬¦à¬¾à¬¨à€ à¬•à¬°à¬¿à¬¬à¬¾à¬•à ସମରàଥନ କରିଥାà¬à¥¤" + +#: ../src/empathy-import-dialog.ui.h:1 +msgid "Import Accounts" +msgstr "ଖାତାଗàଡ଼ିକà ଆମଦାନି କରନàତà" + +#: ../src/empathy-main-window.c:396 +msgid "_Edit account" +msgstr "ଖାତା ସମàପାଦନ କରନàତà (_E)" + +#: ../src/empathy-main-window.c:499 +msgid "No error specified" +msgstr "କିଛି ତàରàଟି ଦରàଶାଯାଇନାହିà¬" + +#: ../src/empathy-main-window.c:502 +msgid "Network error" +msgstr "ନà‡à¬Ÿà±à¬¾à¬°àକ ତàରàଟି" + +#: ../src/empathy-main-window.c:505 +msgid "Authentication failed" +msgstr "ବàˆà¬§à¬¿à¬•à¬°à¬£ ବିଫଳ" + +#: ../src/empathy-main-window.c:508 +msgid "Encryption error" +msgstr "ସଂଗàପàତ ତàରàଟି" + +#: ../src/empathy-main-window.c:511 +msgid "Name in use" +msgstr "ନାମ ଯାହାକି ବàଯବହàƒà¬¤ ହà‡à¬‰à¬…ଛି" + +#: ../src/empathy-main-window.c:514 +msgid "Certificate not provided" +msgstr "ପàରମାଣପତàର ଦିଆଯାଇନାହିà¬" + +#: ../src/empathy-main-window.c:517 +msgid "Certificate untrusted" +msgstr "ପàରମାଣପତàର ବିଶàà±à¬¸àଥ ନàହà¬" + +#: ../src/empathy-main-window.c:520 +msgid "Certificate expired" +msgstr "ପàରମାଣପତàରର à¬¸à¬®àŸ à¬¸à¬®à¬¾à¬ªàତ" + +#: ../src/empathy-main-window.c:523 +msgid "Certificate not activated" +msgstr "ପàରମାଣପତàର ସକàà¬°à¬¿àŸ à¬•à¬°à¬¾à¬¯à¬¾à¬‡à¬¨à¬¾à¬¹à¬¿à¬" + +#: ../src/empathy-main-window.c:526 +msgid "Certificate hostname mismatch" +msgstr "ପàରମାଣପତàର ହà‹à¬·àଟ ନାମ ଅମà‡à¬³" + +#: ../src/empathy-main-window.c:529 +msgid "Certificate fingerprint mismatch" +msgstr "ପàରମାଣପତàର ଅଙàଗàଳିଚିହàନ ମà‡à¬³à¬–ାଉନାହିà¬" + +#: ../src/empathy-main-window.c:532 +msgid "Certificate self-signed" +msgstr "ପàରମାଣପତàର ନିଜ ଦàà±à¬¾à¬°à¬¾ ହସàତାକàଷର ହà‹à¬‡à¬›à¬¿" + +#: ../src/empathy-main-window.c:535 +msgid "Certificate error" +msgstr "ପàରମାଣପତàର ତàରàଟି" + +#: ../src/empathy-main-window.c:538 +msgid "Unknown error" +msgstr "ଅଜଣା ତàରàଟି" + +#: ../src/empathy-main-window.c:1218 +msgid "Show and edit accounts" +msgstr "ଖାତା ଦà‡à¬–ନàତà à¬à¬¬à¬‚ ସମàପାଦନ କରନàତà" + +#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10 +msgid "Contact List" +msgstr "ସମàପରàକ ତାଲିକା" + +#: ../src/empathy-main-window.ui.h:2 +msgid "Contacts on a _Map" +msgstr "" + +#: ../src/empathy-main-window.ui.h:3 +msgid "Context" +msgstr "ପàରସଙàଗ" + +#: ../src/empathy-main-window.ui.h:4 +msgid "Join _Favorites" +msgstr "ମନପସନàଦଗàà¬¡à¬¼à¬¿à¬•à¬°à‡ à¬…à¬‚à¬¶à¬—àରହଣ କରନàତà (_F)" + +#: ../src/empathy-main-window.ui.h:5 +msgid "Manage Favorites" +msgstr "ମନପସନàଦଗàଡ଼ିକà ପରିଚାଳନ କରନàତà" + +#: ../src/empathy-main-window.ui.h:6 +msgid "_Accounts" +msgstr "_ଆକାଉଣàଟଗàଡିକ" + +#: ../src/empathy-main-window.ui.h:7 +msgid "_Add Contact..." +msgstr "ସମàପରàକ ଯà‹à¬— କରନàତà (_A)..." + +#: ../src/empathy-main-window.ui.h:9 +msgid "_Contents" +msgstr "ସà‚ଚà€à¬ªà¬¤àର (_C)" + +#: ../src/empathy-main-window.ui.h:10 +msgid "_Debug" +msgstr "ତàƒà¬Ÿà¬¿à¬®àକàତ କରନàତà (_D)" + +#: ../src/empathy-main-window.ui.h:12 +msgid "_File Transfers" +msgstr "" + +#: ../src/empathy-main-window.ui.h:13 +msgid "_Help" +msgstr "ସହାàŸà¬¤à¬¾ (_H)" + +#: ../src/empathy-main-window.ui.h:14 +msgid "_Join..." +msgstr "" + +#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2 +msgid "_New Conversation..." +msgstr "ନàଆ କଥà‹à¬ªà¬•à¬¥à¬¨ (_N)..." + +#: ../src/empathy-main-window.ui.h:16 +msgid "_Offline Contacts" +msgstr "" + +#: ../src/empathy-main-window.ui.h:17 +msgid "_Personal Information" +msgstr "ବàଯକàତିଗତ ସà‚ଚନା (_P)" + +#: ../src/empathy-main-window.ui.h:19 +msgid "_Previous Conversations" +msgstr "" + +#: ../src/empathy-main-window.ui.h:20 +msgid "_Room" +msgstr "କକàଷ (_R)" + +#: ../src/empathy-new-chatroom-dialog.c:331 +msgid "Chat Room" +msgstr "" + +#: ../src/empathy-new-chatroom-dialog.c:347 +msgid "Members" +msgstr "ସଦସàଯ ମାନà‡" + +#: ../src/empathy-new-chatroom-dialog.c:496 +#, c-format +msgctxt "" +"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no " +"and a number." +msgid "" +"<b>%s</b>\n" +"Invite required: %s\n" +"Password required: %s\n" +"Members: %s" +msgstr "" + +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 +msgid "Yes" +msgstr "ହà¬" + +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 +msgid "No" +msgstr "ନାà¬" + +#: ../src/empathy-new-chatroom-dialog.c:526 +msgid "Could not start room listing" +msgstr "" + +#: ../src/empathy-new-chatroom-dialog.c:536 +msgid "Could not stop room listing" +msgstr "" + +#: ../src/empathy-new-chatroom-dialog.ui.h:2 +msgid "Couldn't load room list" +msgstr "" + +#: ../src/empathy-new-chatroom-dialog.ui.h:3 +msgid "Enter the room name to join here or click on one or more rooms in the list." +msgstr "" +"à¬à¬ à¬¾à¬°à‡ à¬…à¬‚à¬¶à¬—àରହଣ କରିବା ପାଇଠକକàଷ ନାମ à¬à¬°à¬£ କରନàତà କିମàବା à¬¤à¬¾à¬²à¬¿à¬•à¬¾à¬°à‡ à¬¥à¬¿à¬¬à¬¾ ଗà‹à¬Ÿà¬¿à¬ କିମàବା ଅନà‡à¬• " +"କକàà¬·à¬°à‡ à¬•àଲିକ କରନàତà।" + +#: ../src/empathy-new-chatroom-dialog.ui.h:4 +msgid "" +"Enter the server which hosts the room, or leave it empty if the room is on " +"the current account's server" +msgstr "" +"à¬à¬¹à¬¿ କକàଷକà ହà‹à¬·àଟ କରàଥିବା ସରàà¬à¬°à¬•à à¬à¬°à¬£ କରନàତà, କିମàବା ଯଦି ପàରଚଳିତ ଖାତା ସରàà¬à¬°à¬°à‡ ଅଛି ତà‡à¬¬à‡ à¬à¬¹à¬¾à¬•à " +"ଖାଲିଛାଡ଼ନàତà" + +#: ../src/empathy-new-chatroom-dialog.ui.h:5 +msgid "Join Room" +msgstr "" + +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "Room List" +msgstr "କକàଷତାଲିକା" + +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "_Room:" +msgstr "କଠà‹à¬°à¬¿ (_R):" + +#: ../src/empathy-preferences.c:161 +msgid "Message received" +msgstr "ସନàଦà‡à¬¶ ପàରାପàତ" + +#: ../src/empathy-preferences.c:162 +msgid "Message sent" +msgstr "ସନàଦà‡à¬¶ ପଠାଯାଇଅଛି" + +#: ../src/empathy-preferences.c:163 +msgid "New conversation" +msgstr "ନàଆ କଥà‹à¬ªà¬•à¬¥à¬¨" + +#: ../src/empathy-preferences.c:164 +msgid "Contact goes online" +msgstr "ସମàପରàକ ଅନଲାଇନ ଆସିଲà‡" + +#: ../src/empathy-preferences.c:165 +msgid "Contact goes offline" +msgstr "ସମàପରàକ ଅଫଲାଇନ ଗଲà‡" + +#: ../src/empathy-preferences.c:166 +msgid "Account connected" +msgstr "ଖାତା ସଂଯà‹à¬—ିତ" + +#: ../src/empathy-preferences.c:167 +msgid "Account disconnected" +msgstr "ଖାତା ବିଚàଛିନàନ" + +#: ../src/empathy-preferences.c:446 +msgid "Language" +msgstr "à¬à¬¾à¬·à¬¾" + +#: ../src/empathy-preferences.ui.h:1 +msgid "Adium theme to use:" +msgstr "" + +#: ../src/empathy-preferences.ui.h:2 +msgid "Allow _GPS usage" +msgstr "" + +#: ../src/empathy-preferences.ui.h:3 +msgid "Allow _cellphone usage" +msgstr "" + +#: ../src/empathy-preferences.ui.h:4 +msgid "Allow _network usage" +msgstr "" + +#: ../src/empathy-preferences.ui.h:5 +msgid "Appearance" +msgstr "ସାଦàରàଶàଯ" + +#: ../src/empathy-preferences.ui.h:6 +msgid "Automatically _connect on startup " +msgstr "ଆରମàà¬à¬°à‡ ସàà±àŸà¬‚ଚାଳିତ à¬à¬¾à¬¬à¬°à‡ ସଂଯà‹à¬— କରନàତà (_c)" + +#: ../src/empathy-preferences.ui.h:7 +msgid "Avatars are user chosen images shown in the contact list" +msgstr "ଅà¬à¬¤à¬¾à¬°à¬—àଡ଼ିକ ସମàପରàକ à¬¤à¬¾à¬²à¬¿à¬•à¬¾à¬°à‡ à¬¦à¬°àଶାଯାଇଥିବା ଚାଳକ ବଚàଛିତ ପàରତିଛବି" + +#: ../src/empathy-preferences.ui.h:8 +msgid "Behavior" +msgstr "ଆଚରଣ" + +#: ../src/empathy-preferences.ui.h:9 +msgid "Chat Th_eme:" +msgstr "ଚାରàଟ ପàରସଙàଗ (_e):" + +#: ../src/empathy-preferences.ui.h:11 +msgid "Disable notifications when _away or busy" +msgstr "ଦà‚à¬°à¬°à‡ à¬¥à¬¿à¬¬à¬¾ ସମàŸà¬°à‡ କିମàବା ବààŸà¬¸àତ ଥିବା ସମàŸà¬°à‡ ବିଜàଞପàତିକà ନିଷàକàà¬°à¬¿àŸ à¬•à¬°à¬¨àତà (_a)" + +#: ../src/empathy-preferences.ui.h:12 +msgid "Disable sounds when _away or busy" +msgstr "ଦà‚à¬°à¬°à‡ à¬¥à¬¿à¬¬à¬¾ ସମàŸà¬°à‡ କିମàବା ବààŸà¬¸àତ ଥିବା ସମàŸà¬°à‡ ଧàà±à¬¨à¬¿à¬•à ନିଷàକàà¬°à¬¿àŸ à¬•à¬°à¬¨àତà (_a)" + +#: ../src/empathy-preferences.ui.h:13 +msgid "Enable notifications when a contact comes online" +msgstr "" + +#: ../src/empathy-preferences.ui.h:14 +msgid "Enable notifications when a contact goes offline" +msgstr "" + +#: ../src/empathy-preferences.ui.h:15 +msgid "Enable notifications when the _chat is not focused" +msgstr "ଚାରàଟକà ଲକàଷààŸ à¬•à¬°à¬¾à¬¯à¬¾à¬‰à¬¨à¬¥à¬¿à¬¬à¬¾ ସମàŸà¬°à‡ ବିଜàଞପàତିକà ସକàà¬°à¬¿àŸ à¬•à¬°à¬¨àତà (_c)" + +#: ../src/empathy-preferences.ui.h:16 +msgid "Enable spell checking for languages:" +msgstr "" + +#: ../src/empathy-preferences.ui.h:17 +msgid "General" +msgstr "ସାଧାରଣ" + +#: ../src/empathy-preferences.ui.h:18 +msgid "Geoclue Settings" +msgstr "" + +#: ../src/empathy-preferences.ui.h:19 +msgid "Location" +msgstr "ଅବସàଥାନ" + +#: ../src/empathy-preferences.ui.h:20 +msgid "Not a valid adium theme" +msgstr "" + +#: ../src/empathy-preferences.ui.h:21 +msgid "Notifications" +msgstr "ବିଜàଞପàତି" + +#: ../src/empathy-preferences.ui.h:22 +msgid "Play sound for events" +msgstr "" + +#: ../src/empathy-preferences.ui.h:23 +msgid "Preferences" +msgstr "ପସନàଦ" + +#: ../src/empathy-preferences.ui.h:24 +msgid "Privacy" +msgstr "ଗà‹à¬ªà¬¨à€à¬¯à¬¤à¬¾" + +#: ../src/empathy-preferences.ui.h:25 +msgid "" +"Reduced location accuracy means that nothing more precise than your city, " +"state and country will be published. GPS coordinates will have a random " +"value added (±0.25°)." +msgstr "" + +#: ../src/empathy-preferences.ui.h:26 +msgid "Show _avatars" +msgstr "ଅବତାର ଦà‡à¬–ାନàତà (_a)" + +#: ../src/empathy-preferences.ui.h:27 +msgid "Show _smileys as images" +msgstr "ସàମାଇଲିକà ପàରତିଛବି à¬†à¬•à¬¾à¬°à¬°à‡ à¬¦à¬°àଶାନàତà (_s)" + +#: ../src/empathy-preferences.ui.h:28 +msgid "Show co_mpact contact list" +msgstr "ସଂଗàପàତ ସମàପରàକ ତାଲିକା ଦରàଶାନàତà (_m)" + +#: ../src/empathy-preferences.ui.h:29 +msgid "Show contact _list in rooms" +msgstr "" + +#: ../src/empathy-preferences.ui.h:30 +msgid "Sort by _name" +msgstr "ନାମ à¬¹à¬¿à¬¸à¬¾à¬¬à¬°à‡ à¬¸à¬œà¬¾à¬¡à¬¼à¬¨àତà (_n)" + +#: ../src/empathy-preferences.ui.h:31 +msgid "Sort by s_tate" +msgstr "ଅବସàଥା à¬¹à¬¿à¬¸à¬¾à¬¬à¬°à‡ à¬¸à¬œà¬¾à¬¡à¬¼à¬¨àତà (_t)" + +#: ../src/empathy-preferences.ui.h:32 +msgid "Sounds" +msgstr "ଶବàଦ" + +#: ../src/empathy-preferences.ui.h:33 +msgid "Spell Checking" +msgstr "ବନାନ ଯାଞàଚ କରାଯାଉଛି" + +#: ../src/empathy-preferences.ui.h:34 +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "" + +#: ../src/empathy-preferences.ui.h:35 +msgid "Themes" +msgstr "ପàରସଙàଗ" + +#: ../src/empathy-preferences.ui.h:36 +msgid "_Enable bubble notifications" +msgstr "ବବଲ ବିଜàଞପàତିକà ସକàà¬°à¬¿àŸ à¬•à¬°à¬¨àତà (_E)" + +#: ../src/empathy-preferences.ui.h:37 +msgid "_Enable sound notifications" +msgstr "ଧàà±à¬¿à¬¨à¬¿ ବିଜàଞପàତିକà ସକàà¬°à¬¿àŸ à¬•à¬°à¬¨àତà (_E)" + +#: ../src/empathy-preferences.ui.h:38 +msgid "_Open new chats in separate windows" +msgstr "ନàଆ ଚାଟଗààœà¬¿à¬• ଅଲଗା à±à¬¿à¬£àଡà‹à¬°à‡ ଖà‹à¬²à¬¨àତà (_O)" + +#: ../src/empathy-preferences.ui.h:39 +msgid "_Publish location to my contacts" +msgstr "" + +#: ../src/empathy-preferences.ui.h:40 +msgid "_Reduce location accuracy" +msgstr "" + +#: ../src/empathy-status-icon.ui.h:1 +msgid "Status" +msgstr "ଅବସàଥିତି" + +#: ../src/empathy-status-icon.ui.h:3 +msgid "_Quit" +msgstr "à¬¬à¬¿à¬¦à¬¾àŸ à¬¨à¬¿à¬…à¬¨àତà (_Q)" + +#: ../src/empathy-status-icon.ui.h:4 +msgid "_Show Contact List" +msgstr "ସମàପରàକ ତାଲିକା ଦà‡à¬–ନàତà (_S)" + +#: ../src/empathy-tube-dispatch.c:375 +#, c-format +msgid "Unable to start application for service %s: %s" +msgstr "ସରàà¬à¬¿à¬¸ %s ପାଇଠପàରàŸà‹à¬— ଆରମàà¬ à¬•à¬°à¬¿à¬¬à¬¾à¬°à‡ à¬…à¬¸à¬®à¬°àଥ: %s" + +#: ../src/empathy-tube-dispatch.c:446 +#, c-format +msgid "" +"An invitation was offered for service %s, but you don't have the needed " +"application to handle it" +msgstr "" +"ସରàà¬à¬¿à¬¸ %s ପାଇଠଗà‹à¬Ÿà¬¿à¬ ଆମନàତàରଣ ପଠାଯାଇଛି, କିନàତà ଆପଣଙàକ à¬ªà¬¾à¬–à¬°à‡ à¬à¬¹à¬¾à¬•à ନିàŸà¬¨àତàରଣ କରିବା ପାଇଠ" +"ଆବଶààŸà¬•à€àŸ ପàରàŸà‹à¬— ନାହିà¬" + +#: ../src/empathy-call-window-fullscreen.ui.h:1 +msgid "gtk-leave-fullscreen" +msgstr "" + +#: ../src/empathy-map-view.ui.h:1 +msgid "Contact Map View" +msgstr "" + +#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083 +msgid "Error" +msgstr "ତàରàଟି" + +#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077 +msgid "Critical" +msgstr "ଗàରàତର" + +#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071 +msgid "Warning" +msgstr "ଚà‡à¬¤à¬¾à¬¬à¬¨à€" + +#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065 +#: ../src/empathy-debug-dialog.c:1113 +msgid "Message" +msgstr "ସନàଦà‡à¬¶" + +#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059 +msgid "Info" +msgstr "ସà‚ଚନା" + +#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053 +msgid "Debug" +msgstr "ତàƒà¬Ÿà¬¿à¬®àକàତ କରନàତà" + +#: ../src/empathy-debug-dialog.c:845 +msgid "Save" +msgstr "ସଂରକàଷଣ କରନàତà" + +#: ../src/empathy-debug-dialog.c:948 +msgid "Debug Window" +msgstr "ଡିବଗ ଉଇଣàଡà‹" + +#: ../src/empathy-debug-dialog.c:1021 +msgid "Pause" +msgstr "ବିରତି" + +#: ../src/empathy-debug-dialog.c:1033 +msgid "Level " +msgstr "ସàତର" + +#: ../src/empathy-debug-dialog.c:1102 +msgid "Time" +msgstr "ସମଯ" + +#: ../src/empathy-debug-dialog.c:1104 +msgid "Domain" +msgstr "ପରିସର" + +#: ../src/empathy-debug-dialog.c:1106 +msgid "Category" +msgstr "ବିà¬à¬¾à¬—" + +#: ../src/empathy-debug-dialog.c:1108 +msgid "Level" +msgstr "ସàତର" + +#: ../src/empathy-debug-dialog.c:1140 +msgid "" +"The selected connection manager does not support the remote debugging " +"extension." +msgstr "" + @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n" -"POT-Creation-Date: 2009-06-04 16:15+0000\n" -"PO-Revision-Date: 2009-06-05 06:42+0530\n" +"POT-Creation-Date: 2009-07-02 19:42+0000\n" +"PO-Revision-Date: 2009-07-07 06:28+0530\n" "Last-Translator: A S Alam <aalam@users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgstr "ਤà©à¨°à©°à¨¤ ਸà©à¨¨à©‡à¨¹à©‡ ਲਵੋ ਅਤੇ à¨à©‡à¨œà©‹" #: ../data/empathy.schemas.in.h:1 msgid "Always open a separate chat window for new chats." -msgstr "ਨਵੀਂ ਗੱਲਬਾਤ ਲਈ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ à¨à¨°à©‹à¨–ਾ ਵਰਤੋਂ।" +msgstr "ਨਵੀਆਂ ਗੱਲਾਂ ਲਈ ਹਮੇਸ਼ਾ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਰਤੋਂ।" #: ../data/empathy.schemas.in.h:2 msgid "" @@ -41,7 +41,7 @@ msgstr "ਨਾਂ ਦੇ ਬਾਅਦ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅੱਖ #: ../data/empathy.schemas.in.h:3 msgid "Chat window theme" -msgstr "ਗੱਲਬਾਤ à¨à¨°à©‹à¨–ਾ ਸਰੂਪ" +msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ" #: ../data/empathy.schemas.in.h:4 msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)." @@ -49,15 +49,15 @@ msgstr "ਸਪੈਲ ਚੈਕਰ à¨à¨¾à¨¸à¨¼à¨¾à¨µà¨¾à¨‚ ਦੀ ਕਾਮਿਠ#: ../data/empathy.schemas.in.h:5 msgid "Compact contact list" -msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਸੂਚੀ" +msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ" #: ../data/empathy.schemas.in.h:6 msgid "Contact list sort criterium" -msgstr "ਸੰਪਰਕ ਸੂਚੀ ਲੜੀਬੱਧ" +msgstr "ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ" #: ../data/empathy.schemas.in.h:7 msgid "Default directory to select an avatar image from" -msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚà©à¨£à¨¨ ਵਾਸਤੇ ਮੂਲ ਡਾਇਰੈਕਟਰੀ" +msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚà©à¨£à¨¨ ਵਾਸਤੇ ਡਿਫਾਲਟ ਡਾਇਰੈਕਟਰੀ" #: ../data/empathy.schemas.in.h:8 msgid "Disable popup notifications when away" @@ -85,18 +85,17 @@ msgstr "ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨà©à¨®à¨¾à¨¨ ਲਠ#: ../data/empathy.schemas.in.h:14 msgid "Empathy default download folder" -msgstr "ਇੰਪੈਂਥੀ ਮੂਲ ਡਾਊਨਲੋਡ ਫੋਲਡਰ" +msgstr "ਇੰਪੈਂਥੀ ਡਿਫਾਲਟ ਡਾਊਨਲੋਡ ਫੋਲਡਰ" #: ../data/empathy.schemas.in.h:15 msgid "Empathy has asked about importing accounts" -msgstr "ਇੰਪੈਂਥੀ ਖਾਤੇ ਆਯਾਤ ਕਰਨ ਲਈ ਪà©à©±à¨›à©‡" +msgstr "ਇੰਪੈਂਥੀ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਪà©à©±à¨›à©‡" #: ../data/empathy.schemas.in.h:16 msgid "Empathy should auto-connect on startup" -msgstr "ਇੰਪੈਂਥੀ ਸ਼à©à¨°à©‚ ਸਮੇਂ ਸਵੈ-ਚਾਲਤ ਜà©à©œà©‡" +msgstr "ਇੰਪੈਂਥੀ ਸ਼à©à¨°à©‚ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਹੋਵੇ" #: ../data/empathy.schemas.in.h:17 -#| msgid "Empathy should auto-connect on startup" msgid "Empathy should reduce the location's accuracy" msgstr "ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦੀ ਸ਼à©à©±à¨§à¨¤à¨¾ ਘਟਾਵੇ" @@ -114,11 +113,11 @@ msgstr "ਸ਼ਬਦ-ਜੋੜ ਯੋਗ" #: ../data/empathy.schemas.in.h:21 msgid "Hide main window" -msgstr "ਮà©à©±à¨– à¨à¨°à©‹à¨–ਾ ਓਹਲੇ" +msgstr "ਮà©à©±à¨– ਵਿੰਡੋ ਓਹਲੇ" #: ../data/empathy.schemas.in.h:22 msgid "Hide the main window." -msgstr "ਮà©à©±à¨– à¨à¨°à©‹à¨–ਾ ਓਹਲੇ ਕਰੋ" +msgstr "ਮà©à©±à¨– ਵਿੰਡੋ ਓਹਲੇ ਕਰੋ" #: ../data/empathy.schemas.in.h:23 msgid "NetworkManager should be used" @@ -130,230 +129,269 @@ msgstr "ਨਾਂ ਪੂਰਾ ਅੱਖਰ" #: ../data/empathy.schemas.in.h:25 msgid "Open new chats in separate windows" -msgstr "ਵੱਖਰੇ à¨à¨°à©‹à¨–ਿਆਂ ਵਿੱਚ ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਖੋਲà©à¨¹à©‹" +msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲà©à¨¹à©‹" #: ../data/empathy.schemas.in.h:26 +msgid "Path of the adium theme to use" +msgstr "ਵਰਤਣ ਵਾਸਤੀ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ" + +#: ../data/empathy.schemas.in.h:27 +#| msgid "Whether to use the theme for chat rooms or not." +msgid "Path of the adium theme to use if the theme used for chat is adium." +msgstr "ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ, ਜੋ ਕਿ ਵਰਤਣਾ ਹੈ, ਜਦੋਂ ਗੱਲਬਾਤ ਲਈ ਅਡੀਓਮ ਥੀਮ ਚà©à¨£à¨¿à¨† ਹੋਵੇ।" + +#: ../data/empathy.schemas.in.h:28 msgid "Play a sound for incoming messages" msgstr "ਆ ਰਹੇ ਸà©à¨¨à©‡à¨¹à¨¿à¨†à¨‚ ਲਈ ਇੱਕ ਧà©à¨¨à©€ ਚਲਾਓ" -#: ../data/empathy.schemas.in.h:27 +#: ../data/empathy.schemas.in.h:29 msgid "Play a sound for new conversations" msgstr "ਨਵੀਆਂ ਗੱਲਾਂਬਾਤਾਂ ਲਈ ਧà©à¨¨à©€ ਚਲਾਓ" -#: ../data/empathy.schemas.in.h:28 +#: ../data/empathy.schemas.in.h:30 msgid "Play a sound for outgoing messages" msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸà©à¨¨à©‡à¨¹à¨¿à¨†à¨‚ ਲਈ ਆਵਾਜ਼ ਚਲਾਓ" -#: ../data/empathy.schemas.in.h:29 +#: ../data/empathy.schemas.in.h:31 msgid "Play a sound when a contact logs in" msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗਇਨ ਕਰੇ ਤਾਂ ਧà©à¨¨à©€ ਚਲਾਓ" -#: ../data/empathy.schemas.in.h:30 +#: ../data/empathy.schemas.in.h:32 msgid "Play a sound when a contact logs out" msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗ-ਆਉਟ ਕਰੇ ਤਾਂ ਧà©à¨¨à©€ ਚਲਾਓ" -#: ../data/empathy.schemas.in.h:31 +#: ../data/empathy.schemas.in.h:33 msgid "Play a sound when we log in" msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗਇਨ ਕਰੀਠਤਾਂ ਧà©à¨¨à©€ ਚਲਾਓ" -#: ../data/empathy.schemas.in.h:32 +#: ../data/empathy.schemas.in.h:34 msgid "Play a sound when we log out" msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਧà©à¨¨à©€ ਚਲਾਓ" -#: ../data/empathy.schemas.in.h:33 +#: ../data/empathy.schemas.in.h:35 msgid "Popup notifications if the chat isn't focused" msgstr "ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਕਰੋ" -#: ../data/empathy.schemas.in.h:34 +#: ../data/empathy.schemas.in.h:36 +#| msgid "Popup notifications if the chat isn't focused" +msgid "Popup notifications when a contact sign in" +msgstr "ਜੇ ਸੰਪਰਕ ਸਾਇਨ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਕਰੋ" + +#: ../data/empathy.schemas.in.h:37 +#| msgid "Popup notifications if the chat isn't focused" +msgid "Popup notifications when a contact sign out" +msgstr "ਜੇ ਸੰਪਰਕ ਸਾਈਨ-ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਕਰੋ" + +#: ../data/empathy.schemas.in.h:38 msgid "Salut account is created" msgstr "ਸਲਾਉਟ ਅਕਾਊਂਟ ਬਣਾਇਆ" -#: ../data/empathy.schemas.in.h:35 +#: ../data/empathy.schemas.in.h:39 msgid "Show avatars" msgstr "ਅਵਤਾਰ ਵੇਖੋ" -#: ../data/empathy.schemas.in.h:36 +#: ../data/empathy.schemas.in.h:40 +#| msgid "_Show Contact List" +msgid "Show contact list in rooms" +msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ" + +#: ../data/empathy.schemas.in.h:41 msgid "Show hint about closing the main window" -msgstr "ਮà©à©±à¨– à¨à¨°à©‹à¨–ਾ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ" +msgstr "ਮà©à©±à¨– ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ" -#: ../data/empathy.schemas.in.h:37 +#: ../data/empathy.schemas.in.h:42 msgid "Show offline contacts" msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ ਵੇਖੋ" -#: ../data/empathy.schemas.in.h:38 +#: ../data/empathy.schemas.in.h:43 msgid "Spell checking languages" msgstr "ਸ਼ਬਦ-ਜੋੜ à¨à¨¾à¨¸à¨¼à¨¾à¨µà¨¾à¨‚" -#: ../data/empathy.schemas.in.h:39 +#: ../data/empathy.schemas.in.h:44 msgid "The default folder to save file transfers in." msgstr "ਫਾਇਲ ਸੰਚਾਰ ਸੰà¨à¨¾à¨²à¨£ ਲਈ ਡਿਫਾਲਟ ਫੋਲਡਰ ਹੈ।" -#: ../data/empathy.schemas.in.h:40 +#: ../data/empathy.schemas.in.h:45 msgid "The last directory that an avatar image was chosen from." msgstr "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ, ਜਿੱਥੇ ਅਵਤਾਰ ਚਿੱਤਰ ਚà©à¨£à¨¿à¨† ਗਿਆ ਸੀ।" -#: ../data/empathy.schemas.in.h:41 +#: ../data/empathy.schemas.in.h:46 msgid "The theme that is used to display the conversation in chat windows." msgstr "ਥੀਮ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।" -#: ../data/empathy.schemas.in.h:42 +#: ../data/empathy.schemas.in.h:47 msgid "Use graphical smileys" msgstr "ਗਰਾਫਿਕਸ ਚਿਹਰੇ ਵਰਤੋਂ" -#: ../data/empathy.schemas.in.h:43 +#: ../data/empathy.schemas.in.h:48 msgid "Use notification sounds" msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਰਤੋਂ" -#: ../data/empathy.schemas.in.h:44 +#: ../data/empathy.schemas.in.h:49 msgid "Use theme for chat rooms" msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤੋਂ" -#: ../data/empathy.schemas.in.h:45 +#: ../data/empathy.schemas.in.h:50 msgid "Whether or not Empathy can publish the user's location to his contacts." msgstr "ਕੀ ਇੰਪੈਂਥੀ ਯੂਜ਼ਰ ਦਾ ਟਿਕਾਣਾ ਉਸ ਦੇ ਸੰਪਰਕਾਂ ਲਈ ਦੇਵੇ।" -#: ../data/empathy.schemas.in.h:46 +#: ../data/empathy.schemas.in.h:51 msgid "Whether or not Empathy can use the GPS to guess the location." msgstr "ਕੀ ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨà©à¨®à¨¾à¨¨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੇ।" -#: ../data/empathy.schemas.in.h:47 +#: ../data/empathy.schemas.in.h:52 msgid "Whether or not Empathy can use the cellular network to guess the location." msgstr "ਕੀ ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨà©à¨®à¨¾à¨¨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤੇ।" -#: ../data/empathy.schemas.in.h:48 +#: ../data/empathy.schemas.in.h:53 msgid "Whether or not Empathy can use the network to guess the location." msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨà©à¨®à¨¾à¨¨ ਲਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ।" -#: ../data/empathy.schemas.in.h:49 +#: ../data/empathy.schemas.in.h:54 msgid "" "Whether or not Empathy has asked about importing accounts from other " "programs." msgstr "ਕੀ ਇੰਪੈਂਥੀ ਹੋਰ ਪਰੋਗਰਾਮਾਂ ਤੋਂ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਪà©à©±à¨›à©‡à¥¤" -#: ../data/empathy.schemas.in.h:50 +#: ../data/empathy.schemas.in.h:55 msgid "" "Whether or not Empathy should automatically log in to your accounts on " "startup." msgstr "ਕੀ ਇੰਪੈਂਥੀ ਸ਼à©à¨°à©‚ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤà©à¨¹à¨¾à¨¡à©‡ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਲਾਗਇਨ ਕਰੇ।" -#: ../data/empathy.schemas.in.h:51 +#: ../data/empathy.schemas.in.h:56 msgid "" "Whether or not Empathy should reduce the location's accuracy for privacy " "reasons." msgstr "ਕੀ ਇੰਪੈਂਥੀ ਪਰਾਈਵੇਸੀ ਕਾਰਨਾਂ ਕਰਕੇ ਟਿਕਾਣੇ ਦੀ ਸ਼à©à©±à¨§à¨¤à¨¾ ਘਟਾਵੇ।" -#: ../data/empathy.schemas.in.h:52 +#: ../data/empathy.schemas.in.h:57 msgid "" "Whether or not Empathy should use the avatar of the contact as the chat " "window icon." msgstr "ਕੀ ਇੰਪੈਂਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ" -#: ../data/empathy.schemas.in.h:53 +#: ../data/empathy.schemas.in.h:58 msgid "Whether or not the Salut account has been created on the first Empathy run." msgstr "ਕੀ ਪਹਿਲੀ ਵਾਰ ਇੰਪੈਂਥੀ ਚਲਾਉਣ ਲਈ ਲਾਉਟ ਅਕਾਊਂਟ ਬਣਾਇਆ ਜਾਵੇ" -#: ../data/empathy.schemas.in.h:54 +#: ../data/empathy.schemas.in.h:59 msgid "" "Whether or not the network manager should be used to automatically " "disconnect/reconnect." msgstr "ਕੀ ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ ਆਟੋਮੈਟਿਕ ਡਿਸ-ਕà©à¨¨à©ˆà¨•à¨Ÿ/ਮà©à©œ-ਕà©à¨¨à¨•à©ˆà¨Ÿ ਲਈ ਵਰਤਿਆ ਜਾਵੇ" -#: ../data/empathy.schemas.in.h:55 +#: ../data/empathy.schemas.in.h:60 msgid "" "Whether or not to check words typed against the languages you want to check " "with." msgstr "ਕੀ ਜਦੋਂ ਤà©à¨¸à©€à¨‚ ਲਿਖੋ ਤਾਂ ਸ਼ਬਦਾਂ ਨੂੰ à¨à¨¾à¨¸à¨¼à¨¾ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾਵੇ" -#: ../data/empathy.schemas.in.h:56 +#: ../data/empathy.schemas.in.h:61 msgid "Whether or not to convert smileys into graphical images in conversations." msgstr "ਕੀ ਸਮਾਈਲੀ ਨੂੰ ਗੱਲਬਾਤ ਵਿੱਚ ਗਰਾਫਿਕਲ ਚਿੱਤਰਾਂ ਵਿੱਚ ਬਦਲਿਆ ਜਾਵੇ" -#: ../data/empathy.schemas.in.h:57 +#: ../data/empathy.schemas.in.h:62 msgid "Whether or not to play a sound to notify for contacts logging in the network." msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗਇਨ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ" -#: ../data/empathy.schemas.in.h:58 +#: ../data/empathy.schemas.in.h:63 msgid "" "Whether or not to play a sound to notify for contacts logging off the " "network." msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗਆਫ਼ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ" -#: ../data/empathy.schemas.in.h:59 +#: ../data/empathy.schemas.in.h:64 msgid "Whether or not to play a sound to notify for events." msgstr "ਕੀ ਈਵੈਂਟਾਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ" -#: ../data/empathy.schemas.in.h:60 +#: ../data/empathy.schemas.in.h:65 msgid "Whether or not to play a sound to notify for incoming messages." msgstr "ਕੀ ਆ ਰਹੇ ਸà©à¨¨à©‡à¨¹à¨¿à¨†à¨‚ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।" -#: ../data/empathy.schemas.in.h:61 +#: ../data/empathy.schemas.in.h:66 msgid "Whether or not to play a sound to notify for new conversations." msgstr "ਕੀ ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਦੀ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।" -#: ../data/empathy.schemas.in.h:62 +#: ../data/empathy.schemas.in.h:67 msgid "Whether or not to play a sound to notify for outgoing messages." msgstr "ਕੀ ਬਾਹਰ ਜਾ ਰਹੇ ਸà©à¨¨à©‡à¨¹à¨¿à¨†à¨‚ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।" -#: ../data/empathy.schemas.in.h:63 +#: ../data/empathy.schemas.in.h:68 msgid "Whether or not to play a sound when logging in a network." msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।" -#: ../data/empathy.schemas.in.h:64 +#: ../data/empathy.schemas.in.h:69 msgid "Whether or not to play a sound when logging off a network." msgstr "ਕੀ ਨੈੱਟਵਰਕ ਤੋਂ ਲਾਗ-ਆਫ਼ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ" -#: ../data/empathy.schemas.in.h:65 +#: ../data/empathy.schemas.in.h:70 msgid "Whether or not to play sound notifications when away or busy." msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰà©à©±à¨à©‡ ਹੋਵੇ ਤਾਂ ਕੀ ਸਾਊਂਡ ਸੂਚਨਾਵਾਂ ਚਲਾਉਣੀਆਂ ਹਨ ਜਾਂ ਨਹੀਂ।" -#: ../data/empathy.schemas.in.h:66 +#: ../data/empathy.schemas.in.h:71 +#| msgid "Whether or not to show popup notifications when away or busy." +msgid "Whether or not to show a popup notification when a contact goes offline." +msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਠਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੋਵੇ।" + +#: ../data/empathy.schemas.in.h:72 +#| msgid "Whether or not to show popup notifications when away or busy." +msgid "Whether or not to show a popup notification when a contact goes online." +msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਠਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਵੇ।" + +#: ../data/empathy.schemas.in.h:73 msgid "" "Whether or not to show a popup notification when receiving a new message " "even if the chat is already opened, but not focused." msgstr "" -"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸà©à¨¨à©‡à¨¹à¨¾ ਮਿਲੇ, à¨à¨¾à¨µà©‡à¨‚ ਗੱਲਬਾਤ ਪਹਿਲਾਂ ਖà©à©±à¨²à©à¨¹à©€ ਹੋਵੇ, " -"ਪਰ ਫੋਕਸ ਨਾ ਹੋਵੇ।" +"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸà©à¨¨à©‡à¨¹à¨¾ ਮਿਲੇ, à¨à¨¾à¨µà©‡à¨‚ ਗੱਲਬਾਤ ਪਹਿਲਾਂ ਖà©à©±à¨²à©à¨¹à©€ ਹੋਵੇ, ਪਰ " +"ਫੋਕਸ ਨਾ ਹੋਵੇ।" -#: ../data/empathy.schemas.in.h:67 +#: ../data/empathy.schemas.in.h:74 msgid "Whether or not to show a popup notification when receiving a new message." msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਨਵਾਂ ਸà©à¨¨à©‡à¨¹à¨¾ ਮਿਲੇ।" -#: ../data/empathy.schemas.in.h:68 +#: ../data/empathy.schemas.in.h:75 msgid "" "Whether or not to show avatars for contacts in the contact list and chat " "windows." msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਅਤੇ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਅਵਤਾਰ ਵੇਖਾਠਜਾਣ।" -#: ../data/empathy.schemas.in.h:69 +#: ../data/empathy.schemas.in.h:76 msgid "Whether or not to show contacts that are offline in the contact list." msgstr "ਕੀ ਸੰਪਰਕ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਹਨ, ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾਠਜਾਣ" -#: ../data/empathy.schemas.in.h:70 +#: ../data/empathy.schemas.in.h:77 msgid "Whether or not to show popup notifications when away or busy." msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਠਜਾਣ, ਜਦੋਂ ਦੂਰ ਰà©à©±à¨à©‡ ਹੋਵੋ" -#: ../data/empathy.schemas.in.h:71 +#: ../data/empathy.schemas.in.h:78 +#| msgid "Whether to show the contact list in compact mode or not." +msgid "Whether or not to show the contact list in chat rooms." +msgstr "ਕੀ ਗਲੱਬਾਤ ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖਣੀ ਹੈ ਜਾਂ ਨਹੀਂ।" + +#: ../data/empathy.schemas.in.h:79 msgid "" "Whether or not to show the message dialog about closing the main window with " "the 'x' button in the title bar." msgstr "ਕੀ ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ 'x' ਬਟਨ ਦਬਾਉਣ ਨਾਲ ਮà©à©±à¨– ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਬਾਰੇ ਸà©à¨¨à©‡à¨¹à¨¾ ਡਾਈਲਾਗ ਵੇਖਾਇਆ ਜਾਵੇ।" -#: ../data/empathy.schemas.in.h:72 +#: ../data/empathy.schemas.in.h:80 msgid "Whether to show the contact list in compact mode or not." msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਨੂੰ ਸੰਖੇਪ ਮੋਡ ਵਿੱਚ ਵੇਖਣਾ ਹੈ।" -#: ../data/empathy.schemas.in.h:73 +#: ../data/empathy.schemas.in.h:81 msgid "Whether to use the theme for chat rooms or not." msgstr "ਕੀ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤਣਾ ਹੈ।" -#: ../data/empathy.schemas.in.h:74 +#: ../data/empathy.schemas.in.h:82 msgid "" "Which criterium to use when sorting the contact list. Default is to use sort " "by the contact's name with the value \"name\". A value of \"state\" will " "sort the contact list by state." msgstr "" -"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ ਡਿਫਾਲਟ " -"ਸੰਪਰਕ ਦੇ ਨਾਂ ਨਾਲ \"name (ਨਾਂ)\" ਹੈ। \"state (ਹਾਲਤ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮà©à¨¤à¨¾à¨¬à¨• ਲੜੀਬੱਧ ਕਰੋ" +"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ ਡਿਫਾਲਟ ਸੰਪਰਕ " +"ਦੇ ਨਾਂ ਨਾਲ \"name (ਨਾਂ)\" ਹੈ। \"state (ਹਾਲਤ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮà©à¨¤à¨¾à¨¬à¨• ਲੜੀਬੱਧ ਕਰੋ" #: ../libempathy/empathy-ft-handler.c:838 msgid "The hash of the received file and the sent one do not match" @@ -363,55 +401,67 @@ msgstr "ਮਿਲੀ ਫਾਇਲ ਅਤੇ à¨à©‡à¨œà©€ ਦਾ ਹੈਸ਼ ਰ msgid "File transfer not supported by remote contact" msgstr "ਰਿਮੋਟ ਸੰਪਰਕ ਵਲੋਂ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਹਾਇਕ ਨਹੀਂ" -#: ../libempathy/empathy-tp-contact-list.c:727 ../src/empathy.c:286 +#: ../libempathy/empathy-ft-handler.c:1156 +msgid "The selected file is not a regular file" +msgstr "ਚà©à¨£à©€ ਫਾਇਲ ਨਿਯਮਤ ਫਾਇਲ ਨਹੀਂ ਹੈ" + +#: ../libempathy/empathy-ft-handler.c:1165 +msgid "The selected file is empty" +msgstr "ਚà©à¨£à©€ ਫਾਇਲ ਖਾਲੀ ਹੈ" + +#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:289 msgid "People nearby" msgstr "ਨੇੜਲੇ ਲੋਕ" -#: ../libempathy/empathy-tp-file.c:300 +#: ../libempathy/empathy-tp-file.c:279 +msgid "Socket type not supported" +msgstr "ਸਾਕਟ ਟਾਈਪ ਸਹਾਇਕ ਨਹੀਂ ਹੈ" + +#: ../libempathy/empathy-tp-file.c:398 msgid "No reason was specified" msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ" -#: ../libempathy/empathy-tp-file.c:303 +#: ../libempathy/empathy-tp-file.c:401 msgid "The change in state was requested" msgstr "ਹਾਲਤ ਬਦਲਣ ਲਈ ਮੰਗ ਹੈ" -#: ../libempathy/empathy-tp-file.c:306 +#: ../libempathy/empathy-tp-file.c:404 msgid "You canceled the file transfer" msgstr "ਤà©à¨¸à©€à¨‚ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ" -#: ../libempathy/empathy-tp-file.c:309 +#: ../libempathy/empathy-tp-file.c:407 msgid "The other participant canceled the file transfer" msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਨੇ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ" -#: ../libempathy/empathy-tp-file.c:312 +#: ../libempathy/empathy-tp-file.c:410 msgid "Error while trying to transfer the file" msgstr "ਫਾਇਲ ਸੰਚਾਰ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਗਲਤੀ" -#: ../libempathy/empathy-tp-file.c:315 +#: ../libempathy/empathy-tp-file.c:413 msgid "The other participant is unable to transfer the file" msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਫਾਇਲ ਸੰਚਾਰ ਲਈ ਫੇਲà©à¨¹ ਹੈ" -#: ../libempathy/empathy-tp-file.c:318 +#: ../libempathy/empathy-tp-file.c:416 msgid "Unknown reason" msgstr "ਅਣਜਾਣ ਕਾਰਨ" -#: ../libempathy/empathy-utils.c:274 +#: ../libempathy/empathy-utils.c:265 msgid "Available" msgstr "ਉਪਲੱਬਧ" -#: ../libempathy/empathy-utils.c:276 +#: ../libempathy/empathy-utils.c:267 msgid "Busy" msgstr "ਰà©à¨à©‡" -#: ../libempathy/empathy-utils.c:279 +#: ../libempathy/empathy-utils.c:270 msgid "Away" msgstr "ਦੂਰ" -#: ../libempathy/empathy-utils.c:281 +#: ../libempathy/empathy-utils.c:272 msgid "Hidden" msgstr "ਓਹਲੇ" -#: ../libempathy/empathy-utils.c:283 +#: ../libempathy/empathy-utils.c:274 msgid "Offline" msgstr "ਆਫਲਾਈਨ" @@ -443,14 +493,22 @@ msgid_plural "%d days ago" msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ" msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ" -#: ../libempathy/empathy-time.c:157 +#: ../libempathy/empathy-time.c:157, c-format +#| msgid "%d second ago" +#| msgid_plural "%d seconds ago" +msgid "%d week ago" +msgid_plural "%d weeks ago" +msgstr[0] "%d ਹਫ਼ਤਾ ਪਹਿਲਾਂ" +msgstr[1] "%d ਹਫ਼ਤੇ ਪਹਿਲਾਂ" + +#: ../libempathy/empathy-time.c:162 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d ਮਹੀਨਾ ਪਹਿਲਾਂ" msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ" -#: ../libempathy/empathy-time.c:162 +#: ../libempathy/empathy-time.c:167 msgid "in the future" msgstr "à¨à¨µà¨¿à©±à¨– ਵਿੱਚ" @@ -473,8 +531,9 @@ msgstr "%s:" #: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "<b>Advanced</b>" -msgstr "<b>ਤਕਨੀਕੀ</b>" +#| msgid "<b>Advanced</b>" +msgid "Advanced" +msgstr "ਤਕਨੀਕੀ" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 @@ -510,7 +569,7 @@ msgid "_Server:" msgstr "ਸਰਵਰ(_S):" #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "ਲਾਗਇਨ I_D:" @@ -524,49 +583,47 @@ msgstr "ICQ _UIN:" msgid "_Charset:" msgstr "ਅੱਖਰ-ਸੈੱਟ(_C):" -#: ../libempathy-gtk/empathy-account-widget-irc.c:241 +#: ../libempathy-gtk/empathy-account-widget-irc.c:240 msgid "New Network" msgstr "ਨਵਾਂ ਨੈੱਟਵਰਕ" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -msgid "<b>Network</b>" -msgstr "<b>ਨੈੱਟਵਰਕ</b>" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 -msgid "<b>Servers</b>" -msgstr "<b>ਸਰਵਰ</b>" - -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Charset:" msgstr "ਅੱਖਰਸੈੱਟ:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 msgid "Network" msgstr "ਨੈੱਟਵਰਕ" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Network:" msgstr "ਨੈੱਟਵਰਕ:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 msgid "Nickname:" msgstr "ਨਾਂ:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "Password:" msgstr "ਪਾਸਵਰਡ:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Quit message:" msgstr "ਬੰਦ ਕਰਨ ਸà©à¨¨à©‡à¨¹à¨¾:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Real name:" msgstr "ਅਸਲੀ ਨਾਂ:" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "<b>Override server settings</b>" -msgstr "<b>ਸਰਵਰ ਸੈਟਿੰਗ ਅਣਡਿੱਠਾ</b>" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +#| msgid "Server" +msgid "Servers" +msgstr "ਸਰਵਰ" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 +#| msgid "<b>Override server settings</b>" +msgid "Override server settings" +msgstr "ਸਰਵਰ ਸੈਟਿੰਗ ਅਣਡਿੱਠੀ" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 msgid "Pri_ority:" @@ -643,7 +700,7 @@ msgstr "ਕਨਫਰੰਸ ਅਤੇ ਗੱਲਬਾਤ-ਰੂਮ ਸੱਦੇ à #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 msgid "_Room List locale:" -msgstr "ਰੂਮ ਸੂਚੀ à¨à¨¾à¨¸à¨¼à¨¾(_R):" +msgstr "ਰੂਮ ਲਿਸਟ à¨à¨¾à¨¸à¨¼à¨¾(_R):" #: ../libempathy-gtk/empathy-avatar-chooser.c:449 #: ../libempathy-gtk/empathy-avatar-chooser.c:525 @@ -674,108 +731,143 @@ msgstr "ਸਠਫਾਇਲਾਂ" msgid "Click to enlarge" msgstr "ਵੱਡਾ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ" -#: ../libempathy-gtk/empathy-chat.c:178 +#: ../libempathy-gtk/empathy-chat.c:186 msgid "Failed to reconnect this chat" msgstr "ਇਸ ਗੱਲ ਨਾਲ ਫੇਰ-ਕà©à¨¨à©ˆà¨•à¨Ÿ ਹੋਣ ਲਈ ਫੇਲà©à¨¹" -#: ../libempathy-gtk/empathy-chat.c:396 +#: ../libempathy-gtk/empathy-chat.c:404 msgid "Unsupported command" msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਕਮਾਂਡ" -#: ../libempathy-gtk/empathy-chat.c:531 +#: ../libempathy-gtk/empathy-chat.c:539 msgid "offline" msgstr "ਆਫਲਾਈਨ" -#: ../libempathy-gtk/empathy-chat.c:534 +#: ../libempathy-gtk/empathy-chat.c:542 msgid "invalid contact" msgstr "ਗਲਤ ਸੰਪਰਕ" -#: ../libempathy-gtk/empathy-chat.c:537 +#: ../libempathy-gtk/empathy-chat.c:545 msgid "permission denied" msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ" -#: ../libempathy-gtk/empathy-chat.c:540 +#: ../libempathy-gtk/empathy-chat.c:548 msgid "too long message" msgstr "ਬਹà©à¨¤ ਲੰਮਾ ਸà©à¨¨à©‡à¨¹à¨¾" -#: ../libempathy-gtk/empathy-chat.c:543 +#: ../libempathy-gtk/empathy-chat.c:551 msgid "not implemented" msgstr "ਸਥਾਪਤ ਨਹੀਂ" -#: ../libempathy-gtk/empathy-chat.c:546 +#: ../libempathy-gtk/empathy-chat.c:554 msgid "unknown" msgstr "ਅਣਜਾਣ" -#: ../libempathy-gtk/empathy-chat.c:550 +#: ../libempathy-gtk/empathy-chat.c:558 #, c-format msgid "Error sending message '%s': %s" msgstr "ਸà©à¨¨à©‡à¨¹à¨¾ '%s' à¨à©‡à¨œà¨£ ਦੌਰਾਨ ਗਲਤੀ: %s" -#: ../libempathy-gtk/empathy-chat.c:580 +#: ../libempathy-gtk/empathy-chat.c:588 #, c-format msgid "Topic set to: %s" msgstr "ਵਿਸ਼ਾ ਨਹੀਂ ਕੀਤਾ: %s" -#: ../libempathy-gtk/empathy-chat.c:582 +#: ../libempathy-gtk/empathy-chat.c:590 msgid "No topic defined" msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ" -#: ../libempathy-gtk/empathy-chat.c:951 +#: ../libempathy-gtk/empathy-chat.c:959 msgid "(No Suggestions)" msgstr "(ਕੋਈ ਸà©à¨à¨¾à¨… ਨਹੀਂ)" -#: ../libempathy-gtk/empathy-chat.c:1005 +#: ../libempathy-gtk/empathy-chat.c:1013 msgid "Insert Smiley" msgstr "ਚਿਹਰਾ ਸ਼ਾਮਲ ਕਰੋ" #. send button -#: ../libempathy-gtk/empathy-chat.c:1023 -#: ../libempathy-gtk/empathy-ui-utils.c:1453 +#: ../libempathy-gtk/empathy-chat.c:1031 +#: ../libempathy-gtk/empathy-ui-utils.c:1475 msgid "_Send" msgstr "à¨à©‡à¨œà©‹(_S)" -#: ../libempathy-gtk/empathy-chat.c:1057 +#: ../libempathy-gtk/empathy-chat.c:1065 msgid "_Spelling Suggestions" msgstr "ਸਪੈਲਿੰਗ ਸà©à¨à¨¾à¨…(_S)" -#: ../libempathy-gtk/empathy-chat.c:1171 +#: ../libempathy-gtk/empathy-chat.c:1180, c-format +#| msgid "Contact disconnected" +msgid "%s has disconnected" +msgstr "%s ਡਿਸ-ਕà©à¨¨à©ˆà¨•à¨Ÿ ਹੋ ਗਿਆ ਹੈ" + +#: ../libempathy-gtk/empathy-chat.c:1184 #, c-format -msgid "%s has joined the room" -msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ" +msgid "%s was kicked by %s" +msgstr "%s ਨੂੰ %s ਨੇ ਕਿੱਕ ਮਾਰੀ" -#: ../libempathy-gtk/empathy-chat.c:1174 +#: ../libempathy-gtk/empathy-chat.c:1187 +#, c-format +msgid "%s was kicked" +msgstr "%s ਨੂੰ ਕਿੱਕ ਮਾਰੀ" + +#: ../libempathy-gtk/empathy-chat.c:1192 +#, c-format +msgid "%s was banned by %s" +msgstr "%s ਉੱਤੇ %s ਵਲੋਂ ਪਾਬੰਦੀ ਲਾਈ" + +#: ../libempathy-gtk/empathy-chat.c:1195 +#, c-format +msgid "%s was banned" +msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ" + +#: ../libempathy-gtk/empathy-chat.c:1199 #, c-format msgid "%s has left the room" msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ" -#: ../libempathy-gtk/empathy-chat.c:1289 ../src/empathy-call-window.c:1014 +#. Note to translators: this string is appended to +#. * notifications like "foo has left the room", with the message +#. * given by the user living the room. If this poses a problem, +#. * please let us know. :-) +#. +#: ../libempathy-gtk/empathy-chat.c:1208 +#, c-format +msgid " (%s)" +msgstr " (%s)" + +#: ../libempathy-gtk/empathy-chat.c:1231 +#, c-format +msgid "%s has joined the room" +msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ" + +#: ../libempathy-gtk/empathy-chat.c:1364 ../src/empathy-call-window.c:1226 msgid "Disconnected" msgstr "ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਖਤਮ" -#: ../libempathy-gtk/empathy-chat.c:1700 +#: ../libempathy-gtk/empathy-chat.c:1793 msgid "Connected" msgstr "ਕà©à¨¨à©ˆà¨•à¨Ÿ ਕੀਤਾ" -#: ../libempathy-gtk/empathy-chat.c:1750 -#: ../libempathy-gtk/empathy-log-window.c:501 +#: ../libempathy-gtk/empathy-chat.c:1843 +#: ../libempathy-gtk/empathy-log-window.c:502 msgid "Conversation" msgstr "ਗੱਲਬਾਤ" -#: ../libempathy-gtk/empathy-chat.ui.h:1 -msgid "<b>Topic:</b>" -msgstr "<b>ਵਿਸ਼ਾ:</b>" +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472 +msgid "Topic:" +msgstr "ਵਿਸ਼ਾ:" -#: ../libempathy-gtk/empathy-chat-text-view.c:323 +#: ../libempathy-gtk/empathy-chat-text-view.c:316 msgid "_Copy Link Address" -msgstr "ਲਿੰਕ ਸਿਰਨਾਵਾਂ ਨਕਲ ਕਰੋ(_C)" +msgstr "ਲਿੰਕ à¨à¨¡à¨°à©ˆà©±à¨¸ ਕਾਪੀ ਕਰੋ(_C)" -#: ../libempathy-gtk/empathy-chat-text-view.c:331 +#: ../libempathy-gtk/empathy-chat-text-view.c:323 msgid "_Open Link" msgstr "ਲਿੰਕ ਖੋਲà©à¨¹à©‹(_O)" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:424 +#: ../libempathy-gtk/empathy-chat-text-view.c:421 msgid "%A %B %d %Y" msgstr "%A %d %B %Y" @@ -788,7 +880,7 @@ msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸੋਧ" msgid "Personal Information" msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ" -#: ../libempathy-gtk/empathy-contact-dialogs.c:392 +#: ../libempathy-gtk/empathy-contact-dialogs.c:384 msgid "New Contact" msgstr "ਨਵਾਂ ਸੰਪਰਕ" @@ -800,26 +892,26 @@ msgstr "ਬਾਅਦ 'ਚ ਸੋਚੂ(_L)" msgid "Subscription Request" msgstr "ਮੈਂਬਰੀ ਮੰਗ" -#: ../libempathy-gtk/empathy-contact-list-view.c:1378 +#: ../libempathy-gtk/empathy-contact-list-view.c:1375 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "ਕੀ ਤà©à¨¸à©€à¨‚ ਗਰà©à©±à¨ª '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1380 +#: ../libempathy-gtk/empathy-contact-list-view.c:1377 msgid "Removing group" msgstr "ਗਰà©à©±à¨ª ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../libempathy-gtk/empathy-contact-list-view.c:1427 -#: ../libempathy-gtk/empathy-contact-list-view.c:1505 +#: ../libempathy-gtk/empathy-contact-list-view.c:1424 +#: ../libempathy-gtk/empathy-contact-list-view.c:1502 msgid "_Remove" msgstr "ਹਟਾਓ(_R)" -#: ../libempathy-gtk/empathy-contact-list-view.c:1457 +#: ../libempathy-gtk/empathy-contact-list-view.c:1454 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "ਕੀ ਤà©à¨¸à©€à¨‚ ਸੰਪਰਕ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1459 +#: ../libempathy-gtk/empathy-contact-list-view.c:1456 msgid "Removing contact" msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" @@ -880,7 +972,7 @@ msgid "Select" msgstr "ਚà©à¨£à©‹" #: ../libempathy-gtk/empathy-contact-widget.c:988 -#: ../src/empathy-main-window.c:905 +#: ../src/empathy-main-window.c:903 msgid "Group" msgstr "ਗਰà©à©±à¨ª" @@ -990,55 +1082,59 @@ msgstr "<b>ਟਿਕਾਣਾ</b>, " #: ../libempathy-gtk/empathy-contact-widget.c:1395 msgid "%B %e, %Y at %R UTC" -msgstr "%B %e, %Y at %R UTC" +msgstr "%R UTC %e %B %Y ਨੂੰ" #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -msgid "<b>Client Information</b>" -msgstr "<b>ਕਲਾਇਟ ਜਾਣਕਾਰੀ</b>" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -msgid "<b>Contact Details</b>" -msgstr "<b>ਸੰਪਰਕ ਵੇਰਵਾ</b>" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -msgid "<b>Contact</b>" -msgstr "<b>ਸੰਪਰਕ</b>" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -msgid "<b>Groups</b>" -msgstr "<b>ਗਰà©à©±à¨ª</b>" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 msgid "<b>Location</b> at (date)\t" msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ\t" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 #: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" msgstr "ਅਕਾਊਂਟ:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 msgid "Alias:" msgstr "ਉਪ-ਨਾਂ:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 msgid "Birthday:" msgstr "ਜਨਮਦਿਨ:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +#| msgid "<b>Client Information</b>" +msgid "Client Information" +msgstr "ਕਲਾਇਟ ਜਾਣਕਾਰੀ" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 msgid "Client:" msgstr "ਕਲਾਇਟ:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../src/empathy-main-window.c:886 +msgid "Contact" +msgstr "ਸੰਪਰਕ" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +#| msgid "<b>Contact Details</b>" +msgid "Contact Details" +msgstr "ਸੰਪਰਕ ਵੇਰਵਾ" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "Email:" msgstr "ਈਮੇਲ:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Fullname:" msgstr "ਪੂਰਾ ਨਾਂ:" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#| msgid "Group" +msgid "Groups" +msgstr "ਗਰà©à©±à¨ª" + #. Identifier to connect to Instant Messaging network #: ../libempathy-gtk/empathy-contact-widget.ui.h:13 msgid "Identifier:" @@ -1057,8 +1153,7 @@ msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." msgstr "" -"ਗਰà©à©±à¨ª ਚà©à¨£à©‹, ਜਿਸ ਵਿੱਚ ਤà©à¨¸à©€à¨‚ ਇਹ ਸੰਪਰਕ ਨੂੰ ਰੱਖਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ। ਯਾਦ ਰੱਖੋ ਕਿ ਤà©à¨¸à©€à¨‚ ਇੱਕ ਤੋਂ ਵੱਧ ਗਰà©à©±à¨ª " -"ਜਾਂ ਕੋਈ " +"ਗਰà©à©±à¨ª ਚà©à¨£à©‹, ਜਿਸ ਵਿੱਚ ਤà©à¨¸à©€à¨‚ ਇਹ ਸੰਪਰਕ ਨੂੰ ਰੱਖਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ। ਯਾਦ ਰੱਖੋ ਕਿ ਤà©à¨¸à©€à¨‚ ਇੱਕ ਤੋਂ ਵੱਧ ਗਰà©à©±à¨ª ਜਾਂ ਕੋਈ " "ਗਰà©à©±à¨ª ਨਹੀਂ ਵੀ ਚà©à¨£ ਸਕਦੇ ਹੋ।" #: ../libempathy-gtk/empathy-contact-widget.ui.h:17 @@ -1089,12 +1184,12 @@ msgstr "ਪੋਰਟ" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:494 -#: ../src/empathy-import-dialog.c:281 +#: ../libempathy-gtk/empathy-log-window.c:495 +#: ../src/empathy-import-dialog.c:285 msgid "Account" msgstr "ਅਕਾਊਂਟ" -#: ../libempathy-gtk/empathy-log-window.c:511 +#: ../libempathy-gtk/empathy-log-window.c:512 msgid "Date" msgstr "ਮਿਤੀ" @@ -1156,15 +1251,55 @@ msgstr "ਇਹ ਹਾਲਤ ਨੂੰ ਪਸੰਦੀਦਾ ਬਣਾਉਣ ਲà msgid "Set status" msgstr "ਹਾਲਤ ਸੈੱਟ ਕਰੋ" -#: ../libempathy-gtk/empathy-presence-chooser.c:778 +#: ../libempathy-gtk/empathy-presence-chooser.c:782 msgid "Set your presence and current status" msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਅਤੇ ਮੌਜੂਦਾ ਹਾਲਤ ਸੈੱਟ ਕਰੋ" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1013 +#: ../libempathy-gtk/empathy-presence-chooser.c:1017 msgid "Custom messages..." msgstr "ਪਸੰਦੀਦਾ ਸà©à¨¨à©‡à¨¹à©‡..." +#: ../libempathy-gtk/empathy-sound.c:51 +msgid "Received an instant message" +msgstr "ਇੱਕ ਤà©à¨°à©°à¨¤ ਸà©à¨¨à©‡à¨¹à©‡ ਮਿਲਿਆ" + +#: ../libempathy-gtk/empathy-sound.c:53 +msgid "Sent an instant message" +msgstr "ਇੱਕ ਤà©à¨°à©°à¨¤ ਸà©à¨¨à©‡à¨¹à©‡ à¨à©‡à¨œà¨¿à¨†" + +#: ../libempathy-gtk/empathy-sound.c:55 +msgid "Incoming chat request" +msgstr "ਆ ਰਹੀ ਗੱਲਬਾਤ ਮੰਗ" + +#: ../libempathy-gtk/empathy-sound.c:57 +msgid "Contact connected" +msgstr "ਸੰਪਰਕ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਹੋਇਆ" + +#: ../libempathy-gtk/empathy-sound.c:59 +msgid "Contact disconnected" +msgstr "ਸੰਪਰਕ ਨੇ ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਖਤਮ" + +#: ../libempathy-gtk/empathy-sound.c:61 +msgid "Connected to server" +msgstr "ਸਰਵਰ ਨਾਲ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਕੀਤਾ" + +#: ../libempathy-gtk/empathy-sound.c:63 +msgid "Disconnected from server" +msgstr "ਸਰਵਰ ਤੋਂ ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਖਤਮ" + +#: ../libempathy-gtk/empathy-sound.c:65 +msgid "Incoming voice call" +msgstr "ਆ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ" + +#: ../libempathy-gtk/empathy-sound.c:67 +msgid "Outgoing voice call" +msgstr "ਜਾ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ" + +#: ../libempathy-gtk/empathy-sound.c:69 +msgid "Voice call ended" +msgstr "ਆਵਾਜ਼ ਕਾਲ ਖਤਮ ਕੀਤੀ" + #: ../libempathy-gtk/empathy-status-preset-dialog.c:362 msgid "Enter Custom Message" msgstr "ਪਸੰਦੀਦਾ ਸà©à¨¨à©‡à¨¹à¨¾ ਦਿਓ" @@ -1189,75 +1324,34 @@ msgstr "gtk-add" msgid "gtk-remove" msgstr "gtk-remove" -#: ../libempathy-gtk/empathy-theme-manager.c:60 +#: ../libempathy-gtk/empathy-theme-manager.c:67 msgid "Classic" msgstr "ਕਲਾਸਿਕ" -#: ../libempathy-gtk/empathy-theme-manager.c:61 +#: ../libempathy-gtk/empathy-theme-manager.c:68 msgid "Simple" msgstr "ਸਧਾਰਨ" -#: ../libempathy-gtk/empathy-theme-manager.c:62 +#: ../libempathy-gtk/empathy-theme-manager.c:69 msgid "Clean" msgstr "ਸਾਫ਼" -#: ../libempathy-gtk/empathy-theme-manager.c:63 +#: ../libempathy-gtk/empathy-theme-manager.c:70 msgid "Blue" msgstr "ਨੀਲਾ" -#: ../libempathy-gtk/empathy-ui-utils.c:1355 +#: ../libempathy-gtk/empathy-ui-utils.c:1377 msgid "Unable to open URI" msgstr "URI ਖੋਲà©à¨¹à¨£ ਲਈ ਅਸਮਰੱਥ" -#: ../libempathy-gtk/empathy-ui-utils.c:1445 +#: ../libempathy-gtk/empathy-ui-utils.c:1467 msgid "Select a file" msgstr "ਇੱਕ ਫਾਇਲ ਚà©à¨£à©‹" -#: ../libempathy-gtk/empathy-ui-utils.c:1503 -#| msgid "Select a contact" +#: ../libempathy-gtk/empathy-ui-utils.c:1525 msgid "Select a destination" msgstr "ਟਿਕਾਣਾ ਚà©à¨£à©‹" -#: ../libempathy-gtk/empathy-ui-utils.c:1532 -msgid "Received an instant message" -msgstr "ਇੱਕ ਤà©à¨°à©°à¨¤ ਸà©à¨¨à©‡à¨¹à©‡ ਮਿਲਿਆ" - -#: ../libempathy-gtk/empathy-ui-utils.c:1534 -msgid "Sent an instant message" -msgstr "ਇੱਕ ਤà©à¨°à©°à¨¤ ਸà©à¨¨à©‡à¨¹à©‡ à¨à©‡à¨œà¨¿à¨†" - -#: ../libempathy-gtk/empathy-ui-utils.c:1536 -msgid "Incoming chat request" -msgstr "ਆ ਰਹੀ ਗੱਲਬਾਤ ਮੰਗ" - -#: ../libempathy-gtk/empathy-ui-utils.c:1538 -msgid "Contact connected" -msgstr "ਸੰਪਰਕ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਹੋਇਆ" - -#: ../libempathy-gtk/empathy-ui-utils.c:1540 -msgid "Contact disconnected" -msgstr "ਸੰਪਰਕ ਨੇ ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਖਤਮ" - -#: ../libempathy-gtk/empathy-ui-utils.c:1542 -msgid "Connected to server" -msgstr "ਸਰਵਰ ਨਾਲ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਕੀਤਾ" - -#: ../libempathy-gtk/empathy-ui-utils.c:1544 -msgid "Disconnected from server" -msgstr "ਸਰਵਰ ਤੋਂ ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਖਤਮ" - -#: ../libempathy-gtk/empathy-ui-utils.c:1546 -msgid "Incoming voice call" -msgstr "ਆ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ" - -#: ../libempathy-gtk/empathy-ui-utils.c:1548 -msgid "Outgoing voice call" -msgstr "ਜਾ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ" - -#: ../libempathy-gtk/empathy-ui-utils.c:1550 -msgid "Voice call ended" -msgstr "ਆਵਾਜ਼ ਕਾਲ ਖਤਮ ਕੀਤੀ" - #: ../libempathy-gtk/totem-subtitle-encoding.c:158 msgid "Current Locale" msgstr "ਮੌਜੂਦਾ ਲੋਕੇਲ" @@ -1441,7 +1535,7 @@ msgid "Megaphone" msgstr "ਮੇਗਾਫੋਨ" #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2 -#: ../megaphone/src/megaphone-applet.c:527 +#: ../megaphone/src/megaphone-applet.c:519 msgid "Talk!" msgstr "ਗੱਲ!" @@ -1476,79 +1570,79 @@ msgstr "ਮੌਜੂਦਗੀ" msgid "Set your own presence" msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਦਿਓ" -#: ../src/empathy.c:476 +#: ../src/empathy.c:506 msgid "Don't connect on startup" msgstr "ਸ਼à©à¨°à©‚ ਸਮੇਂ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਨਾ ਕਰੋ" -#: ../src/empathy.c:480 +#: ../src/empathy.c:510 msgid "Don't show the contact list on startup" msgstr "ਸ਼à©à¨°à©‚ ਸਮੇਂ ਸੰਪਰਕ ਸੂਚੀ ਨਾ ਵੇਖਾਓ" -#: ../src/empathy.c:484 +#: ../src/empathy.c:514 msgid "Show the accounts dialog" msgstr "ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਵੇਖੋ" -#: ../src/empathy.c:496 +#: ../src/empathy.c:526 msgid "- Empathy Instant Messenger" msgstr "- ਇੰਪਥੀ ਤà©à¨°à©°à¨¤ ਸà©à¨¨à©‡à¨¹à©‡à¨¦à¨¾à¨°" -#: ../src/empathy-about-dialog.c:84 +#: ../src/empathy-about-dialog.c:83 msgid "" "Empathy is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version." msgstr "" -"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਇੱਕ ਮà©à¨«à¨¤ ਸਾਫਟਵੇਅਰ ਹੈ, ਜਿਸ ਨੂੰ ਤà©à¨¸à©€à¨‚ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ, " -"ਜਿਸ ਨੂੰ ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ ੨ ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ " -"(ਉਹ ਤà©à¨¹à¨¾à¨¡à©€ ਆਪਣੀ ਮਰਜ਼ੀ ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।" +"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਇੱਕ ਮà©à¨«à¨¤ ਸਾਫਟਵੇਅਰ ਹੈ, ਜਿਸ ਨੂੰ ਤà©à¨¸à©€à¨‚ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ, ਜਿਸ ਨੂੰ ਫਰੀ " +"ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ ੨ ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ (ਉਹ ਤà©à¨¹à¨¾à¨¡à©€ ਆਪਣੀ ਮਰਜ਼ੀ " +"ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।" -#: ../src/empathy-about-dialog.c:88 +#: ../src/empathy-about-dialog.c:87 msgid "" "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." msgstr "" -"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ, " -"ਪਰ ਇਸ ਦੀ ਕੋਈ ਵਾਰੰਟੀ ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨà©à¨•à©‚ਲ ਹੋਣ " -"ਜਾਂ ਠੀਕ ਤਰà©à¨¹à¨¾à¨‚ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜà©à¨¹à©‹à¥¤" +"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ, ਪਰ ਇਸ ਦੀ ਕੋਈ ਵਾਰੰਟੀ " +"ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨà©à¨•à©‚ਲ ਹੋਣ ਜਾਂ ਠੀਕ ਤਰà©à¨¹à¨¾à¨‚ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ " +"ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜà©à¨¹à©‹à¥¤" -#: ../src/empathy-about-dialog.c:92 +#: ../src/empathy-about-dialog.c:91 msgid "" "You should have received a copy of the GNU General Public License along with " "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-130159 USA" msgstr "" "ਇੰਪੈਂਥੀ ਨਾਲ ਤà©à¨¸à©€à¨‚ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਦੀ ਕਾਪੀ ਪà©à¨°à¨¾à¨ªà¨¤ ਕਰੋਗੇ, ਜੇਕਰ ਤà©à¨¹à¨¾à¨¨à©‚à©° ਨਹੀਂ ਮਿਲੀ ਹੈ ਤਾਂ " -"ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, à¨à¨® ਠ" -"੦੨੧੧੦-੧੩੦੧੫੯, ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।" +"ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, à¨à¨® ਠ੦੨੧੧੦-੧੩੦੧੫੯, " +"ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।" -#: ../src/empathy-about-dialog.c:120 +#: ../src/empathy-about-dialog.c:119 msgid "An Instant Messaging client for GNOME" msgstr "ਗਨੋਮ ਲਈ ਤà©à¨°à©°à¨¤ ਸà©à¨¨à©‡à¨¹à©‡à¨¦à¨¾à¨° ਕਲਾਇਟ" -#: ../src/empathy-about-dialog.c:126 +#: ../src/empathy-about-dialog.c:125 msgid "translator-credits" msgstr "" "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net) 2007, 2008, 2009\n" "http://www.satluj.com/" -#: ../src/empathy-accounts-dialog.c:391 +#: ../src/empathy-accounts-dialog.c:392 msgid "Enabled" msgstr "ਚਾਲੂ" -#: ../src/empathy-accounts-dialog.c:401 ../src/empathy-accounts-dialog.ui.h:4 +#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1 msgid "Accounts" msgstr "ਅਕਾਊਂਟ" #. To translator: %s is the protocol name -#: ../src/empathy-accounts-dialog.c:834 +#: ../src/empathy-accounts-dialog.c:837 #, c-format msgid "New %s account" msgstr "ਨਵਾਂ %s ਅਕਾਊਂਟ" -#: ../src/empathy-accounts-dialog.c:944 +#: ../src/empathy-accounts-dialog.c:950 #, c-format msgid "" "You are about to remove your %s account!\n" @@ -1557,7 +1651,7 @@ msgstr "" "ਤà©à¨¸à©€à¨‚ %s ਅਕਾਊਂਟ ਹਟਾਉਣ ਲਈ ਤਿਆਰ ਹੋ!\n" "ਕੀ ਤà©à¨¸à©€à¨‚ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?" -#: ../src/empathy-accounts-dialog.c:950 +#: ../src/empathy-accounts-dialog.c:956 msgid "" "Any associated conversations and chat rooms will NOT be removed if you " "decide to proceed.\n" @@ -1569,30 +1663,34 @@ msgstr "" "\n" "ਕੀ ਤà©à¨¸à©€à¨‚ ਬਾਅਦ ਵਿੱਚ ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ, ਉਹ ਤਾਂ ਵੀ ਉਪਲੱਬਧ ਰਹਿਣਗੇ।" -#: ../src/empathy-accounts-dialog.ui.h:1 -msgid "<b>New Account</b>" -msgstr "<b>ਨਵਾਂ ਅਕਾਊਂਟ</b>" - #: ../src/empathy-accounts-dialog.ui.h:2 -msgid "<b>No protocol installed</b>" -msgstr "<b>ਕੋਈ ਪਰੋਟੋਕਾਲ ਇੰਸਟਾਲ ਨਹੀਂ</b>" +#| msgid "Account" +msgid "Add Account" +msgstr "ਅਕਾਊਂਟ ਸ਼ਾਮਲ" #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "<b>Settings</b>" -msgstr "<b>ਸੈਟਿੰਗ</b>" - -#: ../src/empathy-accounts-dialog.ui.h:5 msgid "Cr_eate" msgstr "ਬਣਾਓ(_e)" -#: ../src/empathy-accounts-dialog.ui.h:6 -msgid "I already have an account I want to use" -msgstr "ਮੇਰੇ ਕੋਲ ਪਹਿਲਾਂ ਹੀ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਮੈਂ ਵਰਤਣਾ ਚਾਹà©à©°à¨¦à¨¾ ਹਾਂ" +#: ../src/empathy-accounts-dialog.ui.h:4 +#| msgid "Email:" +msgid "Gmail" +msgstr "ਜੀਮੇਲ" -#: ../src/empathy-accounts-dialog.ui.h:7 +#: ../src/empathy-accounts-dialog.ui.h:5 msgid "Import Accounts..." msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ..." +#: ../src/empathy-accounts-dialog.ui.h:6 +#| msgid "<b>No protocol installed</b>" +msgid "No protocol installed" +msgstr "ਕੋਈ ਪਰੋਟੋਕਾਲ ਇੰਸਟਾਲ ਨਹੀਂ" + +#: ../src/empathy-accounts-dialog.ui.h:7 +#| msgid "<b>Settings</b>" +msgid "Settings" +msgstr "ਸੈਟਿੰਗ" + #: ../src/empathy-accounts-dialog.ui.h:8 msgid "" "To add a new account, you first have to install a backend for each protocol " @@ -1609,53 +1707,63 @@ msgstr "ਕਿਸਮ:" msgid "_Add..." msgstr "ਸ਼ਾਮਲ(_A)..." -#: ../src/empathy-call-window.c:382 +#: ../src/empathy-accounts-dialog.ui.h:11 +#| msgid "Create a new IRC network" +msgid "_Create a new account" +msgstr "ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ(_C)" + +#: ../src/empathy-accounts-dialog.ui.h:12 +#| msgid "Show and edit accounts" +msgid "_Reuse an existing account" +msgstr "ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਨੂੰ ਵਰਤੋਂ(_R)" + +#: ../src/empathy-call-window.c:420 msgid "Contrast" msgstr "ਕਨਟਰਾਸਟ" -#: ../src/empathy-call-window.c:385 +#: ../src/empathy-call-window.c:423 msgid "Brightness" msgstr "ਚਮਕ" -#: ../src/empathy-call-window.c:388 +#: ../src/empathy-call-window.c:426 msgid "Gamma" msgstr "ਗਾਮਾ" -#: ../src/empathy-call-window.c:492 +#: ../src/empathy-call-window.c:531 msgid "Volume" msgstr "ਆਵਾਜ਼" -#: ../src/empathy-call-window.c:638 +#: ../src/empathy-call-window.c:662 +msgid "Connecting..." +msgstr "ਕà©à¨¨à©ˆà¨•à¨Ÿ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." + +#: ../src/empathy-call-window.c:746 msgid "_Sidebar" msgstr "ਬਾਹੀ(_S)" -#: ../src/empathy-call-window.c:657 +#: ../src/empathy-call-window.c:765 msgid "Dialpad" msgstr "ਡਾਇਲ-ਪੈਡ" -#: ../src/empathy-call-window.c:663 +#: ../src/empathy-call-window.c:771 msgid "Audio input" msgstr "ਆਡੀਓ ਆਉਟਪà©à©±à¨Ÿ" -#: ../src/empathy-call-window.c:667 +#: ../src/empathy-call-window.c:775 msgid "Video input" msgstr "ਵੀਡਿਓ ਆਉਟਪà©à©±à¨Ÿ" -#: ../src/empathy-call-window.c:691 -msgid "Connecting..." -msgstr "ਕà©à¨¨à©ˆà¨•à¨Ÿ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." - -#: ../src/empathy-call-window.c:730 +#: ../src/empathy-call-window.c:836 #, c-format msgid "Call with %s" msgstr "%s ਲਈ ਕਾਲ ਕਰੋ" -#: ../src/empathy-call-window.c:801 +#: ../src/empathy-call-window.c:905 msgid "Call" msgstr "ਕਾਲ ਕਰੋ" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1096 +#: ../src/empathy-call-window.c:1336 #, c-format msgid "Connected — %d:%02dm" msgstr "ਕà©à¨¨à©ˆà¨•à¨Ÿ ਹੈ -- %d:%02dm" @@ -1665,43 +1773,38 @@ msgid "Hang up" msgstr "ਬੰਦ ਕਰੋ" #: ../src/empathy-call-window.ui.h:2 +msgid "Redial" +msgstr "ਰੀ-ਡਾਇਲ" + +#: ../src/empathy-call-window.ui.h:3 msgid "Send Audio" msgstr "ਆਡੀਓ à¨à©‡à¨œà©‹" -#: ../src/empathy-call-window.ui.h:3 +#: ../src/empathy-call-window.ui.h:4 msgid "Send video" msgstr "ਵੀਡਿਓ à¨à©‡à¨œà©‹" -#: ../src/empathy-call-window.ui.h:4 +#: ../src/empathy-call-window.ui.h:5 msgid "Video preview" msgstr "ਵੀਡਿਓ à¨à¨²à¨•" -#: ../src/empathy-call-window.ui.h:5 +#: ../src/empathy-call-window.ui.h:6 msgid "_Call" msgstr "ਕਾਲ ਕਰੋ(_C)" -#: ../src/empathy-call-window.ui.h:6 ../src/empathy-main-window.ui.h:21 +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21 msgid "_View" msgstr "ਵੇਖੋ(_V)" -#: ../src/empathy-chat-window.c:342 +#: ../src/empathy-chat-window.c:344 #, c-format msgid "Conversations (%d)" msgstr "ਗੱਲਬਾਤ (%d)" -#: ../src/empathy-chat-window.c:449 -msgid "Topic:" -msgstr "ਵਿਸ਼ਾ:" - -#: ../src/empathy-chat-window.c:454 +#: ../src/empathy-chat-window.c:476 msgid "Typing a message." msgstr "ਸà©à¨¨à©‡à¨¹à¨¾ ਲਿਖਦਾ/ਲਿਖਦੀ ਹੈ।" -#: ../src/empathy-chat-window.c:917 ../src/empathy-event-manager.c:429 -#, c-format -msgid "New message from %s" -msgstr "%s ਵਲੋਂ ਨਵਾਂ ਸà©à¨¨à©‡à¨¹à¨¾" - #: ../src/empathy-chatrooms-window.c:258 msgid "Name" msgstr "ਨਾਂ" @@ -1718,75 +1821,75 @@ msgstr "ਆਟੋ-ਕà©à¨¨à©ˆà¨•à¨Ÿ" msgid "Manage Favorite Rooms" msgstr "ਪਸੰਦੀਦਾ ਰੂਮ ਪਰਬੰਧ" -#: ../src/empathy-event-manager.c:377 +#: ../src/empathy-event-manager.c:321 msgid "Incoming call" msgstr "ਆ ਰਹੀ ਕਾਲ" -#: ../src/empathy-event-manager.c:380 +#: ../src/empathy-event-manager.c:324 #, c-format msgid "%s is calling you, do you want to answer?" msgstr "%s ਤà©à¨¹à¨¾à¨¨à©‚à©° ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤà©à¨¸à©€à¨‚ ਜਵਾਬ ਦੇਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?" -#: ../src/empathy-event-manager.c:387 +#: ../src/empathy-event-manager.c:331 msgid "_Reject" msgstr "ਰੱਦ ਕਰੋ(_R)" -#: ../src/empathy-event-manager.c:393 +#: ../src/empathy-event-manager.c:337 msgid "_Answer" msgstr "ਜਵਾਬ ਦਿਓ(_A)" -#: ../src/empathy-event-manager.c:507 +#: ../src/empathy-event-manager.c:452 #, c-format msgid "Incoming call from %s" msgstr "%s ਤੋਂ ਕਾਲ ਆ ਰਹੀ ਹੈ" -#: ../src/empathy-event-manager.c:547 +#: ../src/empathy-event-manager.c:496 #, c-format msgid "%s is offering you an invitation" msgstr "%s ਤà©à¨¹à¨¾à¨¨à©‚à©° ਇੱਕ ਸੱਦਾ ਦੇ ਰਿਹਾ ਹੈ" -#: ../src/empathy-event-manager.c:553 +#: ../src/empathy-event-manager.c:502 msgid "An external application will be started to handle it." msgstr "ਇਸ ਨੂੰ ਵਰਤਣ ਲਈ ਇੱਕ ਬਾਹਰੀ à¨à¨ªà¨²à©€à¨•à©‡à¨¸à¨¼à¨¨ ਵਰਤੀ ਜਾਵੇਗੀ।" -#: ../src/empathy-event-manager.c:558 +#: ../src/empathy-event-manager.c:507 msgid "You don't have the needed external application to handle it." -msgstr "ਤà©à¨¹à¨¾à¨¨à©‚à©° ਇਹ ਹੈਂਡਲ ਕਰਨ ਲਈ ਬਾਹਰੀ ਕਾਰਜ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।" +msgstr "ਤà©à¨¹à¨¾à¨¨à©‚à©° ਇਹ ਹੈਂਡਲ ਕਰਨ ਲਈ ਬਾਹਰੀ à¨à¨ªà¨²à©€à¨•à©‡à¨¸à¨¼à¨¨ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।" -#: ../src/empathy-event-manager.c:685 +#: ../src/empathy-event-manager.c:634 msgid "Room invitation" msgstr "ਰੂਮ ਸੱਦਾ" -#: ../src/empathy-event-manager.c:688 +#: ../src/empathy-event-manager.c:637 #, c-format msgid "%s is inviting you to join %s" -msgstr "%s ਤà©à¨¹à¨¾à¨¨à©‚à©° %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ" +msgstr "%s ਤà©à¨¹à¨¾à¨¨à©‚à©° %s ਜà©à¨†à¨‡à©°à¨¨ ਕਰਨ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ" -#: ../src/empathy-event-manager.c:696 +#: ../src/empathy-event-manager.c:645 msgid "_Decline" msgstr "ਇਨਕਾਰ(_D)" -#: ../src/empathy-event-manager.c:701 +#: ../src/empathy-event-manager.c:650 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "ਦਾਖਲ(_J)" -#: ../src/empathy-event-manager.c:740 +#: ../src/empathy-event-manager.c:689 #, c-format msgid "%s invited you to join %s" msgstr "%s ਨੇ ਤà©à¨¹à¨¾à¨¨à©‚à©° %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦਿਆ" -#: ../src/empathy-event-manager.c:766 +#: ../src/empathy-event-manager.c:715 #, c-format msgid "Incoming file transfer from %s" msgstr "%s ਤੋਂ ਆ ਰਿਹਾ ਫਾਇਲ ਸੰਚਾਰ" -#: ../src/empathy-event-manager.c:946 +#: ../src/empathy-event-manager.c:895 #, c-format msgid "Subscription requested by %s" msgstr "%s ਵਲੋਂ ਮੈਂਬਰੀ ਚਾਹੀਦੀ ਹੈ" -#: ../src/empathy-event-manager.c:950 +#: ../src/empathy-event-manager.c:899 #, c-format msgid "" "\n" @@ -1795,6 +1898,18 @@ msgstr "" "\n" "ਸà©à¨¨à©‡à¨¹à¨¾: %s" +#. someone is logging off +#: ../src/empathy-event-manager.c:935 +#, c-format +msgid "%s is now offline." +msgstr "%s ਹà©à¨£ ਆਫਲਾਈਨ ਹੈ।" + +#. someone is logging in +#: ../src/empathy-event-manager.c:951 +#, c-format +msgid "%s is now online." +msgstr "%s ਹà©à¨£ ਆਨਲਾਈਨ ਹੈ।" + #. Translators: time left, when it is more than one hour #: ../src/empathy-ft-manager.c:101 #, c-format @@ -1817,8 +1932,8 @@ msgstr "ਅਣਜਾਣ" msgid "%s of %s at %s/s" msgstr "%3$s/s ਨਾਲ %2$s ਵਿੱਚੋਂ %1$s" -#: ../src/empathy-ft-manager.c:276, c-format -#| msgid "%s of %s at %s/s" +#: ../src/empathy-ft-manager.c:276 +#, c-format msgid "%s of %s" msgstr "%2$s ਵਿੱਚੋਂ %1$s" @@ -1837,21 +1952,20 @@ msgstr "\"%s\" %s ਨੂੰ à¨à©‡à¨œà©€ ਜਾ ਰਹੀ ਹੈ" #. translators: first %s is filename, second %s #. * is the contact name #: ../src/empathy-ft-manager.c:340, c-format -#| msgid "Receiving \"%s\" from %s" +#| msgid "Error receiving \"%s\" from %s" msgid "Error receiving \"%s\" from %s" -msgstr "%2$s ਤੋਂ \"%s\" ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ" +msgstr "%2$s ਤੋਂ \"%1$s\" ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ" #: ../src/empathy-ft-manager.c:343 msgid "Error receiving a file" msgstr "ਫਾਇਲ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ" -#: ../src/empathy-ft-manager.c:348, c-format -#| msgid "Sending \"%s\" to %s" +#: ../src/empathy-ft-manager.c:348 +#, c-format msgid "Error sending \"%s\" to %s" msgstr "\"%s\" %s ਨੂੰ à¨à©‡à¨œà¨£ ਦੌਰਾਨ ਗਲਤੀ" #: ../src/empathy-ft-manager.c:351 -#| msgid "Error sending message '%s': %s" msgid "Error sending a file" msgstr "ਫਾਇਲ à¨à©‡à¨œà¨£ ਦੌਰਾਨ ਗਲਤੀ" @@ -1900,27 +2014,28 @@ msgid "Remaining" msgstr "ਬਾਕੀ" #: ../src/empathy-ft-manager.ui.h:1 -msgid "File transfers" -msgstr "ਫਾਇਲ ਸੰਚਾਰ" +#| msgid "_File Transfers" +msgid "File Transfers" +msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ" #: ../src/empathy-ft-manager.ui.h:2 msgid "Remove completed, canceled and failed file transfers from the list" msgstr "ਲਿਸਟ ਵਿੱਚੋਂ ਪੂਰੇ ਹੋà¨, ਰੱਦ ਕੀਤੇ ਅਤੇ ਫੇਲà©à¨¹ ਹੋਠਫਾਇਲ ਸੰਚਾਰ ਹਟਾਓ" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-dialog.c:259 +#: ../src/empathy-import-dialog.c:263 msgid "Import" msgstr "ਇੰਪੋਰਟ" -#: ../src/empathy-import-dialog.c:268 +#: ../src/empathy-import-dialog.c:272 msgid "Protocol" msgstr "ਪਰੋਟੋਕਾਲ" -#: ../src/empathy-import-dialog.c:294 +#: ../src/empathy-import-dialog.c:298 msgid "Source" msgstr "ਸਰੋਤ" -#: ../src/empathy-import-dialog.c:388 +#: ../src/empathy-import-dialog.c:392 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -1932,80 +2047,75 @@ msgstr "" msgid "Import Accounts" msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-main-window.c:396 msgid "_Edit account" msgstr "ਅਕਾਊਂਟ ਸੋਧ(_E)" -#: ../src/empathy-main-window.c:498 +#: ../src/empathy-main-window.c:499 msgid "No error specified" msgstr "ਕੋਈ ਗਲਤੀ ਨਹੀਂ ਦਿੱਤੀ" -#: ../src/empathy-main-window.c:501 +#: ../src/empathy-main-window.c:502 msgid "Network error" msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ" -#: ../src/empathy-main-window.c:504 +#: ../src/empathy-main-window.c:505 msgid "Authentication failed" msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲà©à¨¹ ਹੈ" -#: ../src/empathy-main-window.c:507 +#: ../src/empathy-main-window.c:508 msgid "Encryption error" msgstr "ਇੰਕà©à¨°à¨¿à¨ªà¨¸à¨¼à¨¨ ਗਲਤੀ" -#: ../src/empathy-main-window.c:510 +#: ../src/empathy-main-window.c:511 msgid "Name in use" msgstr "ਵਰਤਣ ਲਈ ਨਾਂ" -#: ../src/empathy-main-window.c:513 +#: ../src/empathy-main-window.c:514 msgid "Certificate not provided" msgstr "ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਦਿੱਤਾ" -#: ../src/empathy-main-window.c:516 +#: ../src/empathy-main-window.c:517 msgid "Certificate untrusted" msgstr "ਸਰਟੀਫਿਕੇਟ ਬੇà¨à¨°à©‹à¨¸à©‡à¨¯à©‹à¨—" -#: ../src/empathy-main-window.c:519 +#: ../src/empathy-main-window.c:520 msgid "Certificate expired" msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪà©à©±à¨—à©€" -#: ../src/empathy-main-window.c:522 +#: ../src/empathy-main-window.c:523 msgid "Certificate not activated" msgstr "ਸਰਟੀਫਿਕੇਟ ਸਰਗਰਮ ਨਹੀਂ ਹੈ" -#: ../src/empathy-main-window.c:525 +#: ../src/empathy-main-window.c:526 msgid "Certificate hostname mismatch" msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ ਨਹੀਂ ਮਿਲਦਾ" -#: ../src/empathy-main-window.c:528 +#: ../src/empathy-main-window.c:529 msgid "Certificate fingerprint mismatch" msgstr "ਸਰਟੀਫਿਕੇਟ ਫਿੰਗਰ-ਪਰਿੰਟ ਮਿਲਦਾ ਨਹੀਂ" -#: ../src/empathy-main-window.c:531 +#: ../src/empathy-main-window.c:532 msgid "Certificate self-signed" msgstr "ਸਰਟੀਫਿਕੇਟ ਖà©à¨¦-ਦਸਤਖਤੀ ਹੈ" -#: ../src/empathy-main-window.c:534 +#: ../src/empathy-main-window.c:535 msgid "Certificate error" msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤੀ" -#: ../src/empathy-main-window.c:537 +#: ../src/empathy-main-window.c:538 msgid "Unknown error" msgstr "ਅਣਜਾਣ ਗਲਤੀ" -#: ../src/empathy-main-window.c:888 -msgid "Contact" -msgstr "ਸੰਪਰਕ" - -#: ../src/empathy-main-window.c:1220 +#: ../src/empathy-main-window.c:1218 msgid "Show and edit accounts" msgstr "ਅਕਾਊਂਟ ਵੇਖੋ ਅਤੇ ਸੋਧੋ" -#: ../src/empathy-main-window.ui.h:1 +#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:9 msgid "Contact List" msgstr "ਸੰਪਰਕ ਲਿਸਟ" #: ../src/empathy-main-window.ui.h:2 -#| msgid "Show Contacts on a Map" msgid "Contacts on a _Map" msgstr "ਨਕਸ਼ੇ ਉੱਤੇ ਸੰਪਰਕ(_M)" @@ -2038,7 +2148,6 @@ msgid "_Debug" msgstr "ਡੀਬੱਗ(_D)" #: ../src/empathy-main-window.ui.h:12 -#| msgid "File transfers" msgid "_File Transfers" msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)" @@ -2048,14 +2157,13 @@ msgstr "ਮੱਦਦ(_H)" #: ../src/empathy-main-window.ui.h:14 msgid "_Join..." -msgstr "ਦਾਖਲ(_J)..." +msgstr "ਜà©à¨†à¨‡à©°à¨¨(_J)..." #: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2 msgid "_New Conversation..." msgstr "ਨਵੀਂ ਗੱਲਬਾਤ(_N)..." #: ../src/empathy-main-window.ui.h:16 -#| msgid "Show _Offline Contacts" msgid "_Offline Contacts" msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ(_O)" @@ -2064,7 +2172,6 @@ msgid "_Personal Information" msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ(_P)" #: ../src/empathy-main-window.ui.h:19 -#| msgid "Previous Conversations" msgid "_Previous Conversations" msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)" @@ -2072,15 +2179,15 @@ msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)" msgid "_Room" msgstr "ਰੂਮ(_R)" -#: ../src/empathy-new-chatroom-dialog.c:332 +#: ../src/empathy-new-chatroom-dialog.c:331 msgid "Chat Room" msgstr "ਗੱਲਬਾਤ ਰੂਮ" -#: ../src/empathy-new-chatroom-dialog.c:348 +#: ../src/empathy-new-chatroom-dialog.c:347 msgid "Members" msgstr "ਮੈਂਬਰ" -#: ../src/empathy-new-chatroom-dialog.c:492 +#: ../src/empathy-new-chatroom-dialog.c:496 #, c-format msgctxt "" "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no " @@ -2096,21 +2203,21 @@ msgstr "" "ਪਾਸਵਰਡ ਲੋੜੀਦਾ: %s\n" "ਮੈਂਬਰ: %s" -#: ../src/empathy-new-chatroom-dialog.c:494 -#: ../src/empathy-new-chatroom-dialog.c:495 +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 msgid "Yes" msgstr "ਹਾਂ" -#: ../src/empathy-new-chatroom-dialog.c:494 -#: ../src/empathy-new-chatroom-dialog.c:495 +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 msgid "No" msgstr "ਨਹੀਂ" -#: ../src/empathy-new-chatroom-dialog.c:522 +#: ../src/empathy-new-chatroom-dialog.c:526 msgid "Could not start room listing" msgstr "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਸ਼à©à¨°à©‚ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" -#: ../src/empathy-new-chatroom-dialog.c:532 +#: ../src/empathy-new-chatroom-dialog.c:536 msgid "Could not stop room listing" msgstr "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਰੋਕਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" @@ -2140,185 +2247,206 @@ msgstr "ਰੂਮ ਲਿਸਟ" msgid "_Room:" msgstr "ਰੂਮ(_R):" -#: ../src/empathy-preferences.c:162 +#: ../src/empathy-preferences.c:161 msgid "Message received" msgstr "ਸà©à¨¨à©‡à¨¹à¨¾ ਮਿਲਿਆ" -#: ../src/empathy-preferences.c:163 +#: ../src/empathy-preferences.c:162 msgid "Message sent" msgstr "ਸà©à¨¨à©‡à¨¹à¨¾ à¨à©‡à¨œà¨¿à¨†" -#: ../src/empathy-preferences.c:164 +#: ../src/empathy-preferences.c:163 msgid "New conversation" msgstr "ਨਵੀਂ ਗੱਲਬਾਤ" -#: ../src/empathy-preferences.c:165 +#: ../src/empathy-preferences.c:164 msgid "Contact goes online" msgstr "ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਇਆ" -#: ../src/empathy-preferences.c:166 +#: ../src/empathy-preferences.c:165 msgid "Contact goes offline" msgstr "ਸੰਪਰਕ ਬੰਦ ਕਰ ਗਿਆ" -#: ../src/empathy-preferences.c:167 +#: ../src/empathy-preferences.c:166 msgid "Account connected" msgstr "ਅਕਾਊਂਟ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਕੀਤਾ" -#: ../src/empathy-preferences.c:168 +#: ../src/empathy-preferences.c:167 msgid "Account disconnected" msgstr "ਅਕਾਊਂਟ ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਬੰਦ ਹੋਇਆ" -#: ../src/empathy-preferences.c:435 +#: ../src/empathy-preferences.c:446 msgid "Language" msgstr "à¨à¨¾à¨¸à¨¼à¨¾" #: ../src/empathy-preferences.ui.h:1 -msgid "<b>Appearance</b>" -msgstr "<b>ਦਿੱਖ</b>" +msgid "Allow _GPS usage" +msgstr "_GPS ਵਰਤੋਂ ਮਨਜ਼ੂਰ" #: ../src/empathy-preferences.ui.h:2 -msgid "<b>Behavior</b>" -msgstr "<b>ਰਵੱਈਆ</b>" +msgid "Allow _cellphone usage" +msgstr "ਸੈਲ-ਫੋਨ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_C)" #: ../src/empathy-preferences.ui.h:3 -msgid "<b>Contact List</b>" -msgstr "<b>ਸੰਪਰਕ ਲਿਸਟ</b>" +msgid "Allow _network usage" +msgstr "ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_N)" #: ../src/empathy-preferences.ui.h:4 -msgid "<b>Enable spell checking for languages:</b>" -msgstr "<b>à¨à¨¾à¨¸à¨¼à¨¾à¨µà¨¾à¨‚ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:</b>" +#| msgid "<b>Appearance</b>" +msgid "Appearance" +msgstr "ਦਿੱਖ" #: ../src/empathy-preferences.ui.h:5 -#| msgid "<b>Settings</b>" -msgid "<b>Geoclue Settings</b>" -msgstr "<b>ਜੀਓ-ਕਲੂ ਸੈਟਿੰਗ</b>" +msgid "Automatically _connect on startup " +msgstr "ਸ਼à©à¨°à©‚ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਕਰੋ(_c)" #: ../src/empathy-preferences.ui.h:6 -msgid "<b>Play sound for events</b>" -msgstr "<b>ਘਟਨਾਵਾਂ ਲਈ ਸਾਊਂਡ ਚਲਾਓ</b>" +msgid "Avatars are user chosen images shown in the contact list" +msgstr "ਅਵਤਾਰ ਯੂਜ਼ਰਾਂ ਲਈ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚੋਂ ਚà©à¨£à©‡ ਚਿੱਤਰ ਹਨ" #: ../src/empathy-preferences.ui.h:7 -#| msgid "<b>Advanced</b>" -msgid "<b>Privacy</b>" -msgstr "<b>ਪਰਾਈਵੇਸੀ</b>" +#| msgid "<b>Behavior</b>" +msgid "Behavior" +msgstr "ਰਵੱਈਆ" #: ../src/empathy-preferences.ui.h:8 -msgid "" -"<small>Reduced location accuracy means that nothing more precise than your " -"city, state and country will be published. GPS coordinates will have a " -"random value added (±0.25°).</small>" -msgstr "" -"<small>ਟਿਕਾਣਾ ਸ਼à©à©±à¨§à¨¤à¨¾ ਘਟਾਉਣ ਦਾ ਮਤਲਬ ਹੈ ਕਿ ਤà©à¨¹à¨¾à¨¡à©‡ ਸ਼ਹਿਰ, ਸੂਬਾ ਅਤੇ ਦੇਸ਼ ਤੋਂ ਵੱਧ ਕà©à¨ ਵੀ ਵੇਖਾਇਆ " -"ਨਹੀਂ ਜਾਵੇਗਾ। GPS ਧà©à¨°à©‡ ਵਿੱਚ ਕà©à¨ ਰਲਵੇਂ ਮà©à©±à¨² ਸ਼ਾਮਲ ਕੀਤੇ ਜਾਣਗੇ (±0.25°)।</small>" - -#: ../src/empathy-preferences.ui.h:9 -msgid "" -"<small>The list of languages reflects only the languages for which you have " -"a dictionary installed.</small>" -msgstr "<small>à¨à¨¾à¨¸à¨¼à¨¾ ਦੀ ਲਿਸਟ ਵੇਖਾ ਰਿਹਾ ਹੈ, ਜਿੰਨà©à¨¹à¨¾à¨‚ ਲਈ ਤà©à¨¹à¨¾à¨¡à©‡ ਕੋਲ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।</small>" +msgid "Chat Th_eme:" +msgstr "ਗੱਲਬਾਤ ਥੀਮ(_e):" #: ../src/empathy-preferences.ui.h:10 -msgid "Allow _GPS usage" -msgstr "_GPS ਵਰਤੋਂ ਮਨਜ਼ੂਰ" +msgid "Disable notifications when _away or busy" +msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰà©à©±à¨à¨¿à¨†/ਰà©à¨à©€ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਰੱਖੋ(_a)" #: ../src/empathy-preferences.ui.h:11 -msgid "Allow _cellphone usage" -msgstr "ਸੈਲ-ਫੋਨ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_C)" +msgid "Disable sounds when _away or busy" +msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰà©à¨à¨¿à¨†/ਰà©à¨à©€ ਹੋਵਾਂ ਤਾਂ ਸਾਊਂਡ ਬੰਦ ਰੱਖੋ(_a)" #: ../src/empathy-preferences.ui.h:12 -msgid "Allow _network usage" -msgstr "ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_N)" +#| msgid "Enable notifications when the _chat is not focused" +msgid "Enable notifications when a contact comes online" +msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਆਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ" #: ../src/empathy-preferences.ui.h:13 -msgid "Automatically _connect on startup " -msgstr "ਸ਼à©à¨°à©‚ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕà©à¨¨à©ˆà¨•à¨Ÿ ਕਰੋ(_c)" +#| msgid "Enable notifications when the _chat is not focused" +msgid "Enable notifications when a contact goes offline" +msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਜਾਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ" #: ../src/empathy-preferences.ui.h:14 -msgid "Avatars are user chosen images shown in the contact list" -msgstr "ਅਵਤਾਰ ਯੂਜ਼ਰਾਂ ਲਈ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚੋਂ ਚà©à¨£à©‡ ਚਿੱਤਰ ਹਨ" +msgid "Enable notifications when the _chat is not focused" +msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ(_c)" #: ../src/empathy-preferences.ui.h:15 -msgid "Chat Th_eme:" -msgstr "ਗੱਲਬਾਤ ਥੀਮ(_e):" +#| msgid "<b>Enable spell checking for languages:</b>" +msgid "Enable spell checking for languages:" +msgstr "à¨à¨¾à¨¸à¨¼à¨¾à¨µà¨¾à¨‚ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:" #: ../src/empathy-preferences.ui.h:16 -msgid "Disable notifications when _away or busy" -msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰà©à©±à¨à¨¿à¨†/ਰà©à¨à©€ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਰੱਖੋ(_a)" +msgid "General" +msgstr "ਆਮ" #: ../src/empathy-preferences.ui.h:17 -msgid "Disable sounds when _away or busy" -msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰà©à¨à¨¿à¨†/ਰà©à¨à©€ ਹੋਵਾਂ ਤਾਂ ਸਾਊਂਡ ਬੰਦ ਰੱਖੋ(_a)" +#| msgid "<b>Geoclue Settings</b>" +msgid "Geoclue Settings" +msgstr "à¨à©‚ਗੋਲਿਕ-ਸà©à¨°à¨¾à¨— ਸੈਟਿੰਗ" #: ../src/empathy-preferences.ui.h:18 -msgid "Enable notifications when the _chat is not focused" -msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਦਿਓ(_c)" - -#: ../src/empathy-preferences.ui.h:19 -msgid "General" -msgstr "ਆਮ" - -#: ../src/empathy-preferences.ui.h:20 -#| msgid "<b>Location</b>" msgid "Location" msgstr "ਟਿਕਾਣਾ" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:19 msgid "Notifications" msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ" -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:20 +#| msgid "<b>Play sound for events</b>" +msgid "Play sound for events" +msgstr "ਘਟਨਾਵਾਂ ਲਈ ਸਾਊਂਡ ਚਲਾਓ" + +#: ../src/empathy-preferences.ui.h:21 msgid "Preferences" msgstr "ਪਸੰਦ" +#: ../src/empathy-preferences.ui.h:22 +#| msgid "<b>Privacy</b>" +msgid "Privacy" +msgstr "ਪਰਾਈਵੇਸੀ" + #: ../src/empathy-preferences.ui.h:23 +#| msgid "" +#| "<small>Reduced location accuracy means that nothing more precise than " +#| "your city, state and country will be published. GPS coordinates will " +#| "have a random value added (±0.25°).</small>" +msgid "" +"Reduced location accuracy means that nothing more precise than your city, " +"state and country will be published. GPS coordinates will have a random " +"value added (±0.25°)." +msgstr "" +"ਟਿਕਾਣਾ ਸ਼à©à©±à¨§à¨¤à¨¾ ਘਟਾਉਣ ਦਾ ਮਤਲਬ ਹੈ ਕਿ ਤà©à¨¹à¨¾à¨¡à©‡ ਸ਼ਹਿਰ, ਸੂਬਾ ਅਤੇ ਦੇਸ਼ ਤੋਂ ਵੱਧ ਕà©à¨ ਵੀ ਵੇਖਾਇਆ " +"ਨਹੀਂ ਜਾਵੇਗਾ। GPS ਧà©à¨°à©‡ ਵਿੱਚ ਕà©à¨ ਰਲਵੇਂ ਮà©à©±à¨² ਸ਼ਾਮਲ ਕੀਤੇ ਜਾਣਗੇ (±0.25°)।" + +#: ../src/empathy-preferences.ui.h:24 msgid "Show _avatars" msgstr "ਅਵਤਾਰ ਵੇਖੋ(_a)" -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:25 msgid "Show _smileys as images" msgstr "ਖà©à¨¸à¨¼ ਚਿੱਤਰਾਂ ਵਾਂਗ ਵੇਖੋ(_s)" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:26 msgid "Show co_mpact contact list" msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_m)" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:27 +#| msgid "_Show Contact List" +msgid "Show contact _list in rooms" +msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_l)" + +#: ../src/empathy-preferences.ui.h:28 msgid "Sort by _name" msgstr "ਨਾਂ ਨਾਲ ਲੜੀਬੱਧ(_n)" -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:29 msgid "Sort by s_tate" msgstr "ਹਾਲਤ ਨਾਲ ਲੜੀਬੱਧ(_t)" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:30 msgid "Sounds" msgstr "ਸਾਊਂਡ" -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:31 msgid "Spell Checking" msgstr "ਸ਼ਬਦਜੋੜ ਜਾਂਚ" -#: ../src/empathy-preferences.ui.h:30 +#: ../src/empathy-preferences.ui.h:32 +#| msgid "" +#| "<small>The list of languages reflects only the languages for which you " +#| "have a dictionary installed.</small>" +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." +msgstr "à¨à¨¾à¨¸à¨¼à¨¾ ਦੀ ਲਿਸਟ ਵੇਖਾ ਰਿਹਾ ਹੈ, ਜਿੰਨà©à¨¹à¨¾à¨‚ ਲਈ ਤà©à¨¹à¨¾à¨¡à©‡ ਕੋਲ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।" + +#: ../src/empathy-preferences.ui.h:33 msgid "Themes" msgstr "ਥੀਮ" -#: ../src/empathy-preferences.ui.h:31 +#: ../src/empathy-preferences.ui.h:34 msgid "_Enable bubble notifications" msgstr "ਬà©à¨²à¨¬à©à¨²à¨¾ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)" -#: ../src/empathy-preferences.ui.h:32 +#: ../src/empathy-preferences.ui.h:35 msgid "_Enable sound notifications" msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)" -#: ../src/empathy-preferences.ui.h:33 +#: ../src/empathy-preferences.ui.h:36 msgid "_Open new chats in separate windows" msgstr "ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲà©à¨¹à©‹(_O)" -#: ../src/empathy-preferences.ui.h:34 +#: ../src/empathy-preferences.ui.h:37 msgid "_Publish location to my contacts" msgstr "ਮੇਰੇ ਸੰਪਰਕਾਂ ਲਈ ਟਿਕਾਣਾ ਦੱਸੋ(_P)" -#: ../src/empathy-preferences.ui.h:35 +#: ../src/empathy-preferences.ui.h:38 msgid "_Reduce location accuracy" msgstr "ਟਿਕਾਣਾ ਸ਼à©à©±à¨§à¨¤à¨¾ ਘਟਾਓ(_R)" @@ -2354,76 +2482,99 @@ msgstr "gtk-leave-fullscreen" msgid "Contact Map View" msgstr "ਸੰਪਰਕ ਮੈਪ à¨à¨²à¨•" -#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1075 -#| msgid "Error:" +#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083 msgid "Error" msgstr "ਗਲਤੀ" -#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1069 -#| msgid "Croatian" +#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077 msgid "Critical" msgstr "ਨਾਜ਼à©à¨•" -#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1063 -#| msgid "Bearing:" +#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071 msgid "Warning" msgstr "ਚੇਤਾਵਨੀ" -#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1057 -#: ../src/empathy-debug-dialog.c:1105 -#| msgid "Message:" +#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065 +#: ../src/empathy-debug-dialog.c:1113 msgid "Message" msgstr "ਸà©à¨¨à©‡à¨¹à¨¾" -#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1051 +#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059 msgid "Info" msgstr "ਜਾਣਕਾਰੀ" -#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1045 +#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053 msgid "Debug" msgstr "ਡੀਬੱਗ" -#: ../src/empathy-debug-dialog.c:836 -#| msgid "State:" +#: ../src/empathy-debug-dialog.c:845 msgid "Save" msgstr "ਸੰà¨à¨¾à¨²à©‹" -#: ../src/empathy-debug-dialog.c:939 +#: ../src/empathy-debug-dialog.c:948 msgid "Debug Window" msgstr "ਡੀਬੱਗ ਵਿੰਡੋ" -#: ../src/empathy-debug-dialog.c:1013 +#: ../src/empathy-debug-dialog.c:1021 msgid "Pause" msgstr "ਵਿਰਾਮ" -#: ../src/empathy-debug-dialog.c:1025 +#: ../src/empathy-debug-dialog.c:1033 msgid "Level " msgstr "ਲੈਵਲ " -#: ../src/empathy-debug-dialog.c:1094 -#| msgid "Simple" +#: ../src/empathy-debug-dialog.c:1102 msgid "Time" msgstr "ਸਮਾਂ" -#: ../src/empathy-debug-dialog.c:1096 -#| msgid "Romanian" +#: ../src/empathy-debug-dialog.c:1104 msgid "Domain" msgstr "ਡੋਮੇਨ" -#: ../src/empathy-debug-dialog.c:1098 +#: ../src/empathy-debug-dialog.c:1106 msgid "Category" msgstr "ਕੈਟਾਗਰੀ" -#: ../src/empathy-debug-dialog.c:1100 +#: ../src/empathy-debug-dialog.c:1108 msgid "Level" msgstr "ਲੈਵਲ" -#: ../src/empathy-debug-dialog.c:1133 +#: ../src/empathy-debug-dialog.c:1140 msgid "" "The selected connection manager does not support the remote debugging " "extension." msgstr "ਚà©à¨£à¨¿à¨† ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਮੈਨੇਜਰ ਰਿਮੋਟ ਡੀਬੱਗ ਇਕਸਟੈਨਸ਼ਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।" +#~ msgid "<b>Network</b>" +#~ msgstr "<b>ਨੈੱਟਵਰਕ</b>" + +#~ msgid "<b>Servers</b>" +#~ msgstr "<b>ਸਰਵਰ</b>" + +#~ msgid "<b>Topic:</b>" +#~ msgstr "<b>ਵਿਸ਼ਾ:</b>" + +#~ msgid "<b>Contact</b>" +#~ msgstr "<b>ਸੰਪਰਕ</b>" + +#~ msgid "<b>Groups</b>" +#~ msgstr "<b>ਗਰà©à©±à¨ª</b>" + +#~ msgid "<b>New Account</b>" +#~ msgstr "<b>ਨਵਾਂ ਅਕਾਊਂਟ</b>" + +#~ msgid "I already have an account I want to use" +#~ msgstr "ਮੇਰੇ ਕੋਲ ਪਹਿਲਾਂ ਹੀ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਮੈਂ ਵਰਤਣਾ ਚਾਹà©à©°à¨¦à¨¾ ਹਾਂ" + +#~ msgid "New message from %s" +#~ msgstr "%s ਵਲੋਂ ਨਵਾਂ ਸà©à¨¨à©‡à¨¹à¨¾" + +#~ msgid "File transfers" +#~ msgstr "ਫਾਇਲ ਸੰਚਾਰ" + +#~ msgid "<b>Contact List</b>" +#~ msgstr "<b>ਸੰਪਰਕ ਲਿਸਟ</b>" + #~ msgctxt "file size" #~ msgid "Unknown" #~ msgstr "ਅਣਜਾਣ" @@ -2470,9 +2621,6 @@ msgstr "ਚà©à¨£à¨¿à¨† ਕà©à¨¨à©ˆà¨•à¨¸à¨¼à¨¨ ਮੈਨੇਜਰ ਰਿਮੋ #~ msgid "Forget password and clear the entry." #~ msgstr "ਪਾਸਵਰਡ à¨à©à©±à¨²à©‹ ਅਤੇ à¨à¨‚ਟਰੀ ਸਾਫ਼ ਕਰੋ।" -#~ msgid "Create a new IRC network" -#~ msgstr "ਇੱਕ ਨਵਾਂ IRC ਨੈੱਟਵਰਕ ਬਣਾਓ" - #~ msgid "Edit the selected IRC network" #~ msgstr "ਚà©à¨£à©‡ IRC ਨੈੱਟਵਰਕ ਸੋਧੋ" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-19 20:27+0100\n" -"PO-Revision-Date: 2009-02-19 00:38+0100\n" +"POT-Creation-Date: 2009-07-07 12:14+0200\n" +"PO-Revision-Date: 2009-07-07 15:38+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "MIME-Version: 1.0\n" @@ -32,23 +32,16 @@ msgid "Always open a separate chat window for new chats." msgstr "Öppna alltid ett separat fönster för nya chattar." #: ../data/empathy.schemas.in.h:2 -msgid "" -"Character to add after nickname when using nick completion (tab) in group " -"chat." -msgstr "" -"Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) " -"används i gruppchatt." +msgid "Character to add after nickname when using nick completion (tab) in group chat." +msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt." #: ../data/empathy.schemas.in.h:3 msgid "Chat window theme" msgstr "Chattfönstertema" #: ../data/empathy.schemas.in.h:4 -msgid "" -"Comma separated list of spell checker languages to use (e.g. en, fr, nl)." -msgstr "" -"Kommaseparerad lista av sprÃ¥k att använda för stavningskontroll (tex en, fr, " -"nl)." +msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)." +msgstr "Kommaseparerad lista av sprÃ¥k att använda för stavningskontroll (tex en, fr, nl)." #: ../data/empathy.schemas.in.h:5 msgid "Compact contact list" @@ -71,1002 +64,1253 @@ msgid "Disable sounds when away" msgstr "Inaktivera ljud under frÃ¥nvaro" #: ../data/empathy.schemas.in.h:10 +msgid "Empathy can publish the user's location" +msgstr "Empathy kan publicera användarens plats" + +#: ../data/empathy.schemas.in.h:11 +msgid "Empathy can use the GPS to guess the location" +msgstr "Empathy kan använda GPS:en för att gissa platsen" + +#: ../data/empathy.schemas.in.h:12 +msgid "Empathy can use the cellular network to guess the location" +msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen" + +#: ../data/empathy.schemas.in.h:13 +msgid "Empathy can use the network to guess the location" +msgstr "Empathy kan använda nätverket för att gissa platsen" + +#: ../data/empathy.schemas.in.h:14 msgid "Empathy default download folder" msgstr "Standardhämtningsmapp för Empathy" -#: ../data/empathy.schemas.in.h:11 +#: ../data/empathy.schemas.in.h:15 msgid "Empathy has asked about importing accounts" msgstr "Empathy har frÃ¥gat om att importera konton" -#: ../data/empathy.schemas.in.h:12 +#: ../data/empathy.schemas.in.h:16 msgid "Empathy should auto-connect on startup" msgstr "Empathy ska ansluta automatiskt vid uppstart" -#: ../data/empathy.schemas.in.h:13 +#: ../data/empathy.schemas.in.h:17 +msgid "Empathy should reduce the location's accuracy" +msgstr "Empathy bör minska precisionen för platsen" + +#: ../data/empathy.schemas.in.h:18 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "Empathy ska använda avataren för kontakten som chattfönsterikon" -#: ../data/empathy.schemas.in.h:14 +#: ../data/empathy.schemas.in.h:19 msgid "Enable popup notifications for new messages" msgstr "Aktivera popupnotifieringar för nya meddelanden" -#: ../data/empathy.schemas.in.h:15 +#: ../data/empathy.schemas.in.h:20 msgid "Enable spell checker" msgstr "Aktivera stavningskontroll" # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man nÃ¥got för att det # inte ska hittas, döljer gör man för att det inte ska synas. -#: ../data/empathy.schemas.in.h:16 +#: ../data/empathy.schemas.in.h:21 msgid "Hide main window" msgstr "Dölj huvudfönstret" # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man nÃ¥got för att det # inte ska hittas, döljer gör man för att det inte ska synas. -#: ../data/empathy.schemas.in.h:17 +#: ../data/empathy.schemas.in.h:22 msgid "Hide the main window." msgstr "Dölj huvudfönstret." -#: ../data/empathy.schemas.in.h:18 +#: ../data/empathy.schemas.in.h:23 msgid "NetworkManager should be used" msgstr "NetworkManager ska användas" -#: ../data/empathy.schemas.in.h:19 +#: ../data/empathy.schemas.in.h:24 msgid "Nick completed character" msgstr "Tecken för smeknamnskomplettering" -#: ../data/empathy.schemas.in.h:20 +#: ../data/empathy.schemas.in.h:25 msgid "Open new chats in separate windows" msgstr "Öppna nya chattar i separata fönster" -#: ../data/empathy.schemas.in.h:21 +#: ../data/empathy.schemas.in.h:26 +msgid "Path of the adium theme to use" +msgstr "Sökväg för adium-temat att använda" + +#: ../data/empathy.schemas.in.h:27 +msgid "Path of the adium theme to use if the theme used for chat is adium." +msgstr "Sökväg för adium-temat som ska användas om temat som används för chatt är adium." + +#: ../data/empathy.schemas.in.h:28 msgid "Play a sound for incoming messages" msgstr "Spela upp ljud för inkommande meddelanden" -#: ../data/empathy.schemas.in.h:22 +#: ../data/empathy.schemas.in.h:29 msgid "Play a sound for new conversations" msgstr "Spela upp ett ljud för nya samtal" -#: ../data/empathy.schemas.in.h:23 +#: ../data/empathy.schemas.in.h:30 msgid "Play a sound for outgoing messages" msgstr "Spela upp ljud för utgÃ¥ende meddelanden" -#: ../data/empathy.schemas.in.h:24 +#: ../data/empathy.schemas.in.h:31 msgid "Play a sound when a contact logs in" msgstr "Spela upp ljud när en kontakt loggar in" -#: ../data/empathy.schemas.in.h:25 +#: ../data/empathy.schemas.in.h:32 msgid "Play a sound when a contact logs out" msgstr "Spela upp ett ljud när en kontakt loggar ut" -#: ../data/empathy.schemas.in.h:26 +#: ../data/empathy.schemas.in.h:33 msgid "Play a sound when we log in" msgstr "Spela upp ljud när vi loggar in" -#: ../data/empathy.schemas.in.h:27 +#: ../data/empathy.schemas.in.h:34 msgid "Play a sound when we log out" msgstr "Spela upp ljud när vi loggar ut" -#: ../data/empathy.schemas.in.h:28 +#: ../data/empathy.schemas.in.h:35 msgid "Popup notifications if the chat isn't focused" msgstr "Visa popupnotifieringar om chatten inte är fokuserad" -#: ../data/empathy.schemas.in.h:29 +#: ../data/empathy.schemas.in.h:36 +msgid "Popup notifications when a contact sign in" +msgstr "Visa popupnotifieringar när en kontakt loggar in" + +#: ../data/empathy.schemas.in.h:37 +msgid "Popup notifications when a contact sign out" +msgstr "Visa popupnotifieringar när en kontakt loggar ut" + +#: ../data/empathy.schemas.in.h:38 msgid "Salut account is created" msgstr "Salut-konto har skapats" -#: ../data/empathy.schemas.in.h:30 +#: ../data/empathy.schemas.in.h:39 msgid "Show avatars" msgstr "Visa avatarer" -#: ../data/empathy.schemas.in.h:31 +#: ../data/empathy.schemas.in.h:40 +msgid "Show contact list in rooms" +msgstr "Visa kontaktlista i rum" + +#: ../data/empathy.schemas.in.h:41 msgid "Show hint about closing the main window" msgstr "Visa tips om att stänga huvudfönstret" -#: ../data/empathy.schemas.in.h:32 +#: ../data/empathy.schemas.in.h:42 msgid "Show offline contacts" msgstr "Visa frÃ¥nkopplade kontakter" -#: ../data/empathy.schemas.in.h:33 +#: ../data/empathy.schemas.in.h:43 msgid "Spell checking languages" msgstr "RättstavningssprÃ¥k" -#: ../data/empathy.schemas.in.h:34 +#: ../data/empathy.schemas.in.h:44 msgid "The default folder to save file transfers in." msgstr "Standardmappen att spara filöverföringar i." -#: ../data/empathy.schemas.in.h:35 +#: ../data/empathy.schemas.in.h:45 msgid "The last directory that an avatar image was chosen from." msgstr "Den senaste katalogen som en avatarbild valdes frÃ¥n." -#: ../data/empathy.schemas.in.h:36 +#: ../data/empathy.schemas.in.h:46 msgid "The theme that is used to display the conversation in chat windows." msgstr "Det tema som används för att visa samtal i chattfönster." -#: ../data/empathy.schemas.in.h:37 +#: ../data/empathy.schemas.in.h:47 msgid "Use graphical smileys" msgstr "Använd grafiska smilisar" -#: ../data/empathy.schemas.in.h:38 +#: ../data/empathy.schemas.in.h:48 msgid "Use notification sounds" msgstr "Använd notifieringsljud" -#: ../data/empathy.schemas.in.h:39 +#: ../data/empathy.schemas.in.h:49 msgid "Use theme for chat rooms" msgstr "Använd tema för chattrum" -#: ../data/empathy.schemas.in.h:40 -msgid "" -"Whether or not Empathy has asked about importing accounts from other " -"programs." -msgstr "" -"Huruvida Empathy har frÃ¥gat om att importera konton frÃ¥n andra program eller " -"inte." +#: ../data/empathy.schemas.in.h:50 +msgid "Whether or not Empathy can publish the user's location to his contacts." +msgstr "Huruvida Empathy kan publicera användarens plats till kontakter eller inte." -#: ../data/empathy.schemas.in.h:41 -msgid "" -"Whether or not Empathy should automatically log in to your accounts on " -"startup." -msgstr "" -"Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart eller " -"inte." +#: ../data/empathy.schemas.in.h:51 +msgid "Whether or not Empathy can use the GPS to guess the location." +msgstr "Huruvida Empathy kan använda GPS:en för att gissa platsen eller inte." -#: ../data/empathy.schemas.in.h:42 -msgid "" -"Whether or not Empathy should use the avatar of the contact as the chat " -"window icon." -msgstr "" -"Huruvida Empathy ska använda avataren för kontakten som chattfönsterikon " -"eller inte." +#: ../data/empathy.schemas.in.h:52 +msgid "Whether or not Empathy can use the cellular network to guess the location." +msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen eller inte." -#: ../data/empathy.schemas.in.h:43 -msgid "" -"Whether or not the Salut account has been created on the first Empathy run." -msgstr "" -"Huruvida Salut-kontot har skapats eller inte vid första starten av Empathy." +#: ../data/empathy.schemas.in.h:53 +msgid "Whether or not Empathy can use the network to guess the location." +msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen eller inte." -#: ../data/empathy.schemas.in.h:44 -msgid "" -"Whether or not the network manager should be used to automatically " -"disconnect/reconnect." -msgstr "" -"Huruvida nätverkshanteraren ska användas för att automatiskt koppla frÃ¥n/" -"Ã¥teransluta eller inte." +#: ../data/empathy.schemas.in.h:54 +msgid "Whether or not Empathy has asked about importing accounts from other programs." +msgstr "Huruvida Empathy har frÃ¥gat om att importera konton frÃ¥n andra program eller inte." -#: ../data/empathy.schemas.in.h:45 -msgid "" -"Whether or not to check words typed against the languages you want to check " -"with." +#: ../data/empathy.schemas.in.h:55 +msgid "Whether or not Empathy should automatically log in to your accounts on startup." +msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart eller inte." + +#: ../data/empathy.schemas.in.h:56 +msgid "Whether or not Empathy should reduce the location's accuracy for privacy reasons." +msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl eller inte." + +#: ../data/empathy.schemas.in.h:57 +msgid "Whether or not Empathy should use the avatar of the contact as the chat window icon." +msgstr "Huruvida Empathy ska använda avataren för kontakten som chattfönsterikon eller inte." + +#: ../data/empathy.schemas.in.h:58 +msgid "Whether or not the Salut account has been created on the first Empathy run." +msgstr "Huruvida Salut-kontot har skapats eller inte vid första starten av Empathy." + +#: ../data/empathy.schemas.in.h:59 +msgid "Whether or not the network manager should be used to automatically disconnect/reconnect." +msgstr "Huruvida nätverkshanteraren ska användas för att automatiskt koppla frÃ¥n/Ã¥teransluta eller inte." + +#: ../data/empathy.schemas.in.h:60 +msgid "Whether or not to check words typed against the languages you want to check with." msgstr "Huruvida ord som skrivs ska kontrolleras mot sprÃ¥ken du valt." -#: ../data/empathy.schemas.in.h:46 -msgid "" -"Whether or not to convert smileys into graphical images in conversations." -msgstr "" -"Huruvida smilisar ska omvandlas till grafiska bilder eller inte i samtal." +#: ../data/empathy.schemas.in.h:61 +msgid "Whether or not to convert smileys into graphical images in conversations." +msgstr "Huruvida smilisar ska omvandlas till grafiska bilder eller inte i samtal." -#: ../data/empathy.schemas.in.h:47 -msgid "" -"Whether or not to play a sound to notify for contacts logging in the network." -msgstr "" -"Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar in i " -"nätverket." +#: ../data/empathy.schemas.in.h:62 +msgid "Whether or not to play a sound to notify for contacts logging in the network." +msgstr "Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar in i nätverket." -#: ../data/empathy.schemas.in.h:48 -msgid "" -"Whether or not to play a sound to notify for contacts logging off the " -"network." -msgstr "" -"Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar ut frÃ¥n " -"nätverket." +#: ../data/empathy.schemas.in.h:63 +msgid "Whether or not to play a sound to notify for contacts logging off the network." +msgstr "Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar ut frÃ¥n nätverket." -#: ../data/empathy.schemas.in.h:49 +#: ../data/empathy.schemas.in.h:64 msgid "Whether or not to play a sound to notify for events." -msgstr "" -"Huruvida ett ljud ska spelas upp eller inte för att notifiera om händelser." +msgstr "Huruvida ett ljud ska spelas upp eller inte för att notifiera om händelser." -#: ../data/empathy.schemas.in.h:50 +#: ../data/empathy.schemas.in.h:65 msgid "Whether or not to play a sound to notify for incoming messages." -msgstr "" -"Huruvida ett ljud ska spelas upp eller inte för inkommande meddelanden." +msgstr "Huruvida ett ljud ska spelas upp eller inte för inkommande meddelanden." -#: ../data/empathy.schemas.in.h:51 +#: ../data/empathy.schemas.in.h:66 msgid "Whether or not to play a sound to notify for new conversations." msgstr "Huruvida ett ljud ska spelas upp eller inte för nya samtal." -#: ../data/empathy.schemas.in.h:52 +#: ../data/empathy.schemas.in.h:67 msgid "Whether or not to play a sound to notify for outgoing messages." msgstr "Huruvida ett ljud ska spelas upp eller inte för utgÃ¥ende meddelanden." -#: ../data/empathy.schemas.in.h:53 +#: ../data/empathy.schemas.in.h:68 msgid "Whether or not to play a sound when logging in a network." -msgstr "" -"Huruvida ett ljud ska spelas upp eller inte vid inloggning i ett nätverk." +msgstr "Huruvida ett ljud ska spelas upp eller inte vid inloggning i ett nätverk." -#: ../data/empathy.schemas.in.h:54 +#: ../data/empathy.schemas.in.h:69 msgid "Whether or not to play a sound when logging off a network." -msgstr "" -"Huruvida ett ljud ska spelas upp eller inte vid utloggning frÃ¥n ett nätverk." +msgstr "Huruvida ett ljud ska spelas upp eller inte vid utloggning frÃ¥n ett nätverk." -#: ../data/empathy.schemas.in.h:55 +#: ../data/empathy.schemas.in.h:70 msgid "Whether or not to play sound notifications when away or busy." -msgstr "" -"Huruvida ljudnotifieringar ska spelas upp eller inte vid frÃ¥nvaro eller " -"upptagen." +msgstr "Huruvida ljudnotifieringar ska spelas upp eller inte vid frÃ¥nvaro eller upptagen." -#: ../data/empathy.schemas.in.h:56 -msgid "" -"Whether or not to show a popup notification when receiving a new message " -"even if the chat is already opened, but not focused." -msgstr "" -"Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, " -"även om chatten redan är öppnad, men inte fokuserad." +#: ../data/empathy.schemas.in.h:71 +msgid "Whether or not to show a popup notification when a contact goes offline." +msgstr "Huruvida popupnotifieringar ska visas eller inte när en kontakt kopplar frÃ¥n." -#: ../data/empathy.schemas.in.h:57 -msgid "" -"Whether or not to show a popup notification when receiving a new message." -msgstr "" -"Huruvida en popupnotifiering ska visas eller inte när ett nytt meddelande " -"tas emot." +#: ../data/empathy.schemas.in.h:72 +msgid "Whether or not to show a popup notification when a contact goes online." +msgstr "Huruvida popupnotifieringar ska visas eller inte när en kontakt ansluter." -#: ../data/empathy.schemas.in.h:58 -msgid "" -"Whether or not to show avatars for contacts in the contact list and chat " -"windows." -msgstr "" -"Huruvida avatarer ska visas i kontaktlistan och chattfönster eller inte." +#: ../data/empathy.schemas.in.h:73 +msgid "Whether or not to show a popup notification when receiving a new message even if the chat is already opened, but not focused." +msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad." -#: ../data/empathy.schemas.in.h:59 +#: ../data/empathy.schemas.in.h:74 +msgid "Whether or not to show a popup notification when receiving a new message." +msgstr "Huruvida en popupnotifiering ska visas eller inte när ett nytt meddelande tas emot." + +#: ../data/empathy.schemas.in.h:75 +msgid "Whether or not to show avatars for contacts in the contact list and chat windows." +msgstr "Huruvida avatarer ska visas i kontaktlistan och chattfönster eller inte." + +#: ../data/empathy.schemas.in.h:76 msgid "Whether or not to show contacts that are offline in the contact list." msgstr "Huruvida frÃ¥nkopplade kontakter ska visas i kontaktlistan eller inte." -#: ../data/empathy.schemas.in.h:60 +#: ../data/empathy.schemas.in.h:77 msgid "Whether or not to show popup notifications when away or busy." -msgstr "" -"Huruvida popupnotifieringar ska visas eller inte under frÃ¥nvaro eller " -"upptagen." +msgstr "Huruvida popupnotifieringar ska visas eller inte under frÃ¥nvaro eller upptagen." -#: ../data/empathy.schemas.in.h:61 -msgid "" -"Whether or not to show the message dialog about closing the main window with " -"the 'x' button in the title bar." -msgstr "" -"Huruvida meddelandedialogen om att stänga huvudfönstret ska visas eller inte " -"när man klickar pÃ¥ \"x\"-knappen i titelraden." +#: ../data/empathy.schemas.in.h:78 +msgid "Whether or not to show the contact list in chat rooms." +msgstr "Huruvida kontaktlistan ska visas i chattrum eller inte." -#: ../data/empathy.schemas.in.h:62 +#: ../data/empathy.schemas.in.h:79 +msgid "Whether or not to show the message dialog about closing the main window with the 'x' button in the title bar." +msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas eller inte när man klickar pÃ¥ \"x\"-knappen i titelraden." + +#: ../data/empathy.schemas.in.h:80 msgid "Whether to show the contact list in compact mode or not." msgstr "Huruvida kontaktlistan ska visas i kompakt läge eller inte." -#: ../data/empathy.schemas.in.h:63 +#: ../data/empathy.schemas.in.h:81 msgid "Whether to use the theme for chat rooms or not." msgstr "Huruvida tema ska användas för chattrum eller inte." -#: ../data/empathy.schemas.in.h:64 -msgid "" -"Which criterium to use when sorting the contact list. Default is to use sort " -"by the contact's name with the value \"name\". A value of \"state\" will " -"sort the contact list by state." -msgstr "" -"Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att " -"sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer " -"att sortera kontaktlistan efter tillstÃ¥nd." +#: ../data/empathy.schemas.in.h:82 +msgid "Which criterium to use when sorting the contact list. Default is to use sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state." +msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstÃ¥nd." + +#: ../libempathy/empathy-ft-handler.c:838 +msgid "The hash of the received file and the sent one do not match" +msgstr "Hashsumman för den mottagna filen och den som skickades stämmer inte överens" + +#: ../libempathy/empathy-ft-handler.c:1098 +msgid "File transfer not supported by remote contact" +msgstr "Filöverföringar stöds inte fjärrkontakten" -#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269 +#: ../libempathy/empathy-ft-handler.c:1156 +msgid "The selected file is not a regular file" +msgstr "Den valda filen är inte en vanlig fil" + +#: ../libempathy/empathy-ft-handler.c:1165 +msgid "The selected file is empty" +msgstr "Den valda filen är tom" + +#: ../libempathy/empathy-tp-contact-list.c:757 +#: ../src/empathy.c:289 msgid "People nearby" msgstr "Personer i närheten" -#: ../libempathy/empathy-utils.c:252 +#: ../libempathy/empathy-tp-file.c:279 +msgid "Socket type not supported" +msgstr "Uttagstypen stöds inte" + +#: ../libempathy/empathy-tp-file.c:398 +msgid "No reason was specified" +msgstr "Ingen anledning angavs" + +#: ../libempathy/empathy-tp-file.c:401 +msgid "The change in state was requested" +msgstr "Ändring i tillstÃ¥nd begärdes" + +#: ../libempathy/empathy-tp-file.c:404 +msgid "You canceled the file transfer" +msgstr "Du avbröt filöverföringen" + +#: ../libempathy/empathy-tp-file.c:407 +msgid "The other participant canceled the file transfer" +msgstr "Den andra deltagaren avbröt filöverföringen" + +#: ../libempathy/empathy-tp-file.c:410 +msgid "Error while trying to transfer the file" +msgstr "Fel vid försök att överföra filen" + +#: ../libempathy/empathy-tp-file.c:413 +msgid "The other participant is unable to transfer the file" +msgstr "Den andra deltagaren kunde inte överföra filen" + +#: ../libempathy/empathy-tp-file.c:416 +msgid "Unknown reason" +msgstr "Okänd anledning" + +#: ../libempathy/empathy-utils.c:265 msgid "Available" msgstr "Tillgänglig" -#: ../libempathy/empathy-utils.c:254 +#: ../libempathy/empathy-utils.c:267 msgid "Busy" msgstr "Upptagen" -#: ../libempathy/empathy-utils.c:257 +#: ../libempathy/empathy-utils.c:270 msgid "Away" msgstr "FrÃ¥nvarande" -#: ../libempathy/empathy-utils.c:259 +#: ../libempathy/empathy-utils.c:272 msgid "Hidden" msgstr "Dold" -#: ../libempathy/empathy-utils.c:262 +#: ../libempathy/empathy-utils.c:274 msgid "Offline" msgstr "FrÃ¥nkopplad" -#: ../libempathy-gtk/empathy-account-chooser.c:326 +#: ../libempathy/empathy-time.c:137 +#, c-format +msgid "%d second ago" +msgid_plural "%d seconds ago" +msgstr[0] "%d sekund sedan" +msgstr[1] "%d sekunder sedan" + +#: ../libempathy/empathy-time.c:142 +#, c-format +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "%d minut sedan" +msgstr[1] "%d minuter sedan" + +#: ../libempathy/empathy-time.c:147 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "%d timme sedan" +msgstr[1] "%d timmar sedan" + +#: ../libempathy/empathy-time.c:152 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d dag sedan" +msgstr[1] "%d dagar sedan" + +#: ../libempathy/empathy-time.c:157 +#, c-format +msgid "%d week ago" +msgid_plural "%d weeks ago" +msgstr[0] "%d vecka sedan" +msgstr[1] "%d veckor sedan" + +#: ../libempathy/empathy-time.c:162 +#, c-format +msgid "%d month ago" +msgid_plural "%d months ago" +msgstr[0] "%d mÃ¥nad sedan" +msgstr[1] "%d mÃ¥nader sedan" + +#: ../libempathy/empathy-time.c:167 +msgid "in the future" +msgstr "i framtiden" + +#: ../libempathy-gtk/empathy-account-chooser.c:419 msgid "All" msgstr "Alla" #: ../libempathy-gtk/empathy-account-widget.c:302 -#: ../libempathy-gtk/empathy-account-widget.c:347 +#: ../libempathy-gtk/empathy-account-widget.c:354 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1 -msgid "<b>Advanced</b>" -msgstr "<b>Avancerat</b>" - -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2 -msgid "Forget password and clear the entry." -msgstr "Glöm lösenordet och töm inmatningen." - -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 +msgid "Advanced" +msgstr "Avancerat" + +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 msgid "Pass_word:" msgstr "L_ösenord:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3 msgid "Screen _Name:" msgstr "Skärm_namn:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "_Port:" msgstr "_Port:" -#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10 -#: ../src/empathy-new-chatroom-dialog.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 +#: ../src/empathy-new-chatroom-dialog.ui.h:9 msgid "_Server:" msgstr "_Server:" -#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3 -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4 -#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 msgid "Login I_D:" msgstr "Inloggningsi_d:" -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 msgid "ICQ _UIN:" msgstr "ICQ _UIN:" -#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5 -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "_Charset:" msgstr "Tec_kenuppsättning:" -#: ../libempathy-gtk/empathy-account-widget-irc.c:245 +#: ../libempathy-gtk/empathy-account-widget-irc.c:240 msgid "New Network" msgstr "Nytt nätverk" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1 -msgid "<b>Network</b>" -msgstr "<b>Nätverk</b>" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2 -msgid "<b>Servers</b>" -msgstr "<b>Servrar</b>" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 msgid "Charset:" msgstr "Teckenuppsättning:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4 -msgid "Create a new IRC network" -msgstr "Skapa ett nytt irc-nätverk" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5 -msgid "Edit the selected IRC network" -msgstr "Redigera markerat irc-nätverk" - -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 msgid "Network" msgstr "Nätverk" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 msgid "Network:" msgstr "Nätverk:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 msgid "Nickname:" msgstr "Smeknamn:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "Password:" msgstr "Lösenord:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Quit message:" msgstr "Avslutningsmeddelande:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Real name:" msgstr "Verkligt namn:" -#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12 -msgid "Remove the selected IRC network" -msgstr "Ta bort markerat irc-nätverk" +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +msgid "Servers" +msgstr "Servrar" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2 -msgid "<b>Override server settings</b>" -msgstr "<b>Ã…sidosätt serverinställningar</b>" +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 +msgid "Override server settings" +msgstr "Ã…sidosätt serverinställningar" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 msgid "Pri_ority:" msgstr "Pri_oritet:" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "Reso_urce:" msgstr "_Resurs:" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7 msgid "Use old SS_L" msgstr "Använd gammal SS_L" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8 msgid "_Encryption required (TLS/SSL)" msgstr "_Kryptering krävs (TLS/SSL)" -#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 msgid "_Ignore SSL certificate errors" msgstr "_Ignorera SSL-certifikatfel" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2 msgid "_Email:" msgstr "_E-post:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3 msgid "_First Name:" msgstr "_Förnamn:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4 msgid "_Jabber ID:" msgstr "_Jabber-id:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5 msgid "_Last Name:" msgstr "_Efternamn:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6 -#: ../src/empathy-chatrooms-window.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6 msgid "_Nickname:" msgstr "Smek_namn:" -#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7 msgid "_Published Name:" msgstr "_Publikt namn:" #. look up the DNS SRV record at the service's domain for the host name of a STUN server. -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 msgid "Discover STUN" msgstr "Upptäck STUN" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 msgid "STUN Server:" msgstr "STUN-server:" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 msgid "STUN port:" msgstr "STUN-port:" -#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 msgid "_Username:" msgstr "A_nvändarnamn:" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 msgid "Use _Yahoo Japan" msgstr "Använd _Yahoo Japan" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 msgid "Yahoo I_D:" msgstr "Yahoo-I_D:" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 msgid "_Ignore conference and chatroom invitations" msgstr "_Ignorera inbjudningar till konferenser och chattrum" -#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9 +#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 msgid "_Room List locale:" msgstr "Lokalanpassning för _rumslista:" -#: ../libempathy-gtk/empathy-avatar-chooser.c:462 -#: ../libempathy-gtk/empathy-avatar-chooser.c:537 +#: ../libempathy-gtk/empathy-avatar-chooser.c:449 +#: ../libempathy-gtk/empathy-avatar-chooser.c:525 msgid "Couldn't convert image" msgstr "Kunde inte konvertera bild" -#: ../libempathy-gtk/empathy-avatar-chooser.c:463 +#: ../libempathy-gtk/empathy-avatar-chooser.c:450 msgid "None of the accepted image formats is supported on your system" msgstr "Inga av de accepterade bildformaten stöds pÃ¥ ditt system" -#: ../libempathy-gtk/empathy-avatar-chooser.c:956 +#: ../libempathy-gtk/empathy-avatar-chooser.c:933 msgid "Select Your Avatar Image" msgstr "Välj din avatarbild" -#: ../libempathy-gtk/empathy-avatar-chooser.c:959 +#: ../libempathy-gtk/empathy-avatar-chooser.c:936 msgid "No Image" msgstr "Ingen bild" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1021 +#: ../libempathy-gtk/empathy-avatar-chooser.c:998 msgid "Images" msgstr "Bilder" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1025 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1002 msgid "All Files" msgstr "Alla filer" -#: ../libempathy-gtk/empathy-avatar-image.c:294 +#: ../libempathy-gtk/empathy-avatar-image.c:324 msgid "Click to enlarge" msgstr "Klicka för att förstora" -#: ../libempathy-gtk/empathy-chat.c:507 +#: ../libempathy-gtk/empathy-chat.c:186 +msgid "Failed to reconnect this chat" +msgstr "Misslyckades med att Ã¥teransluta till denna chatt" + +#: ../libempathy-gtk/empathy-chat.c:404 +msgid "Unsupported command" +msgstr "Kommandot stöds inte" + +#: ../libempathy-gtk/empathy-chat.c:539 msgid "offline" msgstr "frÃ¥nkopplad" -#: ../libempathy-gtk/empathy-chat.c:510 +#: ../libempathy-gtk/empathy-chat.c:542 msgid "invalid contact" msgstr "ogiltig kontakt" -#: ../libempathy-gtk/empathy-chat.c:513 +#: ../libempathy-gtk/empathy-chat.c:545 msgid "permission denied" msgstr "Ã¥tkomst nekad" -#: ../libempathy-gtk/empathy-chat.c:516 +#: ../libempathy-gtk/empathy-chat.c:548 msgid "too long message" msgstr "för lÃ¥ngt meddelande" -#: ../libempathy-gtk/empathy-chat.c:519 +#: ../libempathy-gtk/empathy-chat.c:551 msgid "not implemented" msgstr "inte implementerat" -#: ../libempathy-gtk/empathy-chat.c:522 +#: ../libempathy-gtk/empathy-chat.c:554 msgid "unknown" msgstr "okänt" -#: ../libempathy-gtk/empathy-chat.c:526 +#: ../libempathy-gtk/empathy-chat.c:558 #, c-format msgid "Error sending message '%s': %s" msgstr "Fel vid sändning av meddelandet \"%s\": %s" -#: ../libempathy-gtk/empathy-chat.c:556 +#: ../libempathy-gtk/empathy-chat.c:588 #, c-format msgid "Topic set to: %s" msgstr "Ämnet inställt till: %s" -#: ../libempathy-gtk/empathy-chat.c:558 +#: ../libempathy-gtk/empathy-chat.c:590 msgid "No topic defined" msgstr "Inget ämne definierat" -#: ../libempathy-gtk/empathy-chat.c:973 +#: ../libempathy-gtk/empathy-chat.c:959 +msgid "(No Suggestions)" +msgstr "(Inga förslag)" + +#: ../libempathy-gtk/empathy-chat.c:1013 msgid "Insert Smiley" msgstr "Infoga smilis" #. send button -#: ../libempathy-gtk/empathy-chat.c:991 -#: ../libempathy-gtk/empathy-ui-utils.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1031 +#: ../libempathy-gtk/empathy-ui-utils.c:1475 msgid "_Send" msgstr "_Skicka" -#: ../libempathy-gtk/empathy-chat.c:1025 -msgid "_Check Word Spelling..." -msgstr "_Kontrollera stavning..." +#: ../libempathy-gtk/empathy-chat.c:1065 +msgid "_Spelling Suggestions" +msgstr "Sta_vningsförslag" -#: ../libempathy-gtk/empathy-chat.c:1131 +#: ../libempathy-gtk/empathy-chat.c:1180 #, c-format -msgid "%s has joined the room" -msgstr "%s har gÃ¥tt in i rummet" +msgid "%s has disconnected" +msgstr "%s har kopplat frÃ¥n" + +#: ../libempathy-gtk/empathy-chat.c:1184 +#, c-format +msgid "%s was kicked by %s" +msgstr "%s sparkades ut av %s" + +#: ../libempathy-gtk/empathy-chat.c:1187 +#, c-format +msgid "%s was kicked" +msgstr "%s sparkades ut" + +#: ../libempathy-gtk/empathy-chat.c:1192 +#, c-format +msgid "%s was banned by %s" +msgstr "%s blev bannlyst av %s" -#: ../libempathy-gtk/empathy-chat.c:1134 +#: ../libempathy-gtk/empathy-chat.c:1195 +#, c-format +msgid "%s was banned" +msgstr "%s blev bannlyst" + +#: ../libempathy-gtk/empathy-chat.c:1199 #, c-format msgid "%s has left the room" msgstr "%s har lämnat rummet" -#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548 +#. Note to translators: this string is appended to +#. * notifications like "foo has left the room", with the message +#. * given by the user living the room. If this poses a problem, +#. * please let us know. :-) +#. +#: ../libempathy-gtk/empathy-chat.c:1208 +#, c-format +msgid " (%s)" +msgstr " (%s)" + +#: ../libempathy-gtk/empathy-chat.c:1231 +#, c-format +msgid "%s has joined the room" +msgstr "%s har gÃ¥tt in i rummet" + +#: ../libempathy-gtk/empathy-chat.c:1364 +#: ../src/empathy-call-window.c:1226 msgid "Disconnected" msgstr "FrÃ¥nkopplad" -#: ../libempathy-gtk/empathy-chat.c:1644 +#: ../libempathy-gtk/empathy-chat.c:1793 msgid "Connected" msgstr "Ansluten" -#: ../libempathy-gtk/empathy-chat.c:1694 -#: ../libempathy-gtk/empathy-log-window.c:505 +#: ../libempathy-gtk/empathy-chat.c:1843 +#: ../libempathy-gtk/empathy-log-window.c:502 msgid "Conversation" msgstr "Samtal" -#: ../libempathy-gtk/empathy-chat.glade.h:1 -msgid "<b>Topic:</b>" -msgstr "<b>Ämne:</b>" - -#: ../libempathy-gtk/empathy-chat.glade.h:2 -msgid "Group Chat" -msgstr "Gruppchatt" +#: ../libempathy-gtk/empathy-chat.ui.h:1 +#: ../src/empathy-chat-window.c:472 +msgid "Topic:" +msgstr "Ämne:" -#: ../libempathy-gtk/empathy-chat-text-view.c:340 +#: ../libempathy-gtk/empathy-chat-text-view.c:316 msgid "_Copy Link Address" msgstr "_Kopiera länkadress" -#: ../libempathy-gtk/empathy-chat-text-view.c:348 +#: ../libempathy-gtk/empathy-chat-text-view.c:323 msgid "_Open Link" msgstr "_Öppna länk" -#: ../libempathy-gtk/empathy-chat-text-view.c:439 +#. Translators: timestamp displayed between conversations in +#. * chat windows (strftime format string) +#: ../libempathy-gtk/empathy-chat-text-view.c:421 msgid "%A %B %d %Y" msgstr "%A %e %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:180 -msgid "Personal Information" -msgstr "Personlig information" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:183 +#: ../libempathy-gtk/empathy-contact-dialogs.c:179 +#: ../libempathy-gtk/empathy-contact-dialogs.c:238 msgid "Edit Contact Information" msgstr "Redigera kontaktinformation" -#: ../libempathy-gtk/empathy-contact-dialogs.c:186 -msgid "Contact Information" -msgstr "Kontaktinformation" - -#: ../libempathy-gtk/empathy-contact-dialogs.c:267 -msgid "I would like to add you to my contact list." -msgstr "Jag vill lägga till dig i min kontaktlista." +#: ../libempathy-gtk/empathy-contact-dialogs.c:289 +msgid "Personal Information" +msgstr "Personlig information" -#: ../libempathy-gtk/empathy-contact-dialogs.c:291 +#: ../libempathy-gtk/empathy-contact-dialogs.c:384 msgid "New Contact" msgstr "Ny kontakt" -#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1 msgid "Decide _Later" msgstr "Bestäm _senare" -#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2 +#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" msgstr "Prenumerationsbegäran" -#: ../libempathy-gtk/empathy-contact-list-view.c:1249 +#: ../libempathy-gtk/empathy-contact-list-view.c:1375 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Vill du verkligen ta bort gruppen \"%s\"?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1251 +#: ../libempathy-gtk/empathy-contact-list-view.c:1377 msgid "Removing group" msgstr "Tar bort grupp" -#: ../libempathy-gtk/empathy-contact-list-view.c:1298 -#: ../libempathy-gtk/empathy-contact-list-view.c:1377 +#: ../libempathy-gtk/empathy-contact-list-view.c:1424 +#: ../libempathy-gtk/empathy-contact-list-view.c:1502 msgid "_Remove" msgstr "_Ta bort" -#: ../libempathy-gtk/empathy-contact-list-view.c:1328 +#: ../libempathy-gtk/empathy-contact-list-view.c:1454 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Vill du verkligen ta bort kontakten \"%s\"?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1330 +#: ../libempathy-gtk/empathy-contact-list-view.c:1456 msgid "Removing contact" msgstr "Tar bort kontakt" -#: ../libempathy-gtk/empathy-contact-list-view.c:1335 -msgid "Sorry, I don't want you in my contact list anymore." -msgstr "Tyvärr, jag vill inte längre ha dig i min kontaktlista." - -#: ../libempathy-gtk/empathy-contact-menu.c:130 -#: ../src/empathy-main-window.glade.h:9 +#: ../libempathy-gtk/empathy-contact-menu.c:135 +#: ../src/empathy-main-window.ui.h:8 msgid "_Chat" msgstr "_Chatt" -#: ../libempathy-gtk/empathy-contact-menu.c:161 -#: ../src/empathy-call-window.glade.h:5 -msgid "_Call" -msgstr "_Ring" +#: ../libempathy-gtk/empathy-contact-menu.c:166 +msgctxt "menu item" +msgid "_Audio Call" +msgstr "_Ljudsamtal" + +#: ../libempathy-gtk/empathy-contact-menu.c:198 +msgctxt "menu item" +msgid "_Video Call" +msgstr "_Videosamtal" -#: ../libempathy-gtk/empathy-contact-menu.c:200 -#: ../src/empathy-main-window.glade.h:17 +#: ../libempathy-gtk/empathy-contact-menu.c:237 msgid "_View Previous Conversations" msgstr "_Visa tidigare samtal" -#: ../libempathy-gtk/empathy-contact-menu.c:222 +#: ../libempathy-gtk/empathy-contact-menu.c:259 msgid "Send file" msgstr "Skicka fil" -#: ../libempathy-gtk/empathy-contact-menu.c:250 +#: ../libempathy-gtk/empathy-contact-menu.c:287 msgid "Infor_mation" msgstr "Infor_mation" -#: ../libempathy-gtk/empathy-contact-menu.c:277 -#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11 +#: ../libempathy-gtk/empathy-contact-menu.c:314 +#: ../src/empathy-main-window.ui.h:11 msgid "_Edit" msgstr "R_edigera" -#: ../libempathy-gtk/empathy-contact-menu.c:336 +#: ../libempathy-gtk/empathy-contact-menu.c:372 msgid "Inviting to this room" msgstr "Bjuder in till detta rum" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:403 msgid "_Invite to chatroom" msgstr "_Bjud in till chattrum" -#: ../libempathy-gtk/empathy-contact-selector.c:111 +#: ../libempathy-gtk/empathy-contact-selector.c:129 msgid "Select a contact" msgstr "Välj en kontakt" -#: ../libempathy-gtk/empathy-contact-widget.c:358 +#: ../libempathy-gtk/empathy-contact-widget.c:440 msgid "Save Avatar" msgstr "Spara avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:414 +#: ../libempathy-gtk/empathy-contact-widget.c:496 msgid "Unable to save avatar" msgstr "Kunde inte spara avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:895 +#: ../libempathy-gtk/empathy-contact-widget.c:979 msgid "Select" msgstr "Markera" -#: ../libempathy-gtk/empathy-contact-widget.c:904 -#: ../src/empathy-main-window.c:991 +#: ../libempathy-gtk/empathy-contact-widget.c:988 +#: ../src/empathy-main-window.c:903 msgid "Group" msgstr "Grupp" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:1 -msgid "<b>Client Information</b>" -msgstr "<b>Klientinformation</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1239 +msgid "Country ISO Code:" +msgstr "Landets ISO-kod:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1241 +msgid "Country:" +msgstr "Land:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1243 +msgid "State:" +msgstr "Län:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1245 +msgid "City:" +msgstr "Stad:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1247 +msgid "Area:" +msgstr "OmrÃ¥de:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1249 +msgid "Postal Code:" +msgstr "Postnummer:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1251 +msgid "Street:" +msgstr "Gata:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1253 +msgid "Building:" +msgstr "Byggnad:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:2 -msgid "<b>Contact Details</b>" -msgstr "<b>Kontaktdetaljer</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1255 +msgid "Floor:" +msgstr "VÃ¥ning:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:3 -msgid "<b>Contact</b>" -msgstr "<b>Kontakt</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1257 +msgid "Room:" +msgstr "Rum:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:4 -msgid "<b>Groups</b>" -msgstr "<b>Grupper</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:1259 +msgid "Text:" +msgstr "Text:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:5 -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1 -#: ../src/empathy-chatrooms-window.glade.h:1 -#: ../src/empathy-new-chatroom-dialog.glade.h:1 +#: ../libempathy-gtk/empathy-contact-widget.c:1261 +msgid "Description:" +msgstr "Beskrivning:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1263 +msgid "URI:" +msgstr "URI:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1265 +msgid "Accuracy Level:" +msgstr "PrecisionsnivÃ¥:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1267 +msgid "Error:" +msgstr "Fel:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1269 +msgid "Vertical Error (meters):" +msgstr "Vertikalt fel (meter):" + +#: ../libempathy-gtk/empathy-contact-widget.c:1271 +msgid "Horizontal Error (meters):" +msgstr "Horisontellt fel (meter):" + +#: ../libempathy-gtk/empathy-contact-widget.c:1273 +msgid "Speed:" +msgstr "Hastighet:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1275 +msgid "Bearing:" +msgstr "Riktning:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1277 +msgid "Climb Speed:" +msgstr "Höjdökning:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1279 +msgid "Last Updated on:" +msgstr "Senast uppdaterad:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1281 +msgid "Longitude:" +msgstr "Longitud:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1283 +msgid "Latitude:" +msgstr "Latitud:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1285 +msgid "Altitude:" +msgstr "Höjd:" + +#: ../libempathy-gtk/empathy-contact-widget.c:1332 +msgid "<b>Location</b>" +msgstr "<b>Plats</b>" + +#: ../libempathy-gtk/empathy-contact-widget.c:1345 +msgid "<b>Location</b>, " +msgstr "<b>Plats</b>, " + +#: ../libempathy-gtk/empathy-contact-widget.c:1395 +msgid "%B %e, %Y at %R UTC" +msgstr "%e %B, %Y klockan %H.%M UTC" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:1 +msgid "<b>Location</b> at (date)\t" +msgstr "<b>Plats</b> den (datum)\t" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 +#: ../src/empathy-chatrooms-window.ui.h:1 +#: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" msgstr "Konto:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:6 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:3 msgid "Alias:" msgstr "Alias:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:7 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:4 msgid "Birthday:" msgstr "Födelsedag:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:8 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:5 +msgid "Client Information" +msgstr "Klientinformation" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:6 msgid "Client:" msgstr "Klient:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:9 -msgid "Contact information" -msgstr "Kontaktinformation" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:7 +#: ../src/empathy-main-window.c:886 +msgid "Contact" +msgstr "Kontakt" + +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "Contact Details" +msgstr "Kontaktdetaljer" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:10 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 msgid "Email:" msgstr "E-post:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Fullname:" msgstr "Fullständigt namn:" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +msgid "Groups" +msgstr "Grupper" + #. Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.glade.h:13 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:13 msgid "Identifier:" msgstr "Identifierare:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:14 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:14 msgid "Information requested..." msgstr "Information begärd..." -#: ../libempathy-gtk/empathy-contact-widget.glade.h:15 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:15 msgid "OS:" msgstr "OS:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:16 -msgid "" -"Select the groups you want this contact to appear in. Note that you can " -"select more than one group or no groups." -msgstr "" -"Välj de grupper som du vill att denna kontakt ska finnas i. Observera att du " -"kan välja fler än en grupp eller inga grupper alls." +#: ../libempathy-gtk/empathy-contact-widget.ui.h:16 +msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups." +msgstr "Välj de grupper som du vill att denna kontakt ska finnas i. Observera att du kan välja fler än en grupp eller inga grupper alls." -#: ../libempathy-gtk/empathy-contact-widget.glade.h:17 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:17 msgid "Version:" msgstr "Version:" # "Web site" är "webbplats". "Web page" är "webbsida". -#: ../libempathy-gtk/empathy-contact-widget.glade.h:18 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:18 msgid "Web site:" msgstr "Webbplats:" -#: ../libempathy-gtk/empathy-contact-widget.glade.h:19 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:19 msgid "_Add Group" msgstr "_Lägg till grupp" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:284 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:283 msgid "new server" msgstr "ny server" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:513 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:510 msgid "Server" msgstr "Server" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:528 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:525 msgid "Port" msgstr "Port" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:541 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:538 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:498 -#: ../src/empathy-import-dialog.c:277 +#: ../libempathy-gtk/empathy-log-window.c:495 +#: ../src/empathy-import-dialog.c:285 msgid "Account" msgstr "Konto" -#: ../libempathy-gtk/empathy-log-window.c:515 +#: ../libempathy-gtk/empathy-log-window.c:512 msgid "Date" msgstr "Datum" -#. Tab Label -#: ../libempathy-gtk/empathy-log-window.glade.h:2 +#: ../libempathy-gtk/empathy-log-window.ui.h:1 msgid "Conversations" msgstr "Samtal" -#: ../libempathy-gtk/empathy-log-window.glade.h:3 +#: ../libempathy-gtk/empathy-log-window.ui.h:2 msgid "Previous Conversations" msgstr "Tidigare samtal" -#. Tab Label -#: ../libempathy-gtk/empathy-log-window.glade.h:5 +#: ../libempathy-gtk/empathy-log-window.ui.h:3 msgid "Search" msgstr "Sök" -#. Searching *for* something -#: ../libempathy-gtk/empathy-log-window.glade.h:7 +#: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "_For:" msgstr "_För:" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2 msgid "C_all" msgstr "Rin_g" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3 msgid "C_hat" msgstr "C_hatta" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4 msgid "Contact ID:" msgstr "Kontakt-id:" -#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5 msgid "New Conversation" msgstr "Nytt samtal" -#. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:685 -msgid "Custom messages..." -msgstr "Anpassade meddelanden..." - -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1 -msgid "Custom message" -msgstr "Anpassat meddelande" +#. COL_STATE_ICON_NAME +#. COL_STATE +#. COL_STATUS_TEXT +#. COL_DISPLAY_MARKUP +#. COL_STATUS_CUSTOMISABLE +#. COL_TYPE +#: ../libempathy-gtk/empathy-presence-chooser.c:172 +msgid "Custom Message..." +msgstr "Anpassat meddelande..." -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2 -msgid "Message:" -msgstr "Meddelande:" +#: ../libempathy-gtk/empathy-presence-chooser.c:227 +msgid "Edit Custom Messages..." +msgstr "Redigera anpassade meddelanden..." -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3 -msgid "Save message" -msgstr "Spara meddelande" +#: ../libempathy-gtk/empathy-presence-chooser.c:326 +msgid "Click to remove this status as a favorite" +msgstr "Klicka för att ta bort denna status som favorit" -#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4 -msgid "Status:" -msgstr "Status:" +#: ../libempathy-gtk/empathy-presence-chooser.c:335 +msgid "Click to make this status a favorite" +msgstr "Klicka för att göra denna status till favorit" -#: ../libempathy-gtk/empathy-spell-dialog.c:88 -msgid "Word" -msgstr "Ord" +#: ../libempathy-gtk/empathy-presence-chooser.c:369 +msgid "Set status" +msgstr "Ange status" -#: ../libempathy-gtk/empathy-spell-dialog.c:265 -msgid "Suggestions for the word" -msgstr "Förslag för ordet" +#: ../libempathy-gtk/empathy-presence-chooser.c:782 +msgid "Set your presence and current status" +msgstr "Ange din närvaro och aktuell status" -#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1 -msgid "Spell Checker" -msgstr "Stavningskontroll" - -#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2 -msgid "Suggestions for the word:" -msgstr "Förslag för ordet:" - -#: ../libempathy-gtk/empathy-theme-manager.c:60 -msgid "Classic" -msgstr "Klassiskt" - -#: ../libempathy-gtk/empathy-theme-manager.c:61 -msgid "Simple" -msgstr "Enkelt" - -#: ../libempathy-gtk/empathy-theme-manager.c:62 -msgid "Clean" -msgstr "Rent" - -#: ../libempathy-gtk/empathy-theme-manager.c:63 -msgid "Blue" -msgstr "BlÃ¥tt" - -#: ../libempathy-gtk/empathy-ui-utils.c:1385 -msgid "Unable to open URI" -msgstr "Kunde inte öppna uri" - -#: ../libempathy-gtk/empathy-ui-utils.c:1530 -msgid "Select a file" -msgstr "Välj en fil" +#. Custom messages +#: ../libempathy-gtk/empathy-presence-chooser.c:1017 +msgid "Custom messages..." +msgstr "Anpassade meddelanden..." -#: ../libempathy-gtk/empathy-ui-utils.c:1566 +#: ../libempathy-gtk/empathy-sound.c:51 msgid "Received an instant message" msgstr "Tog emot ett snabbmeddelande" -#: ../libempathy-gtk/empathy-ui-utils.c:1568 +#: ../libempathy-gtk/empathy-sound.c:53 msgid "Sent an instant message" msgstr "Skickade ett snabbmeddelande" -#: ../libempathy-gtk/empathy-ui-utils.c:1570 +#: ../libempathy-gtk/empathy-sound.c:55 msgid "Incoming chat request" msgstr "Inkommande chattbegäran" -#: ../libempathy-gtk/empathy-ui-utils.c:1572 +#: ../libempathy-gtk/empathy-sound.c:57 msgid "Contact connected" msgstr "Kontakten ansluten" -#: ../libempathy-gtk/empathy-ui-utils.c:1574 +#: ../libempathy-gtk/empathy-sound.c:59 msgid "Contact disconnected" msgstr "Kontakten frÃ¥nkopplad" -#: ../libempathy-gtk/empathy-ui-utils.c:1576 +#: ../libempathy-gtk/empathy-sound.c:61 msgid "Connected to server" msgstr "Ansluten till server" -#: ../libempathy-gtk/empathy-ui-utils.c:1578 +#: ../libempathy-gtk/empathy-sound.c:63 msgid "Disconnected from server" msgstr "FrÃ¥nkopplad frÃ¥n server" -#: ../libempathy-gtk/empathy-ui-utils.c:1580 +#: ../libempathy-gtk/empathy-sound.c:65 msgid "Incoming voice call" msgstr "Inkommande röstsamtal" -#: ../libempathy-gtk/empathy-ui-utils.c:1582 +#: ../libempathy-gtk/empathy-sound.c:67 msgid "Outgoing voice call" msgstr "UtgÃ¥ende röstsamtal" -#: ../libempathy-gtk/empathy-ui-utils.c:1584 +#: ../libempathy-gtk/empathy-sound.c:69 msgid "Voice call ended" msgstr "Röstsamtal avslutat" +#: ../libempathy-gtk/empathy-status-preset-dialog.c:362 +msgid "Enter Custom Message" +msgstr "Ange anpassat meddelande" + +#: ../libempathy-gtk/empathy-status-preset-dialog.c:521 +msgid "Edit Custom Messages" +msgstr "Redigera anpassade meddelanden" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 +msgid "Add _New Preset" +msgstr "Lägg till _nytt förval" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2 +msgid "Saved Presets" +msgstr "Sparade förval" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3 +msgid "gtk-add" +msgstr "Lägg till" + +#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4 +msgid "gtk-remove" +msgstr "Ta bort" + +#: ../libempathy-gtk/empathy-theme-manager.c:67 +msgid "Classic" +msgstr "Klassiskt" + +#: ../libempathy-gtk/empathy-theme-manager.c:68 +msgid "Simple" +msgstr "Enkelt" + +#: ../libempathy-gtk/empathy-theme-manager.c:69 +msgid "Clean" +msgstr "Rent" + +#: ../libempathy-gtk/empathy-theme-manager.c:70 +msgid "Blue" +msgstr "BlÃ¥tt" + +#: ../libempathy-gtk/empathy-ui-utils.c:1377 +msgid "Unable to open URI" +msgstr "Kunde inte öppna uri" + +#: ../libempathy-gtk/empathy-ui-utils.c:1467 +msgid "Select a file" +msgstr "Välj en fil" + +#: ../libempathy-gtk/empathy-ui-utils.c:1525 +msgid "Select a destination" +msgstr "Välj ett mÃ¥l" + #: ../libempathy-gtk/totem-subtitle-encoding.c:158 msgid "Current Locale" msgstr "Aktuell lokal" @@ -1239,10 +1483,8 @@ msgstr "Vietnamesisk" #. * vim: sw=2 ts=8 cindent noai bs=2 #. #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1 -msgid "" -"The contact to display in the applet. Empty means no contact is displayed." -msgstr "" -"Kontakten att visa i panelprogrammet. Tom betyder att ingen kontakt visas." +msgid "The contact to display in the applet. Empty means no contact is displayed." +msgstr "Kontakten att visa i panelprogrammet. Tom betyder att ingen kontakt visas." #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2 msgid "The contact's avatar token. Empty means contact has no avatar." @@ -1253,7 +1495,7 @@ msgid "Megaphone" msgstr "Megaphone" #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2 -#: ../megaphone/src/megaphone-applet.c:417 +#: ../megaphone/src/megaphone-applet.c:519 msgid "Talk!" msgstr "Prata!" @@ -1267,15 +1509,15 @@ msgid "_Information" msgstr "_Information" #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3 -#: ../src/empathy-main-window.glade.h:15 +#: ../src/empathy-main-window.ui.h:18 msgid "_Preferences" msgstr "In_ställningar" -#: ../megaphone/src/megaphone-applet.c:255 +#: ../megaphone/src/megaphone-applet.c:168 msgid "Please configure a contact." msgstr "Konfigurera en kontakt." -#: ../megaphone/src/megaphone-applet.c:348 +#: ../megaphone/src/megaphone-applet.c:258 msgid "Select contact..." msgstr "Välj kontakt..." @@ -1288,60 +1530,39 @@ msgstr "Närvaro" msgid "Set your own presence" msgstr "Ställ in din egna närvaro" -#: ../src/empathy.c:426 +#: ../src/empathy.c:506 msgid "Don't connect on startup" msgstr "Anslut inte vid uppstart" -#: ../src/empathy.c:430 +#: ../src/empathy.c:510 msgid "Don't show the contact list on startup" msgstr "Visa inte kontaktlistan vid uppstart" -#: ../src/empathy.c:434 +#: ../src/empathy.c:514 msgid "Show the accounts dialog" msgstr "Visa kontodialogrutan" -#: ../src/empathy.c:446 +#: ../src/empathy.c:526 msgid "- Empathy Instant Messenger" msgstr "- Empathy snabbmeddelandeklient" -#: ../src/empathy-about-dialog.c:84 -msgid "" -"Empathy is free software; you can redistribute it and/or modify it under the " -"terms of the GNU General Public License as published by the Free Software " -"Foundation; either version 2 of the License, or (at your option) any later " -"version." -msgstr "" -"Empathy är fri programvara. Du kan distribuera det och/eller modifiera det " -"under villkoren i GNU General Public License, publicerad av Free Software " -"Foundation, antingen version 2 eller (om du sÃ¥ vill) nÃ¥gon senare version." +#: ../src/empathy-about-dialog.c:83 +msgid "Empathy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." +msgstr "Empathy är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du sÃ¥ vill) nÃ¥gon senare version." -#: ../src/empathy-about-dialog.c:88 -msgid "" -"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -"details." -msgstr "" -"Empathy distribueras i hopp om att det ska vara användbart, men UTAN NÃ…GON " -"SOM HELST GARANTI, även utan underförstÃ¥dd garanti om SÄLJBARHET eller " -"LÄMPLIGHET FÖR NÃ…GOT SPECIELLT ÄNDAMÃ…L. Se GNU General Public License för " -"ytterligare information." +#: ../src/empathy-about-dialog.c:87 +msgid "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." +msgstr "Empathy distribueras i hopp om att det ska vara användbart, men UTAN NÃ…GON SOM HELST GARANTI, även utan underförstÃ¥dd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÃ…GOT SPECIELLT ÄNDAMÃ…L. Se GNU General Public License för ytterligare information." -#: ../src/empathy-about-dialog.c:92 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " -"Street, Fifth Floor, Boston, MA 02110-130159 USA" -msgstr "" -"Du bör ha fÃ¥tt en kopia av GNU General Public License tillsammans med " -"Empathy. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin " -"Street, Fifth Floor, Boston, MA 02110-130159 USA" +#: ../src/empathy-about-dialog.c:91 +msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" +msgstr "Du bör ha fÃ¥tt en kopia av GNU General Public License tillsammans med Empathy. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:120 +#: ../src/empathy-about-dialog.c:119 msgid "An Instant Messaging client for GNOME" msgstr "En snabbmeddelandeklient för GNOME" -#: ../src/empathy-about-dialog.c:126 +#: ../src/empathy-about-dialog.c:125 msgid "translator-credits" msgstr "" "Daniel Nylander\n" @@ -1351,22 +1572,22 @@ msgstr "" "Skicka synpunkter pÃ¥ översättningen till\n" "tp-sv@listor.tp-sv.se" -#: ../src/empathy-accounts-dialog.c:391 +#: ../src/empathy-accounts-dialog.c:392 msgid "Enabled" msgstr "Aktiverad" -#: ../src/empathy-accounts-dialog.c:401 -#: ../src/empathy-accounts-dialog.glade.h:4 +#: ../src/empathy-accounts-dialog.c:402 +#: ../src/empathy-accounts-dialog.ui.h:1 msgid "Accounts" msgstr "Konton" #. To translator: %s is the protocol name -#: ../src/empathy-accounts-dialog.c:833 +#: ../src/empathy-accounts-dialog.c:837 #, c-format msgid "New %s account" msgstr "Nytt %s-konto" -#: ../src/empathy-accounts-dialog.c:943 +#: ../src/empathy-accounts-dialog.c:950 #, c-format msgid "" "You are about to remove your %s account!\n" @@ -1375,316 +1596,234 @@ msgstr "" "Du hÃ¥ller pÃ¥ att ta bort kontot %s!\n" "Är du säker att du vill fortsätta?" -#: ../src/empathy-accounts-dialog.c:949 +#: ../src/empathy-accounts-dialog.c:956 msgid "" -"Any associated conversations and chat rooms will NOT be removed if you " -"decide to proceed.\n" +"Any associated conversations and chat rooms will NOT be removed if you decide to proceed.\n" "\n" -"Should you decide to add the account back at a later time, they will still " -"be available." +"Should you decide to add the account back at a later time, they will still be available." msgstr "" "Eventuella samtal och chattrum kommer inte tas bort.\n" "\n" -"Om du senare lägger till kontot igen, kommer dessa fortfarande vara " -"tillgängliga." - -#: ../src/empathy-accounts-dialog.glade.h:1 -msgid "<b>New Account</b>" -msgstr "<b>Nytt konto</b>" +"Om du senare lägger till kontot igen, kommer dessa fortfarande vara tillgängliga." -#: ../src/empathy-accounts-dialog.glade.h:2 -msgid "<b>No protocol installed</b>" -msgstr "<b>Inga protokoll installerade</b>" +#: ../src/empathy-accounts-dialog.ui.h:2 +msgid "Add Account" +msgstr "Lägg till konto" -#: ../src/empathy-accounts-dialog.glade.h:3 -msgid "<b>Settings</b>" -msgstr "<b>Inställningar</b>" - -#: ../src/empathy-accounts-dialog.glade.h:5 +#: ../src/empathy-accounts-dialog.ui.h:3 msgid "Cr_eate" msgstr "Ska_pa" -#: ../src/empathy-accounts-dialog.glade.h:6 -msgid "I already have an account I want to use" -msgstr "Jag har redan ett konto som jag vill använda" +#: ../src/empathy-accounts-dialog.ui.h:4 +msgid "Gmail" +msgstr "Gmail" -#: ../src/empathy-accounts-dialog.glade.h:7 +#: ../src/empathy-accounts-dialog.ui.h:5 msgid "Import Accounts..." msgstr "Importera konton..." -#: ../src/empathy-accounts-dialog.glade.h:8 -msgid "" -"To add a new account, you first have to install a backend for each protocol " -"you want to use." -msgstr "" -"För att lägga till ett nytt konto mÃ¥ste du först installera en bakände för " -"varje protokoll som du vill använda." +#: ../src/empathy-accounts-dialog.ui.h:6 +msgid "No protocol installed" +msgstr "Inga protokoll installerade" + +#: ../src/empathy-accounts-dialog.ui.h:7 +msgid "Settings" +msgstr "Inställningar" + +#: ../src/empathy-accounts-dialog.ui.h:8 +msgid "To add a new account, you first have to install a backend for each protocol you want to use." +msgstr "För att lägga till ett nytt konto mÃ¥ste du först installera en bakände för varje protokoll som du vill använda." -#: ../src/empathy-accounts-dialog.glade.h:9 +#: ../src/empathy-accounts-dialog.ui.h:9 msgid "Type:" msgstr "Typ:" -#: ../src/empathy-call-window.c:258 +#: ../src/empathy-accounts-dialog.ui.h:10 +msgid "_Add..." +msgstr "_Lägg till..." + +#: ../src/empathy-accounts-dialog.ui.h:11 +msgid "_Create a new account" +msgstr "_Skapa ett nytt konto" + +#: ../src/empathy-accounts-dialog.ui.h:12 +msgid "_Reuse an existing account" +msgstr "_Ã…teranvänd ett befintligt konto" + +#: ../src/empathy-call-window.c:420 msgid "Contrast" msgstr "Kontrast" -#: ../src/empathy-call-window.c:258 +#: ../src/empathy-call-window.c:423 msgid "Brightness" msgstr "Ljusstyrka" -#: ../src/empathy-call-window.c:258 +#: ../src/empathy-call-window.c:426 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-call-window.c:290 +#: ../src/empathy-call-window.c:531 msgid "Volume" msgstr "Volym" -#: ../src/empathy-call-window.c:366 +#: ../src/empathy-call-window.c:662 +msgid "Connecting..." +msgstr "Ansluter..." + +#: ../src/empathy-call-window.c:746 msgid "_Sidebar" msgstr "_Sidopanel" -#: ../src/empathy-call-window.c:384 +#: ../src/empathy-call-window.c:765 msgid "Dialpad" msgstr "Knappsats" -#: ../src/empathy-call-window.c:390 +#: ../src/empathy-call-window.c:771 msgid "Audio input" msgstr "LjudingÃ¥ng" -#: ../src/empathy-call-window.c:394 +#: ../src/empathy-call-window.c:775 msgid "Video input" msgstr "VideoingÃ¥ng" -#: ../src/empathy-call-window.c:407 -msgid "Connecting..." -msgstr "Ansluter..." +#: ../src/empathy-call-window.c:836 +#, c-format +msgid "Call with %s" +msgstr "Ring med %s" -#: ../src/empathy-call-window.c:572 +#: ../src/empathy-call-window.c:905 +msgid "Call" +msgstr "Ring" + +#. Translators: number of minutes:seconds the caller has been connected +#: ../src/empathy-call-window.c:1336 #, c-format -msgid "Connected -- %d:%02dm" -msgstr "Ansluten -- %d:%02dm" +msgid "Connected — %d:%02dm" +msgstr "Ansluten — %d:%02dm" -#: ../src/empathy-call-window.glade.h:1 +#: ../src/empathy-call-window.ui.h:1 msgid "Hang up" msgstr "Lägg pÃ¥" -#: ../src/empathy-call-window.glade.h:2 +#: ../src/empathy-call-window.ui.h:2 +msgid "Redial" +msgstr "Ring igen" + +#: ../src/empathy-call-window.ui.h:3 msgid "Send Audio" msgstr "Skicka ljud" -#: ../src/empathy-call-window.glade.h:3 +#: ../src/empathy-call-window.ui.h:4 msgid "Send video" msgstr "Skicka video" -#: ../src/empathy-call-window.glade.h:4 +#: ../src/empathy-call-window.ui.h:5 msgid "Video preview" msgstr "Videoförhandsvisning" -#: ../src/empathy-call-window.glade.h:6 +#: ../src/empathy-call-window.ui.h:6 +msgid "_Call" +msgstr "_Ring" + +#: ../src/empathy-call-window.ui.h:7 +#: ../src/empathy-main-window.ui.h:21 msgid "_View" msgstr "_Visa" -#: ../src/empathy-chat-window.c:313 +#: ../src/empathy-chat-window.c:344 #, c-format msgid "Conversations (%d)" msgstr "Samtal (%d)" -#: ../src/empathy-chat-window.c:418 -msgid "Topic:" -msgstr "Ämne:" - -#: ../src/empathy-chat-window.c:423 +#: ../src/empathy-chat-window.c:476 msgid "Typing a message." msgstr "Skriver ett meddelande." -#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424 -#, c-format -msgid "New message from %s" -msgstr "Nytt meddelande frÃ¥n %s" - -#: ../src/empathy-chat-window.glade.h:1 -msgid "C_lear" -msgstr "T_öm" - -#: ../src/empathy-chat-window.glade.h:2 -msgid "Chat" -msgstr "Chatta" - -#: ../src/empathy-chat-window.glade.h:3 -msgid "Insert _Smiley" -msgstr "Infoga _smilis" - -#: ../src/empathy-chat-window.glade.h:4 -msgid "Invitation _message:" -msgstr "Inbjudnings_meddelande:" - -#: ../src/empathy-chat-window.glade.h:5 -msgid "Invite" -msgstr "Bjud in" - -#: ../src/empathy-chat-window.glade.h:6 -msgid "Move Tab _Left" -msgstr "Flytta flik till _vänster" - -#: ../src/empathy-chat-window.glade.h:7 -msgid "Move Tab _Right" -msgstr "Flytta flik till _höger" - -#: ../src/empathy-chat-window.glade.h:8 -msgid "Select who would you like to invite:" -msgstr "Välj vem du vill bjuda in:" - -#: ../src/empathy-chat-window.glade.h:9 -msgid "You have been invited to join a chat conference." -msgstr "Du har blivit inbjuden till en chattkonferens." - -#: ../src/empathy-chat-window.glade.h:10 -msgid "_Contact" -msgstr "_Kontakt" - -#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10 -msgid "_Contents" -msgstr "I_nnehÃ¥ll" - -#: ../src/empathy-chat-window.glade.h:12 -msgid "_Conversation" -msgstr "_Samtal" - -#: ../src/empathy-chat-window.glade.h:13 -msgid "_Detach Tab" -msgstr "_Koppla loss flik" - -#: ../src/empathy-chat-window.glade.h:15 -msgid "_Favorite Chatroom" -msgstr "_Favoritchattrum" - -#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12 -msgid "_Help" -msgstr "_Hjälp" - -#: ../src/empathy-chat-window.glade.h:17 -msgid "_Next Tab" -msgstr "_Nästa flik" - -#: ../src/empathy-chat-window.glade.h:18 -msgid "_Previous Tab" -msgstr "_FöregÃ¥ende flik" - -#: ../src/empathy-chat-window.glade.h:19 -msgid "_Tabs" -msgstr "_Flikar" - -#: ../src/empathy-chatrooms-window.c:262 +#: ../src/empathy-chatrooms-window.c:258 msgid "Name" msgstr "Namn" -#: ../src/empathy-chatrooms-window.c:280 +#: ../src/empathy-chatrooms-window.c:276 msgid "Room" msgstr "Rum" -#: ../src/empathy-chatrooms-window.c:289 +#: ../src/empathy-chatrooms-window.c:285 msgid "Auto-Connect" msgstr "Anslut automatiskt" -#: ../src/empathy-chatrooms-window.glade.h:2 -msgid "Edit Favorite Room" -msgstr "Redigera favoritrum" - -#: ../src/empathy-chatrooms-window.glade.h:3 -msgid "Join room on start_up" -msgstr "GÃ¥ in i rummet vid _uppstart" - -#: ../src/empathy-chatrooms-window.glade.h:4 -msgid "Join this chat room when Empathy starts and you are connected" -msgstr "GÃ¥ in i detta chattrum när Empathy startar och du är ansluten" - -#: ../src/empathy-chatrooms-window.glade.h:5 +#: ../src/empathy-chatrooms-window.ui.h:2 msgid "Manage Favorite Rooms" msgstr "Hantera favoritrum" -#: ../src/empathy-chatrooms-window.glade.h:6 -msgid "N_ame:" -msgstr "N_amn:" - -#: ../src/empathy-chatrooms-window.glade.h:7 -msgid "S_erver:" -msgstr "S_erver:" - -#: ../src/empathy-chatrooms-window.glade.h:9 -#: ../src/empathy-new-chatroom-dialog.glade.h:9 -msgid "_Room:" -msgstr "_Rum:" - -#: ../src/empathy-event-manager.c:372 +#: ../src/empathy-event-manager.c:321 msgid "Incoming call" msgstr "Inkommande samtal" -#: ../src/empathy-event-manager.c:375 +#: ../src/empathy-event-manager.c:324 #, c-format msgid "%s is calling you, do you want to answer?" msgstr "%s ringer dig. Vill du svara?" -#: ../src/empathy-event-manager.c:382 +#: ../src/empathy-event-manager.c:331 msgid "_Reject" msgstr "Avv_isa" -#: ../src/empathy-event-manager.c:388 +#: ../src/empathy-event-manager.c:337 msgid "_Answer" msgstr "_Svara" -#: ../src/empathy-event-manager.c:511 +#: ../src/empathy-event-manager.c:452 #, c-format msgid "Incoming call from %s" msgstr "Inkommande samtal frÃ¥n %s" -#: ../src/empathy-event-manager.c:559 +#: ../src/empathy-event-manager.c:496 #, c-format msgid "%s is offering you an invitation" msgstr "%s erbjuder dig en inbjudan" -#: ../src/empathy-event-manager.c:565 +#: ../src/empathy-event-manager.c:502 msgid "An external application will be started to handle it." msgstr "Ett externt program kommer att startas för att hantera den." -#: ../src/empathy-event-manager.c:570 +#: ../src/empathy-event-manager.c:507 msgid "You don't have the needed external application to handle it." msgstr "Du har inte det nödvändiga externa programmet att hantera den med." -#: ../src/empathy-event-manager.c:692 +#: ../src/empathy-event-manager.c:634 msgid "Room invitation" msgstr "Rumsinbjudan" -#: ../src/empathy-event-manager.c:695 +#: ../src/empathy-event-manager.c:637 #, c-format msgid "%s is inviting you to join %s" msgstr "%s bjuder in dig till %s" -#. Decline button -#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021 +#: ../src/empathy-event-manager.c:645 msgid "_Decline" msgstr "_Neka" -#: ../src/empathy-event-manager.c:708 +#: ../src/empathy-event-manager.c:650 +#: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_GÃ¥ in" -#: ../src/empathy-event-manager.c:738 +#: ../src/empathy-event-manager.c:689 #, c-format msgid "%s invited you to join %s" msgstr "%s har bjudit in dig till %s" -#: ../src/empathy-event-manager.c:860 +#: ../src/empathy-event-manager.c:715 #, c-format msgid "Incoming file transfer from %s" msgstr "Inkommande filöverföring frÃ¥n %s" -#: ../src/empathy-event-manager.c:954 +#: ../src/empathy-event-manager.c:895 #, c-format msgid "Subscription requested by %s" msgstr "Prenumeration begärd av %s" -#: ../src/empathy-event-manager.c:958 +#: ../src/empathy-event-manager.c:899 #, c-format msgid "" "\n" @@ -1693,631 +1832,846 @@ msgstr "" "\n" "Meddelande: %s" -#: ../src/empathy-ft-manager.c:113 +#. someone is logging off +#: ../src/empathy-event-manager.c:935 +#, c-format +msgid "%s is now offline." +msgstr "%s är nu frÃ¥nkopplad." + +#. someone is logging in +#: ../src/empathy-event-manager.c:951 +#, c-format +msgid "%s is now online." +msgstr "%s är nu ansluten." + +#. Translators: time left, when it is more than one hour +#: ../src/empathy-ft-manager.c:101 #, c-format msgid "%u:%02u.%02u" msgstr "%u:%02u.%02u" -#: ../src/empathy-ft-manager.c:115 +#. Translators: time left, when is is less than one hour +#: ../src/empathy-ft-manager.c:104 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:164 -msgid "No reason was specified" -msgstr "Ingen anledning angavs" - -#: ../src/empathy-ft-manager.c:166 -msgid "The change in state was requested" -msgstr "Ändring i tillstÃ¥nd begärdes" - -#: ../src/empathy-ft-manager.c:168 -msgid "You canceled the file transfer" -msgstr "Du avbröt filöverföringen" - -#: ../src/empathy-ft-manager.c:170 -msgid "The other participant canceled the file transfer" -msgstr "Den andra deltagaren avbröt filöverföringen" - -#: ../src/empathy-ft-manager.c:172 -msgid "Error while trying to transfer the file" -msgstr "Fel vid försök att överföra filen" +#: ../src/empathy-ft-manager.c:180 +msgctxt "file transfer percent" +msgid "Unknown" +msgstr "Okänt" -#: ../src/empathy-ft-manager.c:174 -msgid "The other participant is unable to transfer the file" -msgstr "Den andra deltagaren kunde inte överföra filen" +#: ../src/empathy-ft-manager.c:275 +#, c-format +msgid "%s of %s at %s/s" +msgstr "%s av %s i %s/s" -#: ../src/empathy-ft-manager.c:176 -msgid "Unknown reason" -msgstr "Okänd anledning" +#: ../src/empathy-ft-manager.c:276 +#, c-format +msgid "%s of %s" +msgstr "%s av %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:224 +#: ../src/empathy-ft-manager.c:307 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Tar emot \"%s\" frÃ¥n %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:227 +#: ../src/empathy-ft-manager.c:310 #, c-format msgid "Sending \"%s\" to %s" msgstr "Skickar \"%s\" till %s" -#: ../src/empathy-ft-manager.c:237 -msgctxt "file size" -msgid "Unknown" -msgstr "Okänt" +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:340 +#, c-format +msgid "Error receiving \"%s\" from %s" +msgstr "Fel vid mottagning av \"%s\" frÃ¥n %s" -#. translators: first %s is the transferred size, second %s is -#. * the total file size -#: ../src/empathy-ft-manager.c:245 +#: ../src/empathy-ft-manager.c:343 +msgid "Error receiving a file" +msgstr "Fel vid mottagning av en fil" + +#: ../src/empathy-ft-manager.c:348 #, c-format -msgid "%s of %s" -msgstr "%s av %s" +msgid "Error sending \"%s\" to %s" +msgstr "Fel vid sändning av \"%s\" till %s" -#: ../src/empathy-ft-manager.c:252 -msgid "Waiting the other participant's response" -msgstr "Väntar pÃ¥ svar frÃ¥n den andra deltagaren" +#: ../src/empathy-ft-manager.c:351 +msgid "Error sending a file" +msgstr "Fel vid sändning av en fil" -#: ../src/empathy-ft-manager.c:262 +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:490 #, c-format msgid "\"%s\" received from %s" msgstr "\"%s\" togs emot frÃ¥n %s" -#: ../src/empathy-ft-manager.c:268 +#. translators: first %s is filename, second %s +#. * is the contact name +#: ../src/empathy-ft-manager.c:495 #, c-format msgid "\"%s\" sent to %s" msgstr "\"%s\" skickades till %s" -#: ../src/empathy-ft-manager.c:271 +#: ../src/empathy-ft-manager.c:498 msgid "File transfer completed" msgstr "Filöverföringen är färdig" -#: ../src/empathy-ft-manager.c:280 -#, c-format -msgid "\"%s\" receiving from %s" -msgstr "\"%s\" tas emot frÃ¥n %s" +#: ../src/empathy-ft-manager.c:617 +#: ../src/empathy-ft-manager.c:784 +msgid "Waiting for the other participant's response" +msgstr "Väntar pÃ¥ svar frÃ¥n den andra deltagaren" -#: ../src/empathy-ft-manager.c:286 +#: ../src/empathy-ft-manager.c:643 +#: ../src/empathy-ft-manager.c:681 #, c-format -msgid "\"%s\" sending to %s" -msgstr "\"%s\" skickas till %s" +msgid "Checking integrity of \"%s\"" +msgstr "Kontrollerar integritet för \"%s\"" -#: ../src/empathy-ft-manager.c:289 +#: ../src/empathy-ft-manager.c:646 +#: ../src/empathy-ft-manager.c:684 #, c-format -msgid "File transfer canceled: %s" -msgstr "Filöverföringen avbröts: %s" +msgid "Hashing \"%s\"" +msgstr "Hashar \"%s\"" -#: ../src/empathy-ft-manager.c:304 -msgctxt "remaining time" -msgid "Unknown" -msgstr "Okänt" - -#: ../src/empathy-ft-manager.c:364 -msgctxt "file transfer percent" -msgid "Unknown" -msgstr "Okänt" - -#: ../src/empathy-ft-manager.c:700 +#: ../src/empathy-ft-manager.c:1024 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:712 +#: ../src/empathy-ft-manager.c:1036 msgid "File" msgstr "Fil" -#: ../src/empathy-ft-manager.c:734 +#: ../src/empathy-ft-manager.c:1058 msgid "Remaining" msgstr "Ã…terstÃ¥r" -#: ../src/empathy-ft-manager.c:885 -msgid "Cannot save file to this location" -msgstr "Kan inte spara fil till denna plats" - -#: ../src/empathy-ft-manager.c:931 -msgid "Save file as..." -msgstr "Spara fil som..." - -#: ../src/empathy-ft-manager.c:1001 -msgid "unknown size" -msgstr "okänd storlek" - -#: ../src/empathy-ft-manager.c:1007 -#, c-format -msgid "%s would like to send you a file" -msgstr "%s vill skicka en fil till dig" - -#: ../src/empathy-ft-manager.c:1012 -#, c-format -msgid "Do you want to accept the file \"%s\" (%s)?" -msgstr "Vill du ta emot filen \"%s\" (%s)?" - -#. Accept button -#: ../src/empathy-ft-manager.c:1030 -msgid "_Accept" -msgstr "_Acceptera" - -#: ../src/empathy-ft-manager.glade.h:1 -msgid "File transfers" +#: ../src/empathy-ft-manager.ui.h:1 +msgid "File Transfers" msgstr "Filöverföringar" -#: ../src/empathy-ft-manager.glade.h:2 +#: ../src/empathy-ft-manager.ui.h:2 msgid "Remove completed, canceled and failed file transfers from the list" msgstr "Ta bort färdiga, avbrutna och misslyckade filöverföringar frÃ¥n listan" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-dialog.c:255 +#: ../src/empathy-import-dialog.c:263 msgid "Import" msgstr "Importera" -#: ../src/empathy-import-dialog.c:264 +#: ../src/empathy-import-dialog.c:272 msgid "Protocol" msgstr "Protokoll" -#: ../src/empathy-import-dialog.c:290 +#: ../src/empathy-import-dialog.c:298 msgid "Source" msgstr "Källa" -#: ../src/empathy-import-dialog.c:378 -msgid "" -"No accounts to import could be found. Empathy currently only supports " -"importing accounts from Pidgin." -msgstr "" -"Inga konton att importera kunde hittas. Empathy har för närvarande endast " -"stöd för att importera konton frÃ¥n Pidgin." +#: ../src/empathy-import-dialog.c:392 +msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin." +msgstr "Inga konton att importera kunde hittas. Empathy har för närvarande endast stöd för att importera konton frÃ¥n Pidgin." -#: ../src/empathy-import-dialog.glade.h:1 +#: ../src/empathy-import-dialog.ui.h:1 msgid "Import Accounts" msgstr "Importera konton" -#: ../src/empathy-main-window.c:391 +#: ../src/empathy-main-window.c:396 +msgid "_Edit account" +msgstr "_Redigera konto" + +#: ../src/empathy-main-window.c:499 msgid "No error specified" msgstr "Inget fel angivet" -#: ../src/empathy-main-window.c:394 +#: ../src/empathy-main-window.c:502 msgid "Network error" msgstr "Nätverksfel" -#: ../src/empathy-main-window.c:397 +#: ../src/empathy-main-window.c:505 msgid "Authentication failed" msgstr "Autentisering misslyckades" -#: ../src/empathy-main-window.c:400 +#: ../src/empathy-main-window.c:508 msgid "Encryption error" msgstr "Krypteringsfel" -#: ../src/empathy-main-window.c:403 +#: ../src/empathy-main-window.c:511 msgid "Name in use" msgstr "Namnet används" -#: ../src/empathy-main-window.c:406 +#: ../src/empathy-main-window.c:514 msgid "Certificate not provided" msgstr "Certifikat inte tillhandahÃ¥llet" -#: ../src/empathy-main-window.c:409 +#: ../src/empathy-main-window.c:517 msgid "Certificate untrusted" msgstr "Certifikatet är inte betrott" -#: ../src/empathy-main-window.c:412 +#: ../src/empathy-main-window.c:520 msgid "Certificate expired" msgstr "Certifikatet har gÃ¥tt ut" -#: ../src/empathy-main-window.c:415 +#: ../src/empathy-main-window.c:523 msgid "Certificate not activated" msgstr "Certifikatet är inte aktiverat" -#: ../src/empathy-main-window.c:418 +#: ../src/empathy-main-window.c:526 msgid "Certificate hostname mismatch" msgstr "Värdnamnet i certifikatet stämmer inte" -#: ../src/empathy-main-window.c:421 +#: ../src/empathy-main-window.c:529 msgid "Certificate fingerprint mismatch" msgstr "Certifikatets fingeravtryck stämmer inte" -#: ../src/empathy-main-window.c:424 +#: ../src/empathy-main-window.c:532 msgid "Certificate self-signed" msgstr "Självsignerat certifikat" -#: ../src/empathy-main-window.c:427 +#: ../src/empathy-main-window.c:535 msgid "Certificate error" msgstr "Certifikatfel" -#: ../src/empathy-main-window.c:430 +#: ../src/empathy-main-window.c:538 msgid "Unknown error" msgstr "Okänt fel" -#: ../src/empathy-main-window.c:594 +#: ../src/empathy-main-window.c:1218 msgid "Show and edit accounts" msgstr "Visa och redigera konton" -#: ../src/empathy-main-window.c:974 -msgid "Contact" -msgstr "Kontakt" - -#: ../src/empathy-main-window.c:1176 -msgid "_Edit account" -msgstr "_Redigera konto" - -#: ../src/empathy-main-window.glade.h:1 +#: ../src/empathy-main-window.ui.h:1 +#: ../src/empathy-preferences.ui.h:9 msgid "Contact List" msgstr "Kontaktlista" +#: ../src/empathy-main-window.ui.h:2 +msgid "Contacts on a _Map" +msgstr "Kontakter pÃ¥ en ka_rta" + # Hm? -#: ../src/empathy-main-window.glade.h:2 +#: ../src/empathy-main-window.ui.h:3 msgid "Context" msgstr "Sammanhang" -#: ../src/empathy-main-window.glade.h:3 +#: ../src/empathy-main-window.ui.h:4 msgid "Join _Favorites" msgstr "GÃ¥ in i _favoriter" -#: ../src/empathy-main-window.glade.h:4 -msgid "Join _New..." -msgstr "GÃ¥ in i _nytt..." - -#: ../src/empathy-main-window.glade.h:5 +#: ../src/empathy-main-window.ui.h:5 msgid "Manage Favorites" msgstr "Hantera favoriter" -#: ../src/empathy-main-window.glade.h:6 -msgid "Show _Offline Contacts" -msgstr "Visa _frÃ¥nkopplade kontakter" - -#: ../src/empathy-main-window.glade.h:7 +#: ../src/empathy-main-window.ui.h:6 msgid "_Accounts" msgstr "_Konton" -#: ../src/empathy-main-window.glade.h:8 +#: ../src/empathy-main-window.ui.h:7 msgid "_Add Contact..." msgstr "_Lägg till kontakt..." -#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2 +#: ../src/empathy-main-window.ui.h:9 +msgid "_Contents" +msgstr "I_nnehÃ¥ll" + +#: ../src/empathy-main-window.ui.h:10 +msgid "_Debug" +msgstr "_Felsökning" + +#: ../src/empathy-main-window.ui.h:12 +msgid "_File Transfers" +msgstr "Fi_löverföringar" + +#: ../src/empathy-main-window.ui.h:13 +msgid "_Help" +msgstr "_Hjälp" + +#: ../src/empathy-main-window.ui.h:14 +msgid "_Join..." +msgstr "_GÃ¥ in..." + +#: ../src/empathy-main-window.ui.h:15 +#: ../src/empathy-status-icon.ui.h:2 msgid "_New Conversation..." msgstr "_Nytt samtal..." -#: ../src/empathy-main-window.glade.h:14 +#: ../src/empathy-main-window.ui.h:16 +msgid "_Offline Contacts" +msgstr "_FrÃ¥nkopplade kontakter" + +#: ../src/empathy-main-window.ui.h:17 msgid "_Personal Information" msgstr "_Personlig information" -#: ../src/empathy-main-window.glade.h:16 +#: ../src/empathy-main-window.ui.h:19 +msgid "_Previous Conversations" +msgstr "Ti_digare samtal" + +#: ../src/empathy-main-window.ui.h:20 msgid "_Room" msgstr "_Rum" -#: ../src/empathy-new-chatroom-dialog.c:291 -msgid "Chat Rooms" +#: ../src/empathy-new-chatroom-dialog.c:331 +msgid "Chat Room" msgstr "Chattrum" -#: ../src/empathy-new-chatroom-dialog.glade.h:2 -msgid "Browse:" -msgstr "Bläddra:" +#: ../src/empathy-new-chatroom-dialog.c:347 +msgid "Members" +msgstr "Medlemmar" -#: ../src/empathy-new-chatroom-dialog.glade.h:3 -msgid "" -"Enter the room name to join here or click on one or more rooms in the list." -msgstr "" -"Ange rumsnamnet för att gÃ¥ in i eller klicka pÃ¥ ett eller flera rum i listan." - -#: ../src/empathy-new-chatroom-dialog.glade.h:4 -msgid "" -"Enter the server which hosts the room, or leave it empty if the room is on " -"the current account's server" -msgstr "" -"Ange servern som tillhandahÃ¥ller rummet, eller lämna den tom om rummet finns " -"pÃ¥ servern för det aktuella kontot" - -#: ../src/empathy-new-chatroom-dialog.glade.h:5 -msgid "Join" -msgstr "GÃ¥ in" - -#: ../src/empathy-new-chatroom-dialog.glade.h:6 -msgid "Join New" -msgstr "GÃ¥ in i nytt" - -#: ../src/empathy-new-chatroom-dialog.glade.h:7 -msgid "Re_fresh" -msgstr "Uppda_tera" - -#: ../src/empathy-new-chatroom-dialog.glade.h:8 +#: ../src/empathy-new-chatroom-dialog.c:496 +#, c-format +msgctxt "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no and a number." msgid "" -"This list represents all chat rooms hosted on the server you have entered." +"<b>%s</b>\n" +"Invite required: %s\n" +"Password required: %s\n" +"Members: %s" msgstr "" -"Den här listan representerar alla chattrum som finns pÃ¥ servern som du har " -"gÃ¥tt in pÃ¥." +"<b>%s</b>\n" +"Inbjudan krävs: %s\n" +"Lösenord krävs: %s\n" +"Medlemmar: %s" + +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 +msgid "Yes" +msgstr "Ja" + +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 +msgid "No" +msgstr "Nej" + +#: ../src/empathy-new-chatroom-dialog.c:526 +msgid "Could not start room listing" +msgstr "Kunde inte starta rumslistningen" + +#: ../src/empathy-new-chatroom-dialog.c:536 +msgid "Could not stop room listing" +msgstr "Kunde inte stoppa rumslistningen" + +#: ../src/empathy-new-chatroom-dialog.ui.h:2 +msgid "Couldn't load room list" +msgstr "Kunde inte läsa in rumslistan" + +#: ../src/empathy-new-chatroom-dialog.ui.h:3 +msgid "Enter the room name to join here or click on one or more rooms in the list." +msgstr "Ange rumsnamnet för att gÃ¥ in i eller klicka pÃ¥ ett eller flera rum i listan." + +#: ../src/empathy-new-chatroom-dialog.ui.h:4 +msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server" +msgstr "Ange servern som tillhandahÃ¥ller rummet, eller lämna den tom om rummet finns pÃ¥ servern för det aktuella kontot" + +#: ../src/empathy-new-chatroom-dialog.ui.h:5 +msgid "Join Room" +msgstr "GÃ¥ in i rum" + +#: ../src/empathy-new-chatroom-dialog.ui.h:6 +msgid "Room List" +msgstr "Rumslista" + +#: ../src/empathy-new-chatroom-dialog.ui.h:8 +msgid "_Room:" +msgstr "_Rum:" -#: ../src/empathy-preferences.c:157 +#: ../src/empathy-preferences.c:161 msgid "Message received" msgstr "Meddelande togs emot" -#: ../src/empathy-preferences.c:158 +#: ../src/empathy-preferences.c:162 msgid "Message sent" msgstr "Meddelandet skickat" -#: ../src/empathy-preferences.c:159 +#: ../src/empathy-preferences.c:163 msgid "New conversation" msgstr "Nytt samtal" -#: ../src/empathy-preferences.c:160 +#: ../src/empathy-preferences.c:164 msgid "Contact goes online" msgstr "Kontakt ansluts" -#: ../src/empathy-preferences.c:161 +#: ../src/empathy-preferences.c:165 msgid "Contact goes offline" msgstr "Kontakt kopplas ner" -#: ../src/empathy-preferences.c:162 +#: ../src/empathy-preferences.c:166 msgid "Account connected" msgstr "Kontot anslutet" -#: ../src/empathy-preferences.c:163 +#: ../src/empathy-preferences.c:167 msgid "Account disconnected" msgstr "Kontot frÃ¥nkopplat" -#: ../src/empathy-preferences.c:397 +#: ../src/empathy-preferences.c:446 msgid "Language" msgstr "SprÃ¥k" -#: ../src/empathy-preferences.glade.h:1 -msgid "<b>Appearance</b>" -msgstr "<b>Utseende</b>" - -#: ../src/empathy-preferences.glade.h:2 -msgid "<b>Behavior</b>" -msgstr "<b>Beteende</b>" - -#: ../src/empathy-preferences.glade.h:3 -msgid "<b>Contact List</b>" -msgstr "<b>Kontaktlista</b>" +#: ../src/empathy-preferences.ui.h:1 +msgid "Allow _GPS usage" +msgstr "TillÃ¥t _GPS-användning" -#: ../src/empathy-preferences.glade.h:4 -msgid "<b>Enable spell checking for languages:</b>" -msgstr "<b>Aktivera rättstavning för sprÃ¥k:</b>" +#: ../src/empathy-preferences.ui.h:2 +msgid "Allow _cellphone usage" +msgstr "TillÃ¥t användning av _mobiltelefon" -#: ../src/empathy-preferences.glade.h:5 -msgid "<b>Play sound for events</b>" -msgstr "<b>Spela upp ljud för händelser</b>" +#: ../src/empathy-preferences.ui.h:3 +msgid "Allow _network usage" +msgstr "TillÃ¥t _nätverksanvändning" -#: ../src/empathy-preferences.glade.h:6 -msgid "" -"<small>The list of languages reflects only the languages for which you have " -"a dictionary installed.</small>" -msgstr "" -"<small>Listan visar endast sprÃ¥k du har en ordlista installerad för.</small>" +#: ../src/empathy-preferences.ui.h:4 +msgid "Appearance" +msgstr "Utseende" -#: ../src/empathy-preferences.glade.h:7 +#: ../src/empathy-preferences.ui.h:5 msgid "Automatically _connect on startup " msgstr "Anslut _automatiskt vid uppstart" -#: ../src/empathy-preferences.glade.h:8 +#: ../src/empathy-preferences.ui.h:6 msgid "Avatars are user chosen images shown in the contact list" msgstr "Avatarer är användarvalda bilder som visas i kontaktlistan" -#: ../src/empathy-preferences.glade.h:9 +#: ../src/empathy-preferences.ui.h:7 +msgid "Behavior" +msgstr "Beteende" + +#: ../src/empathy-preferences.ui.h:8 msgid "Chat Th_eme:" msgstr "Chatt_ema:" -#: ../src/empathy-preferences.glade.h:10 +#: ../src/empathy-preferences.ui.h:10 msgid "Disable notifications when _away or busy" msgstr "Inaktivera notifieringar under fr_Ã¥nvaro eller upptagen" -#: ../src/empathy-preferences.glade.h:11 +#: ../src/empathy-preferences.ui.h:11 msgid "Disable sounds when _away or busy" msgstr "Inaktivera ljud under fr_Ã¥nvaro eller upptagen" -#: ../src/empathy-preferences.glade.h:12 +#: ../src/empathy-preferences.ui.h:12 +msgid "Enable notifications when a contact comes online" +msgstr "Aktivera notifieringar när en kontakt ansluter" + +#: ../src/empathy-preferences.ui.h:13 +msgid "Enable notifications when a contact goes offline" +msgstr "Aktivera notifieringar när en kontakt kopplar frÃ¥n" + +#: ../src/empathy-preferences.ui.h:14 msgid "Enable notifications when the _chat is not focused" msgstr "Aktivera notifieringar när _chatten inte är fokuserad" -#: ../src/empathy-preferences.glade.h:13 +#: ../src/empathy-preferences.ui.h:15 +msgid "Enable spell checking for languages:" +msgstr "Aktivera rättstavning för sprÃ¥k:" + +#: ../src/empathy-preferences.ui.h:16 msgid "General" msgstr "Allmänt" -#: ../src/empathy-preferences.glade.h:14 +#: ../src/empathy-preferences.ui.h:17 +msgid "Geoclue Settings" +msgstr "Inställningar för Geoclue" + +#: ../src/empathy-preferences.ui.h:18 +msgid "Location" +msgstr "Plats" + +#: ../src/empathy-preferences.ui.h:19 msgid "Notifications" msgstr "Notifieringar" -#: ../src/empathy-preferences.glade.h:15 +#: ../src/empathy-preferences.ui.h:20 +msgid "Play sound for events" +msgstr "Spela upp ljud för händelser" + +#: ../src/empathy-preferences.ui.h:21 msgid "Preferences" msgstr "Inställningar" -#: ../src/empathy-preferences.glade.h:16 +#: ../src/empathy-preferences.ui.h:22 +msgid "Privacy" +msgstr "Integritet" + +#: ../src/empathy-preferences.ui.h:23 +msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will have a random value added (±0.25°)." +msgstr "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer att fÃ¥ ett slumpmässigt värde (±0.25°)." + +#: ../src/empathy-preferences.ui.h:24 msgid "Show _avatars" msgstr "Visa _avatarer" -#: ../src/empathy-preferences.glade.h:17 +#: ../src/empathy-preferences.ui.h:25 msgid "Show _smileys as images" msgstr "Visa _smilisar som bilder" -#: ../src/empathy-preferences.glade.h:18 +#: ../src/empathy-preferences.ui.h:26 msgid "Show co_mpact contact list" msgstr "Visa ko_mpakt kontaktlista" -#: ../src/empathy-preferences.glade.h:19 +#: ../src/empathy-preferences.ui.h:27 +msgid "Show contact _list in rooms" +msgstr "Visa kontakt_lista i rum" + +#: ../src/empathy-preferences.ui.h:28 msgid "Sort by _name" msgstr "Sortera efter _namn" -#: ../src/empathy-preferences.glade.h:20 +#: ../src/empathy-preferences.ui.h:29 msgid "Sort by s_tate" msgstr "Sortera efter _tillstÃ¥nd" -#: ../src/empathy-preferences.glade.h:21 +#: ../src/empathy-preferences.ui.h:30 msgid "Sounds" msgstr "Ljud" -#: ../src/empathy-preferences.glade.h:22 +#: ../src/empathy-preferences.ui.h:31 msgid "Spell Checking" msgstr "Stavningskontroll" -#: ../src/empathy-preferences.glade.h:23 +#: ../src/empathy-preferences.ui.h:32 +msgid "The list of languages reflects only the languages for which you have a dictionary installed." +msgstr "Listan visar endast sprÃ¥k som du har en ordlista installerad för." + +#: ../src/empathy-preferences.ui.h:33 msgid "Themes" msgstr "Teman" -#: ../src/empathy-preferences.glade.h:24 +#: ../src/empathy-preferences.ui.h:34 msgid "_Enable bubble notifications" msgstr "_Aktivera bubbelnotifieringar" -#: ../src/empathy-preferences.glade.h:25 +#: ../src/empathy-preferences.ui.h:35 msgid "_Enable sound notifications" msgstr "_Aktivera ljudnotifieringar" -#: ../src/empathy-preferences.glade.h:26 +#: ../src/empathy-preferences.ui.h:36 msgid "_Open new chats in separate windows" msgstr "_Öppna nya chattar i separata fönster" -#: ../src/empathy-status-icon.glade.h:1 +#: ../src/empathy-preferences.ui.h:37 +msgid "_Publish location to my contacts" +msgstr "_Publicera platsen till mina kontakter" + +#: ../src/empathy-preferences.ui.h:38 +msgid "_Reduce location accuracy" +msgstr "_Minska precision för plats" + +#: ../src/empathy-status-icon.ui.h:1 msgid "Status" msgstr "Status" -#: ../src/empathy-status-icon.glade.h:3 +#: ../src/empathy-status-icon.ui.h:3 msgid "_Quit" msgstr "_Avsluta" -#: ../src/empathy-status-icon.glade.h:4 +#: ../src/empathy-status-icon.ui.h:4 msgid "_Show Contact List" msgstr "_Visa kontaktlista" -#: ../src/empathy-tube-dispatch.c:364 +#: ../src/empathy-tube-dispatch.c:375 #, c-format msgid "Unable to start application for service %s: %s" msgstr "Kunde inte starta program för tjänsten %s: %s" -#: ../src/empathy-tube-dispatch.c:435 +#: ../src/empathy-tube-dispatch.c:446 #, c-format -msgid "" -"An invitation was offered for service %s, but you don't have the needed " -"application to handle it" -msgstr "" -"Du blev erbjuden en inbjudan för tjänsten %s, men du har inte det nödvändiga " -"programmet att hantera den med" +msgid "An invitation was offered for service %s, but you don't have the needed application to handle it" +msgstr "Du blev erbjuden en inbjudan för tjänsten %s, men du har inte det nödvändiga programmet att hantera den med" + +#: ../src/empathy-call-window-fullscreen.ui.h:1 +msgid "gtk-leave-fullscreen" +msgstr "Lämna helskärmsläge" + +#: ../src/empathy-map-view.ui.h:1 +msgid "Contact Map View" +msgstr "Kartvy för kontakter" + +#: ../src/empathy-debug-dialog.c:111 +#: ../src/empathy-debug-dialog.c:1083 +msgid "Error" +msgstr "Fel" + +#: ../src/empathy-debug-dialog.c:114 +#: ../src/empathy-debug-dialog.c:1077 +msgid "Critical" +msgstr "Kritiskt" + +#: ../src/empathy-debug-dialog.c:117 +#: ../src/empathy-debug-dialog.c:1071 +msgid "Warning" +msgstr "Varning" + +#: ../src/empathy-debug-dialog.c:120 +#: ../src/empathy-debug-dialog.c:1065 +#: ../src/empathy-debug-dialog.c:1113 +msgid "Message" +msgstr "Meddelande" + +#: ../src/empathy-debug-dialog.c:123 +#: ../src/empathy-debug-dialog.c:1059 +msgid "Info" +msgstr "Info" + +#: ../src/empathy-debug-dialog.c:126 +#: ../src/empathy-debug-dialog.c:1053 +msgid "Debug" +msgstr "Felsökning" + +#: ../src/empathy-debug-dialog.c:845 +msgid "Save" +msgstr "Spara" + +#: ../src/empathy-debug-dialog.c:948 +msgid "Debug Window" +msgstr "Felsökningsfönster" + +#: ../src/empathy-debug-dialog.c:1021 +msgid "Pause" +msgstr "Gör paus" + +#: ../src/empathy-debug-dialog.c:1033 +msgid "Level " +msgstr "NivÃ¥ " + +#: ../src/empathy-debug-dialog.c:1102 +msgid "Time" +msgstr "Tid" + +#: ../src/empathy-debug-dialog.c:1104 +msgid "Domain" +msgstr "Domän" + +#: ../src/empathy-debug-dialog.c:1106 +msgid "Category" +msgstr "Kategori" + +#: ../src/empathy-debug-dialog.c:1108 +msgid "Level" +msgstr "NivÃ¥" + +#: ../src/empathy-debug-dialog.c:1140 +msgid "The selected connection manager does not support the remote debugging extension." +msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfelsökning." + +#~ msgid "<b>Network</b>" +#~ msgstr "<b>Nätverk</b>" +#~ msgid "<b>Servers</b>" +#~ msgstr "<b>Servrar</b>" +#~ msgid "<b>Topic:</b>" +#~ msgstr "<b>Ämne:</b>" +#~ msgid "<b>Contact</b>" +#~ msgstr "<b>Kontakt</b>" +#~ msgid "<b>Groups</b>" +#~ msgstr "<b>Grupper</b>" +#, fuzzy +#~ msgid "<b>Add Account</b>" +#~ msgstr "<b>Konto</b>" +#~ msgid "New message from %s" +#~ msgstr "Nytt meddelande frÃ¥n %s" +#~ msgid "File transfers" +#~ msgstr "Filöverföringar" +#~ msgid "<b>Contact List</b>" +#~ msgstr "<b>Kontaktlista</b>" +#~ msgid "Forget password and clear the entry." +#~ msgstr "Glöm lösenordet och töm inmatningen." +#~ msgid "Edit the selected IRC network" +#~ msgstr "Redigera markerat irc-nätverk" +#~ msgid "Remove the selected IRC network" +#~ msgstr "Ta bort markerat irc-nätverk" +#~ msgid "_Check Word Spelling..." +#~ msgstr "_Kontrollera stavning..." +#~ msgid "Group Chat" +#~ msgstr "Gruppchatt" +#~ msgid "Contact Information" +#~ msgstr "Kontaktinformation" +#~ msgid "I would like to add you to my contact list." +#~ msgstr "Jag vill lägga till dig i min kontaktlista." +#~ msgid "Sorry, I don't want you in my contact list anymore." +#~ msgstr "Tyvärr, jag vill inte längre ha dig i min kontaktlista." +#~ msgid "Contact information" +#~ msgstr "Kontaktinformation" +#~ msgid "Word" +#~ msgstr "Ord" +#~ msgid "Suggestions for the word" +#~ msgstr "Förslag för ordet" +#~ msgid "Spell Checker" +#~ msgstr "Stavningskontroll" +#~ msgid "Suggestions for the word:" +#~ msgstr "Förslag för ordet:" +#~ msgid "<b>New Account</b>" +#~ msgstr "<b>Nytt konto</b>" +#~ msgid "I already have an account I want to use" +#~ msgstr "Jag har redan ett konto som jag vill använda" +#~ msgid "C_lear" +#~ msgstr "T_öm" +#~ msgid "Chat" +#~ msgstr "Chatta" +#~ msgid "Insert _Smiley" +#~ msgstr "Infoga _smilis" +#~ msgid "Invitation _message:" +#~ msgstr "Inbjudnings_meddelande:" +#~ msgid "Invite" +#~ msgstr "Bjud in" +#~ msgid "Move Tab _Left" +#~ msgstr "Flytta flik till _vänster" +#~ msgid "Move Tab _Right" +#~ msgstr "Flytta flik till _höger" +#~ msgid "Select who would you like to invite:" +#~ msgstr "Välj vem du vill bjuda in:" +#~ msgid "You have been invited to join a chat conference." +#~ msgstr "Du har blivit inbjuden till en chattkonferens." +#~ msgid "_Contact" +#~ msgstr "_Kontakt" +#~ msgid "_Conversation" +#~ msgstr "_Samtal" +#~ msgid "_Detach Tab" +#~ msgstr "_Koppla loss flik" +#~ msgid "_Favorite Chatroom" +#~ msgstr "_Favoritchattrum" +#~ msgid "_Next Tab" +#~ msgstr "_Nästa flik" +#~ msgid "_Previous Tab" +#~ msgstr "_FöregÃ¥ende flik" +#~ msgid "_Tabs" +#~ msgstr "_Flikar" +#~ msgid "Edit Favorite Room" +#~ msgstr "Redigera favoritrum" +#~ msgid "Join room on start_up" +#~ msgstr "GÃ¥ in i rummet vid _uppstart" +#~ msgid "Join this chat room when Empathy starts and you are connected" +#~ msgstr "GÃ¥ in i detta chattrum när Empathy startar och du är ansluten" +#~ msgid "N_ame:" +#~ msgstr "N_amn:" +#~ msgid "S_erver:" +#~ msgstr "S_erver:" +#~ msgctxt "file size" +#~ msgid "Unknown" +#~ msgstr "Okänt" +#~ msgid "\"%s\" receiving from %s" +#~ msgstr "\"%s\" tas emot frÃ¥n %s" +#~ msgid "\"%s\" sending to %s" +#~ msgstr "\"%s\" skickas till %s" +#~ msgid "File transfer canceled: %s" +#~ msgstr "Filöverföringen avbröts: %s" +#~ msgctxt "remaining time" +#~ msgid "Unknown" +#~ msgstr "Okänt" +#~ msgid "Cannot save file to this location" +#~ msgstr "Kan inte spara fil till denna plats" +#~ msgid "Save file as..." +#~ msgstr "Spara fil som..." +#~ msgid "unknown size" +#~ msgstr "okänd storlek" +#~ msgid "%s would like to send you a file" +#~ msgstr "%s vill skicka en fil till dig" +#~ msgid "Do you want to accept the file \"%s\" (%s)?" +#~ msgstr "Vill du ta emot filen \"%s\" (%s)?" +#~ msgid "_Accept" +#~ msgstr "_Acceptera" +#~ msgid "Join _New..." +#~ msgstr "GÃ¥ in i _nytt..." +#~ msgid "Chat Rooms" +#~ msgstr "Chattrum" +#~ msgid "Browse:" +#~ msgstr "Bläddra:" +#~ msgid "Join" +#~ msgstr "GÃ¥ in" +#~ msgid "Join New" +#~ msgstr "GÃ¥ in i nytt" +#~ msgid "Re_fresh" +#~ msgstr "Uppda_tera" +#~ msgid "" +#~ "This list represents all chat rooms hosted on the server you have entered." +#~ msgstr "" +#~ "Den här listan representerar alla chattrum som finns pÃ¥ servern som du " +#~ "har gÃ¥tt in pÃ¥." #~ msgid "menuitem2" #~ msgstr "menyobjekt2" - #~ msgid "Closed" #~ msgstr "Stängd" - #~ msgid "End this call?" #~ msgstr "Avsluta samtalet?" - #~ msgid "Closing this window will end the call in progress." #~ msgstr "Stängning av detta fönster gör att alla pÃ¥gÃ¥ende samtal avslutas." - -#~ msgid "_End Call" -#~ msgstr "A_vsluta samtal" - #~ msgid "Empathy Call" #~ msgstr "Empathy-samtal" - #~ msgid "Readying" #~ msgstr "Förbereder" - #~ msgid "%s - Empathy Call" #~ msgstr "%s - Empathy-samtal" - #~ msgid "Ringing" #~ msgstr "Ringer" - #~ msgid "Connecting" #~ msgstr "Ansluter" - #~ msgid "" #~ "Incoming call from %s rejected because there is already a running call." #~ msgstr "" #~ "Inkommande samtal frÃ¥n %s avvisades därför att det redan finns ett " #~ "pÃ¥gÃ¥ende samtal." - #~ msgid "#" #~ msgstr "#" - #~ msgid "*" #~ msgstr "*" - #~ msgid "0" #~ msgstr "0" - #~ msgid "1" #~ msgstr "1" - #~ msgid "2" #~ msgstr "2" - #~ msgid "3" #~ msgstr "3" - #~ msgid "4" #~ msgstr "4" - #~ msgid "5" #~ msgstr "5" - #~ msgid "6" #~ msgstr "6" - #~ msgid "7" #~ msgstr "7" - #~ msgid "8" #~ msgstr "8" - #~ msgid "9" #~ msgstr "9" - #~ msgid "<b>Keypad</b>" #~ msgstr "<b>Knappsats</b>" - #~ msgid "<b>Volume</b>" #~ msgstr "<b>Volym</b>" - #~ msgid "Enable popup when contact is available" #~ msgstr "Aktivera popup när kontakt är tillgänglig" - #~ msgid "Whether or not to show a popup when a contact becomes available." #~ msgstr "" #~ "Huruvida en popup ska visas eller inte när en kontakt blir tillgänglig." - #~ msgid "" #~ "%s is offering you an invitation, but you don't have the needed external " #~ "application to handle it." #~ msgstr "" #~ "%s erbjuder dig en inbjudan men du har inte det nödvändiga externa " #~ "programmet för att hantera den." - #~ msgid "Invitation Error" #~ msgstr "Inbjudningsfel" - -#~ msgid "gtk-clear" -#~ msgstr "Töm" - #~ msgid "gtk-cancel" #~ msgstr "Avbryt" - -#~ msgid "gtk-ok" -#~ msgstr "OK" - #~ msgid "Enable sound when busy" #~ msgstr "Aktivera ljud under upptagetläge" - #~ msgid "<b>Audio</b>" #~ msgstr "<b>Ljud</b>" - #~ msgid "<b>Visual</b>" #~ msgstr "<b>Visuellt</b>" - #~ msgid "Enable sounds when _busy" #~ msgstr "Aktivera ljud under _upptagetläge" - #~ msgid "Configure Telepathy account settings" #~ msgstr "Konfigurera inställningar för Telepathy-konto" - #~ msgid "Empathy accounts" #~ msgstr "Empathy-konton" - #~ msgid "" #~ "To add a new account, you can click on the 'Add' button and a new entry " #~ "will be created for you to start configuring." #~ msgstr "" #~ "För att lägga till ett nytt konto, klicka pÃ¥ knappen \"Lägg till\" och en " #~ "ny post kommer att skapas för dig att börja konfigurera." - #~ msgid "" #~ "\n" #~ "\n" @@ -2328,46 +2682,30 @@ msgstr "" #~ "\n" #~ "Om du inte vill lägga till ett konto, kan du helt enkelt klicka pÃ¥ " #~ "kontot, i listan till vänster, som du vill konfigurera." - #~ msgid "<b>No Accounts Configured</b>" #~ msgstr "<b>Inga konton konfigurerade</b>" - #~ msgid "J_apan server:" #~ msgstr "J_apansk server:" - #~ msgid "Invalid handle" #~ msgstr "Ogiltig hanterare" - #~ msgid "No matching connection" #~ msgstr "Ingen matchande anslutning" - #~ msgid "Invalid account" #~ msgstr "Ogiltigt konto" - #~ msgid "Presence failure" #~ msgstr "Närvarofel" - -#~ msgid "Contact does not support voice" -#~ msgstr "Kontakten saknar stöd för röstsamtal" - #~ msgid "Lowmem" #~ msgstr "LÃ¥gminne" - #~ msgid "Channel request generic error" #~ msgstr "Allmänt fel vid kanalbegäran" - #~ msgid "Channel banned" #~ msgstr "Bannlyst frÃ¥n kanalen" - #~ msgid "Channel full" #~ msgstr "Kanalen är full" - #~ msgid "Channel invite only" #~ msgstr "Kanalen är endast för inbjudna" - #~ msgid "Unknown error code" #~ msgstr "Okänd felkod" - #~ msgid "" #~ "To add a new account, you can click on the 'Add' button and a new entry " #~ "will be created for you to started configuring.\n" @@ -2380,272 +2718,177 @@ msgstr "" #~ "\n" #~ "Om du inte vill lägga till ett konto, kan du helt enkelt klicka pÃ¥ " #~ "kontot, i listan till vänster, som du vill konfigurera." - #~ msgid "Chat with contact" #~ msgstr "Chatta med kontakten" - #~ msgid "View contact information" #~ msgstr "Visa kontaktinformation" - #~ msgid "Re_name" #~ msgstr "Byt _namn" - #~ msgid "Rename" #~ msgstr "Byt namn" - #~ msgid "Edit the groups and name for this contact" #~ msgstr "Redigera grupper och namn för kontakten" - #~ msgid "Invite to a currently open chat room" #~ msgstr "Bjud in till ett för tillfället öppet chattrum" - #~ msgid "View previous conversations with this contact" #~ msgstr "Visa tidigare samtal med denna kontakt" - #~ msgid "Start a voice or video conversation with this contact" #~ msgstr "Starta röst- eller videosamtal med denna kontakt" - #~ msgid "Start Call" #~ msgstr "PÃ¥börja samtal" - #~ msgid "gtk-cut" #~ msgstr "Klipp ut" - #~ msgid "gtk-paste" #~ msgstr "Klistra in" - #~ msgid "gtk-about" #~ msgstr "Om" - #~ msgid "gtk-quit" #~ msgstr "Avsluta" - #~ msgid "ICQ account settings" #~ msgstr "Inställningar för ICQ-konto" - #~ msgid "jabber account settings" #~ msgstr "inställningar för jabberkonto" - #~ msgid "msn account settings" #~ msgstr "inställningar för msn-konto" - #~ msgid "salut account settings" #~ msgstr "inställningar för salut-konto" - #~ msgid "Yahoo! account settings" #~ msgstr "Inställningar för Yahoo!-konto" - #~ msgid "Input" #~ msgstr "IngÃ¥ng" - #~ msgid "Mute" #~ msgstr "Tyst" # Det mÃ¥ste finnas ett bättre ord #~ msgid "Output" #~ msgstr "UtgÃ¥ng" - #~ msgid "Ca_ll" #~ msgstr "R_ing" - #~ msgid "Change _Topic..." #~ msgstr "Ändra _ämne..." - #~ msgid "Contact Infor_mation" #~ msgstr "Kontaktinfor_mation" - #~ msgid "Cu_t" #~ msgstr "Klipp _ut" - #~ msgid "In_vite..." #~ msgstr "_Bjud in..." - #~ msgid "_Add To Favorites" #~ msgstr "_Lägg till i favoriter" - #~ msgid "_Copy" #~ msgstr "_Kopiera" - -#~ msgid "_Paste" -#~ msgstr "Klistra _in" - #~ msgid "_Show Contacts" #~ msgstr "_Visa kontakter" - #~ msgid "Enter the new topic you want to set for this room:" #~ msgstr "Ange det nya ämnet som du vill ställa in för det här rummet:" - -#~ msgid "<b>Options</b>" -#~ msgstr "<b>Alternativ</b>" - #~ msgid "_Use for chat rooms" #~ msgstr "Använd för _chattrum" - #~ msgid "%s went offline" #~ msgstr "%s kopplade frÃ¥n" - -#~ msgid "%s has come online" -#~ msgstr "%s anslöt sig" - #~ msgid "Disable" #~ msgstr "Inaktivera" - -#~ msgid "Call from %s" -#~ msgstr "Samtal frÃ¥n %s" - #~ msgid "Edit Account _Details" #~ msgstr "Redigera konto_detaljer" - #~ msgid "_New Message..." #~ msgstr "_Nytt meddelande..." - #~ msgid "New message" #~ msgstr "Nytt meddelande" - #~ msgid "A unique name for this account to identify it personally to you." #~ msgstr "" #~ "Ett unikt namn pÃ¥ kontot för att personligen identifiera det till dig." - -#~ msgid "Chat Room" -#~ msgstr "Chattrum" - #~ msgid "Contact List - Empathy" #~ msgstr "Kontaktlista - Empathy" - #~ msgid "<b>Languages</b>" #~ msgstr "<b>SprÃ¥k</b>" - #~ msgid "_Enable spell checking" #~ msgstr "_Aktivera stavningskontroll" - #~ msgid "Clear List..." #~ msgstr "Töm listan..." - #~ msgid "Are you sure you want to clear the list?" #~ msgstr "Är du säker pÃ¥ att du vill tömma listan?" - #~ msgid "" #~ "This will remove any custom messages you have added to the list of preset " #~ "status messages." #~ msgstr "" #~ "Detta kommer att ta bort de meddelanden du har lagt till i listan med " #~ "förinställda statusmeddelanden" - #~ msgid "Clear List" #~ msgstr "Töm listan" - #~ msgid "Enter status message:" #~ msgstr "Ange statusmeddelande:" - #~ msgid "Status Message Presets" #~ msgstr "Förinställda statusmeddelanden" - #~ msgid "_Add to status message list" #~ msgstr "_Lägg till i statusmeddelandelistan" - #~ msgid "" #~ "Subscription requested for %s\n" #~ "Message: %s" #~ msgstr "" #~ "PrenumerationsförfrÃ¥gan för %s\n" #~ "Meddelande: %s" - #~ msgid "Instant Messenger" #~ msgstr "Snabbmeddelandeklient" - #~ msgid "Sorry, I don't want you in my contact list." #~ msgstr "Tyvärr, jag vill inte ha dig i min kontaktlista." - -#~ msgid "<b>Account</b>" -#~ msgstr "<b>Konto</b>" - #~ msgid "Imendio " #~ msgstr "Imendio " - #~ msgid "Jabber" #~ msgstr "Jabber" - #~ msgid "Create" #~ msgstr "Skapa" - #~ msgid "" #~ "<small><b><span foreground=\"#555\">Example: user@jabber.org</span></b></" #~ "small>" #~ msgstr "" #~ "<small><b><span foreground=\"#555\">Exempel: användare@jabber.org</span></" #~ "b></small>" - #~ msgid "Gnome Instant Messaging Client" #~ msgstr "Snabbmeddelandeklient för Gnome" - #~ msgid "-" #~ msgstr "-" - #~ msgid "<b>Personal Details</b>" #~ msgstr "<b>Personliga detaljer</b>" - #~ msgid "<b>Status</b>" #~ msgstr "<b>Status</b>" - #~ msgid "<b>Subscription</b>" #~ msgstr "<b>Prenumeration</b>" - #~ msgid "<span size=\"smaller\">Example: Mikael or user@server.org</span>" #~ msgstr "" #~ "<span size=\"smaller\">Exempel: Mikael eller användare@server.org</span>" - #~ msgid "" #~ "<span size=\"smaller\">Note: You must select an account if the contact is " #~ "unknown</span>" #~ msgstr "" #~ "<span size=\"smaller\">Observera: Du mÃ¥ste välja ett konto om kontakten " #~ "är okänd</span>" - #~ msgid "Accou_nt:" #~ msgstr "Ko_nto:" - #~ msgid "Add Contact" #~ msgstr "Lägg till kontakt" - #~ msgid "C_hange" #~ msgstr "_Ändra" - #~ msgid "Ch_at" #~ msgstr "Ch_atta" - #~ msgid "Con_tact:" #~ msgstr "_Kontakt:" - #~ msgid "Contact List - Gossip" #~ msgstr "Kontaktlista - Gossip" - -#~ msgid "Country:" -#~ msgstr "Land:" - #~ msgid "Edit Contact" #~ msgstr "Redigera kontakt" - #~ msgid "Edit Groups" #~ msgstr "Redigera grupper" - #~ msgid "ID:" #~ msgstr "Id:" - #~ msgid "" #~ "If you chose to decide later you will be asked the next time you log on." #~ msgstr "" #~ "Om du väljer att bestämma dig senare kommer du att bli frÃ¥gad nästa gÃ¥ng " #~ "du logga in." - #~ msgid "Name:" #~ msgstr "Namn:" - #~ msgid "Personal Details" #~ msgstr "Personliga detaljer" - #~ msgid "R_egister" #~ msgstr "Re_gistrera" - #~ msgid "" #~ "Set the alias you want to use for:\n" #~ "<b>foo@bar.baz</b>\n" @@ -2656,7 +2899,6 @@ msgstr "" #~ "<b>foo@bar.baz</b>\n" #~ "\n" #~ "Du kan hämta kontaktinformation frÃ¥n servern." - #~ msgid "" #~ "This acts as a filter to the contact list below.\n" #~ "\n" @@ -2673,7 +2915,6 @@ msgstr "" #~ "\n" #~ "Du kan även använda namnet pÃ¥ en grupp för att endast visa kontakterna i " #~ "en specifik grupp." - #~ msgid "" #~ "This acts as a filter to the contact list below. You can use segments of " #~ "contact's name or ID, for example, \"jabber.org\" will list everyone " @@ -2682,289 +2923,198 @@ msgstr "" #~ "Detta fungerar som ett filter till kontaktlistan nedan. Du kan använda " #~ "delar av kontaktens namn eller id, till exempel \"jabber.org\" kommer att " #~ "lista alla som använder den servern" - #~ msgid "This is the name that will be used on your roster for this contact" #~ msgstr "" #~ "Detta är namnet som kommer att användas pÃ¥ din kontaktlista för denna " #~ "kontakt" - #~ msgid "This name will be used to identify you in chat windows" #~ msgstr "" #~ "Detta namn kommer att användas för att identifiera dig i chattfönster" - #~ msgid "" #~ "This name will be used to identify you when new contacts lookup your " #~ "details" #~ msgstr "" #~ "Detta namn kommer att användas för att identifiera dig när nya kontakter " #~ "kontrollerar din information" - #~ msgid "Use default name here from the contact's VCard." #~ msgstr "Använd standardnamnet här frÃ¥n kontaktens VCard." - #~ msgid "Use system pro_xy" #~ msgstr "Använd systemets pro_xyinställningar" - #~ msgid "You are not subscribed to this contact." #~ msgstr "Du prenumererar inte pÃ¥ denna kontakt." - #~ msgid "_Birthday:" #~ msgstr "_Födelsedag:" - #~ msgid "_Connect" #~ msgstr "An_slut" - #~ msgid "_Deny" #~ msgstr "_Neka" - -#~ msgid "_Description:" -#~ msgstr "_Beskrivning:" - #~ msgid "_Disconnect" #~ msgstr "_Koppla ifrÃ¥n" - #~ msgid "" #~ "_Enter the name or contact ID of the person you want to chat to below:" #~ msgstr "Ange _namnet eller kontakt-id för den person du vill chatta med:" - #~ msgid "_Group:" #~ msgstr "_Grupp:" - #~ msgid "_Password:" #~ msgstr "_Lösenord:" - #~ msgid "_Retrieve" #~ msgstr "_Hämta" - #~ msgid "_Subscribe" #~ msgstr "_Prenumerera" - # "Web site" är "webbplats". "Web page" är "webbsida". #~ msgid "_Web site:" #~ msgstr "_Webbplats:" - #~ msgid "Gossip Instant Messenger" #~ msgstr "Snabbmeddelandeklienten Gossip" - #~ msgid "Normal" #~ msgstr "Normalt" - #~ msgid "Active" #~ msgstr "Aktivt" - #~ msgid "Inactive" #~ msgstr "Inaktivt" - -#~ msgid "Error" -#~ msgstr "Fel" - #~ msgid "Moderator" #~ msgid_plural "Moderators" #~ msgstr[0] "Moderator" #~ msgstr[1] "Moderatorer" - #~ msgid "Participant" #~ msgid_plural "Participants" #~ msgstr[0] "Deltagare" #~ msgstr[1] "Deltagare" - #~ msgid "Visitor" #~ msgid_plural "Visitors" #~ msgstr[0] "Besökare" #~ msgstr[1] "Besökare" - #~ msgid "No role" #~ msgstr "Ingen roll" - #~ msgid "Owner" #~ msgid_plural "Owners" #~ msgstr[0] "Ägare" #~ msgstr[1] "Ägare" - #~ msgid "Administrator" #~ msgid_plural "Administrators" #~ msgstr[0] "Administrator" #~ msgstr[1] "Administratörer" - -#~ msgid "Member" -#~ msgid_plural "Members" -#~ msgstr[0] "Medlem" -#~ msgstr[1] "Medlemmar" - #~ msgid "The nickname you have chosen is already in use." #~ msgstr "Smeknamnet du har valt är upptaget." - #~ msgid "The chat room you tried to join requires a password." #~ msgstr "Chattrummet du försökte gÃ¥ in i kräver ett lösenord." - #~ msgid "The remote conference server did not respond in a sensible time." #~ msgstr "Fjärrkonferensservern svarade inte inom en rimlig tid." - #~ msgid "The conference server you tried to join could not be found." #~ msgstr "Konferensservern du försökte gÃ¥ in pÃ¥ kunde inte hittas." - #~ msgid "An unknown error occurred, check your details are correct." #~ msgstr "" #~ "Ett okänt fel har inträffat, kontrollera att dina detaljer är korrekta." - #~ msgid "Joining the chatroom was canceled." #~ msgstr "GÃ¥ in i chattrummet avbröts." - #~ msgid "Unavailable" #~ msgstr "Otillgänglig" - #~ msgid "An unknown error occurred." #~ msgstr "Ett okänt fel inträffade." - #~ msgid "Connection refused." #~ msgstr "Anslutning vägrades." - #~ msgid "Server address could not be resolved." #~ msgstr "Serverns address kunde inte slÃ¥s upp." - #~ msgid "Connection timed out." #~ msgstr "Anslutning timade ut." - #~ msgid "Authentication failed." #~ msgstr "Autentisering misslyckades." - #~ msgid "The username you are trying already exists." #~ msgstr "Användarnamnet du försöker använda existerar redan." - #~ msgid "The username you are trying is not valid." #~ msgstr "Användarnamnet du försöker använda är inte giltigt." - #~ msgid "This feature is unavailable." #~ msgstr "Denna funktion är inte tillgänglig." - #~ msgid "This feature is unauthorized." #~ msgstr "Denna funktion är inte auktoriserad." - #~ msgid "A specific protocol error occurred that was unexpected." #~ msgstr "Ett oväntat specifikt protokollfel inträffade." - #~ msgid "Connection could not be opened" #~ msgstr "Anslutning kunde inte öppnas" - #~ msgid "Service has gone and is no longer available" #~ msgstr "Tjänsten ar försvunnit och finns inte längre tillgänglig" - #~ msgid "Bad or malformed request to this service" #~ msgstr "Felaktig eller felformulerad begäran till den här tjänsten" - #~ msgid "Unauthorized request to this service" #~ msgstr "Obehörig begäran till den här tjänsten" - #~ msgid "Payment is required for this service" #~ msgstr "Betalning krävs för den här tjänsten" - #~ msgid "This service is forbidden" #~ msgstr "Den här tjänsten är förbjuden" - #~ msgid "This service is unavailable or not found" #~ msgstr "Den här tjänsten är inte tillgänglig eller hittades inte" - #~ msgid "Unacceptable request sent to this services" #~ msgstr "Oaccepterbar begäran skickades till den här tjänsten" - #~ msgid "Registration is required" #~ msgstr "Registrering krävs" - #~ msgid "There was a conflict of interest trying to use this service" #~ msgstr "" #~ "Det inträffade en intressekonflikt vid försök att använda den här " #~ "tjänsten " - #~ msgid "There was an internal service error" #~ msgstr "Det inträffade ett internt fel i tjänsten" - #~ msgid "This feature is not implemented" #~ msgstr "Den här funktionen är inte implementerad" - #~ msgid "The remote service timed out" #~ msgstr "Tidsgränsen för fjärrtjänsten överstegs" - #~ msgid "Using the %s backend" #~ msgstr "Använder bakänden %s" - #~ msgid "Stop" #~ msgstr "Stopp" - #~ msgid "Disconnect" #~ msgstr "Koppla ifrÃ¥n" - #~ msgid "Connect" #~ msgstr "Anslut" - #~ msgid "Bye bye" #~ msgstr "Hej dÃ¥" - #~ msgid "Successfully registered your new account settings." #~ msgstr "Registrering av dina nya kontoinställningar lyckades." - #~ msgid "You should now be able to connect to your new account." #~ msgstr "Du ska nu kunna ansluta med ditt nya konto." - #~ msgid "Failed to register your new account settings." #~ msgstr "Misslyckades med att registrera dina nya kontoinställningar." - #~ msgid "Successfully changed your account password." #~ msgstr "Ditt kontolösenord ändrades." - #~ msgid "You should now be able to connect with your new password." #~ msgstr "Du ska nu kunna ansluta med ditt nya lösenord." - #~ msgid "Failed to change your account password." #~ msgstr "Misslyckades med att ändra ditt kontolösenord." - #~ msgid "" #~ "Please enter a new password for this account:\n" #~ "%s" #~ msgstr "" #~ "Ange ett nytt lösenord för det här kontot:\n" #~ "%s" - #~ msgid "No information is available for this contact." #~ msgstr "Ingen information finns tillgänglig för denna kontakt." - #~ msgid "Information requested, please wait..." #~ msgstr "Information begärd, var vänlig vänta..." - #~ msgid "To summarize:" #~ msgstr "Sammanfattning:" - #~ msgid "%d subscription request" #~ msgid_plural "%d subscription requests" #~ msgstr[0] "%d prenumerationsförfrÃ¥gan" #~ msgstr[1] "%d prenumerationsförfrÃ¥gan" - #~ msgid "%d file transfer request" #~ msgid_plural "%d file transfer requests" #~ msgstr[0] "%d filöverföringsförfrÃ¥gan" #~ msgstr[1] "%d filöverföringsförfrÃ¥gan" - #~ msgid "%d server message" #~ msgid_plural "%d server messages" #~ msgstr[0] "%d servermeddelande" #~ msgstr[1] "%d servermeddelanden" - #~ msgid "%d error" #~ msgid_plural "%d errors" #~ msgstr[0] "%d fel" #~ msgstr[1] "%d fel" - #~ msgid "If you quit, you will lose all unread information." #~ msgstr "Om du avslutar kommer all oläst information förloras." - #~ msgid "Gossip is still running, it is just hidden." #~ msgstr "Gossip kör fortfarande, den är bara dold." - #~ msgid "Click on the notification area icon to show Gossip." #~ msgstr "Klicka pÃ¥ ikonen i notifieringsytan för att visa Gossip." - #~ msgid "You were about to quit!" #~ msgstr "Du är pÃ¥ väg att avsluta!" - #~ msgid "" #~ "Since no system or notification tray has been found, this action would " #~ "normally quit Gossip.\n" @@ -2977,29 +3127,22 @@ msgstr "" #~ "\n" #~ "Detta är bara en pÃ¥minnelse, frÃ¥n och med nu kommer Gossip att avslutas " #~ "när denna Ã¥tgärd genomförs sÃ¥vida du inte avkryssar alternativet nedan." - #~ msgid "Select who would you like to invite to room:" #~ msgstr "Välj vilka du vill bjuda in till rummet:" - #~ msgid "Select which room you would like to invite:" #~ msgstr "Välj vilket rum du vill bjuda in till:" - #~ msgid "Your invitation has been declined" #~ msgstr "Ditt inbjudan har nekats." - #~ msgid "Accept" #~ msgstr "Acceptera" - #~ msgid "" #~ "Please enter a new name for the group:\n" #~ "%s" #~ msgstr "" #~ "Ange ett nytt namn för gruppen:\n" #~ "%s" - #~ msgid "Unsorted" #~ msgstr "Osorterade" - #~ msgid "" #~ "Set the alias you want to use for:\n" #~ "<b>%s</b>\n" @@ -3010,160 +3153,105 @@ msgstr "" #~ "<b>%s</b>\n" #~ "\n" #~ "Du kan hämta kontaktinformation frÃ¥n servern." - #~ msgid "New file transfer request from %s" #~ msgstr "Ny filöverföringsförfrÃ¥gan frÃ¥n %s" - -#~ msgid "File transfer is not supported by both parties." -#~ msgstr "Filöverföring stöds inte av bÃ¥da parter." - #~ msgid "Your file transfer offer declined." #~ msgstr "Ditt erbjudande om filöverföring nekades." - #~ msgid "The other user decided not to continue." #~ msgstr "Den andra användaren beslöts sig för att inte fortsätta." - #~ msgid "Unknown error occurred during file transfer." #~ msgstr "Ett okänt fel inträffade under filöverföringen." - #~ msgid "Someone would like to send you a file." #~ msgstr "NÃ¥gon vill skicka en fil till dig." - #~ msgid "Retry connection" #~ msgstr "Ã…teranslut" - #~ msgid "Invited %s to join this chat conference." #~ msgstr "Inbjöd %s till att gÃ¥ med i chattkonferens." - #~ msgid "%s has set the topic: %s" #~ msgstr "%s har satt ämnet: %s" - #~ msgid "Conversation With" #~ msgstr "Samtal med" - #~ msgid "Allow multiple instances of the application to run at the same time" #~ msgstr "TillÃ¥t flera instanser av applikationen att köras samtidigt" - # "Lista" som verb brukar vi inte använda; hellre "visa" eller möjligtvis # "visa i lista" #~ msgid "List the available accounts" #~ msgstr "Visa tillgängliga konton" - #~ msgid "ACCOUNT-NAME" #~ msgstr "KONTONAMN" - #~ msgid "You can not use --no-connect together with --account" #~ msgstr "Du kan inte använda --no-connect tillsammans med --account" - #~ msgid "No accounts available." #~ msgstr "Inga konton tillgängliga." - #~ msgid "Available accounts:" #~ msgstr "Tillgängliga konton:" - #~ msgid "[default]" #~ msgstr "[standard]" - #~ msgid "There is no account with the name '%s'." #~ msgstr "Det finns inget konto med namnet \"%s\"." - #~ msgid "Found %d conference rooms" #~ msgstr "Hittade %d konferensrum" - #~ msgid "Browsing for conference rooms, please wait..." #~ msgstr "Bläddrar efter konferensrum, vänta..." - #~ msgid "Browsing cancelled!" #~ msgstr "Bläddring avbröts!" - #~ msgid "Default" #~ msgstr "Standard" - #~ msgid "Chat!" #~ msgstr "Chatta!" - #~ msgid "%s wants to be added to your contact list." #~ msgstr "%s vill bli tillagd till din kontaktlista." - #~ msgid "Someone wants to be added to your contact list." #~ msgstr "NÃ¥gon vill bli tillagd till din kontaktlista." - #~ msgid "Show" #~ msgstr "Visa" - #~ msgid "Contact has been removed" #~ msgstr "Kontakten har tagits bort" - #~ msgid "Subject: %s" #~ msgstr "Ämne: %s" - #~ msgid "Do you want to add this person to your contact list?" #~ msgstr "Vill du lägga till denna person till din kontaktlista?" - #~ msgid "Do you want to add %s to your contact list?" #~ msgstr "Vill du lägga till %s till din kontaktlista?" - #~ msgid "Please enter your %s account password" #~ msgstr "Ange lösenordet för kontot %s" - #~ msgid "Logging in to account '%s'" #~ msgstr "Loggar in mot kontot \"%s\"" - #~ msgid "Remember Password?" #~ msgstr "Kom ihÃ¥g lösenord?" - #~ msgid "Do not show this again" #~ msgstr "Visa inte det här igen" - #~ msgid "Could not display the help contents." #~ msgstr "Kunde inte visa hjälpinnehÃ¥llet." - #~ msgid "OK" #~ msgstr "OK" - #~ msgid "The server does not seem to be responding." #~ msgstr "Servern verkar inte svara." - #~ msgid "Try again later." #~ msgstr "Försök igen senare." - #~ msgid "Change" #~ msgstr "Ändra" - #~ msgid "File name:" #~ msgstr "Filnamn:" - # "Web site" är "webbplats". "Web page" är "webbsida". #~ msgid "File size:" #~ msgstr "Filstorlek:" - #~ msgid "Not supported yet" #~ msgstr "Stöds inte ännu" - #~ msgid "This person wishes to send you this file:" #~ msgstr "Denna person vill skicka den här filen till dig:" - -#~ msgid "me" -#~ msgstr "jag" - #~ msgid "Choose the protocol" #~ msgstr "Välj protokollet" - #~ msgid "Gossip" #~ msgstr "Gossip" - #~ msgid "%s - New Message" #~ msgstr "%s - Nytt meddelande" - #~ msgid "%s - Conversation" #~ msgstr "%s - Samtal" - #~ msgid "_Forget" #~ msgstr "_Glöm" - #~ msgid "Martyn Russell" #~ msgstr "Martyn Russell" - #~ msgid "" #~ "Set the alias you want to use for:\n" #~ "<b>martyn@imendio.com</b>\n" @@ -3174,92 +3262,64 @@ msgstr "" #~ "<b>martyn@imendio.com</b>\n" #~ "\n" #~ "Du kan hämta kontaktinformation frÃ¥n servern. " - #~ msgid " " #~ msgstr " " - #~ msgid "Group:" #~ msgstr "Grupp:" - # "Web site" är "webbplats". "Web page" är "webbsida". #~ msgid "Web Site:" #~ msgstr "Webbplats:" - #~ msgid "Favourite" #~ msgstr "Favorit" - #~ msgid "Add to _favourites" #~ msgstr "_Lägg till i favoriter" - #~ msgid "" #~ "Customize your own nickname, the server and chatroom which you wish to " #~ "join." #~ msgstr "Anpassa ditt smeknamn, servern och chattrummet du vill gÃ¥ in i." - #~ msgid "Edit your chat room details:" #~ msgstr "Redigera chattrumsdetaljer:" - #~ msgid "Na_me:" #~ msgstr "Na_mn:" - #~ msgid "New Chat Room" #~ msgstr "Nytt chattrum" - #~ msgid "" #~ "Pick a saved chat room from the presets available below and click Join to " #~ "start chatting." #~ msgstr "" #~ "Välj ett sparat chattrum nedan och tryck GÃ¥ in för att börja chatta." - #~ msgid "Save _this chat room" #~ msgstr "Spara detta chattrum" - #~ msgid "Press Subscribe to request to receive their status" #~ msgstr "Tryck pÃ¥ Prenumerera för att ta emot kontaktens status" - #~ msgid "_Group Chat" #~ msgstr "_Gruppchatt" - #~ msgid "You have no Instant Messaging accounts configured!" #~ msgstr "Du har inte konfigurerar ett snabbmeddelandekonto!" - #~ msgid "" #~ "Next you will be presented with the Account Information dialog to set " #~ "your details up." #~ msgstr "" #~ "Kontoinformationsdialogen kommer nu att visas sÃ¥ att du kan mata in din " #~ "information." - -#~ msgid "Registering account" -#~ msgstr "Registrerar konto" - #~ msgid "<span size=\"smaller\">Example:</span>" #~ msgstr "<span size=\"smaller\">Exempel:</span>" - #~ msgid "Account Name" #~ msgstr "Kontonamn" - #~ msgid "Connection Details" #~ msgstr "Anslutningsdetaljer" - #~ msgid "Enter a name for this account" #~ msgstr "Ange ett namn för detta konto" - #~ msgid "Enter the port used in the connection for this account" #~ msgstr "Ange porten att ansluta till för detta konto" - #~ msgid "Enter the server used in the connection for this account" #~ msgstr "Ange den server som ska anslutas till för detta konto" - #~ msgid "Enter your real name here" #~ msgstr "Ange ditt riktiga namn här" - #~ msgid "Finished" #~ msgstr "Slutfört" - #~ msgid "For increased security, enable this option" #~ msgstr "För ökad säkerhet, aktivera detta val" - #~ msgid "" #~ "Gossip is a modern client for the Jabber Instant Messaging system.\n" #~ "\n" @@ -3274,7 +3334,6 @@ msgstr "" #~ "till din Jabber-favoritserver.\n" #~ "\n" #~ "För att börja klickar du bara pÃ¥ \"FramÃ¥t\"." - #~ msgid "" #~ "If you have another machine on your network which 'proxies' the " #~ "connection to the internet and you want to use it, enable this option" @@ -3282,14 +3341,12 @@ msgstr "" #~ "Om du har en annan dator pÃ¥ ditt nätverk som fungerar som proxy för " #~ "anslutningar till internet och du vill använda den, aktivera detta " #~ "alternativ" - #~ msgid "" #~ "If you need to set specific connection details, like a different server " #~ "or port, you can configure that here:" #~ msgstr "" #~ "Om du behöver ställa in specifika anslutningsdetaljer, som en annan " #~ "server eller port, kan du konfigurera det här:" - #~ msgid "" #~ "Leave this blank if you don't want your password stored on a public " #~ "machine. If you decide to do this, you will be prompted each time you " @@ -3298,16 +3355,12 @@ msgstr "" #~ "Lämna denna blank om du inte vill lagra ditt lösenord pÃ¥ en publik dator. " #~ "Om du väljer att göra det, kommer du att frÃ¥gas efter ett lösenord varje " #~ "gÃ¥ng du ansluter" - #~ msgid "Registering Account" #~ msgstr "Registrerar konto" - #~ msgid "Welcome to Gossip" #~ msgstr "Välkommen till Gossip" - #~ msgid "What is your name?" #~ msgstr "Vad heter du?" - #~ msgid "" #~ "What name do you want to use to identify this account?\n" #~ "\n" @@ -3318,63 +3371,42 @@ msgstr "" #~ "\n" #~ "Detta namn skulle kunna vara nÃ¥got som kan kopplas ihop med " #~ "tjänsteleverantören, till exempel <b>Google</b>." - #~ msgid "What password do you want to use?" #~ msgstr "Vilket lösenord vill du använda?" - #~ msgid "What username do you use?" #~ msgstr "Vad använder du för användarnamn?" - #~ msgid "What username do you want to use?" #~ msgstr "Vilket användarnamn vill du använda?" - #~ msgid "" #~ "You can change your account settings later by selecting the Edit-" #~ ">Accounts menu item." #~ msgstr "" #~ "Du kan ändra dina kontoinställningar senare genom att välja menyvalet " #~ "Redigera->Konton." - #~ msgid "" #~ "You need to set a name for the connection, for example, <b>Home</b> or " #~ "<b>Laptop</b>." #~ msgstr "" #~ "Du behöver ställa in ett namn för anslutningen, till exempel <b>Hem</b> " #~ "eller <b>Bärbar dator</b>." - #~ msgid "Your Account" #~ msgstr "Ditt konto" - #~ msgid "Your Identity" #~ msgstr "Din identitet" - #~ msgid "Your new account has now been set up." #~ msgstr "Ditt nya konto är nu inställt." - -#~ msgid "_No" -#~ msgstr "_Nej" - -#~ msgid "_Yes" -#~ msgstr "_Ja" - #~ msgid "<b>Information requested, please wait...</b>" #~ msgstr "<b>Information begärd, var vänlig vänta...</b>" - #~ msgid "%s will be added to your contact list." #~ msgstr "%s kommer att läggas till i din kontaktlista." - #~ msgid "%s ID of new contact:" #~ msgstr "%s id för ny kontakt:" - #~ msgid "Example: %s" #~ msgstr "Exempel: %s" - #~ msgid "Add a contact" #~ msgstr "Lägg till en kontakt" - #~ msgid "Enter the user's contact ID:" #~ msgstr "Ange användarens kontakt-ID:" - #~ msgid "" #~ "In order to subscribe to presence notifications from the user, a request " #~ "will be sent. Until this request is approved, the user will always be " @@ -3384,353 +3416,242 @@ msgstr "" #~ "en förfrÃ¥gan att skickas. Användaren kommer alltid att visas som " #~ "\"FrÃ¥nkopplad\" i din kontaktlista till dess att denna förfrÃ¥gan är " #~ "godkänd." - #~ msgid "In which group do you want to place this contact?" #~ msgstr "I vilken grupp vill du placera denna kontakt?" - #~ msgid "Jabber ID:" #~ msgstr "Jabber-id:" - #~ msgid "What instant messaging system does the contact use?" #~ msgstr "Vilket meddelandesystem använder kontakten?" - #~ msgid "Which account do you want to add this contact to?" #~ msgstr "Till vilket konto vill du lägga till denna kontakt?" - #~ msgid "_Search..." #~ msgstr "_Sök..." - #~ msgid "_Compact contact list" #~ msgstr "_Kompakt kontaktlista" - #~ msgid "Show accounts and pending connections" #~ msgstr "Visa konton och avvaktande anslutningar" - #~ msgid "Edit" #~ msgstr "Redigera" - #~ msgid "Perhaps you are trying to connect to the wrong port?" #~ msgstr "Försöker du kanske ansluta till fel port?" - #~ msgid "Perhaps the service is not currently running?" #~ msgstr "Tjänsten kanske inte är igÃ¥ng just nu?" - #~ msgid "Check your connection details." #~ msgstr "Kontrollera dina anslutningsdetaljer." - #~ msgid "Perhaps the server is not running this service." #~ msgstr "Servern kanske inte kör denna tjänsten." - #~ msgid "Check your username and password are correct." #~ msgstr "Kontrollera att användarnamn och lösenord är korrekta." - #~ msgid "Re_name group" #~ msgstr "Byt _namn pÃ¥ grupp" - #~ msgid "_Remove contact" #~ msgstr "_Ta bort kontakt" - #~ msgid "" #~ "Please enter your invitation message to:\n" #~ "%s" #~ msgstr "" #~ "Ange ditt inbjudningsmeddelande till:\n" #~ "%s" - # Vi brukar förvisso lÃ¥ta R:et vara Ã¥tkomsttangent i "Redigera" #~ msgid "_Edit Groups" #~ msgstr "R_edigera grupper" - #~ msgid "" #~ "Please enter a new nickname for the contact\n" #~ "%s" #~ msgstr "" #~ "Ange ett nytt smeknamn för kontakten\n" #~ "%s" - #~ msgid "Edit groups for %s" #~ msgstr "Redigera grupper för %s" - # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man nÃ¥got för att det # inte ska hittas, döljer gör man för att det inte ska synas. #~ msgid "_Hide Contact List" #~ msgstr "_Dölj kontaktlista" - #~ msgid "/Contact Infor_mation" #~ msgstr "/Kontaktinfor_mation" - #~ msgid "/_View Previous Conversations" #~ msgstr "/Visa tidigare samtal" - #~ msgid "Enable Spell Checker" #~ msgstr "Aktivera stavningskontroll" - #~ msgid "Preset status messages" #~ msgstr "Förinställda statusmeddelanden" - #~ msgid "Preset status messages." #~ msgstr "Förinställda statusmeddelanden." - #~ msgid "Peekaboo" #~ msgstr "Peekaboo" - # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man nÃ¥got för att det # inte ska hittas, döljer gör man för att det inte ska synas. #~ msgid "_Show/Hide Contact List" #~ msgstr "_Dölj/Visa kontaktlista" - #~ msgid "An instant messaging applet." #~ msgstr "En snabbmeddelandeklient för GNOME" - #~ msgid "Contact Information for %s" #~ msgstr "Kontaktinformation för %s" - #~ msgid "Convert smiley text into images when chatting" #~ msgstr "Konvertera textsmilisar till bilder" - #~ msgid "Be silent when away" #~ msgstr "Var tyst under frÃ¥nvaro" - #~ msgid "Be silent when busy" #~ msgstr "Var tyst under upptagetläge" - #~ msgid "<b>Chat Window</b>" #~ msgstr "<b>Chattfönster</b>" - #~ msgid "Join _Group Chat..." #~ msgstr "_GÃ¥ in i gruppchatt..." - #~ msgid "Available..." #~ msgstr "Tillgänglig..." - #~ msgid "Busy..." #~ msgstr "Upptagen..." - #~ msgid "Away..." #~ msgstr "FrÃ¥nvarande..." - #~ msgid "Requesting contact information, please wait..." #~ msgstr "Begär kontaktinformation, var vänlig vänta..." - #~ msgid "Height of main window" #~ msgstr "Höjden pÃ¥ huvudfönstret" - #~ msgid "The X position of the main window." #~ msgstr "X-positionen av huvudfönstret." - #~ msgid "The Y position of the main window." #~ msgstr "Y-positionen av huvudfönstret." - #~ msgid "The width of the main window." #~ msgstr "Bredden pÃ¥ huvudfönstret." - #~ msgid "Whether spell checking should be turned on." #~ msgstr "Huruvida stavningskontroll ska vara pÃ¥slaget." - #~ msgid "Width of the main window" #~ msgstr "Bredden pÃ¥ huvudfönstret" - #~ msgid "X position of main window" #~ msgstr "X-positionen av huvudfönstret" - #~ msgid "Y position of main window" #~ msgstr "Y-positionen av huvudfönstret" - #~ msgid "<b>Appearance and Behavior</b>" #~ msgstr "<b>Utseende och beteende</b>" - #~ msgid "Check spelling while I _type" #~ msgstr "Kontrollera stavning medan jag skriver" - #~ msgid "Close this chat window" #~ msgstr "Stäng detta chattfönster" - #~ msgid "Requested Information" #~ msgstr "Information efterfrÃ¥gad" - #~ msgid "Requested information." #~ msgstr "Information efterfrÃ¥gad." - #~ msgid "/_Contact Information" #~ msgstr "/_Kontaktinformation" - #~ msgid "Contact _Information" #~ msgstr "Kontakti_nformation" - #~ msgid "Gossip - Accounts" #~ msgstr "Gossip - konton" - #~ msgid "Por_t:" #~ msgstr "_Port:" - #~ msgid "/_Invite to Chat Conference" #~ msgstr "/_Bjud in till chattkonferens" - -#~ msgid "%s has gone offline" -#~ msgstr "%s kopplade frÃ¥n" - #~ msgid "/View Message _History" #~ msgstr "/Visa _meddelandehistorik" - #~ msgid "View Message _History" #~ msgstr "Visa _meddelandehistorik" - #~ msgid "View Message Hi_story" #~ msgstr "Visa _meddelandehistorik" - #~ msgid "View Message History" #~ msgstr "Visa meddelandehistorik" - #~ msgid "Gossip - Group Chat" #~ msgstr "Gossip - gruppchatt" - #~ msgid "Gossip - New Chatroom" #~ msgstr "Gossip - nytt chattrum" - #~ msgid "Gossip - Add contact" #~ msgstr "Gossip - lägg till kontakt" - #~ msgid "Gossip - Contact Information" #~ msgstr "Gossip - kontaktinformation" - #~ msgid "Gossip - Edit Groups" #~ msgstr "Gossip - redigera grupper" - #~ msgid "Gossip - New Account" #~ msgstr "Gossip - nytt konto" - #~ msgid "Gossip - Personal Details" #~ msgstr "Gossip - personlig information" - #~ msgid "Gossip - Preferences" #~ msgstr "Gossip - inställningar" - #~ msgid "Gossip - Spell Checker" #~ msgstr "Gossip - stavningskontroll" - #~ msgid "Gossip - Status Message" #~ msgstr "Gossip - statusmeddelande" - #~ msgid "Gossip - View Message History" #~ msgstr "Gossip - visa meddelandehistorik" - #~ msgid "Written by:" #~ msgstr "Skrivet av:" - #~ msgid "Artwork by:" #~ msgstr "Grafik av:" - #~ msgid "Translated by:" #~ msgstr "Översatt av:" - #~ msgid "/Show _Log" #~ msgstr "/_Visa logg" - #~ msgid "View Lo_g" #~ msgstr "_Visa logg" - #~ msgid "" #~ "You can identify this account with a name, for example, <b>Home</b> or " #~ "<b>Work</b>. Choose a name for this account:" #~ msgstr "" #~ "Du kan identifiera detta kontot med ett namn, till exempel <b>Hemma</b> " #~ "eller <b>Jobb</b>. Välj ett namn för kontot:" - #~ msgid "Open" #~ msgstr "Öppet" - #~ msgid "Account ID" #~ msgstr "Kontoid" - #~ msgid "Could not find the server you wanted to use" #~ msgstr "Kunde inte hitta servern du ville använda" - #~ msgid "Connection to the server failed." #~ msgstr "Anslutningen till servern misslyckades." - #~ msgid "Connection could not be created" #~ msgstr "Anslutning kunde inte skapas" - #~ msgid "Bad Request" #~ msgstr "Felaktig förfrÃ¥gan" - #~ msgid "Payment Required" #~ msgstr "Betalning krävd" - #~ msgid "Not Found" #~ msgstr "Inte hittad" - #~ msgid "Not Allowed" #~ msgstr "Inte tillÃ¥ten" - #~ msgid "Not Acceptable" #~ msgstr "Inte acceptabel" - #~ msgid "Request Timeout" #~ msgstr "FörfrÃ¥gan timade ut" - #~ msgid "Conflict" #~ msgstr "Konflikt" - #~ msgid "Remote Server Error" #~ msgstr "Fjärrserverfel" - #~ msgid "Service Unavailable" #~ msgstr "Tjänst otillgänglig" - #~ msgid "Custom" #~ msgstr "Anpassad" - #~ msgid "Check the server host name is correct and is available." #~ msgstr "" #~ "Kontrollera att serverns namn är korrent och att den finns tillgänglig." - # Dessa meddelanden slutar inte bÃ¥da i punkt, borde kanske rapporteras #~ msgid "Gossip will now try to use your account:" #~ msgstr "Gossip kommer nu att försöka använda ditt konto:" - #~ msgid "Gossip will now try to register the account:" #~ msgstr "Gossip kommer nu att försöka registrera kontot:" - #~ msgid "Reason:" #~ msgstr "Orsak:" - #~ msgid "R_esource:" #~ msgstr "R_esurs:" - #~ msgid "<b>Personal Information</b>" #~ msgstr "<b>Personlig information</b>" - #~ msgid "Choose a Server" #~ msgstr "Välj en server" - #~ msgid "On what server do you have an account?" #~ msgstr "PÃ¥ vilken server har du ett konto?" - #~ msgid "_Jabber ID of new contact:" #~ msgstr "_Jabber-id för ny kontakt:" - #~ msgid "<b>Preferences</b>" #~ msgstr "<b>Inställningar</b>" - #~ msgid "Connect _Server:" #~ msgstr "Anslut till _server:" - #~ msgid "_Automatically Connect" #~ msgstr "_Anslut automatiskt" - #~ msgid "_Resource:" #~ msgstr "_Resurs:" - #~ msgid "" #~ "The default account is used for information like your name in chat " #~ "windows." #~ msgstr "" #~ "Standardkontot används för information som ditt namn i chattfönster." - #~ msgid "_Connect..." #~ msgstr "_Anslut..." - #, fuzzy #~ msgid "" #~ "<b>Configuring your new service...</b>\n" @@ -3742,7 +3663,6 @@ msgstr "" #, fuzzy #~ msgid "<b>Preferred Service</b>" #~ msgstr "<b>Rekommenderade tjänster</b>" - #~ msgid "<b>Recommended Services</b>" #~ msgstr "<b>Rekommenderade tjänster</b>" @@ -3753,64 +3673,46 @@ msgstr "" #~ msgstr "" #~ "<b>Söker efter den bästa servern...</b>\n" #~ "Detta kommer att ta en stund, var god vänta." - -#~ msgid "Add Account" -#~ msgstr "Lägg till konto" - #~ msgid "Add Another Account" #~ msgstr "Lägg till ytterligare konto" - #~ msgid "Configuring Service" #~ msgstr "Konfigurerar tjänst" - #~ msgid "Nick name:" #~ msgstr "Smeknamn:" - #~ msgid "Please complete the details below to set up your account: " #~ msgstr "Fyll i detaljerna nedan för att ställa in ditt konto: " - #~ msgid "Remove Account" #~ msgstr "Ta bort konto" - #~ msgid "Service Details" #~ msgstr "Tjänstedetaljer" - #~ msgid "Service:" #~ msgstr "Tjänst:" - #~ msgid "" #~ "This wizard will allow you to configure your account settings for another " #~ "protocol. " #~ msgstr "" #~ "Denna guide kommer att lÃ¥ta dig konfigurera dina kontoinställningar för " #~ "ytterligare ett protokoll. " - #~ msgid "Which protocol would you like to set up? " #~ msgstr "Vilket protokoll vill du konfigurera? " - #~ msgid "Edit List..." #~ msgstr "Redigera listan..." - #~ msgid "Gossip - Status Presets" #~ msgstr "Gossip - förinställd status" #, fuzzy #~ msgid "Choose _from list:" #~ msgstr "Välj frÃ¥n lista:" - #~ msgid "Jabber.com" #~ msgstr "Jabber.com" - #~ msgid "Jabber.org" #~ msgstr "Jabber.org" #, fuzzy #~ msgid "Use a _different server" #~ msgstr "Använd en annan server" - #~ msgid "_Account Information" #~ msgstr "_Kontoinformation" - #~ msgid "Searching Local Services..." #~ msgstr "Söker lokala tjänster..." @@ -3827,99 +3729,70 @@ msgstr "" #, fuzzy #~ msgid "Registration Successful!" #~ msgstr "Registrerar konto" - #~ msgid "Service" #~ msgstr "Tjänst" #, fuzzy #~ msgid "Registering With Service" #~ msgstr "Konfigurerar tjänst" - #~ msgid "From:" #~ msgstr "FrÃ¥n:" - #~ msgid "In reply to:" #~ msgstr "Svar pÃ¥:" - #~ msgid "To:" #~ msgstr "Till:" - #~ msgid "_Reply..." #~ msgstr "_Svara..." - #~ msgid "C_onnect" #~ msgstr "A_nslut" - #~ msgid " " #~ msgstr " " - #~ msgid "<b>Available chat rooms</b>" #~ msgstr "<b>Tillgängliga chattrum</b>" - #~ msgid "N_ickname:" #~ msgstr "Smek_namn:" - -#~ msgid "_Add" -#~ msgstr "_Lägg till" - #~ msgid "<b>Preset status messages</b>" #~ msgstr "<b>Förinställda statusmeddelanden</b>" - #~ msgid "<i>Information not available</i>" #~ msgstr "<i>Informationen inte tillgänglig</i>" - #~ msgid "Information about ..." #~ msgstr "Information om..." - #~ msgid "Jabber Account" #~ msgstr "Jabberkonto" - #~ msgid "Personal information" #~ msgstr "Personlig information" - #~ msgid "Status Message" #~ msgstr "Statusmeddelande" - #~ msgid "What request message do you want to send to %s?" #~ msgstr "Vilket förfrÃ¥gansmeddelande vill du skicka till %s?" - #~ msgid "%s wants to be notified of your status." #~ msgstr "%s vill bli meddelad om din status." - #~ msgid "Add to your contact list" #~ msgstr "Lägg till i din kontaktlista" - #~ msgid "What request message do you want to send to ...?" #~ msgstr "Vilket förfrÃ¥gansmeddelande vill du skicka till ..." - #~ msgid "Make sure that your account information is correct." #~ msgstr "Kontrollera att din kontoinformation är korrekt." - #~ msgid "You were disconnected from the server. Do you want to reconnect?" #~ msgstr "Du frÃ¥nkopplades frÃ¥n servern. Vill du Ã¥teransluta?" - #~ msgid "" #~ "Make sure that your account information is correct. The server may also " #~ "currently be unavailable." #~ msgstr "" #~ "Kontrollera att din kontoinformation är korrekt. Servern kan ocksÃ¥ vara " #~ "otillgänglig för tillfället." - #~ msgid "An error occurred when chatting in the group chat %s." #~ msgstr "Ett fel inträffade under samtal i gruppchatten %s." - #~ msgid "Details:" #~ msgstr "Detaljer:" - #~ msgid "Unable to enter the group chat %s." #~ msgstr "Kunde inte gÃ¥ in i gruppchatten %s." - #~ msgid "An error occurred when chatting with %s." #~ msgstr "Ett fel inträffade under chatt med %s." - #~ msgid "" #~ "Please enter your user name, password and all other required details " #~ "below to set up your account." #~ msgstr "" #~ "Ange ditt användarnamn, lösenord och alla andra nödvändiga detaljer nedan " #~ "för att konfigurera ditt konto." + @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-19 05:47+0530\n" -"PO-Revision-Date: 2009-06-20 14:19+0530\n" +"POT-Creation-Date: 2009-07-03 22:10+0530\n" +"PO-Revision-Date: 2009-07-04 14:42+0530\n" "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n" "Language-Team: Tamil <Ubuntu-l10n-tam@lists.ubuntu.com>\n" "MIME-Version: 1.0\n" @@ -169,98 +169,107 @@ msgid "Popup notifications if the chat isn't focused" msgstr "அரடà¯à®Ÿà¯ˆ கà¯à®µà®¿à®ªà¯à®ªà®¿à®²à¯ இலà¯à®²à¯ˆà®¯à®¾à®©à®¾à®²à¯ வெளிதà¯à®¤à¯à®³à¯à®³à®²à¯ மூலம௠அறிவி" #: ../data/empathy.schemas.in.h:36 +msgid "Popup notifications when a contact sign in" +msgstr "தொடரà¯à®ªà¯ உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ வெளிதà¯à®¤à¯à®³à¯à®³à®²à¯ மூலம௠அறிவி" + +#: ../data/empathy.schemas.in.h:37 +msgid "Popup notifications when a contact sign out" +msgstr "தொடரà¯à®ªà¯ உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ வெளிதà¯à®¤à¯à®³à¯à®³à®²à¯ மூலம௠அறிவி" + +#: ../data/empathy.schemas.in.h:38 msgid "Salut account is created" msgstr "சாலà¯à®Ÿà¯ கணகà¯à®•à¯ தà¯à®µà®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯ " -#: ../data/empathy.schemas.in.h:37 +#: ../data/empathy.schemas.in.h:39 msgid "Show avatars" msgstr "அவதாரஙà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯" -#: ../data/empathy.schemas.in.h:38 +#: ../data/empathy.schemas.in.h:40 msgid "Show contact list in rooms" msgstr "தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ ஠அறைகளில௠காடà¯à®Ÿà¯ " -#: ../data/empathy.schemas.in.h:39 +#: ../data/empathy.schemas.in.h:41 msgid "Show hint about closing the main window" msgstr "à®®à¯à®¤à®©à¯à®®à¯ˆ சாளரதà¯à®¤à¯ˆ மூடிவத௠கà¯à®±à®¿à®¤à¯à®¤à¯ கà¯à®±à®¿à®ªà¯à®ªà¯ காடà¯à®Ÿà¯ " -#: ../data/empathy.schemas.in.h:40 +#: ../data/empathy.schemas.in.h:42 msgid "Show offline contacts" msgstr " வலை தொடரà¯à®ªà®¿à®²à¯à®²à®¾à®¤ தொடரà¯à®ªà¯à®•à®³à¯ˆ காடà¯à®Ÿà¯" -#: ../data/empathy.schemas.in.h:41 +#: ../data/empathy.schemas.in.h:43 msgid "Spell checking languages" msgstr "எழà¯à®¤à¯à®¤à¯à®ªà¯à®ªà®¿à®´à¯ˆ திரà¯à®¤à¯à®¤ மொழி" -#: ../data/empathy.schemas.in.h:42 +#: ../data/empathy.schemas.in.h:44 msgid "The default folder to save file transfers in." msgstr "இடமாறà¯à®±à®¿à®¯ கோபà¯à®ªà¯à®•à®³à¯ˆ சேமிகà¯à®• à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ அடைவà¯" -#: ../data/empathy.schemas.in.h:43 +#: ../data/empathy.schemas.in.h:45 msgid "The last directory that an avatar image was chosen from." msgstr "அவதாரம௠படம௠தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ கடைசி அடைவ௠" -#: ../data/empathy.schemas.in.h:44 +#: ../data/empathy.schemas.in.h:46 msgid "The theme that is used to display the conversation in chat windows." msgstr "அரடà¯à®Ÿà¯ˆ சாளரஙà¯à®•à®³à®¿à®²à¯ உரையாடலà¯à®•à®³à¯ˆ காடà¯à®Ÿ பயனà¯à®ªà®Ÿà¯à®®à¯ கரà¯à®¤à¯à®¤à¯" -#: ../data/empathy.schemas.in.h:45 +#: ../data/empathy.schemas.in.h:47 msgid "Use graphical smileys" msgstr "வரைகலை சிரிபà¯à®ªà®¾à®©à¯à®•à®³à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•" -#: ../data/empathy.schemas.in.h:46 +#: ../data/empathy.schemas.in.h:48 msgid "Use notification sounds" msgstr "அறிவிபà¯à®ªà¯ ஒலிகளை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•" -#: ../data/empathy.schemas.in.h:47 +#: ../data/empathy.schemas.in.h:49 msgid "Use theme for chat rooms" msgstr "அரடà¯à®Ÿà¯ˆ அறைகளà¯à®•à¯à®•à¯ கரà¯à®¤à¯à®¤à¯à®•à¯à®•à®³à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•" -#: ../data/empathy.schemas.in.h:48 +#: ../data/empathy.schemas.in.h:50 msgid "Whether or not Empathy can publish the user's location to his contacts." msgstr "பயனரின௠இடதà¯à®¤à¯ˆ தொடரà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ எமà¯à®ªà®¤à®¿ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:49 +#: ../data/empathy.schemas.in.h:51 msgid "Whether or not Empathy can use the GPS to guess the location." msgstr "எமà¯à®ªà®¤à®¿ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• ஜிபிஎஸ௠஠பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¾à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾." -#: ../data/empathy.schemas.in.h:50 +#: ../data/empathy.schemas.in.h:52 msgid "Whether or not Empathy can use the cellular network to guess the location." msgstr "எமà¯à®ªà®¤à®¿ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• அலைபேசி வலையை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¾à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾." -#: ../data/empathy.schemas.in.h:51 +#: ../data/empathy.schemas.in.h:53 msgid "Whether or not Empathy can use the network to guess the location." msgstr "எமà¯à®ªà®¤à®¿ பயனரின௠இடதà¯à®¤à¯ˆ ஊகிகà¯à®• வலையை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¾à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾." -#: ../data/empathy.schemas.in.h:52 +#: ../data/empathy.schemas.in.h:54 msgid "" "Whether or not Empathy has asked about importing accounts from other " "programs." msgstr "எமà¯à®ªà®¤à®¿ மறà¯à®± நிரலà¯à®•à®³à®¿à®²à¯ இரà¯à®¨à¯à®¤à¯ கணகà¯à®•à¯à®•à®³à¯ˆ இறகà¯à®•à¯à®®à®¤à®¿ செயà¯à®µà®¤à¯ கà¯à®±à®¿à®¤à¯à®¤à¯ வினவியதா இலà¯à®²à¯ˆà®¯à®¾." -#: ../data/empathy.schemas.in.h:53 +#: ../data/empathy.schemas.in.h:55 msgid "" "Whether or not Empathy should automatically log in to your accounts on " "startup." msgstr "எமà¯à®ªà®¤à®¿ தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ கணகà¯à®•à¯à®•à®³à®¿à®²à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• உளà¯à®¨à¯à®´à¯ˆà®¯ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾." -#: ../data/empathy.schemas.in.h:54 +#: ../data/empathy.schemas.in.h:56 msgid "" "Whether or not Empathy should reduce the location's accuracy for privacy " "reasons." -msgstr "அநà¯à®¤à®°à®™à¯à®•à®¤à¯à®¤à¯ˆ காபà¯à®ªà®¾à®±à¯à®± தà¯à®µà®™à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ இடதà¯à®¤à®¿à®©à¯ கà¯à®±à®¿à®ªà¯à®ªà¯ˆ கà¯à®±à¯ˆà®•à¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾" +msgstr "" +"அநà¯à®¤à®°à®™à¯à®•à®¤à¯à®¤à¯ˆ காபà¯à®ªà®¾à®±à¯à®± தà¯à®µà®™à¯à®•à¯à®®à¯ போத௠எமà¯à®ªà®¤à®¿ இடதà¯à®¤à®¿à®©à¯ கà¯à®±à®¿à®ªà¯à®ªà¯ˆ கà¯à®±à¯ˆà®•à¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾" -#: ../data/empathy.schemas.in.h:55 +#: ../data/empathy.schemas.in.h:57 msgid "" "Whether or not Empathy should use the avatar of the contact as the chat " "window icon." msgstr "எமà¯à®ªà®¤à®¿ தொடரà¯à®ªà®¿à®©à¯ அவதாரதà¯à®¤à¯ˆ அரடà¯à®Ÿà¯ˆ அறை சினà¯à®©à®®à®¾à®• பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾." -#: ../data/empathy.schemas.in.h:56 +#: ../data/empathy.schemas.in.h:58 msgid "Whether or not the Salut account has been created on the first Empathy run." msgstr "à®®à¯à®¤à®²à¯ ஓடà¯à®Ÿà®¤à¯à®¤à®¿à®²à¯ எமà¯à®ªà®¤à®¿ சலூட௠கணகà¯à®•à¯ˆ உரà¯à®µà®¾à®•à¯à®•à®¿à®¯à®¤à®¾ இலà¯à®²à¯ˆà®¯à®¾." -#: ../data/empathy.schemas.in.h:57 +#: ../data/empathy.schemas.in.h:59 msgid "" "Whether or not the network manager should be used to automatically " "disconnect/reconnect." @@ -268,55 +277,63 @@ msgstr "" "வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯ மேலாளர௠஠தானியஙà¯à®•à®¿à®¯à®¾à®• இணைகà¯à®•à®µà¯à®®à¯ இணைபà¯à®ªà¯ விலகவà¯à®®à¯ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾ " "இலà¯à®²à¯ˆà®¯à®¾" -#: ../data/empathy.schemas.in.h:58 +#: ../data/empathy.schemas.in.h:60 msgid "" "Whether or not to check words typed against the languages you want to check " "with." msgstr "நீஙà¯à®•à®³à¯ விரà¯à®®à¯à®ªà®¿à®¯ மொழிகளில௠உளà¯à®³à®¿à®Ÿà¯à®Ÿ சொறà¯à®•à®³à¯ˆ சோதிகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:59 +#: ../data/empathy.schemas.in.h:61 msgid "Whether or not to convert smileys into graphical images in conversations." msgstr "உரையாடலà¯à®•à®³à®¿à®²à¯ சிரிபà¯à®ªà®¾à®©à¯à®•à®³à¯ˆ வரைகலை படஙà¯à®•à®³à®¾à®• மாறà¯à®± வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:60 +#: ../data/empathy.schemas.in.h:62 msgid "Whether or not to play a sound to notify for contacts logging in the network." msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ தொடரà¯à®ªà¯à®•à®³à¯ உளà¯à®¨à¯à®´à¯ˆà®¯à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:61 +#: ../data/empathy.schemas.in.h:63 msgid "" "Whether or not to play a sound to notify for contacts logging off the " "network." msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ தொடரà¯à®ªà¯à®•à®³à¯ வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:62 +#: ../data/empathy.schemas.in.h:64 msgid "Whether or not to play a sound to notify for events." msgstr "நிகழà¯à®µà¯à®•à®³à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:63 +#: ../data/empathy.schemas.in.h:65 msgid "Whether or not to play a sound to notify for incoming messages." msgstr "செயà¯à®¤à®¿à®•à®³à¯ உளà¯à®µà®°à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:64 +#: ../data/empathy.schemas.in.h:66 msgid "Whether or not to play a sound to notify for new conversations." msgstr "பà¯à®¤à®¿à®¯ உரையாடலà¯à®•à®³à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:65 +#: ../data/empathy.schemas.in.h:67 msgid "Whether or not to play a sound to notify for outgoing messages." msgstr "செயà¯à®¤à®¿à®•à®³à¯ வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ போத௠ஒலியை எழà¯à®ªà¯à®ª வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:66 +#: ../data/empathy.schemas.in.h:68 msgid "Whether or not to play a sound when logging in a network." msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ உளà¯à®¨à¯à®´à¯ˆà®¯à¯à®®à¯ போத௠ஒலி இயகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:67 +#: ../data/empathy.schemas.in.h:69 msgid "Whether or not to play a sound when logging off a network." msgstr "வலைபà¯à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ வெளிசà¯à®šà¯†à®²à¯à®²à¯à®®à¯ போத௠ஒலி இயகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:68 +#: ../data/empathy.schemas.in.h:70 msgid "Whether or not to play sound notifications when away or busy." msgstr "வெளியே அலà¯à®²à®¤à¯ வேலையாக உளà¯à®³ போத௠ஒலி அறிகà¯à®•à¯ˆà®•à®³à¯ˆ இயகà¯à®• வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:69 +#: ../data/empathy.schemas.in.h:71 +msgid "Whether or not to show a popup notification when a contact goes offline." +msgstr "தொடரà¯à®ªà¯ இணைபà¯à®ªà¯ விலகி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" + +#: ../data/empathy.schemas.in.h:72 +msgid "Whether or not to show a popup notification when a contact goes online." +msgstr "தொடரà¯à®ªà¯ இணைபà¯à®ªà®¿à®²à¯ வரà¯à®•à¯ˆà®¯à®¿à®²à¯ தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" + +#: ../data/empathy.schemas.in.h:73 msgid "" "Whether or not to show a popup notification when receiving a new message " "even if the chat is already opened, but not focused." @@ -324,29 +341,29 @@ msgstr "" "பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿ ஒனà¯à®±à¯ வரà¯à®®à¯à®ªà¯‹à®¤à¯ அரடà¯à®Ÿà¯ˆ திறநà¯à®¤à¯ இரà¯à®¨à¯à®¤à¯ கà¯à®µà®¿à®ªà¯à®ªà®¿à®²à¯ இலà¯à®²à®¾à®µà®¿à®Ÿà¯à®Ÿà®¾à®²à¯à®®à¯ தà¯à®³à¯à®³à¯ " "அறிகà¯à®•à¯ˆà®¯à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:70 +#: ../data/empathy.schemas.in.h:74 msgid "Whether or not to show a popup notification when receiving a new message." msgstr "பà¯à®¤à®¿à®¯ செயà¯à®¤à®¿ ஒனà¯à®±à¯ வரà¯à®®à¯à®ªà¯‹à®¤à¯ தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®¯à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:71 +#: ../data/empathy.schemas.in.h:75 msgid "" "Whether or not to show avatars for contacts in the contact list and chat " "windows." msgstr "அரடà¯à®Ÿà¯ˆ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯à®®à¯ தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯à®®à¯ அவதாரஙà¯à®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:72 +#: ../data/empathy.schemas.in.h:76 msgid "Whether or not to show contacts that are offline in the contact list." msgstr "தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯à®®à¯ இணைபà¯à®ªà®¿à®²à¯ இலà¯à®²à®¾à®¤ தொடரà¯à®ªà¯à®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:73 +#: ../data/empathy.schemas.in.h:77 msgid "Whether or not to show popup notifications when away or busy." msgstr "வெளியே அலà¯à®²à®¤à¯ வேலையாக உளà¯à®³ போத௠தà¯à®³à¯à®³à¯ அறிகà¯à®•à¯ˆà®•à®³à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:74 +#: ../data/empathy.schemas.in.h:78 msgid "Whether or not to show the contact list in chat rooms." msgstr "அரடà¯à®Ÿà¯ˆ அறையில௠தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:75 +#: ../data/empathy.schemas.in.h:79 msgid "" "Whether or not to show the message dialog about closing the main window with " "the 'x' button in the title bar." @@ -354,15 +371,15 @@ msgstr "" "தலைபà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®¿à®²à¯ x பொதà¯à®¤à®¾à®©à®¾à®²à¯ à®®à¯à®¤à®©à¯à®®à¯ˆ சாளரதà¯à®¤à¯ˆ மூடà¯à®µà®¤à¯ˆ கà¯à®±à®¿à®¤à¯à®¤ உரையாடலை காடà¯à®Ÿ " "வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:76 +#: ../data/empathy.schemas.in.h:80 msgid "Whether to show the contact list in compact mode or not." msgstr "அடகà¯à®•à®ªà¯à®ªà®¾à®™à¯à®•à®¿à®²à¯ தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ˆ காடà¯à®Ÿ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:77 +#: ../data/empathy.schemas.in.h:81 msgid "Whether to use the theme for chat rooms or not." msgstr "அரடà¯à®Ÿà¯ˆ அறைகளில௠கரà¯à®¤à¯à®¤à¯à®•à¯à®•à®³à¯ˆ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà¯à®®à®¾ இலà¯à®²à¯ˆà®¯à®¾?" -#: ../data/empathy.schemas.in.h:78 +#: ../data/empathy.schemas.in.h:82 msgid "" "Which criterium to use when sorting the contact list. Default is to use sort " "by the contact's name with the value \"name\". A value of \"state\" will " @@ -388,7 +405,7 @@ msgstr "தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ கோபà¯à®ªà¯ வழகà¯à msgid "The selected file is empty" msgstr "தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ கோபà¯à®ªà¯ காலியாக உளà¯à®³à®¤à¯" -#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:287 +#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:289 msgid "People nearby" msgstr "à®…à®°à¯à®•à®¿à®²à¯ உளà¯à®³ மகà¯à®•à®³à¯" @@ -424,23 +441,23 @@ msgstr "மறà¯à®± பஙà¯à®•à¯à®¤à®¾à®°à®°à¯ கோபà¯à®ªà¯ பரி msgid "Unknown reason" msgstr "தெரியாத காரணமà¯" -#: ../libempathy/empathy-utils.c:274 +#: ../libempathy/empathy-utils.c:265 msgid "Available" msgstr "இரà¯à®ªà¯à®ªà®µà¯ˆ" -#: ../libempathy/empathy-utils.c:276 +#: ../libempathy/empathy-utils.c:267 msgid "Busy" msgstr "வேலையிலà¯" -#: ../libempathy/empathy-utils.c:279 +#: ../libempathy/empathy-utils.c:270 msgid "Away" msgstr "வெளியிலà¯" -#: ../libempathy/empathy-utils.c:281 +#: ../libempathy/empathy-utils.c:272 msgid "Hidden" msgstr "மறைநà¯à®¤à¯à®³à¯à®³" -#: ../libempathy/empathy-utils.c:283 +#: ../libempathy/empathy-utils.c:274 msgid "Offline" msgstr "இணைபà¯à®ªà¯ விலகி" @@ -560,7 +577,7 @@ msgstr "(_U) à®à®šà®¿à®•à¯à®¯à¯‚ (ICQ) யà¯à®à®Žà®©à¯:" msgid "_Charset:" msgstr "(_C) எழà¯à®¤à¯à®¤à¯à®°à¯à®¤à¯Šà®•à¯à®¤à®¿:" -#: ../libempathy-gtk/empathy-account-widget-irc.c:241 +#: ../libempathy-gtk/empathy-account-widget-irc.c:240 msgid "New Network" msgstr "பà¯à®¤à®¿à®¯ வலையமைபà¯à®ªà¯" @@ -762,7 +779,7 @@ msgstr "சிரிபà¯à®ªà®¾à®©à¯ˆ சொரà¯à®•à¯" #. send button #: ../libempathy-gtk/empathy-chat.c:1031 -#: ../libempathy-gtk/empathy-ui-utils.c:1476 +#: ../libempathy-gtk/empathy-ui-utils.c:1475 msgid "_Send" msgstr "அனà¯à®ªà¯à®ªà¯ (_S)" @@ -770,30 +787,64 @@ msgstr "அனà¯à®ªà¯à®ªà¯ (_S)" msgid "_Spelling Suggestions" msgstr "_S எழà¯à®¤à¯à®¤à®¾à®•à¯à®• பரிநà¯à®¤à¯à®°à¯ˆà®•à®³à¯ " -#: ../libempathy-gtk/empathy-chat.c:1179 +#: ../libempathy-gtk/empathy-chat.c:1180, c-format +msgid "%s has disconnected" +msgstr "%s தொடரà¯à®ªà¯ˆ தà¯à®£à¯à®Ÿà®¿à®¤à¯à®¤à®¾à®°à¯" + +#: ../libempathy-gtk/empathy-chat.c:1184 #, c-format -msgid "%s has joined the room" -msgstr "%s அறையில௠சேரà¯à®¨à¯à®¤à®¾à®°à¯" +msgid "%s was kicked by %s" +msgstr "%s %s ஆல௠உதைதà¯à®¤à¯ வெளியேறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¾à®°à¯" + +#: ../libempathy-gtk/empathy-chat.c:1187 +#, c-format +msgid "%s was kicked" +msgstr "%s உதைதà¯à®¤à¯ வெளியேறà¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¾à®°à¯" + +#: ../libempathy-gtk/empathy-chat.c:1192 +#, c-format +msgid "%s was banned by %s" +msgstr "%s %s ஆல௠தடை செயà¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¾à®°à¯" + +#: ../libempathy-gtk/empathy-chat.c:1195 +#, c-format +msgid "%s was banned" +msgstr "%s தடை செயà¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà®¾à®°à¯" -#: ../libempathy-gtk/empathy-chat.c:1182 +#: ../libempathy-gtk/empathy-chat.c:1199 #, c-format msgid "%s has left the room" msgstr "%s அறையில௠இரà¯à®¨à¯à®¤à¯ வெளியேறினாரà¯" -#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1199 +#. Note to translators: this string is appended to +#. * notifications like "foo has left the room", with the message +#. * given by the user living the room. If this poses a problem, +#. * please let us know. :-) +#. +#: ../libempathy-gtk/empathy-chat.c:1208 +#, c-format +msgid " (%s)" +msgstr " (%s)" + +#: ../libempathy-gtk/empathy-chat.c:1231 +#, c-format +msgid "%s has joined the room" +msgstr "%s அறையில௠சேரà¯à®¨à¯à®¤à®¾à®°à¯" + +#: ../libempathy-gtk/empathy-chat.c:1364 ../src/empathy-call-window.c:1226 msgid "Disconnected" msgstr "தà¯à®£à¯à®Ÿà®¿à®•à¯à®•à®ªà®Ÿà¯à®Ÿà®¤à¯" -#: ../libempathy-gtk/empathy-chat.c:1742 +#: ../libempathy-gtk/empathy-chat.c:1793 msgid "Connected" msgstr "இணைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" -#: ../libempathy-gtk/empathy-chat.c:1792 -#: ../libempathy-gtk/empathy-log-window.c:501 +#: ../libempathy-gtk/empathy-chat.c:1843 +#: ../libempathy-gtk/empathy-log-window.c:502 msgid "Conversation" msgstr "உரையாடலà¯" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471 +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472 msgid "Topic:" msgstr "தலைபà¯à®ªà¯:" @@ -807,7 +858,7 @@ msgstr "இணைபà¯à®ªà®¿à®©à¯ˆ திற (_O)" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:415 +#: ../libempathy-gtk/empathy-chat-text-view.c:421 msgid "%A %B %d %Y" msgstr "%A %B %d %Y" @@ -820,7 +871,7 @@ msgstr "தொடரà¯à®ªà®¿à®©à¯ தகவல௠஠திரà¯à®¤à¯à®¤à¯ msgid "Personal Information" msgstr "தனிபà¯à®ªà®Ÿà¯à®Ÿ தகவலà¯" -#: ../libempathy-gtk/empathy-contact-dialogs.c:392 +#: ../libempathy-gtk/empathy-contact-dialogs.c:384 msgid "New Contact" msgstr "பà¯à®¤à®¿à®¯ தொடரà¯à®ªà¯" @@ -832,26 +883,26 @@ msgstr "(_L) பிறக௠மà¯à®Ÿà®¿à®µà¯ எடà¯à®•à¯à®•à®²à®¾à®®à¯" msgid "Subscription Request" msgstr "சநà¯à®¤à®¾ வேணà¯à®Ÿà¯à®¤à®²à¯" -#: ../libempathy-gtk/empathy-contact-list-view.c:1378 +#: ../libempathy-gtk/empathy-contact-list-view.c:1375 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "நீஙà¯à®•à®³à¯ நிசà¯à®šà®¯à®®à¯ கà¯à®´à¯ '%s' ஠நீகà¯à®• விரà¯à®®à¯à®ªà¯à®•à®¿à®±à¯€à®°à¯à®•à®³à®¾?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1380 +#: ../libempathy-gtk/empathy-contact-list-view.c:1377 msgid "Removing group" msgstr "கà¯à®´à¯à®µà¯ˆ நீகà¯à®•à¯à®¤à®²à¯" -#: ../libempathy-gtk/empathy-contact-list-view.c:1427 -#: ../libempathy-gtk/empathy-contact-list-view.c:1505 +#: ../libempathy-gtk/empathy-contact-list-view.c:1424 +#: ../libempathy-gtk/empathy-contact-list-view.c:1502 msgid "_Remove" msgstr "நீகà¯à®•à®µà¯à®®à¯ (_R)" -#: ../libempathy-gtk/empathy-contact-list-view.c:1457 +#: ../libempathy-gtk/empathy-contact-list-view.c:1454 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "நீஙà¯à®•à®³à¯ நிசà¯à®šà®¯à®®à¯ தொடரà¯à®ªà¯ '%s' ஠நீகà¯à®• விரà¯à®®à¯à®ªà¯à®•à®¿à®±à¯€à®°à¯à®•à®³à®¾?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1459 +#: ../libempathy-gtk/empathy-contact-list-view.c:1456 msgid "Removing contact" msgstr "தொடரà¯à®ªà¯ ஠நீகà¯à®•à¯à®¤à®²à¯" @@ -912,7 +963,7 @@ msgid "Select" msgstr "தேரà¯à®µà¯" #: ../libempathy-gtk/empathy-contact-widget.c:988 -#: ../src/empathy-main-window.c:905 +#: ../src/empathy-main-window.c:903 msgid "Group" msgstr "கà¯à®´à¯" @@ -1052,7 +1103,7 @@ msgid "Client:" msgstr "சாரà¯à®¨à¯à®¤à¯‹à®©à¯:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:7 -#: ../src/empathy-main-window.c:888 +#: ../src/empathy-main-window.c:886 msgid "Contact" msgstr "தொடரà¯à®ªà¯" @@ -1121,12 +1172,12 @@ msgstr "தà¯à®±à¯ˆ" msgid "SSL" msgstr "எஸà¯à®Žà®¸à¯à®Žà®²à¯" -#: ../libempathy-gtk/empathy-log-window.c:494 -#: ../src/empathy-import-dialog.c:281 +#: ../libempathy-gtk/empathy-log-window.c:495 +#: ../src/empathy-import-dialog.c:285 msgid "Account" msgstr "கணகà¯à®•à¯" -#: ../libempathy-gtk/empathy-log-window.c:511 +#: ../libempathy-gtk/empathy-log-window.c:512 msgid "Date" msgstr "தேதி" @@ -1197,6 +1248,46 @@ msgstr "உஙà¯à®•à®³à¯ நடபà¯à®ªà¯ நிலையையà¯à®®à¯ இ msgid "Custom messages..." msgstr "தனிபà¯à®ªà®¯à®©à¯ செயà¯à®¤à®¿à®•à®³à¯..." +#: ../libempathy-gtk/empathy-sound.c:51 +msgid "Received an instant message" +msgstr "ஒர௠உடனடி செயà¯à®¤à®¿ கிடைகà¯à®•à®ªà¯à®ªà¯†à®±à¯à®±à®¤à¯" + +#: ../libempathy-gtk/empathy-sound.c:53 +msgid "Sent an instant message" +msgstr "ஒர௠உடனடி செயà¯à®¤à®¿ அனà¯à®ªà¯à®ªà¯" + +#: ../libempathy-gtk/empathy-sound.c:55 +msgid "Incoming chat request" +msgstr "உளà¯à®µà®°à¯à®®à¯ அரடà¯à®Ÿà¯ˆ வேணà¯à®Ÿà¯à®¤à®²à¯" + +#: ../libempathy-gtk/empathy-sound.c:57 +msgid "Contact connected" +msgstr "தொடரà¯à®ªà¯ இணைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" + +#: ../libempathy-gtk/empathy-sound.c:59 +msgid "Contact disconnected" +msgstr "தொடரà¯à®ªà¯ தà¯à®£à¯à®Ÿà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" + +#: ../libempathy-gtk/empathy-sound.c:61 +msgid "Connected to server" +msgstr "சேவையகதà¯à®¤à¯à®•à¯à®•à¯ இணைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" + +#: ../libempathy-gtk/empathy-sound.c:63 +msgid "Disconnected from server" +msgstr "சேவையகதà¯à®¤à¯à®•à¯à®•à¯ இணைபà¯à®ªà¯ தà¯à®£à¯à®Ÿà®¿à®•à¯à®•à®ªà®Ÿà¯à®Ÿà®¤à¯" + +#: ../libempathy-gtk/empathy-sound.c:65 +msgid "Incoming voice call" +msgstr "உளà¯à®µà®°à¯à®®à¯ கà¯à®°à®²à¯ அழைபà¯à®ªà¯" + +#: ../libempathy-gtk/empathy-sound.c:67 +msgid "Outgoing voice call" +msgstr "வெளி செலà¯à®²à¯à®®à¯ கà¯à®°à®²à¯ அழைபà¯à®ªà¯" + +#: ../libempathy-gtk/empathy-sound.c:69 +msgid "Voice call ended" +msgstr "கà¯à®°à®²à¯ அழைபà¯à®ªà¯ à®®à¯à®Ÿà®¿à®¨à¯à®¤à®¤à¯" + #: ../libempathy-gtk/empathy-status-preset-dialog.c:362 msgid "Enter Custom Message" msgstr "தனிபà¯à®ªà®¯à®©à¯ செயà¯à®¤à®¿à®¯à¯ˆ உளà¯à®³à®¿à®Ÿà¯à®•" @@ -1221,78 +1312,34 @@ msgstr "ஜிடிகே-சேரà¯" msgid "gtk-remove" msgstr "ஜிடிகே-நீகà¯à®•à¯" -#: ../libempathy-gtk/empathy-theme-manager.c:66 +#: ../libempathy-gtk/empathy-theme-manager.c:67 msgid "Classic" msgstr "தொனà¯à®®à¯ˆà®¯à®¾à®©" -#: ../libempathy-gtk/empathy-theme-manager.c:67 +#: ../libempathy-gtk/empathy-theme-manager.c:68 msgid "Simple" msgstr "எளிய" -#: ../libempathy-gtk/empathy-theme-manager.c:68 +#: ../libempathy-gtk/empathy-theme-manager.c:69 msgid "Clean" msgstr "சà¯à®¤à¯à®¤à®®à®¾à®©" -#: ../libempathy-gtk/empathy-theme-manager.c:69 +#: ../libempathy-gtk/empathy-theme-manager.c:70 msgid "Blue" msgstr "நீலமà¯" -#: ../libempathy-gtk/empathy-theme-manager.c:71 -msgid "Adium" -msgstr "à®à®Ÿà®¿à®¯à®®à¯" - -#: ../libempathy-gtk/empathy-ui-utils.c:1378 +#: ../libempathy-gtk/empathy-ui-utils.c:1377 msgid "Unable to open URI" msgstr "யூஆரà¯à® ஠திறகà¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ" -#: ../libempathy-gtk/empathy-ui-utils.c:1468 +#: ../libempathy-gtk/empathy-ui-utils.c:1467 msgid "Select a file" msgstr "கோபà¯à®ªà¯ˆ தேரà¯à®µà¯ செயà¯" -#: ../libempathy-gtk/empathy-ui-utils.c:1526 +#: ../libempathy-gtk/empathy-ui-utils.c:1525 msgid "Select a destination" msgstr "ஒர௠இலகà¯à®•à®¿à®Ÿà®®à¯ தேரà¯à®µà¯ செயà¯à®•" -#: ../libempathy-gtk/empathy-ui-utils.c:1555 -msgid "Received an instant message" -msgstr "ஒர௠உடனடி செயà¯à®¤à®¿ கிடைகà¯à®•à®ªà¯à®ªà¯†à®±à¯à®±à®¤à¯" - -#: ../libempathy-gtk/empathy-ui-utils.c:1557 -msgid "Sent an instant message" -msgstr "ஒர௠உடனடி செயà¯à®¤à®¿ அனà¯à®ªà¯à®ªà¯" - -#: ../libempathy-gtk/empathy-ui-utils.c:1559 -msgid "Incoming chat request" -msgstr "உளà¯à®µà®°à¯à®®à¯ அரடà¯à®Ÿà¯ˆ வேணà¯à®Ÿà¯à®¤à®²à¯" - -#: ../libempathy-gtk/empathy-ui-utils.c:1561 -msgid "Contact connected" -msgstr "தொடரà¯à®ªà¯ இணைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" - -#: ../libempathy-gtk/empathy-ui-utils.c:1563 -msgid "Contact disconnected" -msgstr "தொடரà¯à®ªà¯ தà¯à®£à¯à®Ÿà®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" - -#: ../libempathy-gtk/empathy-ui-utils.c:1565 -msgid "Connected to server" -msgstr "சேவையகதà¯à®¤à¯à®•à¯à®•à¯ இணைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" - -#: ../libempathy-gtk/empathy-ui-utils.c:1567 -msgid "Disconnected from server" -msgstr "சேவையகதà¯à®¤à¯à®•à¯à®•à¯ இணைபà¯à®ªà¯ தà¯à®£à¯à®Ÿà®¿à®•à¯à®•à®ªà®Ÿà¯à®Ÿà®¤à¯" - -#: ../libempathy-gtk/empathy-ui-utils.c:1569 -msgid "Incoming voice call" -msgstr "உளà¯à®µà®°à¯à®®à¯ கà¯à®°à®²à¯ அழைபà¯à®ªà¯" - -#: ../libempathy-gtk/empathy-ui-utils.c:1571 -msgid "Outgoing voice call" -msgstr "வெளி செலà¯à®²à¯à®®à¯ கà¯à®°à®²à¯ அழைபà¯à®ªà¯" - -#: ../libempathy-gtk/empathy-ui-utils.c:1573 -msgid "Voice call ended" -msgstr "கà¯à®°à®²à¯ அழைபà¯à®ªà¯ à®®à¯à®Ÿà®¿à®¨à¯à®¤à®¤à¯" - #: ../libempathy-gtk/totem-subtitle-encoding.c:158 msgid "Current Locale" msgstr "தறà¯à®ªà¯‹à®¤à¯ˆà®¯ மொழி உளà¯à®³à®®à¯ˆà®µà¯" @@ -1476,7 +1523,7 @@ msgid "Megaphone" msgstr "ஒலி பெரà¯à®•à¯à®•à®¿" #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2 -#: ../megaphone/src/megaphone-applet.c:527 +#: ../megaphone/src/megaphone-applet.c:519 msgid "Talk!" msgstr "பேசà¯!" @@ -1511,19 +1558,19 @@ msgstr "இரà¯à®ªà¯à®ªà¯" msgid "Set your own presence" msgstr "உஙà¯à®•à®³à¯ இரà¯à®ªà¯à®ªà¯ˆ அமைகà¯à®•à®µà¯à®®à¯" -#: ../src/empathy.c:478 +#: ../src/empathy.c:506 msgid "Don't connect on startup" msgstr "தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ இணைகà¯à®• வேணà¯à®Ÿà®¾à®®à¯" -#: ../src/empathy.c:482 +#: ../src/empathy.c:510 msgid "Don't show the contact list on startup" msgstr "தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯ ஠காடà¯à®Ÿ வேணà¯à®Ÿà®¾à®®à¯" -#: ../src/empathy.c:486 +#: ../src/empathy.c:514 msgid "Show the accounts dialog" msgstr "கணகà¯à®•à¯à®•à®³à¯ உரையாடல௠஠காடà¯à®Ÿà¯ " -#: ../src/empathy.c:498 +#: ../src/empathy.c:526 msgid "- Empathy Instant Messenger" msgstr "- எமà¯à®ªà®¤à®¿ உடனடி செயà¯à®¤à®¿à®¯à®¾à®³à®°à¯" @@ -1567,11 +1614,11 @@ msgstr "கà¯à®©à¯‹à®®à¯à®•à¯à®•à¯ ஒர௠உடனடி செயà¯à®¤ msgid "translator-credits" msgstr "மொழிபெயரà¯à®ªà¯à®ªà®¾à®³à®°à¯-நனà¯à®±à®¿ அறிதல௠" -#: ../src/empathy-accounts-dialog.c:393 +#: ../src/empathy-accounts-dialog.c:392 msgid "Enabled" msgstr "செயலாகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" -#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-accounts-dialog.ui.h:1 +#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1 msgid "Accounts" msgstr "கணகà¯à®•à¯à®•à®³à¯" @@ -1651,53 +1698,53 @@ msgstr "(_C) ஒர௠பà¯à®¤à®¿à®¯ கணகà¯à®•à¯ˆ தà¯à®µà®•à¯à®•à¯" msgid "_Reuse an existing account" msgstr "(_R) இரà¯à®•à¯à®•à¯à®®à¯ ஒர௠கணகà¯à®•à¯ˆ மற௠உபயோகம௠செயà¯à®•" -#: ../src/empathy-call-window.c:63 -msgid "Connecting..." -msgstr "இணைகà¯à®•à®¿à®±à®¤à¯...." - -#: ../src/empathy-call-window.c:415 +#: ../src/empathy-call-window.c:420 msgid "Contrast" msgstr "வேறà¯à®ªà®¾à®Ÿà¯" -#: ../src/empathy-call-window.c:418 +#: ../src/empathy-call-window.c:423 msgid "Brightness" msgstr "வெளிசà¯à®šà®®à¯" -#: ../src/empathy-call-window.c:421 +#: ../src/empathy-call-window.c:426 msgid "Gamma" msgstr "காமா" -#: ../src/empathy-call-window.c:526 +#: ../src/empathy-call-window.c:531 msgid "Volume" msgstr "ஒலி அளவà¯" -#: ../src/empathy-call-window.c:728 +#: ../src/empathy-call-window.c:662 +msgid "Connecting..." +msgstr "இணைகà¯à®•à®¿à®±à®¤à¯...." + +#: ../src/empathy-call-window.c:746 msgid "_Sidebar" msgstr "பகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà¯ˆ(_S)" -#: ../src/empathy-call-window.c:747 +#: ../src/empathy-call-window.c:765 msgid "Dialpad" msgstr "டயல௠அடà¯à®Ÿà¯ˆ" -#: ../src/empathy-call-window.c:753 +#: ../src/empathy-call-window.c:771 msgid "Audio input" msgstr "ஒலி உளà¯à®³à¯€à®Ÿà¯" -#: ../src/empathy-call-window.c:757 +#: ../src/empathy-call-window.c:775 msgid "Video input" msgstr "வீடியோ உளà¯à®³à¯€à®Ÿà¯" -#: ../src/empathy-call-window.c:820 +#: ../src/empathy-call-window.c:836 #, c-format msgid "Call with %s" msgstr "%s ஆல௠அழை " -#: ../src/empathy-call-window.c:889 +#: ../src/empathy-call-window.c:905 msgid "Call" msgstr "அழை" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1308 +#: ../src/empathy-call-window.c:1336 #, c-format msgid "Connected — %d:%02dm" msgstr "இணைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯ — %d:%02dm" @@ -1730,12 +1777,12 @@ msgstr "(_C) அழை" msgid "_View" msgstr "பாரà¯à®µà¯ˆ (_V)" -#: ../src/empathy-chat-window.c:343 +#: ../src/empathy-chat-window.c:344 #, c-format msgid "Conversations (%d)" msgstr "உரையாடலà¯à®•à®³à¯ (%d)" -#: ../src/empathy-chat-window.c:475 +#: ../src/empathy-chat-window.c:476 msgid "Typing a message." msgstr "செயà¯à®¤à®¿à®•à®³à¯ தடà¯à®Ÿà®šà¯à®šà®¿à®Ÿà®²à¯" @@ -1755,75 +1802,75 @@ msgstr "தானியஙà¯à®•à®¿ இணை" msgid "Manage Favorite Rooms" msgstr "பிடிதà¯à®¤à®®à®¾à®© அறைகளை மேலாள" -#: ../src/empathy-event-manager.c:377 +#: ../src/empathy-event-manager.c:321 msgid "Incoming call" msgstr "உளà¯à®µà®°à¯à®®à¯ அழைபà¯à®ªà¯" -#: ../src/empathy-event-manager.c:380 +#: ../src/empathy-event-manager.c:324 #, c-format msgid "%s is calling you, do you want to answer?" msgstr "%s உஙà¯à®•à®³à¯ˆ அழைகà¯à®•à®¿à®±à®¾à®°à¯. நீஙà¯à®•à®³à¯ பதில௠பேச வேணà¯à®Ÿà¯à®®à®¾?" -#: ../src/empathy-event-manager.c:387 +#: ../src/empathy-event-manager.c:331 msgid "_Reject" msgstr "(_R) à®à®±à¯à®•à®¾à®¤à¯‡" -#: ../src/empathy-event-manager.c:393 +#: ../src/empathy-event-manager.c:337 msgid "_Answer" msgstr "(_A) பதிலளி" -#: ../src/empathy-event-manager.c:505 +#: ../src/empathy-event-manager.c:452 #, c-format msgid "Incoming call from %s" msgstr "%s இடமிரà¯à®¨à¯à®¤à¯ உளà¯à®µà®°à¯à®®à¯ அழைபà¯à®ªà¯" -#: ../src/empathy-event-manager.c:545 +#: ../src/empathy-event-manager.c:496 #, c-format msgid "%s is offering you an invitation" msgstr "%s உஙà¯à®•à®³à¯à®•à¯à®•à¯ ஒர௠அழைபà¯à®ªà¯ வேணà¯à®Ÿà¯à®¤à®²à¯ விடà¯à®•à¯à®•à®¿à®±à®¾à®°à¯" -#: ../src/empathy-event-manager.c:551 +#: ../src/empathy-event-manager.c:502 msgid "An external application will be started to handle it." msgstr "இதை கையாள ஒர௠வெளி பயனà¯à®ªà®¾à®Ÿà¯ தà¯à®µà®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯." -#: ../src/empathy-event-manager.c:556 +#: ../src/empathy-event-manager.c:507 msgid "You don't have the needed external application to handle it." msgstr "இதை கையாள தேவையான ஒர௠வெளி பயனà¯à®ªà®¾à®Ÿà¯ உஙà¯à®•à®³à¯ கணினியில௠இலà¯à®²à¯ˆ." -#: ../src/empathy-event-manager.c:683 +#: ../src/empathy-event-manager.c:634 msgid "Room invitation" msgstr "அறை அழைபà¯à®ªà¯" -#: ../src/empathy-event-manager.c:686 +#: ../src/empathy-event-manager.c:637 #, c-format msgid "%s is inviting you to join %s" msgstr "%s உஙà¯à®•à®³à¯ˆ %s உடன௠சேர அழைகà¯à®•à®¿à®±à®¾à®°à¯." -#: ../src/empathy-event-manager.c:694 +#: ../src/empathy-event-manager.c:645 msgid "_Decline" msgstr "நிராகரி (_D)" -#: ../src/empathy-event-manager.c:699 +#: ../src/empathy-event-manager.c:650 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "(_J) இணை" -#: ../src/empathy-event-manager.c:738 +#: ../src/empathy-event-manager.c:689 #, c-format msgid "%s invited you to join %s" msgstr "%s %s இல௠சேர உஙà¯à®•à®³à¯ˆ அழைதà¯à®¤à¯à®³à¯à®³à®¾à®°à¯" -#: ../src/empathy-event-manager.c:764 +#: ../src/empathy-event-manager.c:715 #, c-format msgid "Incoming file transfer from %s" msgstr "%s இடமிரà¯à®¨à¯à®¤à¯ உளà¯à®µà®°à¯à®®à¯ கோபà¯à®ªà¯ பரிமாறà¯à®±à®®à¯." -#: ../src/empathy-event-manager.c:944 +#: ../src/empathy-event-manager.c:895 #, c-format msgid "Subscription requested by %s" msgstr "%s இன௠சநà¯à®¤à®¾ வேணà¯à®Ÿà¯à®¤à®²à¯" -#: ../src/empathy-event-manager.c:948 +#: ../src/empathy-event-manager.c:899 #, c-format msgid "" "\n" @@ -1832,6 +1879,18 @@ msgstr "" "\n" "செயà¯à®¤à®¿: %s" +#. someone is logging off +#: ../src/empathy-event-manager.c:935 +#, c-format +msgid "%s is now offline." +msgstr "%s இபà¯à®ªà¯‹à®¤à¯ இணைபà¯à®ªà¯ விலகி உளà¯à®³à®¾à®°à¯" + +#. someone is logging in +#: ../src/empathy-event-manager.c:951 +#, c-format +msgid "%s is now online." +msgstr "%s இபà¯à®ªà¯‹à®¤à¯ இணைபà¯à®ªà®¿à®²à¯ உளà¯à®³à®¾à®°à¯" + #. Translators: time left, when it is more than one hour #: ../src/empathy-ft-manager.c:101 #, c-format @@ -1946,19 +2005,19 @@ msgstr "" "இரà¯à®¨à¯à®¤à¯ நீகà¯à®•à¯ " #. Translators: this is the header of a treeview column -#: ../src/empathy-import-dialog.c:259 +#: ../src/empathy-import-dialog.c:263 msgid "Import" msgstr "இறகà¯à®•à¯à®®à®¤à®¿ செயà¯" -#: ../src/empathy-import-dialog.c:268 +#: ../src/empathy-import-dialog.c:272 msgid "Protocol" msgstr "விதிமà¯à®±à¯ˆ" -#: ../src/empathy-import-dialog.c:294 +#: ../src/empathy-import-dialog.c:298 msgid "Source" msgstr "மூலமà¯" -#: ../src/empathy-import-dialog.c:388 +#: ../src/empathy-import-dialog.c:392 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -1970,71 +2029,71 @@ msgstr "" msgid "Import Accounts" msgstr "இறகà¯à®•à¯à®®à®¤à®¿ செய௠கணகà¯à®•à¯à®•à®³à¯" -#: ../src/empathy-main-window.c:395 +#: ../src/empathy-main-window.c:396 msgid "_Edit account" msgstr "(_E) கணகà¯à®•à¯à®•à®³à¯ˆ திரà¯à®¤à¯à®¤à¯à®•" -#: ../src/empathy-main-window.c:498 +#: ../src/empathy-main-window.c:499 msgid "No error specified" msgstr "பிழை à®à®¤à¯à®®à¯ கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®µà®¿à®²à¯à®²à¯ˆ" -#: ../src/empathy-main-window.c:501 +#: ../src/empathy-main-window.c:502 msgid "Network error" msgstr "வலையமைபà¯à®ªà¯ பிழை" -#: ../src/empathy-main-window.c:504 +#: ../src/empathy-main-window.c:505 msgid "Authentication failed" msgstr "உறà¯à®¤à®¿ செயà¯à®¤à®²à¯ தோலà¯à®µà®¿" -#: ../src/empathy-main-window.c:507 +#: ../src/empathy-main-window.c:508 msgid "Encryption error" msgstr "மறையாகà¯à®• பிழை" -#: ../src/empathy-main-window.c:510 +#: ../src/empathy-main-window.c:511 msgid "Name in use" msgstr "பயனில௠உளà¯à®³ பெயர௠" -#: ../src/empathy-main-window.c:513 +#: ../src/empathy-main-window.c:514 msgid "Certificate not provided" msgstr "சானà¯à®±à®¿à®¤à®´à¯ தரபà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ" -#: ../src/empathy-main-window.c:516 +#: ../src/empathy-main-window.c:517 msgid "Certificate untrusted" msgstr "சானà¯à®±à®¿à®¤à®´à®¿à®²à¯ நமà¯à®ªà®• தனà¯à®®à¯ˆ இலà¯à®²à¯ˆ" -#: ../src/empathy-main-window.c:519 +#: ../src/empathy-main-window.c:520 msgid "Certificate expired" msgstr "சானà¯à®±à®¿à®¤à®´à¯ காலாவதியானதà¯" -#: ../src/empathy-main-window.c:522 +#: ../src/empathy-main-window.c:523 msgid "Certificate not activated" msgstr "சானà¯à®±à®¿à®¤à®´à¯ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ" -#: ../src/empathy-main-window.c:525 +#: ../src/empathy-main-window.c:526 msgid "Certificate hostname mismatch" msgstr "சானà¯à®±à®¿à®¤à®´à¯ பà¯à®°à®µà®²à®©à¯ பெயர௠ஒதà¯à®¤à®¿à®šà¯ˆà®¯à®µà®¿à®²à¯à®²à¯ˆ" -#: ../src/empathy-main-window.c:528 +#: ../src/empathy-main-window.c:529 msgid "Certificate fingerprint mismatch" msgstr "சானà¯à®±à®¿à®¤à®´à¯ அடையாளம௠ஒதà¯à®¤à®¿à®šà¯ˆà®¯à®µà®¿à®²à¯à®²à¯ˆ" -#: ../src/empathy-main-window.c:531 +#: ../src/empathy-main-window.c:532 msgid "Certificate self-signed" msgstr "சானà¯à®±à®¿à®¤à®´à¯ தானே கையெழà¯à®¤à¯à®¤à®¿à®Ÿà¯à®Ÿà®¤à¯" -#: ../src/empathy-main-window.c:534 +#: ../src/empathy-main-window.c:535 msgid "Certificate error" msgstr "சானà¯à®±à®¿à®¤à®´à¯ பிழை" -#: ../src/empathy-main-window.c:537 +#: ../src/empathy-main-window.c:538 msgid "Unknown error" msgstr "தெரியாத பிழை" -#: ../src/empathy-main-window.c:1220 +#: ../src/empathy-main-window.c:1218 msgid "Show and edit accounts" msgstr "கணகà¯à®•à¯à®•à®³à¯ˆ காடà¯à®Ÿà®µà¯à®®à¯ மறà¯à®±à¯à®®à¯ திரà¯à®¤à¯à®¤à®µà¯à®®à¯ " -#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10 +#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:9 msgid "Contact List" msgstr "தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à¯" @@ -2102,15 +2161,15 @@ msgstr "(_P) à®®à¯à®¨à¯à®¤à¯ˆà®¯ உரையாடலà¯à®•à®³à¯" msgid "_Room" msgstr "(_R) அறை" -#: ../src/empathy-new-chatroom-dialog.c:332 +#: ../src/empathy-new-chatroom-dialog.c:331 msgid "Chat Room" msgstr "அரடà¯à®Ÿà¯ˆ அறை" -#: ../src/empathy-new-chatroom-dialog.c:348 +#: ../src/empathy-new-chatroom-dialog.c:347 msgid "Members" msgstr "உறà¯à®ªà¯à®ªà®¿à®©à®°à¯à®•à®³à¯" -#: ../src/empathy-new-chatroom-dialog.c:492 +#: ../src/empathy-new-chatroom-dialog.c:496 #, c-format msgctxt "" "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no " @@ -2126,21 +2185,21 @@ msgstr "" "கடவà¯à®šà¯à®šà¯Šà®²à¯ தேவை: %s\n" "உறà¯à®ªà¯à®ªà®¿à®©à®°à¯à®•à®³à¯: %s" -#: ../src/empathy-new-chatroom-dialog.c:494 -#: ../src/empathy-new-chatroom-dialog.c:495 +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 msgid "Yes" msgstr "ஆமà¯" -#: ../src/empathy-new-chatroom-dialog.c:494 -#: ../src/empathy-new-chatroom-dialog.c:495 +#: ../src/empathy-new-chatroom-dialog.c:498 +#: ../src/empathy-new-chatroom-dialog.c:499 msgid "No" msgstr "இலà¯à®²à¯ˆ" -#: ../src/empathy-new-chatroom-dialog.c:522 +#: ../src/empathy-new-chatroom-dialog.c:526 msgid "Could not start room listing" msgstr "அறை படà¯à®Ÿà®¿à®¯à®²à¯ˆ எடà¯à®ªà¯à®ªà®¤à¯ˆ தà¯à®µà®•à¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ" -#: ../src/empathy-new-chatroom-dialog.c:532 +#: ../src/empathy-new-chatroom-dialog.c:536 msgid "Could not stop room listing" msgstr "அறை படà¯à®Ÿà®¿à®¯à®²à¯ˆ எடà¯à®ªà¯à®ªà®¤à¯ˆ நிறà¯à®¤à¯à®¤ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ" @@ -2174,106 +2233,106 @@ msgstr "அறை படà¯à®Ÿà®¿à®¯à®²à¯" msgid "_Room:" msgstr "(_R) அறை:" -#: ../src/empathy-preferences.c:159 +#: ../src/empathy-preferences.c:161 msgid "Message received" msgstr "தகவல௠பெறபà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" -#: ../src/empathy-preferences.c:160 +#: ../src/empathy-preferences.c:162 msgid "Message sent" msgstr "தகவல௠அனà¯à®ªà¯à®ªà®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" -#: ../src/empathy-preferences.c:161 +#: ../src/empathy-preferences.c:163 msgid "New conversation" msgstr "பà¯à®¤à®¿à®¯ உரையாடலà¯" -#: ../src/empathy-preferences.c:162 +#: ../src/empathy-preferences.c:164 msgid "Contact goes online" msgstr "தொடரà¯à®ªà¯ இணைபில௠வரà¯à®•à®¿à®±à®¾à®°à¯" -#: ../src/empathy-preferences.c:163 +#: ../src/empathy-preferences.c:165 msgid "Contact goes offline" msgstr "தொடரà¯à®ªà¯ இணைபà¯à®ªà¯ விலகி செலà¯à®•à®¿à®±à®¾à®°à¯" -#: ../src/empathy-preferences.c:164 +#: ../src/empathy-preferences.c:166 msgid "Account connected" msgstr "கணகà¯à®•à¯ இணைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" -#: ../src/empathy-preferences.c:165 +#: ../src/empathy-preferences.c:167 msgid "Account disconnected" msgstr "கணகà¯à®•à¯ இணைபà¯à®ªà¯ நீகà¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯" -#: ../src/empathy-preferences.c:432 +#: ../src/empathy-preferences.c:446 msgid "Language" msgstr "மொழி" #: ../src/empathy-preferences.ui.h:1 -msgid "Adium theme to use:" -msgstr "பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà®¿à®¯ à®à®Ÿà®¿à®¯à®®à¯ கரà¯à®¤à¯à®¤à¯:" - -#: ../src/empathy-preferences.ui.h:2 msgid "Allow _GPS usage" msgstr "(_G) ஜிபிஎஸ௠பயனை அனà¯à®®à®¤à®¿" -#: ../src/empathy-preferences.ui.h:3 +#: ../src/empathy-preferences.ui.h:2 msgid "Allow _cellphone usage" msgstr "(_c) அலைபேசி பயனை அனà¯à®®à®¤à®¿" -#: ../src/empathy-preferences.ui.h:4 +#: ../src/empathy-preferences.ui.h:3 msgid "Allow _network usage" msgstr "(_n) வலைபà¯à®ªà®¿à®©à¯à®©à®²à¯ பயனை அனà¯à®®à®¤à®¿" -#: ../src/empathy-preferences.ui.h:5 +#: ../src/empathy-preferences.ui.h:4 msgid "Appearance" msgstr "தோறà¯à®±à®®à¯" -#: ../src/empathy-preferences.ui.h:6 +#: ../src/empathy-preferences.ui.h:5 msgid "Automatically _connect on startup " msgstr "(_c) தà¯à®µà®™à¯à®•à¯à®®à¯à®ªà¯‹à®¤à¯ தானியஙà¯à®•à®¿à®¯à®¾à®• இணை" -#: ../src/empathy-preferences.ui.h:7 +#: ../src/empathy-preferences.ui.h:6 msgid "Avatars are user chosen images shown in the contact list" msgstr "அவதாரஙà¯à®•à®³à¯ எனà¯à®ªà®¤à¯ தொடரà¯à®ªà¯ படà¯à®Ÿà®¿à®¯à®²à®¿à®²à¯ காணபà¯à®ªà®Ÿà¯à®®à¯ பயனர௠தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ பிமà¯à®ªà®™à¯à®•à®³à¯" -#: ../src/empathy-preferences.ui.h:8 +#: ../src/empathy-preferences.ui.h:7 msgid "Behavior" msgstr "நடதà¯à®¤à¯ˆ" -#: ../src/empathy-preferences.ui.h:9 +#: ../src/empathy-preferences.ui.h:8 msgid "Chat Th_eme:" msgstr "(_e) அரடà¯à®Ÿà¯ˆ கரà¯à®¤à¯à®¤à¯:" -#: ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-preferences.ui.h:10 msgid "Disable notifications when _away or busy" msgstr "(_a) வெளியே அலà¯à®²à®¤à¯ வேலையில௠உளà¯à®³à®ªà¯‹à®¤à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயல௠நீகà¯à®•à¯" -#: ../src/empathy-preferences.ui.h:12 +#: ../src/empathy-preferences.ui.h:11 msgid "Disable sounds when _away or busy" msgstr "(_a) வெளியே அலà¯à®²à®¤à¯ வேலையில௠உளà¯à®³à®ªà¯‹à®¤à¯ ஒலிகளை செயல௠நீகà¯à®•à¯" +#: ../src/empathy-preferences.ui.h:12 +msgid "Enable notifications when a contact comes online" +msgstr "தொடரà¯à®ªà¯ உள௠நà¯à®´à¯ˆà®•à¯ˆà®¯à®¿à®²à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯" + #: ../src/empathy-preferences.ui.h:13 +msgid "Enable notifications when a contact goes offline" +msgstr "தொடரà¯à®ªà¯ இணைபà¯à®ªà¯ விலகி செலà¯à®•à¯ˆà®¯à®¿à®²à¯ அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯" + +#: ../src/empathy-preferences.ui.h:14 msgid "Enable notifications when the _chat is not focused" msgstr "(_c) அரடà¯à®Ÿà¯ˆ கà¯à®µà®¿à®ªà¯à®ªà®¿à®²à¯ இலà¯à®²à®¾à®¤ போத௠அறிவிபà¯à®ªà¯à®•à®³à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯" -#: ../src/empathy-preferences.ui.h:14 +#: ../src/empathy-preferences.ui.h:15 msgid "Enable spell checking for languages:" msgstr "மொழிகளà¯à®•à¯à®•à¯ எழà¯à®¤à¯à®¤à¯ பிழை திரà¯à®¤à¯à®¤à®¤à¯à®¤à¯ˆ செயலà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯:" -#: ../src/empathy-preferences.ui.h:15 +#: ../src/empathy-preferences.ui.h:16 msgid "General" msgstr "பொதà¯" -#: ../src/empathy-preferences.ui.h:16 +#: ../src/empathy-preferences.ui.h:17 msgid "Geoclue Settings" msgstr "ஜியோ கà¯à®³à¯‚ அமைபà¯à®ªà¯à®•à®³à¯" -#: ../src/empathy-preferences.ui.h:17 +#: ../src/empathy-preferences.ui.h:18 msgid "Location" msgstr "இடமà¯" -#: ../src/empathy-preferences.ui.h:18 -msgid "Not a valid adium theme" -msgstr "செலà¯à®²à¯à®ªà®Ÿà®¿à®¯à®¾à®•à¯à®®à¯ à®à®Ÿà®¿à®¯à®®à¯ கரà¯à®¤à¯à®¤à¯ அலà¯à®²" - #: ../src/empathy-preferences.ui.h:19 msgid "Notifications" msgstr "அறிவிபà¯à®ªà¯à®•à®³à¯" @@ -2296,9 +2355,8 @@ msgid "" "state and country will be published. GPS coordinates will have a random " "value added (±0.25°)." msgstr "" -"கà¯à®±à¯ˆà®¤à¯à®¤ இட கà¯à®±à®¿à®ªà¯à®ªà¯ எனில௠உஙà¯à®•à®³à¯ மாநகரமà¯, மாநிலமà¯, நாட௠தவிர ஒனà¯à®±à¯à®®à¯ " -"வெளியிடபà¯à®ªà®Ÿà®¾à®¤à¯. ஜிபிஎஸ௠ஆயதà¯à®¤à¯Šà®²à¯ˆà®µà¯à®•à®³à¯à®•à¯à®•à¯ தறà¯à®ªà¯‹à®•à¯à®•à¯ மதிபà¯à®ªà¯ சேரà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯ " -"(±0.25°)." +"கà¯à®±à¯ˆà®¤à¯à®¤ இட கà¯à®±à®¿à®ªà¯à®ªà¯ எனில௠உஙà¯à®•à®³à¯ மாநகரமà¯, மாநிலமà¯, நாட௠தவிர ஒனà¯à®±à¯à®®à¯ வெளியிடபà¯à®ªà®Ÿà®¾à®¤à¯. " +"ஜிபிஎஸ௠ஆயதà¯à®¤à¯Šà®²à¯ˆà®µà¯à®•à®³à¯à®•à¯à®•à¯ தறà¯à®ªà¯‹à®•à¯à®•à¯ மதிபà¯à®ªà¯ சேரà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯ (±0.25°)." #: ../src/empathy-preferences.ui.h:24 msgid "Show _avatars" @@ -2336,7 +2394,9 @@ msgstr "எழà¯à®¤à¯à®¤à¯ பிழை திரà¯à®¤à¯à®¤à®®à¯" msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." -msgstr "இநà¯à®¤ படà¯à®Ÿà®¿à®¯à®²à¯ நீஙà¯à®•à®³à¯ எநà¯à®¤ மொழிகளà¯à®•à¯à®•à¯ அகராதி நிறà¯à®µà®¿ இரà¯à®•à¯à®•à®¿à®±à¯€à®°à¯à®•à®³à¯‹ அவறà¯à®±à¯ˆ மடà¯à®Ÿà¯à®®à¯‡ காடà¯à®Ÿà¯à®•à®¿à®±à®¤à¯" +msgstr "" +"இநà¯à®¤ படà¯à®Ÿà®¿à®¯à®²à¯ நீஙà¯à®•à®³à¯ எநà¯à®¤ மொழிகளà¯à®•à¯à®•à¯ அகராதி நிறà¯à®µà®¿ இரà¯à®•à¯à®•à®¿à®±à¯€à®°à¯à®•à®³à¯‹ அவறà¯à®±à¯ˆ மடà¯à®Ÿà¯à®®à¯‡ " +"காடà¯à®Ÿà¯à®•à®¿à®±à®¤à¯" #: ../src/empathy-preferences.ui.h:33 msgid "Themes" @@ -2385,8 +2445,8 @@ msgid "" "An invitation was offered for service %s, but you don't have the needed " "application to handle it" msgstr "" -" %s சேவைகà¯à®•à¯ அழைபà¯à®ªà¯ கொடà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯. ஆனால௠அதை கையாள உஙà¯à®•à®³à¯ கணினியில௠தேவையான பயனà¯à®ªà®¾à®Ÿà¯ " -"இலà¯à®²à¯ˆ" +" %s சேவைகà¯à®•à¯ அழைபà¯à®ªà¯ கொடà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯. ஆனால௠அதை கையாள உஙà¯à®•à®³à¯ கணினியில௠தேவையான " +"பயனà¯à®ªà®¾à®Ÿà¯ இலà¯à®²à¯ˆ" #: ../src/empathy-call-window-fullscreen.ui.h:1 msgid "gtk-leave-fullscreen" @@ -2396,67 +2456,74 @@ msgstr "ஜிடிகே à®®à¯à®´à¯à®¤à¯à®¤à®¿à®°à¯ˆà®¯à¯ˆ விடà¯à®Ÿ msgid "Contact Map View" msgstr "தொடரà¯à®ªà¯à®•à®³à¯ படகà¯à®•à®¾à®Ÿà¯à®šà®¿" -#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1075 +#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083 msgid "Error" msgstr " பிழை" -#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1069 +#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077 msgid "Critical" msgstr "ஆபதà¯à®¤à®¾à®©à®©à¯" -#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1063 +#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071 msgid "Warning" msgstr "எசà¯à®šà®°à®¿à®•à¯à®•à¯ˆ" -#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1057 -#: ../src/empathy-debug-dialog.c:1105 +#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065 +#: ../src/empathy-debug-dialog.c:1113 msgid "Message" msgstr "செயà¯à®¤à®¿" -#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1051 +#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059 msgid "Info" msgstr "தகவலà¯" -#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1045 +#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053 msgid "Debug" msgstr "வழà¯à®¨à¯€à®•à¯à®•à¯" -#: ../src/empathy-debug-dialog.c:837 +#: ../src/empathy-debug-dialog.c:845 msgid "Save" msgstr "சேமி" -#: ../src/empathy-debug-dialog.c:940 +#: ../src/empathy-debug-dialog.c:948 msgid "Debug Window" msgstr "வழ௠நீகà¯à®•à¯ சாளரமà¯" -#: ../src/empathy-debug-dialog.c:1013 +#: ../src/empathy-debug-dialog.c:1021 msgid "Pause" msgstr "தாமதி" -#: ../src/empathy-debug-dialog.c:1025 +#: ../src/empathy-debug-dialog.c:1033 msgid "Level " msgstr "மடà¯à®Ÿà®®à¯" -#: ../src/empathy-debug-dialog.c:1094 +#: ../src/empathy-debug-dialog.c:1102 msgid "Time" msgstr "நேரமà¯" -#: ../src/empathy-debug-dialog.c:1096 +#: ../src/empathy-debug-dialog.c:1104 msgid "Domain" msgstr "களமà¯" -#: ../src/empathy-debug-dialog.c:1098 +#: ../src/empathy-debug-dialog.c:1106 msgid "Category" msgstr "வகை" -#: ../src/empathy-debug-dialog.c:1100 +#: ../src/empathy-debug-dialog.c:1108 msgid "Level" msgstr "மடà¯à®Ÿà®®à¯" -#: ../src/empathy-debug-dialog.c:1132 +#: ../src/empathy-debug-dialog.c:1140 msgid "" "The selected connection manager does not support the remote debugging " "extension." msgstr "தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤ இணைபà¯à®ªà¯ மேலாளர௠தொலை வழ௠நீகà¯à®•à®¤à¯à®¤à¯ˆ ஆதரிகà¯à®•à®µà®¿à®²à¯à®²à¯ˆ" +#~ msgid "Adium" +#~ msgstr "à®à®Ÿà®¿à®¯à®®à¯" + +#~ msgid "Adium theme to use:" +#~ msgstr "பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ வேணà¯à®Ÿà®¿à®¯ à®à®Ÿà®¿à®¯à®®à¯ கரà¯à®¤à¯à®¤à¯:" +#~ msgid "Not a valid adium theme" +#~ msgstr "செலà¯à®²à¯à®ªà®Ÿà®¿à®¯à®¾à®•à¯à®®à¯ à®à®Ÿà®¿à®¯à®®à¯ கரà¯à®¤à¯à®¤à¯ அலà¯à®²" diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs index ed19c7a96..6b6f7dfd3 100644 --- a/python/pyempathy/pyempathy.defs +++ b/python/pyempathy/pyempathy.defs @@ -259,6 +259,8 @@ '("tp-error" "EMPATHY_FT_ERROR_TP_ERROR") '("socket" "EMPATHY_FT_ERROR_SOCKET") '("not-supported" "EMPATHY_FT_ERROR_NOT_SUPPORTED") + '("invalid-source-file" "EMPATHY_FT_ERROR_INVALID_SOURCE_FILE") + '("empty-source-file" "EMPATHY_FT_ERROR_EMPTY_SOURCE_FILE") ) ) @@ -275,6 +277,15 @@ (return-type "EmpathyAccountManager*") ) +(define-method create + (of-object "EmpathyAccountManager") + (c-name "empathy_account_manager_create") + (return-type "EmpathyAccount*") + (parameters + '("McProfile*" "profile") + ) +) + (define-method get_connected_accounts (of-object "EmpathyAccountManager") (c-name "empathy_account_manager_get_connected_accounts") @@ -287,15 +298,6 @@ (return-type "int") ) -(define-method is_account_just_connected - (of-object "EmpathyAccountManager") - (c-name "empathy_account_manager_is_account_just_connected") - (return-type "gboolean") - (parameters - '("McAccount*" "account") - ) -) - (define-method get_count (of-object "EmpathyAccountManager") (c-name "empathy_account_manager_get_count") @@ -305,25 +307,25 @@ (define-method get_account (of-object "EmpathyAccountManager") (c-name "empathy_account_manager_get_account") - (return-type "McAccount*") + (return-type "EmpathyAccount*") (parameters '("TpConnection*" "connection") ) ) -(define-method dup_accounts +(define-method lookup (of-object "EmpathyAccountManager") - (c-name "empathy_account_manager_dup_accounts") - (return-type "GList*") + (c-name "empathy_account_manager_lookup") + (return-type "EmpathyAccount*") + (parameters + '("const-gchar*" "unique_name") + ) ) -(define-method get_connection +(define-method dup_accounts (of-object "EmpathyAccountManager") - (c-name "empathy_account_manager_get_connection") - (return-type "TpConnection*") - (parameters - '("McAccount*" "account") - ) + (c-name "empathy_account_manager_dup_accounts") + (return-type "GList*") ) (define-method dup_connections @@ -332,6 +334,15 @@ (return-type "GList*") ) +(define-method remove + (of-object "EmpathyAccountManager") + (c-name "empathy_account_manager_remove") + (return-type "none") + (parameters + '("EmpathyAccount*" "account") + ) +) + ;; From empathy-chatroom.h @@ -346,7 +357,7 @@ (is-constructor-of "EmpathyChatroom") (return-type "EmpathyChatroom*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") ) ) @@ -354,7 +365,7 @@ (c-name "empathy_chatroom_new_full") (return-type "EmpathyChatroom*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "room") '("const-gchar*" "name") '("gboolean" "auto_connect") @@ -364,7 +375,7 @@ (define-method get_account (of-object "EmpathyChatroom") (c-name "empathy_chatroom_get_account") - (return-type "McAccount*") + (return-type "EmpathyAccount*") ) (define-method set_account @@ -372,7 +383,7 @@ (c-name "empathy_chatroom_set_account") (return-type "none") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") ) ) @@ -560,7 +571,7 @@ (c-name "empathy_chatroom_manager_find") (return-type "EmpathyChatroom*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "room") ) ) @@ -570,7 +581,7 @@ (c-name "empathy_chatroom_manager_get_chatrooms") (return-type "GList*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") ) ) @@ -579,7 +590,7 @@ (c-name "empathy_chatroom_manager_get_count") (return-type "guint") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") ) ) @@ -681,6 +692,18 @@ (return-type "none") ) +(define-method stop_call + (of-object "EmpathyCallHandler") + (c-name "empathy_call_handler_stop_call") + (return-type "none") +) + +(define-method has_initial_video + (of-object "EmpathyCallHandler") + (c-name "empathy_call_handler_has_initial_video") + (return-type "gboolean") +) + (define-method bus_message (of-object "EmpathyCallHandler") (c-name "empathy_call_handler_bus_message") @@ -713,7 +736,7 @@ (c-name "empathy_contact_new_for_log") (return-type "EmpathyContact*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "id") '("const-gchar*" "name") '("gboolean" "is_user") @@ -774,7 +797,7 @@ (define-method get_account (of-object "EmpathyContact") (c-name "empathy_contact_get_account") - (return-type "McAccount*") + (return-type "EmpathyAccount*") ) (define-method get_connection @@ -972,6 +995,15 @@ ) ) +(define-function contact_equal + (c-name "empathy_contact_equal") + (return-type "gboolean") + (parameters + '("gconstpointer" "contact1") + '("gconstpointer" "contact2") + ) +) + ;; From empathy-contact-groups.h @@ -1179,6 +1211,11 @@ (varargs #t) ) +(define-function debug_free + (c-name "empathy_debug_free") + (return-type "none") +) + (define-function debug_set_flags (c-name "empathy_debug_set_flags") (return-type "none") @@ -1794,7 +1831,7 @@ (c-name "empathy_log_manager_exists") (return-type "gboolean") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "chat_id") '("gboolean" "chatroom") ) @@ -1805,7 +1842,7 @@ (c-name "empathy_log_manager_get_dates") (return-type "GList*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "chat_id") '("gboolean" "chatroom") ) @@ -1816,7 +1853,7 @@ (c-name "empathy_log_manager_get_messages_for_date") (return-type "GList*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "chat_id") '("gboolean" "chatroom") '("const-gchar*" "date") @@ -1828,7 +1865,7 @@ (c-name "empathy_log_manager_get_filtered_messages") (return-type "GList*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "chat_id") '("gboolean" "chatroom") '("guint" "num_messages") @@ -1842,7 +1879,7 @@ (c-name "empathy_log_manager_get_chats") (return-type "GList*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") ) ) @@ -1908,7 +1945,7 @@ (c-name "empathy_log_store_exists") (return-type "gboolean") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "chat_id") '("gboolean" "chatroom") ) @@ -1931,7 +1968,7 @@ (c-name "empathy_log_store_get_dates") (return-type "GList*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "chat_id") '("gboolean" "chatroom") ) @@ -1942,7 +1979,7 @@ (c-name "empathy_log_store_get_messages_for_date") (return-type "GList*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "chat_id") '("gboolean" "chatroom") '("const-gchar*" "date") @@ -1954,7 +1991,7 @@ (c-name "empathy_log_store_get_last_messages") (return-type "GList*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "chat_id") '("gboolean" "chatroom") ) @@ -1965,7 +2002,7 @@ (c-name "empathy_log_store_get_chats") (return-type "GList*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") ) ) @@ -1994,7 +2031,7 @@ (c-name "empathy_log_store_get_filtered_messages") (return-type "GList*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "chat_id") '("gboolean" "chatroom") '("guint" "num_messages") @@ -2216,6 +2253,14 @@ (return-type "none") ) +(define-function status_presets_is_valid + (c-name "empathy_status_presets_is_valid") + (return-type "gboolean") + (parameters + '("TpConnectionPresenceType" "state") + ) +) + ;; From empathy-time.h @@ -2338,6 +2383,18 @@ (return-type "gboolean") ) +(define-method is_receiving_video + (of-object "EmpathyTpCall") + (c-name "empathy_tp_call_is_receiving_video") + (return-type "gboolean") +) + +(define-method is_sending_video + (of-object "EmpathyTpCall") + (c-name "empathy_tp_call_is_sending_video") + (return-type "gboolean") +) + ;; From empathy-tp-chat.h @@ -2661,7 +2718,7 @@ (is-constructor-of "EmpathyTpRoomlist") (return-type "EmpathyTpRoomlist*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") ) ) diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs index cf85c7853..377eea43a 100644 --- a/python/pyempathygtk/pyempathygtk.defs +++ b/python/pyempathygtk/pyempathygtk.defs @@ -290,7 +290,7 @@ (define-method dup_account (of-object "EmpathyAccountChooser") (c-name "empathy_account_chooser_dup_account") - (return-type "McAccount*") + (return-type "EmpathyAccount*") ) (define-method get_connection @@ -304,7 +304,7 @@ (c-name "empathy_account_chooser_set_account") (return-type "gboolean") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") ) ) @@ -333,11 +333,11 @@ ) ) -(define-function account_chooser_filter_is_connected +(define-method chooser_filter_is_connected + (of-object "EmpathyAccount") (c-name "empathy_account_chooser_filter_is_connected") (return-type "gboolean") (parameters - '("McAccount*" "account") '("gpointer" "user_data") ) ) @@ -346,22 +346,22 @@ ;; From empathy-account-widget.h -(define-function account_widget_handle_params +(define-method widget_handle_params + (of-object "EmpathyAccount") (c-name "empathy_account_widget_handle_params") (return-type "none") (parameters - '("McAccount*" "account") '("GtkBuilder*" "gui") '("const-gchar*" "first_widget") ) (varargs #t) ) -(define-function account_widget_add_forget_button +(define-method widget_add_forget_button + (of-object "EmpathyAccount") (c-name "empathy_account_widget_add_forget_button") (return-type "none") (parameters - '("McAccount*" "account") '("GtkBuilder*" "gui") '("const-gchar*" "button") '("const-gchar*" "entry") @@ -377,102 +377,72 @@ ) ) -(define-function account_widget_generic_new +(define-method widget_generic_new + (of-object "EmpathyAccount") (c-name "empathy_account_widget_generic_new") - (is-constructor-of "EmpathyAccountWidgetGeneric") (return-type "GtkWidget*") - (parameters - '("McAccount*" "account") - ) ) -(define-function account_widget_salut_new +(define-method widget_salut_new + (of-object "EmpathyAccount") (c-name "empathy_account_widget_salut_new") - (is-constructor-of "EmpathyAccountWidgetSalut") (return-type "GtkWidget*") - (parameters - '("McAccount*" "account") - ) ) -(define-function account_widget_msn_new +(define-method widget_msn_new + (of-object "EmpathyAccount") (c-name "empathy_account_widget_msn_new") - (is-constructor-of "EmpathyAccountWidgetMsn") (return-type "GtkWidget*") - (parameters - '("McAccount*" "account") - ) ) -(define-function account_widget_jabber_new +(define-method widget_jabber_new + (of-object "EmpathyAccount") (c-name "empathy_account_widget_jabber_new") - (is-constructor-of "EmpathyAccountWidgetJabber") (return-type "GtkWidget*") - (parameters - '("McAccount*" "account") - ) ) -(define-function account_widget_icq_new +(define-method widget_icq_new + (of-object "EmpathyAccount") (c-name "empathy_account_widget_icq_new") - (is-constructor-of "EmpathyAccountWidgetIcq") (return-type "GtkWidget*") - (parameters - '("McAccount*" "account") - ) ) -(define-function account_widget_aim_new +(define-method widget_aim_new + (of-object "EmpathyAccount") (c-name "empathy_account_widget_aim_new") - (is-constructor-of "EmpathyAccountWidgetAim") (return-type "GtkWidget*") - (parameters - '("McAccount*" "account") - ) ) -(define-function account_widget_yahoo_new +(define-method widget_yahoo_new + (of-object "EmpathyAccount") (c-name "empathy_account_widget_yahoo_new") - (is-constructor-of "EmpathyAccountWidgetYahoo") (return-type "GtkWidget*") - (parameters - '("McAccount*" "account") - ) ) -(define-function account_widget_groupwise_new +(define-method widget_groupwise_new + (of-object "EmpathyAccount") (c-name "empathy_account_widget_groupwise_new") - (is-constructor-of "EmpathyAccountWidgetGroupwise") (return-type "GtkWidget*") - (parameters - '("McAccount*" "account") - ) ) ;; From empathy-account-widget-irc.h -(define-function account_widget_irc_new +(define-method widget_irc_new + (of-object "EmpathyAccount") (c-name "empathy_account_widget_irc_new") - (is-constructor-of "EmpathyAccountWidgetIrc") (return-type "GtkWidget*") - (parameters - '("McAccount*" "account") - ) ) ;; From empathy-account-widget-sip.h -(define-function account_widget_sip_new +(define-method widget_sip_new + (of-object "EmpathyAccount") (c-name "empathy_account_widget_sip_new") - (is-constructor-of "EmpathyAccountWidgetSip") (return-type "GtkWidget*") - (parameters - '("McAccount*" "account") - ) ) @@ -615,7 +585,7 @@ (define-method get_account (of-object "EmpathyChat") (c-name "empathy_chat_get_account") - (return-type "McAccount*") + (return-type "EmpathyAccount*") ) (define-method get_id @@ -695,6 +665,15 @@ (return-type "gboolean") ) +(define-method set_show_contacts + (of-object "EmpathyChat") + (c-name "empathy_chat_set_show_contacts") + (return-type "none") + (parameters + '("gboolean" "show") + ) +) + ;; From empathy-chat-text-view.h @@ -1521,7 +1500,7 @@ (c-name "empathy_log_window_show") (return-type "GtkWidget*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") '("const-gchar*" "chat_id") '("gboolean" "chatroom") '("GtkWindow*" "parent") @@ -1807,7 +1786,7 @@ (c-name "empathy_icon_name_from_account") (return-type "const-gchar*") (parameters - '("McAccount*" "account") + '("EmpathyAccount*" "account") ) ) diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 4cf391108..98e848566 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -31,7 +31,6 @@ #include <glib/gi18n.h> #include <dbus/dbus-glib.h> -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mc-profile.h> #include <telepathy-glib/util.h> @@ -96,7 +95,7 @@ enum { }; static void accounts_dialog_update_account (EmpathyAccountsDialog *dialog, - McAccount *account); + EmpathyAccount *account); static void accounts_dialog_model_setup (EmpathyAccountsDialog *dialog); static void accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog); static void accounts_dialog_name_editing_started_cb (GtkCellRenderer *renderer, @@ -109,19 +108,19 @@ static void accounts_dialog_model_pixbuf_data_func (GtkTreeViewColumn GtkTreeModel *model, GtkTreeIter *iter, EmpathyAccountsDialog *dialog); -static McAccount *accounts_dialog_model_get_selected (EmpathyAccountsDialog *dialog); +static EmpathyAccount *accounts_dialog_model_get_selected (EmpathyAccountsDialog *dialog); static void accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog, - McAccount *account); + EmpathyAccount *account); static gboolean accounts_dialog_model_remove_selected (EmpathyAccountsDialog *dialog); static void accounts_dialog_model_selection_changed (GtkTreeSelection *selection, EmpathyAccountsDialog *dialog); static void accounts_dialog_add_or_update_account (EmpathyAccountsDialog *dialog, - McAccount *account); + EmpathyAccount *account); static void accounts_dialog_account_added_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountsDialog *dialog); static void accounts_dialog_account_removed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountsDialog *dialog); static gboolean accounts_dialog_row_changed_foreach (GtkTreeModel *model, GtkTreePath *path, @@ -129,7 +128,7 @@ static gboolean accounts_dialog_row_changed_foreach (GtkTreeModel gpointer user_data); static gboolean accounts_dialog_flash_connecting_cb (EmpathyAccountsDialog *dialog); static void accounts_dialog_connection_changed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, TpConnectionStatusReason reason, TpConnectionStatus current, TpConnectionStatus previous, @@ -154,12 +153,12 @@ static void accounts_dialog_destroy_cb (GtkWidget static void accounts_dialog_update_name_label (EmpathyAccountsDialog *dialog, - McAccount *account) + EmpathyAccount *account) { gchar *text; text = g_markup_printf_escaped ("<big><b>%s</b></big>", - mc_account_get_display_name (account)); + empathy_account_get_display_name (account)); gtk_label_set_markup (GTK_LABEL (dialog->label_name), text); g_free (text); @@ -167,7 +166,7 @@ accounts_dialog_update_name_label (EmpathyAccountsDialog *dialog, static void accounts_dialog_update_account (EmpathyAccountsDialog *dialog, - McAccount *account) + EmpathyAccount *account) { McProfile *profile; const gchar *config_ui; @@ -216,7 +215,7 @@ accounts_dialog_update_account (EmpathyAccountsDialog *dialog, dialog->settings_widget = NULL; } - profile = mc_account_get_profile (account); + profile = empathy_account_get_profile (account); config_ui = mc_profile_get_configuration_ui (profile); if (!tp_strdiff (config_ui, "jabber")) { dialog->settings_widget = @@ -282,10 +281,10 @@ accounts_dialog_model_setup (EmpathyAccountsDialog *dialog) GtkTreeSelection *selection; store = gtk_list_store_new (COL_COUNT, - G_TYPE_BOOLEAN, /* enabled */ - G_TYPE_STRING, /* name */ - G_TYPE_UINT, /* status */ - MC_TYPE_ACCOUNT); /* account */ + G_TYPE_BOOLEAN, /* enabled */ + G_TYPE_STRING, /* name */ + G_TYPE_UINT, /* status */ + EMPATHY_TYPE_ACCOUNT); /* account */ gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->treeview), GTK_TREE_MODEL (store)); @@ -311,7 +310,7 @@ accounts_dialog_name_edited_cb (GtkCellRendererText *renderer, gchar *new_text, EmpathyAccountsDialog *dialog) { - McAccount *account; + EmpathyAccount *account; GtkTreeModel *model; GtkTreePath *treepath; GtkTreeIter iter; @@ -333,7 +332,7 @@ accounts_dialog_name_edited_cb (GtkCellRendererText *renderer, -1); gtk_tree_path_free (treepath); - mc_account_set_display_name (account, new_text); + empathy_account_set_display_name (account, new_text); g_object_unref (account); } @@ -342,7 +341,7 @@ accounts_dialog_enable_toggled_cb (GtkCellRendererToggle *cell_renderer, gchar *path, EmpathyAccountsDialog *dialog) { - McAccount *account; + EmpathyAccount *account; GtkTreeModel *model; GtkTreePath *treepath; GtkTreeIter iter; @@ -356,11 +355,11 @@ accounts_dialog_enable_toggled_cb (GtkCellRendererToggle *cell_renderer, -1); gtk_tree_path_free (treepath); - enabled = mc_account_is_enabled (account); - mc_account_set_enabled (account, !enabled); + enabled = empathy_account_is_enabled (account); + empathy_account_set_enabled (account, !enabled); DEBUG ("%s account %s", enabled ? "Disabled" : "Enable", - mc_account_get_display_name (account)); + empathy_account_get_display_name (account)); g_object_unref (account); } @@ -457,7 +456,7 @@ accounts_dialog_model_pixbuf_data_func (GtkTreeViewColumn *tree_column, GtkTreeIter *iter, EmpathyAccountsDialog *dialog) { - McAccount *account; + EmpathyAccount *account; const gchar *icon_name; GdkPixbuf *pixbuf; TpConnectionStatus status; @@ -504,7 +503,7 @@ accounts_dialog_model_pixbuf_data_func (GtkTreeViewColumn *tree_column, static gboolean accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog, - McAccount *account, + EmpathyAccount *account, GtkTreeIter *iter) { GtkTreeView *view; @@ -520,7 +519,7 @@ accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog, for (ok = gtk_tree_model_get_iter_first (model, iter); ok; ok = gtk_tree_model_iter_next (model, iter)) { - McAccount *this_account; + EmpathyAccount *this_account; gboolean equal; gtk_tree_model_get (model, iter, @@ -538,14 +537,14 @@ accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog, return FALSE; } -static McAccount * +static EmpathyAccount * accounts_dialog_model_get_selected (EmpathyAccountsDialog *dialog) { GtkTreeView *view; GtkTreeModel *model; GtkTreeSelection *selection; GtkTreeIter iter; - McAccount *account; + EmpathyAccount *account; view = GTK_TREE_VIEW (dialog->treeview); selection = gtk_tree_view_get_selection (view); @@ -561,7 +560,7 @@ accounts_dialog_model_get_selected (EmpathyAccountsDialog *dialog) static void accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog, - McAccount *account) + EmpathyAccount *account) { GtkTreeSelection *selection; GtkTreeIter iter; @@ -594,7 +593,7 @@ static void accounts_dialog_model_selection_changed (GtkTreeSelection *selection, EmpathyAccountsDialog *dialog) { - McAccount *account; + EmpathyAccount *account; GtkTreeModel *model; GtkTreeIter iter; gboolean is_selection; @@ -611,7 +610,7 @@ accounts_dialog_model_selection_changed (GtkTreeSelection *selection, static void accounts_dialog_add_or_update_account (EmpathyAccountsDialog *dialog, - McAccount *account) + EmpathyAccount *account) { GtkTreeModel *model; GtkTreeIter iter; @@ -620,9 +619,9 @@ accounts_dialog_add_or_update_account (EmpathyAccountsDialog *dialog, gboolean enabled; model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview)); - status = mission_control_get_connection_status (dialog->mc, account, NULL); - name = mc_account_get_display_name (account); - enabled = mc_account_is_enabled (account); + g_object_get (account, "status", &status, NULL); + name = empathy_account_get_display_name (account); + enabled = empathy_account_is_enabled (account); if (!accounts_dialog_get_account_iter (dialog, account, &iter)) { DEBUG ("Adding new account"); @@ -646,7 +645,7 @@ accounts_dialog_add_or_update_account (EmpathyAccountsDialog *dialog, static void accounts_dialog_account_added_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountsDialog *dialog) { const gchar *current_name; @@ -656,25 +655,25 @@ accounts_dialog_account_added_cb (EmpathyAccountManager *manager, /* Change the display name to "%s (%s)" % (protocol, account). * - The protocol is the display name of the profile. - * - The account should be the normalized name of the McAccount but + * - The account should be the normalized name of the EmpathyAccount but * it's not set until first connection, so we get the "account" * parameter for CM that have it. */ - current_name = mc_account_get_display_name (account); - mc_account_get_param_string (account, "account", &account_param); + current_name = empathy_account_get_display_name (account); + account_param = empathy_account_get_param_string (account, "account"); if (!EMP_STR_EMPTY (account_param)) { McProfile *profile; const gchar *profile_name; gchar *new_name; - profile = mc_account_get_profile (account); + profile = empathy_account_get_profile (account); profile_name = mc_profile_get_display_name (profile); new_name = g_strdup_printf ("%s (%s)", profile_name, account_param); DEBUG ("Setting new display name for account %s: '%s'", - mc_account_get_unique_name (account), new_name); + empathy_account_get_unique_name (account), new_name); - mc_account_set_display_name (account, new_name); + empathy_account_set_display_name (account, new_name); g_free (new_name); g_object_unref (profile); } else { @@ -685,7 +684,7 @@ accounts_dialog_account_added_cb (EmpathyAccountManager *manager, static void accounts_dialog_account_removed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountsDialog *dialog) { @@ -722,7 +721,7 @@ accounts_dialog_flash_connecting_cb (EmpathyAccountsDialog *dialog) static void accounts_dialog_connection_changed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, TpConnectionStatusReason reason, TpConnectionStatus current, TpConnectionStatus previous, @@ -763,7 +762,7 @@ accounts_dialog_connection_changed_cb (EmpathyAccountManager *manager, static void enable_or_disable_account (EmpathyAccountsDialog *dialog, - McAccount *account, + EmpathyAccount *account, gboolean enabled) { GtkTreeModel *model; @@ -773,7 +772,7 @@ enable_or_disable_account (EmpathyAccountsDialog *dialog, model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview)); DEBUG ("Account %s is now %s", - mc_account_get_display_name (account), + empathy_account_get_display_name (account), enabled ? "enabled" : "disabled"); if (accounts_dialog_get_account_iter (dialog, account, &iter)) { @@ -785,7 +784,7 @@ enable_or_disable_account (EmpathyAccountsDialog *dialog, static void accounts_dialog_account_disabled_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountsDialog *dialog) { enable_or_disable_account (dialog, account, FALSE); @@ -793,7 +792,7 @@ accounts_dialog_account_disabled_cb (EmpathyAccountManager *manager, static void accounts_dialog_account_enabled_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountsDialog *dialog) { enable_or_disable_account (dialog, account, TRUE); @@ -801,10 +800,10 @@ accounts_dialog_account_enabled_cb (EmpathyAccountManager *manager, static void accounts_dialog_account_changed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyAccountsDialog *dialog) { - McAccount *selected_account; + EmpathyAccount *selected_account; accounts_dialog_add_or_update_account (dialog, account); selected_account = accounts_dialog_model_get_selected (dialog); @@ -818,7 +817,7 @@ accounts_dialog_button_create_clicked_cb (GtkWidget *button, EmpathyAccountsDialog *dialog) { McProfile *profile; - McAccount *account; + EmpathyAccount *account; gchar *str; McProfileCapabilityFlags cap; @@ -826,7 +825,7 @@ accounts_dialog_button_create_clicked_cb (GtkWidget *button, EMPATHY_PROFILE_CHOOSER (dialog->combobox_profile)); /* Create account */ - account = mc_account_create (profile); + account = empathy_account_manager_create (dialog->account_manager, profile); if (account == NULL) { /* We can't display an error to the user as MC doesn't give us * any clue about the reason of the failure... */ @@ -837,7 +836,7 @@ accounts_dialog_button_create_clicked_cb (GtkWidget *button, /* To translator: %s is the protocol name */ str = g_strdup_printf (_("New %s account"), mc_profile_get_display_name (profile)); - mc_account_set_display_name (account, str); + empathy_account_set_display_name (account, str); g_free (str); cap = mc_profile_get_capabilities (profile); @@ -846,7 +845,7 @@ accounts_dialog_button_create_clicked_cb (GtkWidget *button, active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->radiobutton_register)); if (active) { - mc_account_set_param_boolean (account, "register", TRUE); + empathy_account_set_param_boolean (account, "register", TRUE); } } @@ -861,7 +860,7 @@ static void accounts_dialog_button_back_clicked_cb (GtkWidget *button, EmpathyAccountsDialog *dialog) { - McAccount *account; + EmpathyAccount *account; account = accounts_dialog_model_get_selected (dialog); accounts_dialog_update_account (dialog, account); @@ -932,13 +931,13 @@ static void accounts_dialog_button_remove_clicked_cb (GtkWidget *button, EmpathyAccountsDialog *dialog) { - McAccount *account; + EmpathyAccount *account; GtkWidget *message_dialog; gint res; account = accounts_dialog_model_get_selected (dialog); - if (!mc_account_is_complete (account)) { + if (!empathy_account_is_valid (account)) { accounts_dialog_model_remove_selected (dialog); accounts_dialog_model_select_first (dialog); return; @@ -950,7 +949,7 @@ accounts_dialog_button_remove_clicked_cb (GtkWidget *button, GTK_BUTTONS_NONE, _("You are about to remove your %s account!\n" "Are you sure you want to proceed?"), - mc_account_get_display_name (account)); + empathy_account_get_display_name (account)); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog), @@ -971,7 +970,7 @@ accounts_dialog_button_remove_clicked_cb (GtkWidget *button, res = gtk_dialog_run (GTK_DIALOG (message_dialog)); if (res == GTK_RESPONSE_YES) { - mc_account_delete (account); + empathy_account_manager_remove (dialog->account_manager, account); accounts_dialog_model_select_first (dialog); } gtk_widget_destroy (message_dialog); @@ -1021,15 +1020,15 @@ accounts_dialog_destroy_cb (GtkWidget *widget, dialog); /* Delete incomplete accounts */ - accounts = mc_accounts_list (); + accounts = empathy_account_manager_dup_accounts (dialog->account_manager); for (l = accounts; l; l = l->next) { - McAccount *account; + EmpathyAccount *account; account = l->data; - if (!mc_account_is_complete (account)) { + if (!empathy_account_is_valid (account)) { /* FIXME: Warn the user the account is not complete * and is going to be removed. */ - mc_account_delete (account); + empathy_account_manager_remove (dialog->account_manager, account); } g_object_unref (account); @@ -1048,7 +1047,7 @@ accounts_dialog_destroy_cb (GtkWidget *widget, GtkWidget * empathy_accounts_dialog_show (GtkWindow *parent, - McAccount *selected_account) + EmpathyAccount *selected_account) { static EmpathyAccountsDialog *dialog = NULL; GtkBuilder *gui; @@ -1136,7 +1135,7 @@ empathy_accounts_dialog_show (GtkWindow *parent, accounts_dialog_model_setup (dialog); /* Add existing accounts */ - accounts = mc_accounts_list (); + accounts = empathy_account_manager_dup_accounts (dialog->account_manager); for (l = accounts; l; l = l->next) { accounts_dialog_add_or_update_account (dialog, l->data); g_object_unref (l->data); diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h index b8c3d3691..11e237c8f 100644 --- a/src/empathy-accounts-dialog.h +++ b/src/empathy-accounts-dialog.h @@ -27,12 +27,12 @@ #include <gtk/gtk.h> -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> G_BEGIN_DECLS GtkWidget *empathy_accounts_dialog_show (GtkWindow *parent, - McAccount *selected_account); + EmpathyAccount *selected_account); G_END_DECLS diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c index 33f4085b3..e1c3d7a39 100644 --- a/src/empathy-call-window-fullscreen.c +++ b/src/empathy-call-window-fullscreen.c @@ -71,11 +71,11 @@ empathy_call_window_fullscreen_set_cursor_visible ( if (priv->video_widget != NULL && !show_cursor) { - gdk_window_set_cursor (priv->video_widget->window, + gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget), gdk_cursor_new (GDK_BLANK_CURSOR)); } else - gdk_window_set_cursor (priv->video_widget->window, NULL); + gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget), NULL); } static void @@ -130,7 +130,7 @@ empathy_call_window_fullscreen_show_popup (EmpathyCallWindowFullscreen *self) screen = gtk_window_get_screen (GTK_WINDOW (priv->parent_window)); gdk_screen_get_monitor_geometry (screen, gdk_screen_get_monitor_at_window (screen, - GTK_WIDGET (priv->parent_window)->window), + gtk_widget_get_window (GTK_WIDGET (priv->parent_window))), &fullscreen_rect); /* Getting the popup window sizes */ diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 75c6abfc7..a71e9c8be 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -40,9 +40,9 @@ #include <libempathy-gtk/empathy-audio-sink.h> #include <libempathy-gtk/empathy-video-src.h> #include <libempathy-gtk/empathy-ui-utils.h> +#include <libempathy-gtk/empathy-sound.h> #include "empathy-call-window.h" - #include "empathy-call-window-fullscreen.h" #include "empathy-sidebar.h" @@ -60,11 +60,12 @@ #define REMOTE_CONTACT_AVATAR_DEFAULT_WIDTH EMPATHY_VIDEO_WIDGET_DEFAULT_HEIGHT #define REMOTE_CONTACT_AVATAR_DEFAULT_HEIGHT EMPATHY_VIDEO_WIDGET_DEFAULT_HEIGHT -#define CONNECTING_STATUS_TEXT _("Connecting...") - /* If an video input error occurs, the error message will start with "v4l" */ #define VIDEO_INPUT_ERROR_PREFIX "v4l" +/* The time interval in milliseconds between 2 outgoing rings */ +#define MS_BETWEEN_RING 500 + G_DEFINE_TYPE(EmpathyCallWindow, empathy_call_window, GTK_TYPE_WINDOW) /* signal enum */ @@ -81,6 +82,13 @@ enum { PROP_CALL_HANDLER = 1, }; +typedef enum { + CONNECTING, + CONNECTED, + DISCONNECTED, + REDIALING +} CallState; + /* private structure */ typedef struct _EmpathyCallWindowPriv EmpathyCallWindowPriv; @@ -90,7 +98,8 @@ struct _EmpathyCallWindowPriv EmpathyCallHandler *handler; EmpathyContact *contact; - gboolean connected; + guint call_state; + gboolean outgoing; GtkUIManager *ui_manager; GtkWidget *video_output; @@ -165,10 +174,6 @@ struct _EmpathyCallWindowPriv gboolean sidebar_was_visible_before_fs; gint original_width_before_fs; gint original_height_before_fs; - - /* Used to indicate if we are currently redialing. If we are, as soon as the - channel is closed, the call is automatically re-initiated.*/ - gboolean redialing; }; #define GET_PRIV(o) \ @@ -650,6 +655,19 @@ empathy_call_window_setup_video_preview (EmpathyCallWindow *window) } static void +empathy_call_window_set_state_connecting (EmpathyCallWindow *window) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (window); + + empathy_call_window_status_message (window, _("Connecting...")); + priv->call_state = CONNECTING; + + if (priv->outgoing) + empathy_sound_start_playing (GTK_WIDGET (window), + EMPATHY_SOUND_PHONE_OUTGOING, MS_BETWEEN_RING); +} + +static void empathy_call_window_init (EmpathyCallWindow *self) { EmpathyCallWindowPriv *priv = GET_PRIV (self); @@ -778,8 +796,6 @@ empathy_call_window_init (EmpathyCallWindow *self) g_signal_connect (G_OBJECT (self), "key-press-event", G_CALLBACK (empathy_call_window_key_press_cb), self); - empathy_call_window_status_message (self, CONNECTING_STATUS_TEXT); - priv->timer = g_timer_new (); g_object_ref (priv->ui_manager); @@ -921,10 +937,18 @@ empathy_call_window_constructed (GObject *object) { EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object); EmpathyCallWindowPriv *priv = GET_PRIV (self); + EmpathyTpCall *call; g_assert (priv->handler != NULL); + + g_object_get (priv->handler, "tp-call", &call, NULL); + priv->outgoing = (call == NULL); + if (call != NULL) + g_object_unref (call); + empathy_call_window_setup_avatars (self, priv->handler); empathy_call_window_setup_video_preview_visibility (self, priv->handler); + empathy_call_window_set_state_connecting (self); } static void empathy_call_window_dispose (GObject *object); @@ -985,7 +1009,6 @@ empathy_call_window_class_init ( G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_CALL_HANDLER, param_spec); - } static void @@ -1180,7 +1203,11 @@ empathy_call_window_disconnected (EmpathyCallWindow *self) EmpathyCallWindowPriv *priv = GET_PRIV (self); gboolean could_reset_pipeline = empathy_call_window_reset_pipeline (self); - priv->connected = FALSE; + if (priv->call_state == CONNECTING) + empathy_sound_stop (EMPATHY_SOUND_PHONE_OUTGOING); + + if (priv->call_state != REDIALING) + priv->call_state = DISCONNECTED; if (could_reset_pipeline) { @@ -1236,11 +1263,8 @@ empathy_call_window_channel_closed_cb (TfChannel *channel, gpointer user_data) EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data); EmpathyCallWindowPriv *priv = GET_PRIV (self); - if (empathy_call_window_disconnected (self) && priv->redialing) - { + if (empathy_call_window_disconnected (self) && priv->call_state == REDIALING) empathy_call_window_restart_call (self); - priv->redialing = FALSE; - } } /* Called with global lock held */ @@ -1383,11 +1407,12 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, g_mutex_lock (priv->lock); - if (priv->connected == FALSE) + if (priv->call_state != CONNECTED) { g_timer_start (priv->timer); priv->timer_id = g_idle_add (empathy_call_window_connected, self); - priv->connected = TRUE; + priv->call_state = CONNECTED; + empathy_sound_stop (EMPATHY_SOUND_PHONE_OUTGOING); } switch (media_type) @@ -1629,6 +1654,9 @@ empathy_call_window_delete_cb (GtkWidget *widget, GdkEvent*event, if (priv->pipeline != NULL) gst_element_set_state (priv->pipeline, GST_STATE_NULL); + if (priv->call_state == CONNECTING) + empathy_sound_stop (EMPATHY_SOUND_PHONE_OUTGOING); + return FALSE; } @@ -1796,7 +1824,7 @@ empathy_call_window_camera_toggled_cb (GtkToggleToolButton *toggle, EmpathyCallWindowPriv *priv = GET_PRIV (window); gboolean active; - if (!priv->connected) + if (priv->call_state != CONNECTED) return; active = (gtk_toggle_tool_button_get_active (toggle)); @@ -1815,7 +1843,7 @@ empathy_call_window_send_video_toggled_cb (GtkToggleAction *toggle, EmpathyCallWindowPriv *priv = GET_PRIV (window); gboolean active; - if (!priv->connected) + if (priv->call_state != CONNECTED) return; active = (gtk_toggle_action_get_active (toggle)); @@ -1931,7 +1959,9 @@ empathy_call_window_restart_call (EmpathyCallWindow *window) if (!empathy_call_handler_has_initial_video (priv->handler)) gtk_widget_hide (priv->self_user_output_frame); - empathy_call_window_status_message (window, CONNECTING_STATUS_TEXT); + priv->outgoing = TRUE; + empathy_call_window_set_state_connecting (window); + priv->call_started = TRUE; empathy_call_handler_start_call (priv->handler); empathy_call_window_setup_avatars (window, priv->handler); @@ -1947,12 +1977,12 @@ empathy_call_window_redial_cb (gpointer object, { EmpathyCallWindowPriv *priv = GET_PRIV (window); - if (priv->connected) - priv->redialing = TRUE; + if (priv->call_state == CONNECTED) + priv->call_state = REDIALING; empathy_call_handler_stop_call (priv->handler); - if (!priv->connected) + if (priv->call_state != CONNECTED) empathy_call_window_restart_call (window); } diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 898897b5f..7bc64bb08 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -50,6 +50,7 @@ #include <libempathy-gtk/empathy-log-window.h> #include <libempathy-gtk/empathy-geometry.h> #include <libempathy-gtk/empathy-smiley-manager.h> +#include <libempathy-gtk/empathy-sound.h> #include <libempathy-gtk/empathy-ui-utils.h> #include "empathy-chat-window.h" @@ -175,7 +176,7 @@ chat_tab_style_set_cb (GtkWidget *hbox, "chat-window-tab-close-button"); context = gtk_widget_get_pango_context (hbox); - metrics = pango_context_get_metrics (context, hbox->style->font_desc, + metrics = pango_context_get_metrics (context, gtk_widget_get_style (hbox)->font_desc, pango_context_get_language (context)); char_width = pango_font_metrics_get_approximate_char_width (metrics); pango_font_metrics_unref (metrics); @@ -407,7 +408,7 @@ chat_window_update_chat_tab (EmpathyChat *chat) EmpathyContact *remote_contact; const gchar *name; const gchar *id; - McAccount *account; + EmpathyAccount *account; const gchar *subject; const gchar *status = NULL; GtkWidget *widget; @@ -428,7 +429,7 @@ chat_window_update_chat_tab (EmpathyChat *chat) remote_contact = empathy_chat_get_remote_contact (chat); DEBUG ("Updating chat tab, name=%s, account=%s, subject=%s, remote_contact=%p", - name, mc_account_get_unique_name (account), subject, remote_contact); + name, empathy_account_get_unique_name (account), subject, remote_contact); /* Update tab image */ if (g_list_find (priv->chats_new_msg, chat)) { @@ -460,7 +461,7 @@ chat_window_update_chat_tab (EmpathyChat *chat) append_markup_printf (tooltip, "<b>%s</b><small> (%s)</small>", id, - mc_account_get_display_name (account)); + empathy_account_get_display_name (account)); if (!EMP_STR_EMPTY (status)) { append_markup_printf (tooltip, "\n<i>%s</i>", status); @@ -555,13 +556,16 @@ chat_window_conv_activate_cb (GtkAction *action, is_room = empathy_chat_is_room (priv->current_chat); if (is_room) { const gchar *room; - McAccount *account; - gboolean found; + EmpathyAccount *account; + gboolean found = FALSE; + EmpathyChatroom *chatroom; room = empathy_chat_get_id (priv->current_chat); account = empathy_chat_get_account (priv->current_chat); - found = empathy_chatroom_manager_find (priv->chatroom_manager, - account, room) != NULL; + chatroom = empathy_chatroom_manager_find (priv->chatroom_manager, + account, room); + if (chatroom != NULL) + found = empathy_chatroom_is_favorite (chatroom); DEBUG ("This room %s favorite", found ? "is" : "is not"); gtk_toggle_action_set_active ( @@ -601,7 +605,7 @@ chat_window_favorite_toggled_cb (GtkToggleAction *toggle_action, { EmpathyChatWindowPriv *priv = GET_PRIV (window); gboolean active; - McAccount *account; + EmpathyAccount *account; const gchar *room; EmpathyChatroom *chatroom; @@ -612,19 +616,16 @@ chat_window_favorite_toggled_cb (GtkToggleAction *toggle_action, chatroom = empathy_chatroom_manager_find (priv->chatroom_manager, account, room); - if (active && !chatroom) { + if (chatroom == NULL) { const gchar *name; name = empathy_chat_get_name (priv->current_chat); chatroom = empathy_chatroom_new_full (account, room, name, FALSE); empathy_chatroom_manager_add (priv->chatroom_manager, chatroom); g_object_unref (chatroom); - return; - } + } - if (!active && chatroom) { - empathy_chatroom_manager_remove (priv->chatroom_manager, chatroom); - } + empathy_chatroom_set_favorite (chatroom, active); } static void @@ -973,11 +974,15 @@ chat_window_show_or_update_notification (EmpathyChatWindow *window, if (priv->notification != NULL) { notify_notification_update (priv->notification, header, escaped, NULL); - notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf); + /* if icon doesn't exist libnotify will crash */ + if (pixbuf != NULL) + notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf); } else { priv->notification = notify_notification_new (header, escaped, NULL, NULL); notify_notification_set_timeout (priv->notification, NOTIFY_EXPIRES_DEFAULT); - notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf); + /* if icon doesn't exist libnotify will crash */ + if (pixbuf != NULL) + notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf); g_signal_connect (priv->notification, "closed", G_CALLBACK (chat_window_notification_closed_cb), cb_data); @@ -1230,41 +1235,40 @@ chat_window_drag_data_received (GtkWidget *widget, if (info == DND_DRAG_TYPE_CONTACT_ID) { EmpathyChat *chat; EmpathyChatWindow *old_window; - McAccount *account; + EmpathyAccount *account; + EmpathyAccountManager *account_manager; const gchar *id; gchar **strv; const gchar *account_id; const gchar *contact_id; - id = (const gchar*) selection->data; + id = (const gchar*) gtk_selection_data_get_data (selection); + account_manager = empathy_account_manager_dup_singleton (); DEBUG ("DND contact from roster with id:'%s'", id); strv = g_strsplit (id, "/", 2); account_id = strv[0]; contact_id = strv[1]; - account = mc_account_lookup (account_id); + account = empathy_account_manager_lookup (account_manager, account_id); chat = empathy_chat_window_find_chat (account, contact_id); if (!chat) { - EmpathyAccountManager *account_manager; TpConnection *connection; - account_manager = empathy_account_manager_dup_singleton (); - connection = empathy_account_manager_get_connection ( - account_manager, account); + connection = empathy_account_get_connection (account); if (connection) { empathy_dispatcher_chat_with_contact_id ( connection, contact_id, NULL, NULL); } - g_object_unref (account_manager); g_object_unref (account); g_strfreev (strv); return; } g_object_unref (account); + g_object_unref (account_manager); g_strfreev (strv); old_window = chat_window_find_chat (chat); @@ -1295,7 +1299,7 @@ chat_window_drag_data_received (GtkWidget *widget, DEBUG ("DND tab"); - chat = (void *) selection->data; + chat = (void *) gtk_selection_data_get_data (selection); old_window = chat_window_find_chat (*chat); if (old_window) { @@ -1735,12 +1739,11 @@ empathy_chat_window_has_focus (EmpathyChatWindow *window) } EmpathyChat * -empathy_chat_window_find_chat (McAccount *account, +empathy_chat_window_find_chat (EmpathyAccount *account, const gchar *id) { GList *l; - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); g_return_val_if_fail (!EMP_STR_EMPTY (id), NULL); for (l = chat_windows; l; l = l->next) { diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h index c46ef8fc4..6f3d21fca 100644 --- a/src/empathy-chat-window.h +++ b/src/empathy-chat-window.h @@ -31,7 +31,7 @@ #include <glib-object.h> #include <gtk/gtk.h> -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> #include <libempathy-gtk/empathy-chat.h> G_BEGIN_DECLS @@ -69,7 +69,7 @@ void empathy_chat_window_move_chat (EmpathyChatWindow *old_wi void empathy_chat_window_switch_to_chat (EmpathyChatWindow *window, EmpathyChat *chat); gboolean empathy_chat_window_has_focus (EmpathyChatWindow *window); -EmpathyChat * empathy_chat_window_find_chat (McAccount *account, +EmpathyChat * empathy_chat_window_find_chat (EmpathyAccount *account, const gchar *id); void empathy_chat_window_present_chat (EmpathyChat *chat); diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c index a0fb8e6ec..3b5dd1f77 100644 --- a/src/empathy-chatrooms-window.c +++ b/src/empathy-chatrooms-window.c @@ -308,7 +308,7 @@ chatrooms_window_model_refresh_data (EmpathyChatroomsWindow *window, GtkTreeIter iter; GtkTreeViewColumn *column; EmpathyAccountChooser *account_chooser; - McAccount *account; + EmpathyAccount *account; GList *chatrooms, *l; view = GTK_TREE_VIEW (window->treeview); @@ -506,7 +506,7 @@ chatrooms_window_chatroom_added_cb (EmpathyChatroomManager *manager, EmpathyChatroomsWindow *window) { EmpathyAccountChooser *account_chooser; - McAccount *account; + EmpathyAccount *account; account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser); account = empathy_account_chooser_dup_account (account_chooser); diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c index cd0d925f9..9d047bab1 100644 --- a/src/empathy-debug-dialog.c +++ b/src/empathy-debug-dialog.c @@ -212,7 +212,7 @@ debug_dialog_set_toolbar_sensitivity (EmpathyDebugDialog *debug_dialog, gboolean sensitive) { EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog); - GtkWidget *vbox = GTK_DIALOG (debug_dialog)->vbox; + GtkWidget *vbox = gtk_dialog_get_content_area (GTK_DIALOG (debug_dialog)); gtk_widget_set_sensitive (GTK_WIDGET (priv->save_button), sensitive); gtk_widget_set_sensitive (GTK_WIDGET (priv->copy_button), sensitive); @@ -948,7 +948,7 @@ debug_dialog_constructor (GType type, gtk_window_set_title (GTK_WINDOW (object), _("Debug Window")); gtk_window_set_default_size (GTK_WINDOW (object), 800, 400); - vbox = GTK_DIALOG (object)->vbox; + vbox = gtk_dialog_get_content_area (GTK_DIALOG (object)); toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 35c91c48c..1a7ec09cb 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -41,7 +41,7 @@ #include <libempathy-gtk/empathy-conf.h> #include <libempathy-gtk/empathy-images.h> #include <libempathy-gtk/empathy-contact-dialogs.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include <libempathy-gtk/empathy-sound.h> #include "empathy-event-manager.h" #include "empathy-main-window.h" @@ -54,6 +54,9 @@ #define NOTIFICATION_TIMEOUT 2 /* seconds */ +/* The time interval in milliseconds between 2 incoming rings */ +#define MS_BETWEEN_RING 500 + typedef struct { EmpathyEventManager *manager; EmpathyDispatchOperation *operation; @@ -78,8 +81,6 @@ typedef struct { /* Ongoing approvals */ GSList *approvals; - /* voip ringing sound */ - guint voip_timeout; gint ringing; } EmpathyEventManagerPriv; @@ -165,81 +166,6 @@ event_free (EventPriv *event) g_slice_free (EventPriv, event); } -static void event_manager_ringing_finished_cb (ca_context *c, guint id, - int error_code, gpointer user_data); - -static gboolean -event_manager_ringing_timeout_cb (gpointer data) -{ - EmpathyEventManager *manager = EMPATHY_EVENT_MANAGER (data); - EmpathyEventManagerPriv *priv = GET_PRIV (manager); - - priv->voip_timeout = 0; - - empathy_sound_play_full (empathy_main_window_get (), - EMPATHY_SOUND_PHONE_INCOMING, event_manager_ringing_finished_cb, - manager); - - return FALSE; -} - -static gboolean -event_manager_ringing_idle_cb (gpointer data) -{ - EmpathyEventManager *manager = EMPATHY_EVENT_MANAGER (data); - EmpathyEventManagerPriv *priv = GET_PRIV (manager); - - if (priv->ringing > 0) - priv->voip_timeout = g_timeout_add (500, event_manager_ringing_timeout_cb, - data); - - return FALSE; -} - -static void -event_manager_ringing_finished_cb (ca_context *c, guint id, int error_code, - gpointer user_data) -{ - if (error_code == CA_ERROR_CANCELED) - return; - - g_idle_add (event_manager_ringing_idle_cb, user_data); -} - -static void -event_manager_start_ringing (EmpathyEventManager *manager) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (manager); - - priv->ringing++; - - if (priv->ringing == 1) - { - empathy_sound_play_full (empathy_main_window_get (), - EMPATHY_SOUND_PHONE_INCOMING, event_manager_ringing_finished_cb, - manager); - } -} - -static void -event_manager_stop_ringing (EmpathyEventManager *manager) -{ - EmpathyEventManagerPriv *priv = GET_PRIV (manager); - - priv->ringing--; - - if (priv->ringing > 0) - return; - - empathy_sound_stop (EMPATHY_SOUND_PHONE_INCOMING); - - if (priv->voip_timeout != 0) - { - g_source_remove (priv->voip_timeout); - priv->voip_timeout = 0; - } -} - static void event_remove (EventPriv *event) { @@ -473,7 +399,9 @@ event_manager_approval_done (EventManagerApproval *approval) approval->operation); if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA) { - event_manager_stop_ringing (approval->manager); + priv->ringing--; + if (priv->ringing == 0) + empathy_sound_stop (EMPATHY_SOUND_PHONE_INCOMING); } } @@ -518,6 +446,7 @@ event_manager_operation_invalidated_cb (EmpathyDispatchOperation *operation, static void event_manager_media_channel_got_contact (EventManagerApproval *approval) { + EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager); gchar *header; header = g_strdup_printf (_("Incoming call from %s"), @@ -528,7 +457,11 @@ event_manager_media_channel_got_contact (EventManagerApproval *approval) approval, event_channel_process_voip_func, NULL); g_free (header); - event_manager_start_ringing (approval->manager); + + priv->ringing++; + if (priv->ringing == 1) + empathy_sound_start_playing (empathy_main_window_get (), + EMPATHY_SOUND_PHONE_INCOMING, MS_BETWEEN_RING); } static void @@ -981,19 +914,12 @@ event_manager_presence_changed_cb (EmpathyContactMonitor *monitor, TpConnectionPresenceType previous, EmpathyEventManager *manager) { - McAccount *account; - gboolean just_connected; - EmpathyAccountManager *account_manager; + EmpathyAccount *account; gchar *header = NULL; gboolean preference = FALSE; account = empathy_contact_get_account (contact); - account_manager = empathy_account_manager_dup_singleton (); - just_connected = empathy_account_manager_is_account_just_connected ( - account_manager, account); - - g_object_unref (account_manager); - if (just_connected) + if (empathy_account_is_just_connected (account)) return; if (tp_connection_presence_type_cmp_availability (previous, @@ -1058,6 +984,9 @@ event_manager_finalize (GObject *object) { EmpathyEventManagerPriv *priv = GET_PRIV (object); + if (priv->ringing > 0) + empathy_sound_stop (EMPATHY_SOUND_PHONE_INCOMING); + g_slist_foreach (priv->events, (GFunc) event_free, NULL); g_slist_free (priv->events); g_slist_foreach (priv->approvals, (GFunc) event_manager_approval_free, NULL); @@ -1178,4 +1107,3 @@ empathy_event_inhibit_updates (EmpathyEvent *event_public) event->inhibit = TRUE; } - diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index 8e9a04595..1e135892d 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -27,7 +27,6 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libmissioncontrol/mc-account.h> #include <telepathy-glib/util.h> #include "empathy-import-dialog.h" @@ -36,6 +35,7 @@ #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include <libempathy/empathy-debug.h> #include <libempathy/empathy-utils.h> +#include <libempathy/empathy-account-manager.h> #include <libempathy-gtk/empathy-ui-utils.h> @@ -91,13 +91,16 @@ empathy_import_account_data_free (EmpathyImportAccountData *data) static void import_dialog_add_account (EmpathyImportAccountData *data) { - McAccount *account; + EmpathyAccountManager *account_manager; + EmpathyAccount *account; GHashTableIter iter; gpointer key, value; gchar *display_name; GValue *username; - account = mc_account_create (data->profile); + account_manager = empathy_account_manager_dup_singleton (); + account = empathy_account_manager_create (account_manager, data->profile); + g_object_unref (account_manager); if (account == NULL) { DEBUG ("Failed to create account"); @@ -115,21 +118,21 @@ import_dialog_add_account (EmpathyImportAccountData *data) case G_TYPE_STRING: DEBUG ("Set param '%s' to '%s' (string)", param, g_value_get_string (gvalue)); - mc_account_set_param_string (account, + empathy_account_set_param_string (account, param, g_value_get_string (gvalue)); break; case G_TYPE_BOOLEAN: DEBUG ("Set param '%s' to %s (boolean)", param, g_value_get_boolean (gvalue) ? "TRUE" : "FALSE"); - mc_account_set_param_boolean (account, + empathy_account_set_param_boolean (account, param, g_value_get_boolean (gvalue)); break; case G_TYPE_INT: DEBUG ("Set param '%s' to '%i' (integer)", param, g_value_get_int (gvalue)); - mc_account_set_param_int (account, + empathy_account_set_param_int (account, param, g_value_get_int (gvalue)); break; } @@ -140,7 +143,7 @@ import_dialog_add_account (EmpathyImportAccountData *data) display_name = g_strdup_printf ("%s (%s)", mc_profile_get_display_name (data->profile), g_value_get_string (username)); - mc_account_set_display_name (account, display_name); + empathy_account_set_display_name (account, display_name); g_free (display_name); g_object_unref (account); @@ -155,11 +158,12 @@ import_dialog_account_id_in_list (GList *accounts, for (l = accounts; l; l = l->next) { McAccount *account = l->data; - gchar *value; + gchar *value = NULL; gboolean result; - if (mc_account_get_param_string (account, "account", &value) - == MC_ACCOUNT_SETTING_ABSENT) + mc_account_get_param_string (account, "account", &value); + + if (value == NULL) continue; result = tp_strdiff (value, account_id); diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h index a3ef3e13c..0e3fd148f 100644 --- a/src/empathy-import-dialog.h +++ b/src/empathy-import-dialog.h @@ -20,6 +20,7 @@ */ #include <gtk/gtk.h> +#include <libmissioncontrol/mc-profile.h> #ifndef __EMPATHY_IMPORT_DIALOG_H__ #define __EMPATHY_IMPORT_DIALOG_H__ diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c index 804936eae..935c022ea 100644 --- a/src/empathy-import-pidgin.c +++ b/src/empathy-import-pidgin.c @@ -28,7 +28,6 @@ #include <libxml/parser.h> #include <libxml/tree.h> -#include <libmissioncontrol/mc-account.h> #include <telepathy-glib/util.h> #include <telepathy-glib/dbus.h> diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index e92817a0b..0e71229c5 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -37,16 +37,17 @@ #include <libempathy/empathy-contact-manager.h> #include <libempathy/empathy-status-presets.h> +#include <libempathy-gtk/empathy-conf.h> #include <libempathy-gtk/empathy-contact-dialogs.h> #include <libempathy-gtk/empathy-contact-list-store.h> #include <libempathy-gtk/empathy-contact-list-view.h> -#include <libempathy-gtk/empathy-presence-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> #include <libempathy-gtk/empathy-geometry.h> -#include <libempathy-gtk/empathy-conf.h> -#include <libempathy-gtk/empathy-log-window.h> -#include <libempathy-gtk/empathy-new-message-dialog.h> #include <libempathy-gtk/empathy-gtk-enum-types.h> +#include <libempathy-gtk/empathy-new-message-dialog.h> +#include <libempathy-gtk/empathy-log-window.h> +#include <libempathy-gtk/empathy-presence-chooser.h> +#include <libempathy-gtk/empathy-sound.h> +#include <libempathy-gtk/empathy-ui-utils.h> #include <libmissioncontrol/mission-control.h> @@ -94,6 +95,12 @@ typedef struct { GtkWidget *presence_chooser; GtkWidget *errors_vbox; + GtkRadioAction *sort_by_name; + GtkRadioAction *sort_by_status; + GtkRadioAction *normal_with_avatars; + GtkRadioAction *normal_size; + GtkRadioAction *compact_size; + GtkUIManager *ui_manager; GtkAction *view_history; GtkAction *room_join_favorites; @@ -301,7 +308,7 @@ static void main_window_error_edit_clicked_cb (GtkButton *button, EmpathyMainWindow *window) { - McAccount *account; + EmpathyAccount *account; GtkWidget *error_widget; account = g_object_get_data (G_OBJECT (button), "account"); @@ -316,7 +323,7 @@ static void main_window_error_clear_clicked_cb (GtkButton *button, EmpathyMainWindow *window) { - McAccount *account; + EmpathyAccount *account; GtkWidget *error_widget; account = g_object_get_data (G_OBJECT (button), "account"); @@ -327,7 +334,7 @@ main_window_error_clear_clicked_cb (GtkButton *button, static void main_window_error_display (EmpathyMainWindow *window, - McAccount *account, + EmpathyAccount *account, const gchar *message) { GtkWidget *child; @@ -348,7 +355,7 @@ main_window_error_display (EmpathyMainWindow *window, /* Just set the latest error and return */ str = g_markup_printf_escaped ("<b>%s</b>\n%s", - mc_account_get_display_name (account), + empathy_account_get_display_name (account), message); gtk_label_set_markup (GTK_LABEL (label), str); g_free (str); @@ -429,7 +436,7 @@ main_window_error_display (EmpathyMainWindow *window, gtk_misc_set_alignment (GTK_MISC (label), 0, 0); str = g_markup_printf_escaped ("<b>%s</b>\n%s", - mc_account_get_display_name (account), + empathy_account_get_display_name (account), message); gtk_label_set_markup (GTK_LABEL (label), str); g_free (str); @@ -481,7 +488,7 @@ main_window_update_status (EmpathyMainWindow *window, EmpathyAccountManager *man static void main_window_connection_changed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, TpConnectionStatusReason reason, TpConnectionStatus current, TpConnectionStatus previous, @@ -568,11 +575,11 @@ main_window_contact_presence_changed_cb (EmpathyContactMonitor *monitor, TpConnectionPresenceType previous, EmpathyMainWindow *window) { - McAccount *account; + EmpathyAccount *account; gboolean should_play; account = empathy_contact_get_account (contact); - should_play = !empathy_account_manager_is_account_just_connected (window->account_manager, account); + should_play = !empathy_account_is_just_connected (account); if (!should_play) { return; @@ -717,6 +724,120 @@ main_window_view_show_offline_cb (GtkToggleAction *action, } static void +main_window_notify_sort_contact_cb (EmpathyConf *conf, + const gchar *key, + EmpathyMainWindow *window) +{ + gchar *str = NULL; + + if (empathy_conf_get_string (conf, key, &str) && str) { + GType type; + GEnumClass *enum_class; + GEnumValue *enum_value; + + type = empathy_contact_list_store_sort_get_type (); + enum_class = G_ENUM_CLASS (g_type_class_peek (type)); + enum_value = g_enum_get_value_by_nick (enum_class, str); + if (enum_value) { + /* By changing the value of the GtkRadioAction, + it emits a signal that calls main_window_view_sort_contacts_cb + which updates the contacts list */ + gtk_radio_action_set_current_value (window->sort_by_name, + enum_value->value); + } else { + g_warning ("Wrong value for sort_criterium configuration : %s", str); + } + g_free (str); + } +} + +static void +main_window_view_sort_contacts_cb (GtkRadioAction *action, + GtkRadioAction *current, + EmpathyMainWindow *window) +{ + EmpathyContactListStoreSort value; + GSList *group; + GType type; + GEnumClass *enum_class; + GEnumValue *enum_value; + + value = gtk_radio_action_get_current_value (action); + group = gtk_radio_action_get_group (action); + + /* Get string from index */ + type = empathy_contact_list_store_sort_get_type (); + enum_class = G_ENUM_CLASS (g_type_class_peek (type)); + enum_value = g_enum_get_value (enum_class, g_slist_index (group, current)); + + if (!enum_value) { + g_warning ("No GEnumValue for EmpathyContactListSort with GtkRadioAction index:%d", + g_slist_index (group, action)); + } else { + empathy_conf_set_string (empathy_conf_get (), + EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, + enum_value->value_nick); + } + empathy_contact_list_store_set_sort_criterium (window->list_store, value); +} + +/* Matches GtkRadioAction values set in empathy-main-window.ui */ +#define CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS 0 +#define CONTACT_LIST_NORMAL_SIZE 1 +#define CONTACT_LIST_COMPACT_SIZE 2 + +static void +main_window_view_contacts_list_size_cb (GtkRadioAction *action, + GtkRadioAction *current, + EmpathyMainWindow *window) +{ + gint value; + + value = gtk_radio_action_get_current_value (action); + + empathy_conf_set_bool (empathy_conf_get (), + EMPATHY_PREFS_UI_SHOW_AVATARS, + value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS); + empathy_conf_set_bool (empathy_conf_get (), + EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, + value == CONTACT_LIST_COMPACT_SIZE); + + empathy_contact_list_store_set_show_avatars (window->list_store, + value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS); + empathy_contact_list_store_set_is_compact (window->list_store, + value == CONTACT_LIST_COMPACT_SIZE); +} + +static void +main_window_notify_contact_list_size_cb (EmpathyConf *conf, + const gchar *key, + EmpathyMainWindow *window) +{ + gboolean show_avatars; + gboolean compact_contact_list; + gint value = CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS; + + if (empathy_conf_get_bool (conf, + EMPATHY_PREFS_UI_SHOW_AVATARS, + &show_avatars) + && empathy_conf_get_bool (conf, + EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, + &compact_contact_list)) { + if (compact_contact_list) { + value = CONTACT_LIST_COMPACT_SIZE; + } else if (show_avatars) { + value = CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS; + } else { + value = CONTACT_LIST_NORMAL_SIZE; + } + } + /* By changing the value of the GtkRadioAction, + it emits a signal that calls main_window_view_contacts_list_size_cb + which updates the contacts list */ + gtk_radio_action_set_current_value (window->normal_with_avatars, value); +} + +static void main_window_view_show_map_cb (GtkCheckMenuItem *item, EmpathyMainWindow *window) { @@ -728,16 +849,13 @@ main_window_view_show_map_cb (GtkCheckMenuItem *item, static void main_window_favorite_chatroom_join (EmpathyChatroom *chatroom) { - EmpathyAccountManager *manager; - McAccount *account; + EmpathyAccount *account; TpConnection *connection; const gchar *room; - manager = empathy_account_manager_dup_singleton (); account = empathy_chatroom_get_account (chatroom); - connection = empathy_account_manager_get_connection (manager, account); + connection = empathy_account_get_connection (account); room = empathy_chatroom_get_room (chatroom); - g_object_unref (manager); if (connection != NULL) { DEBUG ("Requesting channel for '%s'", room); @@ -1008,7 +1126,7 @@ main_window_configure_event_cb (GtkWidget *widget, static void main_window_account_created_or_deleted_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyMainWindow *window) { gtk_action_set_sensitive (window->view_history, @@ -1028,56 +1146,6 @@ main_window_notify_show_offline_cb (EmpathyConf *conf, } static void -main_window_notify_show_avatars_cb (EmpathyConf *conf, - const gchar *key, - EmpathyMainWindow *window) -{ - gboolean show_avatars; - - if (empathy_conf_get_bool (conf, key, &show_avatars)) { - empathy_contact_list_store_set_show_avatars (window->list_store, - show_avatars); - } -} - -static void -main_window_notify_compact_contact_list_cb (EmpathyConf *conf, - const gchar *key, - EmpathyMainWindow *window) -{ - gboolean compact_contact_list; - - if (empathy_conf_get_bool (conf, key, &compact_contact_list)) { - empathy_contact_list_store_set_is_compact (window->list_store, - compact_contact_list); - } -} - -static void -main_window_notify_sort_criterium_cb (EmpathyConf *conf, - const gchar *key, - EmpathyMainWindow *window) -{ - gchar *str = NULL; - - if (empathy_conf_get_string (conf, key, &str) && str) { - GType type; - GEnumClass *enum_class; - GEnumValue *enum_value; - - type = empathy_contact_list_store_sort_get_type (); - enum_class = G_ENUM_CLASS (g_type_class_peek (type)); - enum_value = g_enum_get_value_by_nick (enum_class, str); - g_free (str); - - if (enum_value) { - empathy_contact_list_store_set_sort_criterium (window->list_store, - enum_value->value); - } - } -} - -static void main_window_connection_items_setup (EmpathyMainWindow *window, GtkBuilder *gui) { @@ -1118,8 +1186,6 @@ empathy_main_window_show (void) GtkAction *show_map_widget; GtkToolItem *item; gboolean show_offline; - gboolean show_avatars; - gboolean compact_contact_list; gint x, y, w, h; gchar *filename; GSList *l; @@ -1139,6 +1205,11 @@ empathy_main_window_show (void) "errors_vbox", &window->errors_vbox, "ui_manager", &window->ui_manager, "view_show_offline", &show_offline_widget, + "view_sort_by_name", &window->sort_by_name, + "view_sort_by_status", &window->sort_by_status, + "view_normal_size_with_avatars", &window->normal_with_avatars, + "view_normal_size", &window->normal_size, + "view_compact_size", &window->compact_size, "view_history", &window->view_history, "view_show_map", &show_map_widget, "room_join_favorites", &window->room_join_favorites, @@ -1159,6 +1230,8 @@ empathy_main_window_show (void) "chat_add_contact", "activate", main_window_chat_add_contact_cb, "view_show_ft_manager", "activate", main_window_view_show_ft_manager, "view_show_offline", "toggled", main_window_view_show_offline_cb, + "view_sort_by_name", "changed", main_window_view_sort_contacts_cb, + "view_normal_size_with_avatars", "changed", main_window_view_contacts_list_size_cb, "view_show_map", "activate", main_window_view_show_map_cb, "edit", "activate", main_window_edit_cb, "edit_accounts", "activate", main_window_edit_accounts_cb, @@ -1310,34 +1383,29 @@ empathy_main_window_show (void) gtk_toggle_action_set_active (show_offline_widget, show_offline); - /* Show avatars ? */ - empathy_conf_get_bool (conf, - EMPATHY_PREFS_UI_SHOW_AVATARS, - &show_avatars); + /* Sort by name / by status ? */ empathy_conf_notify_add (conf, - EMPATHY_PREFS_UI_SHOW_AVATARS, - (EmpathyConfNotifyFunc) main_window_notify_show_avatars_cb, - window); - empathy_contact_list_store_set_show_avatars (window->list_store, show_avatars); + EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, + (EmpathyConfNotifyFunc) main_window_notify_sort_contact_cb, + window); - /* Is compact ? */ - empathy_conf_get_bool (conf, - EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, - &compact_contact_list); - empathy_conf_notify_add (conf, - EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, - (EmpathyConfNotifyFunc) main_window_notify_compact_contact_list_cb, - window); - empathy_contact_list_store_set_is_compact (window->list_store, compact_contact_list); + main_window_notify_sort_contact_cb (conf, + EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, + window); - /* Sort criterium */ + /* Contacts list size */ empathy_conf_notify_add (conf, - EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, - (EmpathyConfNotifyFunc) main_window_notify_sort_criterium_cb, - window); - main_window_notify_sort_criterium_cb (conf, - EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, - window); + EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, + (EmpathyConfNotifyFunc) main_window_notify_contact_list_size_cb, + window); + empathy_conf_notify_add (conf, + EMPATHY_PREFS_UI_SHOW_AVATARS, + (EmpathyConfNotifyFunc) main_window_notify_contact_list_size_cb, + window); + + main_window_notify_contact_list_size_cb (conf, + EMPATHY_PREFS_UI_SHOW_AVATARS, + window); main_window_update_status (window, window->account_manager); diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui index f914979f6..85d4a0559 100644 --- a/src/empathy-main-window.ui +++ b/src/empathy-main-window.ui @@ -99,6 +99,56 @@ </object> </child> <child> + <object class="GtkRadioAction" id="view_sort_by_name"> + <property name="name">view_sort_by_name</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Sort by _Name</property> + <property name="draw_as_radio">True</property> + <property name="value">1</property> + <property name="current-value">1</property> + </object> + </child> + <child> + <object class="GtkRadioAction" id="view_sort_by_status"> + <property name="name">view_sort_by_status</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Sort by _Status</property> + <property name="draw_as_radio">True</property> + <property name="group">view_sort_by_name</property> + <property name="value">0</property> + </object> + </child> + <child> + <object class="GtkRadioAction" id="view_normal_size_with_avatars"> + <property name="name">view_normal_size_with_avatars</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Normal Size With _Avatars</property> + <property name="draw_as_radio">True</property> + <property name="value">0</property> + <property name="current-value">0</property> + </object> + </child> + <child> + <object class="GtkRadioAction" id="view_normal_size"> + <property name="name">view_normal_size</property> + <property name="visible">True</property> + <property name="label" translatable="yes">N_ormal Size</property> + <property name="draw_as_radio">True</property> + <property name="group">view_normal_size_with_avatars</property> + <property name="value">1</property> + </object> + </child> + <child> + <object class="GtkRadioAction" id="view_compact_size"> + <property name="name">view_compact_size</property> + <property name="visible">True</property> + <property name="label" translatable="yes">_Compact Size</property> + <property name="draw_as_radio">True</property> + <property name="group">view_normal_size_with_avatars</property> + <property name="value">2</property> + </object> + </child> + <child> <object class="GtkAction" id="room"> <property name="name">room</property> <property name="label" translatable="yes">_Room</property> @@ -172,6 +222,13 @@ <menu action="view"> <menuitem action="view_show_offline"/> <separator/> + <menuitem action="view_sort_by_name"/> + <menuitem action="view_sort_by_status"/> + <separator/> + <menuitem action="view_normal_size_with_avatars"/> + <menuitem action="view_normal_size"/> + <menuitem action="view_compact_size"/> + <separator/> <menuitem action="view_history"/> <menuitem action="view_show_ft_manager"/> <menuitem action="view_show_map"/> diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index da90cbb49..e16da91a7 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -33,7 +33,6 @@ #include <glib/gprintf.h> #include <libmissioncontrol/mission-control.h> -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mc-profile.h> #include <libempathy/empathy-tp-roomlist.h> @@ -358,14 +357,14 @@ static void new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *dialog) { EmpathyAccountChooser *account_chooser; - McAccount *account; + EmpathyAccount *account; McProfile *profile; const gchar *protocol; const gchar *room; account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser); account = empathy_account_chooser_dup_account (account_chooser); - profile = mc_account_get_profile (account); + profile = empathy_account_get_profile (account); protocol = mc_profile_get_protocol_name (profile); gtk_entry_set_text (GTK_ENTRY (dialog->entry_server), ""); @@ -399,12 +398,13 @@ new_chatroom_dialog_account_changed_cb (GtkComboBox *combobox, EmpathyNewChatroomDialog *dialog) { EmpathyAccountChooser *account_chooser; - McAccount *account; + EmpathyAccount *account; gboolean listing = FALSE; gboolean expanded = FALSE; if (dialog->room_list) { g_object_unref (dialog->room_list); + dialog->room_list = NULL; } ephy_spinner_stop (EPHY_SPINNER (dialog->throbber)); @@ -412,6 +412,9 @@ new_chatroom_dialog_account_changed_cb (GtkComboBox *combobox, account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser); account = empathy_account_chooser_dup_account (account_chooser); + if (account == NULL) + goto out; + dialog->room_list = empathy_tp_roomlist_new (account); if (dialog->room_list) { @@ -444,9 +447,10 @@ new_chatroom_dialog_account_changed_cb (GtkComboBox *combobox, } } - new_chatroom_dialog_update_widgets (dialog); - g_object_unref (account); + +out: + new_chatroom_dialog_update_widgets (dialog); } static void diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index 0e2299cac..65c496547 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -28,6 +28,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> +#include <telepathy-glib/dbus.h> #include <libempathy/empathy-utils.h> @@ -49,18 +50,11 @@ typedef struct { GtkWidget *notebook; - GtkWidget *checkbutton_show_avatars; - GtkWidget *checkbutton_compact_contact_list; GtkWidget *checkbutton_show_smileys; GtkWidget *checkbutton_show_contacts_in_rooms; GtkWidget *combobox_chat_theme; - GtkWidget *hbox_adium_theme; - GtkWidget *filechooserbutton_adium_theme; - GtkWidget *label_invalid_adium_theme; GtkWidget *checkbutton_separate_chat_windows; GtkWidget *checkbutton_autoconnect; - GtkWidget *radiobutton_contact_list_sort_by_name; - GtkWidget *radiobutton_contact_list_sort_by_state; GtkWidget *checkbutton_sounds_enabled; GtkWidget *checkbutton_sounds_disabled_away; @@ -101,11 +95,6 @@ static void preferences_languages_cell_toggled_cb (GtkCellRendererToggle EmpathyPreferences *preferences); static void preferences_widget_sync_bool (const gchar *key, GtkWidget *widget); -static void preferences_widget_sync_string (const gchar *key, - GtkWidget *widget); -static void preferences_notify_string_cb (EmpathyConf *conf, - const gchar *key, - gpointer user_data); static void preferences_notify_bool_cb (EmpathyConf *conf, const gchar *key, gpointer user_data); @@ -115,16 +104,11 @@ static void preferences_notify_sensitivity_cb (EmpathyConf static void preferences_hookup_toggle_button (EmpathyPreferences *preferences, const gchar *key, GtkWidget *widget); -static void preferences_hookup_radio_button (EmpathyPreferences *preferences, - const gchar *key, - GtkWidget *widget); static void preferences_hookup_sensitivity (EmpathyPreferences *preferences, const gchar *key, GtkWidget *widget); static void preferences_toggle_button_toggled_cb (GtkWidget *button, gpointer user_data); -static void preferences_radio_button_toggled_cb (GtkWidget *button, - gpointer user_data); static void preferences_destroy_cb (GtkWidget *widget, EmpathyPreferences *preferences); static void preferences_response_cb (GtkWidget *widget, @@ -139,8 +123,10 @@ enum { }; enum { + COL_COMBO_IS_ADIUM, COL_COMBO_VISIBLE_NAME, COL_COMBO_NAME, + COL_COMBO_PATH, COL_COMBO_COUNT }; @@ -175,24 +161,8 @@ preferences_add_id (EmpathyPreferences *preferences, guint id) } static void -preferences_compact_contact_list_changed_cb (EmpathyConf *conf, - const gchar *key, - gpointer user_data) -{ - EmpathyPreferences *preferences = user_data; - gboolean value; - - if (empathy_conf_get_bool (empathy_conf_get (), key, &value)) { - gtk_widget_set_sensitive (preferences->checkbutton_show_avatars, - !value); - } -} - -static void preferences_setup_widgets (EmpathyPreferences *preferences) { - guint id; - preferences_hookup_toggle_button (preferences, EMPATHY_PREFS_NOTIFICATIONS_ENABLED, preferences->checkbutton_notifications_enabled); @@ -241,14 +211,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences) preferences->checkbutton_separate_chat_windows); preferences_hookup_toggle_button (preferences, - EMPATHY_PREFS_UI_SHOW_AVATARS, - preferences->checkbutton_show_avatars); - - preferences_hookup_toggle_button (preferences, - EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, - preferences->checkbutton_compact_contact_list); - - preferences_hookup_toggle_button (preferences, EMPATHY_PREFS_CHAT_SHOW_SMILEYS, preferences->checkbutton_show_smileys); @@ -256,10 +218,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences) EMPATHY_PREFS_CHAT_SHOW_CONTACTS_IN_ROOMS, preferences->checkbutton_show_contacts_in_rooms); - preferences_hookup_radio_button (preferences, - EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM, - preferences->radiobutton_contact_list_sort_by_name); - preferences_hookup_toggle_button (preferences, EMPATHY_PREFS_AUTOCONNECT, preferences->checkbutton_autoconnect); @@ -295,17 +253,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences) preferences_hookup_sensitivity (preferences, EMPATHY_PREFS_LOCATION_PUBLISH, preferences->checkbutton_location_reduce_accuracy); - - id = empathy_conf_notify_add (empathy_conf_get (), - EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, - preferences_compact_contact_list_changed_cb, - preferences); - if (id) { - preferences_add_id (preferences, id); - } - preferences_compact_contact_list_changed_cb (empathy_conf_get (), - EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST, - preferences); } static void @@ -659,6 +606,7 @@ preferences_widget_sync_bool (const gchar *key, GtkWidget *widget) } } +#if 0 static void preferences_widget_sync_string (const gchar *key, GtkWidget *widget) { @@ -701,7 +649,7 @@ preferences_notify_string_cb (EmpathyConf *conf, { preferences_widget_sync_string (key, user_data); } - +#endif static void preferences_notify_bool_cb (EmpathyConf *conf, @@ -849,6 +797,7 @@ preferences_hookup_toggle_button (EmpathyPreferences *preferences, } } +#if 0 static void preferences_hookup_radio_button (EmpathyPreferences *preferences, const gchar *key, @@ -878,6 +827,7 @@ preferences_hookup_radio_button (EmpathyPreferences *preferences, preferences_add_id (preferences, id); } } +#endif static void preferences_hookup_sensitivity (EmpathyPreferences *preferences, @@ -913,6 +863,7 @@ preferences_toggle_button_toggled_cb (GtkWidget *button, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))); } +#if 0 static void preferences_radio_button_toggled_cb (GtkWidget *button, gpointer user_data) @@ -952,73 +903,7 @@ preferences_radio_button_toggled_cb (GtkWidget *button, empathy_conf_set_string (empathy_conf_get (), key, value); } - - -static void -preferences_theme_adium_update_visibility (EmpathyPreferences *preferences, - const gchar *name) -{ - if (name && strcmp (name, "adium") == 0) { - gtk_widget_show (preferences->hbox_adium_theme); - } else { - gtk_widget_hide (preferences->hbox_adium_theme); - gtk_widget_hide (preferences->label_invalid_adium_theme); - } -} - -static void -preferences_theme_adium_update_validity (EmpathyPreferences *preferences, - const gchar *path) -{ -#ifdef HAVE_WEBKIT - if (empathy_adium_path_is_valid (path)) { - gtk_widget_hide (preferences->label_invalid_adium_theme); - } else { - gtk_widget_show (preferences->label_invalid_adium_theme); - } #endif -} - -static void -preferences_theme_adium_path_notify_cb (EmpathyConf *conf, - const gchar *key, - gpointer user_data) -{ - EmpathyPreferences *preferences = user_data; - GtkFileChooser *chooser; - gchar *value; - const gchar *path; - - if (!empathy_conf_get_string (conf, key, &value)) { - return; - } - - if (EMP_STR_EMPTY (value)) { - path = g_get_home_dir (); - } else { - path = value; - } - - chooser = GTK_FILE_CHOOSER (preferences->filechooserbutton_adium_theme); - gtk_file_chooser_set_current_folder (chooser, path); - preferences_theme_adium_update_validity (preferences, path); - g_free (value); -} - -static void -preferences_theme_adium_file_set_cb (GtkFileChooser *chooser, - EmpathyPreferences *preferences) -{ - gchar *path; - - path = gtk_file_chooser_get_current_folder (chooser); - empathy_conf_set_string (empathy_conf_get (), - EMPATHY_PREFS_CHAT_ADIUM_PATH, - path); - preferences_theme_adium_update_validity (preferences, path); - - g_free (path); -} static void preferences_theme_notify_cb (EmpathyConf *conf, @@ -1027,34 +912,48 @@ preferences_theme_notify_cb (EmpathyConf *conf, { EmpathyPreferences *preferences = user_data; GtkComboBox *combo; - gchar *value; + gchar *conf_name; + gchar *conf_path; GtkTreeModel *model; GtkTreeIter iter; gboolean found = FALSE; - if (!empathy_conf_get_string (conf, key, &value)) { + if (!empathy_conf_get_string (conf, EMPATHY_PREFS_CHAT_THEME, &conf_name)) { return; } - preferences_theme_adium_update_visibility (preferences, value); + if (!empathy_conf_get_string (conf, EMPATHY_PREFS_CHAT_ADIUM_PATH, &conf_path)) { + g_free (conf_name); + return; + } combo = GTK_COMBO_BOX (preferences->combobox_chat_theme); model = gtk_combo_box_get_model (combo); - if (value && gtk_tree_model_get_iter_first (model, &iter)) { + if (gtk_tree_model_get_iter_first (model, &iter)) { + gboolean is_adium; gchar *name; + gchar *path; do { gtk_tree_model_get (model, &iter, + COL_COMBO_IS_ADIUM, &is_adium, COL_COMBO_NAME, &name, + COL_COMBO_PATH, &path, -1); - if (strcmp (name, value) == 0) { - found = TRUE; - gtk_combo_box_set_active_iter (combo, &iter); - break; + if (strcmp (name, conf_name) == 0) { + if (strcmp (name, "adium") != 0 || + strcmp (path, conf_path) == 0) { + found = TRUE; + gtk_combo_box_set_active_iter (combo, &iter); + g_free (name); + g_free (path); + break; + } } g_free (name); + g_free (path); } while (gtk_tree_model_iter_next (model, &iter)); } @@ -1065,7 +964,8 @@ preferences_theme_notify_cb (EmpathyConf *conf, } } - g_free (value); + g_free (conf_name); + g_free (conf_path); } static void @@ -1074,21 +974,28 @@ preferences_theme_changed_cb (GtkComboBox *combo, { GtkTreeModel *model; GtkTreeIter iter; + gboolean is_adium; gchar *name; + gchar *path; if (gtk_combo_box_get_active_iter (combo, &iter)) { model = gtk_combo_box_get_model (combo); gtk_tree_model_get (model, &iter, + COL_COMBO_IS_ADIUM, &is_adium, COL_COMBO_NAME, &name, + COL_COMBO_PATH, &path, -1); - preferences_theme_adium_update_visibility (preferences, name); - empathy_conf_set_string (empathy_conf_get (), EMPATHY_PREFS_CHAT_THEME, name); + if (is_adium == TRUE) + empathy_conf_set_string (empathy_conf_get (), + EMPATHY_PREFS_CHAT_ADIUM_PATH, + path); g_free (name); + g_free (path); } } @@ -1100,6 +1007,7 @@ preferences_themes_setup (EmpathyPreferences *preferences) GtkCellRenderer *renderer; GtkListStore *store; const gchar **themes; + GList *adium_themes; gint i; guint id; @@ -1108,18 +1016,46 @@ preferences_themes_setup (EmpathyPreferences *preferences) /* Create the model */ store = gtk_list_store_new (COL_COMBO_COUNT, + G_TYPE_BOOLEAN, /* Is an Adium theme */ G_TYPE_STRING, /* Display name */ - G_TYPE_STRING); /* Theme name */ + G_TYPE_STRING, /* Theme name */ + G_TYPE_STRING); /* Theme path */ + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), + COL_COMBO_VISIBLE_NAME, GTK_SORT_ASCENDING); /* Fill the model */ themes = empathy_theme_manager_get_themes (); for (i = 0; themes[i]; i += 2) { gtk_list_store_insert_with_values (store, NULL, -1, + COL_COMBO_IS_ADIUM, FALSE, COL_COMBO_VISIBLE_NAME, _(themes[i + 1]), COL_COMBO_NAME, themes[i], + COL_COMBO_PATH, NULL, -1); } + adium_themes = empathy_theme_manager_get_adium_themes (); + while (adium_themes != NULL) { + GHashTable *info; + const gchar *name; + const gchar *path; + + info = adium_themes->data; + name = tp_asv_get_string (info, "CFBundleName"); + path = tp_asv_get_string (info, "path"); + + if (name != NULL && path != NULL) { + gtk_list_store_insert_with_values (store, NULL, -1, + COL_COMBO_IS_ADIUM, TRUE, + COL_COMBO_VISIBLE_NAME, name, + COL_COMBO_NAME, "adium", + COL_COMBO_PATH, path, + -1); + } + g_hash_table_unref (info); + adium_themes = g_list_delete_link (adium_themes, adium_themes); + } + /* Add cell renderer */ renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (cell_layout, renderer, TRUE); @@ -1145,17 +1081,9 @@ preferences_themes_setup (EmpathyPreferences *preferences) preferences_add_id (preferences, id); } - g_signal_connect (preferences->filechooserbutton_adium_theme, - "file-set", - G_CALLBACK (preferences_theme_adium_file_set_cb), - preferences); - /* Select the adium path from the gconf key and track changes */ - preferences_theme_adium_path_notify_cb (empathy_conf_get (), - EMPATHY_PREFS_CHAT_ADIUM_PATH, - preferences); id = empathy_conf_notify_add (empathy_conf_get (), EMPATHY_PREFS_CHAT_ADIUM_PATH, - preferences_theme_adium_path_notify_cb, + preferences_theme_notify_cb, preferences); if (id) { preferences_add_id (preferences, id); @@ -1206,18 +1134,11 @@ empathy_preferences_show (GtkWindow *parent) gui = empathy_builder_get_file (filename, "preferences_dialog", &preferences->dialog, "notebook", &preferences->notebook, - "checkbutton_show_avatars", &preferences->checkbutton_show_avatars, - "checkbutton_compact_contact_list", &preferences->checkbutton_compact_contact_list, "checkbutton_show_smileys", &preferences->checkbutton_show_smileys, "checkbutton_show_contacts_in_rooms", &preferences->checkbutton_show_contacts_in_rooms, "combobox_chat_theme", &preferences->combobox_chat_theme, - "hbox_adium_theme", &preferences->hbox_adium_theme, - "filechooserbutton_adium_theme", &preferences->filechooserbutton_adium_theme, - "label_invalid_adium_theme", &preferences->label_invalid_adium_theme, "checkbutton_separate_chat_windows", &preferences->checkbutton_separate_chat_windows, "checkbutton_autoconnect", &preferences->checkbutton_autoconnect, - "radiobutton_contact_list_sort_by_name", &preferences->radiobutton_contact_list_sort_by_name, - "radiobutton_contact_list_sort_by_state", &preferences->radiobutton_contact_list_sort_by_state, "checkbutton_notifications_enabled", &preferences->checkbutton_notifications_enabled, "checkbutton_notifications_disabled_away", &preferences->checkbutton_notifications_disabled_away, "checkbutton_notifications_focus", &preferences->checkbutton_notifications_focus, diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui index 38cfd3419..a383607aa 100644 --- a/src/empathy-preferences.ui +++ b/src/empathy-preferences.ui @@ -38,38 +38,6 @@ <object class="GtkVBox" id="vbox199"> <property name="visible">True</property> <child> - <object class="GtkCheckButton" id="checkbutton_compact_contact_list"> - <property name="label" translatable="yes">Show co_mpact contact list</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkbutton_show_avatars"> - <property name="label" translatable="yes">Show _avatars</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Avatars are user chosen images shown in the contact list</property> - <property name="use_underline">True</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> <object class="GtkCheckButton" id="checkbutton_show_smileys"> <property name="label" translatable="yes">Show _smileys as images</property> <property name="visible">True</property> @@ -183,68 +151,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkFrame" id="frame13"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment31"> - <property name="visible">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkVBox" id="vbox217"> - <property name="visible">True</property> - <child> - <object class="GtkRadioButton" id="radiobutton_contact_list_sort_by_name"> - <property name="label" translatable="yes">Sort by _name</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="radiobutton_contact_list_sort_by_state"> - <property name="label" translatable="yes">Sort by s_tate</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">radiobutton_contact_list_sort_by_name</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label644"> - <property name="visible">True</property> - <property name="label" translatable="yes">Contact List</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> </object> </child> <child type="tab"> @@ -851,50 +757,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkHBox" id="hbox_adium_theme"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label587"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Adium theme to use:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <object class="GtkFileChooserButton" id="filechooserbutton_adium_theme"> - <property name="visible">True</property> - <property name="preview_widget_active">False</property> - <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_invalid_adium_theme"> - <property name="visible">True</property> - <property name="label" translatable="yes">Not a valid adium theme</property> - <attributes> - <attribute name="foreground" value="red"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> </object> </child> </object> diff --git a/src/empathy-sidebar.c b/src/empathy-sidebar.c index 7b70229e2..85a38267a 100644 --- a/src/empathy-sidebar.c +++ b/src/empathy-sidebar.c @@ -243,7 +243,7 @@ empathy_sidebar_menu_position_under (GtkMenu *menu, widget = GTK_WIDGET (user_data); - gdk_window_get_origin (widget->window, x, y); + gdk_window_get_origin (gtk_widget_get_window (widget), x, y); *x += widget->allocation.x; *y += widget->allocation.y + widget->allocation.height; diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index d6520ff7c..f6c63c537 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -153,7 +153,9 @@ status_icon_update_notification (EmpathyStatusIcon *icon) G_CALLBACK (status_icon_notification_closed_cb), icon); } - notify_notification_set_icon_from_pixbuf (priv->notification, + /* if icon doesn't exist libnotify will crash */ + if (pixbuf != NULL) + notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf); notify_notification_show (priv->notification, NULL); @@ -304,14 +306,20 @@ status_icon_set_visibility (EmpathyStatusIcon *icon, empathy_window_iconify (priv->window, priv->icon); } else { GList *accounts; + GList *l; + gboolean one_enabled = FALSE; empathy_window_present (GTK_WINDOW (priv->window), TRUE); /* Show the accounts dialog if there is no enabled accounts */ - accounts = mc_accounts_list_by_enabled (TRUE); - if (accounts) { - mc_accounts_list_free (accounts); - } else { + accounts = empathy_account_manager_dup_accounts (priv->account_manager); + for (l = accounts ; l != NULL ; l = g_list_next (l)) { + one_enabled = empathy_account_is_enabled (EMPATHY_ACCOUNT (l->data)) + || one_enabled; + g_object_unref (l->data); + } + g_list_free (accounts); + if (!one_enabled) { DEBUG ("No enabled account, Showing account dialog"); empathy_accounts_dialog_show (GTK_WINDOW (priv->window), NULL); } @@ -482,7 +490,7 @@ status_icon_create_menu (EmpathyStatusIcon *icon) static void status_icon_connection_changed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, TpConnectionStatusReason reason, TpConnectionStatus current, TpConnectionStatus previous, diff --git a/src/empathy.c b/src/empathy.c index 85124d1e9..aef361052 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -40,7 +40,6 @@ #include <telepathy-glib/dbus.h> #include <telepathy-glib/util.h> -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mission-control.h> #include <libempathy/empathy-idle.h> @@ -107,7 +106,7 @@ dispatch_cb (EmpathyDispatcher *dispatcher, if (id) { EmpathyAccountManager *manager; TpConnection *connection; - McAccount *account; + EmpathyAccount *account; manager = empathy_account_manager_dup_singleton (); connection = empathy_tp_chat_get_connection (tp_chat); @@ -227,7 +226,8 @@ create_salut_account (void) McProfile *profile; McProtocol *protocol; gboolean salut_created = FALSE; - McAccount *account; + EmpathyAccount *account; + EmpathyAccountManager *account_manager; GList *accounts; EBook *book; EContact *contact; @@ -284,8 +284,10 @@ create_salut_account (void) return; } - account = mc_account_create (profile); - mc_account_set_display_name (account, _("People nearby")); + account_manager = empathy_account_manager_dup_singleton (); + account = empathy_account_manager_create (account_manager, profile); + empathy_account_set_display_name (account, _("People nearby")); + g_object_unref (account_manager); nickname = e_contact_get (contact, E_CONTACT_NICKNAME); first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME); @@ -302,11 +304,11 @@ create_salut_account (void) "last-name=%s\nemail=%s\njid=%s\n", nickname, first_name, last_name, email, jid); - mc_account_set_param_string (account, "nickname", nickname ? nickname : ""); - mc_account_set_param_string (account, "first-name", first_name ? first_name : ""); - mc_account_set_param_string (account, "last-name", last_name ? last_name : ""); - mc_account_set_param_string (account, "email", email ? email : ""); - mc_account_set_param_string (account, "jid", jid ? jid : ""); + empathy_account_set_param_string (account, "nickname", nickname ? nickname : ""); + empathy_account_set_param_string (account, "first-name", first_name ? first_name : ""); + empathy_account_set_param_string (account, "last-name", last_name ? last_name : ""); + empathy_account_set_param_string (account, "email", email ? email : ""); + empathy_account_set_param_string (account, "jid", jid ? jid : ""); g_free (nickname); g_free (first_name); @@ -355,7 +357,7 @@ on_bacon_message_received (const char *message, gtk_widget_realize (GTK_WIDGET (window)); } - startup_timestamp = gdk_x11_get_server_time (window->window); + startup_timestamp = gdk_x11_get_server_time (gtk_widget_get_window (window)); } gtk_window_present_with_time (GTK_WINDOW (window), startup_timestamp); diff --git a/src/ephy-spinner.c b/src/ephy-spinner.c index 30ffa57c1..e7285bc0d 100644 --- a/src/ephy-spinner.c +++ b/src/ephy-spinner.c @@ -666,8 +666,8 @@ ephy_spinner_expose (GtkWidget *widget, return FALSE; } - gc = gdk_gc_new (widget->window); - gdk_draw_pixbuf (widget->window, gc, pixbuf, + gc = gdk_gc_new (gtk_widget_get_window (widget)); + gdk_draw_pixbuf (gtk_widget_get_window (widget), gc, pixbuf, dest.x - x_offset - widget->allocation.x, dest.y - y_offset - widget->allocation.y, dest.x, dest.y, diff --git a/tests/check-empathy-chatroom-manager.c b/tests/check-empathy-chatroom-manager.c index ef5c77618..1c0f924a2 100644 --- a/tests/check-empathy-chatroom-manager.c +++ b/tests/check-empathy-chatroom-manager.c @@ -13,6 +13,7 @@ #include "check-empathy-helpers.h" #include <libempathy/empathy-chatroom-manager.h> +#include <libempathy/empathy-account-manager.h> #define CHATROOM_SAMPLE "chatrooms-sample.xml" #define CHATROOM_FILE "chatrooms.xml" @@ -43,7 +44,7 @@ struct chatroom_t static void check_chatrooms_list (EmpathyChatroomManager *mgr, - McAccount *account, + EmpathyAccount *account, struct chatroom_t *_chatrooms, guint nb_chatrooms) { @@ -83,13 +84,13 @@ check_chatrooms_list (EmpathyChatroomManager *mgr, } static gboolean -change_account_name_in_file (McAccount *account, +change_account_name_in_file (EmpathyAccount *account, const gchar *file) { gchar *cmd; cmd = g_strdup_printf ("sed -i 's/CHANGE_ME/%s/' %s", - mc_account_get_unique_name (account), file); + empathy_account_get_unique_name (account), file); if (system (cmd) == -1) { @@ -106,11 +107,13 @@ START_TEST (test_empathy_chatroom_manager_dup_singleton) { EmpathyChatroomManager *mgr; gchar *file; - McAccount *account; + EmpathyAccount *account; + EmpathyAccountManager *account_manager; struct chatroom_t chatrooms[] = { { "name1", "room1", TRUE, TRUE }, { "name2", "room2", FALSE, TRUE }}; + account_manager = empathy_account_manager_dup_singleton (); account = get_test_account (); copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE); @@ -126,6 +129,7 @@ START_TEST (test_empathy_chatroom_manager_dup_singleton) g_free (file); g_object_unref (mgr); + g_object_unref (account_manager); g_object_unref (account); } END_TEST @@ -134,7 +138,8 @@ START_TEST (test_empathy_chatroom_manager_add) { EmpathyChatroomManager *mgr; gchar *file; - McAccount *account; + EmpathyAccount *account; + EmpathyAccountManager *account_manager; struct chatroom_t chatrooms[] = { { "name1", "room1", TRUE, TRUE }, { "name2", "room2", FALSE, TRUE }, @@ -142,6 +147,8 @@ START_TEST (test_empathy_chatroom_manager_add) { "name4", "room4", FALSE, FALSE }}; EmpathyChatroom *chatroom; + account_manager = empathy_account_manager_dup_singleton (); + account = get_test_account (); copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE); @@ -149,8 +156,7 @@ START_TEST (test_empathy_chatroom_manager_add) file = get_user_xml_file (CHATROOM_FILE); /* change the chatrooms XML file to use the account we just created */ - if (!change_account_name_in_file (account, file)) - return; + fail_unless (change_account_name_in_file (account, file)); mgr = empathy_chatroom_manager_dup_singleton (file); @@ -186,6 +192,7 @@ START_TEST (test_empathy_chatroom_manager_add) g_object_unref (mgr); g_free (file); + g_object_unref (account_manager); g_object_unref (account); } END_TEST @@ -194,11 +201,13 @@ START_TEST (test_empathy_chatroom_manager_remove) { EmpathyChatroomManager *mgr; gchar *file; - McAccount *account; + EmpathyAccount *account; struct chatroom_t chatrooms[] = { { "name2", "room2", FALSE, TRUE }}; EmpathyChatroom *chatroom; + EmpathyAccountManager *account_mgr; + account_mgr = empathy_account_manager_dup_singleton (); account = get_test_account (); copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE); @@ -206,8 +215,7 @@ START_TEST (test_empathy_chatroom_manager_remove) file = get_user_xml_file (CHATROOM_FILE); /* change the chatrooms XML file to use the account we just created */ - if (!change_account_name_in_file (account, file)) - return; + fail_unless (change_account_name_in_file (account, file)); mgr = empathy_chatroom_manager_dup_singleton (file); @@ -241,6 +249,7 @@ START_TEST (test_empathy_chatroom_manager_remove) g_object_unref (mgr); g_free (file); g_object_unref (account); + g_object_unref (account_mgr); } END_TEST @@ -248,12 +257,14 @@ START_TEST (test_empathy_chatroom_manager_change_favorite) { EmpathyChatroomManager *mgr; gchar *file; - McAccount *account; + EmpathyAccount *account; + EmpathyAccountManager *account_manager; struct chatroom_t chatrooms[] = { { "name1", "room1", TRUE, TRUE }, { "name2", "room2", FALSE, FALSE }}; EmpathyChatroom *chatroom; + account_manager = empathy_account_manager_dup_singleton (); account = get_test_account (); copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE); @@ -261,8 +272,7 @@ START_TEST (test_empathy_chatroom_manager_change_favorite) file = get_user_xml_file (CHATROOM_FILE); /* change the chatrooms XML file to use the account we just created */ - if (!change_account_name_in_file (account, file)) - return; + fail_unless (change_account_name_in_file (account, file)); mgr = empathy_chatroom_manager_dup_singleton (file); @@ -302,6 +312,7 @@ START_TEST (test_empathy_chatroom_manager_change_favorite) g_object_unref (mgr); g_object_unref (chatroom); g_free (file); + g_object_unref (account_manager); g_object_unref (account); } END_TEST @@ -310,12 +321,14 @@ START_TEST (test_empathy_chatroom_manager_change_chatroom) { EmpathyChatroomManager *mgr; gchar *file; - McAccount *account; + EmpathyAccount *account; + EmpathyAccountManager *account_manager; struct chatroom_t chatrooms[] = { { "name1", "room1", TRUE, TRUE }, { "name2", "room2", FALSE, TRUE }}; EmpathyChatroom *chatroom; + account_manager = empathy_account_manager_dup_singleton (); account = get_test_account (); copy_xml_file (CHATROOM_SAMPLE, "foo.xml"); @@ -323,8 +336,7 @@ START_TEST (test_empathy_chatroom_manager_change_chatroom) file = get_user_xml_file ("foo.xml"); /* change the chatrooms XML file to use the account we just created */ - if (!change_account_name_in_file (account, file)) - return; + fail_unless (change_account_name_in_file (account, file)); mgr = empathy_chatroom_manager_dup_singleton (file); @@ -369,6 +381,7 @@ START_TEST (test_empathy_chatroom_manager_change_chatroom) g_object_unref (mgr); g_free (file); g_object_unref (account); + g_object_unref (account_manager); } END_TEST diff --git a/tests/check-empathy-chatroom.c b/tests/check-empathy-chatroom.c index a4adf6ce1..f2110a8f8 100644 --- a/tests/check-empathy-chatroom.c +++ b/tests/check-empathy-chatroom.c @@ -12,7 +12,7 @@ static EmpathyChatroom * create_chatroom (void) { - McAccount *account; + EmpathyAccount *account; EmpathyChatroom *chatroom; account = get_test_account (); diff --git a/tests/check-empathy-helpers.c b/tests/check-empathy-helpers.c index 65273f8c8..c77cf9b75 100644 --- a/tests/check-empathy-helpers.c +++ b/tests/check-empathy-helpers.c @@ -24,6 +24,8 @@ #include <gconf/gconf.h> #include <gconf/gconf-client.h> +#include <libempathy/empathy-account-manager.h> + #include "check-helpers.h" #include "check-empathy-helpers.h" @@ -63,25 +65,31 @@ copy_xml_file (const gchar *orig, g_free (buffer); } -McAccount * +EmpathyAccount * get_test_account (void) { McProfile *profile; - McAccount *account; + EmpathyAccountManager *account_manager; + EmpathyAccount *account; GList *accounts; + account_manager = empathy_account_manager_dup_singleton (); profile = mc_profile_lookup ("test"); accounts = mc_accounts_list_by_profile (profile); if (g_list_length (accounts) == 0) { /* need to create a test account */ - account = mc_account_create (profile); + account = empathy_account_manager_create (account_manager, profile); } else { /* reuse an existing test account */ - account = accounts->data; + McAccount *mc_account; + mc_account = accounts->data; + account = empathy_account_manager_lookup (account_manager, + mc_account_get_unique_name (mc_account)); } + g_object_unref (account_manager); g_object_unref (profile); @@ -91,16 +99,17 @@ get_test_account (void) /* Not used for now as there is no API to remove completely gconf keys. * So we reuse existing accounts instead of creating new ones */ void -destroy_test_account (McAccount *account) +destroy_test_account (EmpathyAccount *account) { GConfClient *client; gchar *path; GError *error = NULL; GSList *entries = NULL, *l; + EmpathyAccountManager *manager; client = gconf_client_get_default (); path = g_strdup_printf ("/apps/telepathy/mc/accounts/%s", - mc_account_get_unique_name (account)); + empathy_account_get_unique_name (account)); entries = gconf_client_all_entries (client, path, &error); if (error != NULL) @@ -151,6 +160,8 @@ destroy_test_account (McAccount *account) g_object_unref (client); g_free (path); - mc_account_delete (account); + manager = empathy_account_manager_dup_singleton (); + empathy_account_manager_remove (manager, account); g_object_unref (account); + g_object_unref (manager); } diff --git a/tests/check-empathy-helpers.h b/tests/check-empathy-helpers.h index 4d52c04e5..5544b80aa 100644 --- a/tests/check-empathy-helpers.h +++ b/tests/check-empathy-helpers.h @@ -20,12 +20,12 @@ #define __CHECK_EMPATHY_HELPERS_H__ #include <glib.h> -#include <libmissioncontrol/mc-account.h> +#include <libempathy/empathy-account.h> gchar * get_xml_file (const gchar *filename); gchar * get_user_xml_file (const gchar *filename); void copy_xml_file (const gchar *orig, const gchar *dest); -McAccount * get_test_account (void); -void destroy_test_account (McAccount *account); +EmpathyAccount * get_test_account (void); +void destroy_test_account (EmpathyAccount *account); #endif /* #ifndef __CHECK_EMPATHY_HELPERS_H__ */ diff --git a/tests/check-helpers.h b/tests/check-helpers.h index 3e0783811..b71b3b65b 100644 --- a/tests/check-helpers.h +++ b/tests/check-helpers.h @@ -21,7 +21,6 @@ #include <glib.h> #include <check.h> -#include <libmissioncontrol/mc-account.h> void check_helpers_init (void); |