+NEW in 2.27.4
+==============
+Bugs fixed:
+ - Fixed #584703, Segfault when the contact selector dispose
+ - Fixed #459161, Remove should be insensitive for salut contact
+ - Fixed #494532, empathy should be able to take colours from the GTK theme
+ - Fixed #520972, IRC widget is cut (Matthias Clasen)
+ - Fixed #536383, Add option to hide muc roster
+ - Fixed #556237, time banner is added at each sentence when the remote contact is offline
+ - Fixed #560159, Should take a well-known bus name (Jonny Lamb)
+ - Fixed #562468, Contact list view options are scattered over "Chat" menu and "General" Preferences
+ - Fixed #563678, Doesn't poke block devices to figure out their file size. (Frédéric Péters)
+ - Fixed #565494, Remove libgnomevfs include in megaphone-applet.c
+ - Fixed #571989, "Video preview" menu item doesn't do anything
+ - Fixed #574771, Use call-stop icon (Frédéric Péters)
+ - Fixed #575008, Should play a sound when calling
+ - Fixed #575667, Favourite Chat Room tickybox doesn't work. (Abner Silva)
+ - Fixed #579151, Adds an Adium theme parsing to have a nicer theme selector
+ - Fixed #579893, EmpathyProfileChooser should extend GtkComboBox
+ - Fixed #579940, Show a notification when a buddy goes to offline or online
+ - Fixed #580631, Implement o.fd.Tp.Debug to publish debug messages (Jonny Lamb)
+ - Fixed #580777, Shouldn't be able to send video and enable preview if no webcam is plugged
+ - Fixed #582598, Call window: "send video" widgets should be enabled according the state of the call
+ - Fixed #582810, When we stop receiving video in a call, we should not see the last video frame.
+ - Fixed #585031, Crash when starting if status-presets.xml contains an 'unset' presence (Guillaume Desmottes)
+ - Fixed #585053, Crash when trying to add an 'unset' status as favorite (Guillaume Desmottes)
+ - Fixed #585380, Contact list doesn't appear in windows list when respawned
+ - Fixed #585475, %service% is not replaced in adium themes (Patryk Zawadzki)
+ - Fixed #585522, Use libchamplain 0.3.3's API
+ - Fixed #585601, Adium theme is not reloaded on /clear or Ctrl+L or clear menu item
+ - Fixed #585777, Empathy does not import from Pidgin on start
+ - Fixed #585788, Capitalisation incorrect
+ - Fixed #585882, Can't easily copy URL's when using Adium themes
+ - Fixed #585885, Lines are not smashed together when using Adium themes (Patryk Zawadzki)
+ - Fixed #585887, "Publish my location" causes a crash
+ - Fixed #586059, Remove markup from translatable strings
+ - Fixed #586102, Remove "new message from" from notification message (Guillaume Desmottes)
+ - Fixed #586133, don't autoscroll on new messages
+ - Fixed #586249, Display part reasons and messages.
+ - Fixed #586329, Imported Google account (from Pidgin) not connecting
+ - Fixed #586352, Adium theme should only join messages if time delta is less than 5 minutes (Patryk Zawadzki)
+ - Fixed #586368, Use themed avatar as fallback if provided
+ - Fixed #586382, "history" messageClasses is not set for backlogs
+ - Fixed #586387, We are not using Info.plist settings for adium themes (Patryk Zawadzki)
+ - Fixed #586481, telepathy-idle IRC chat window has no users or chat content
+ - Fixed #586645, Status icon not updated when going offline (Guillaume Desmottes)
+ - Fixed #586734, Modules linking cleanup
+ - Fixed #587365, empaty crashs whenever a file trasnfert request is received
+ - Fixed #587446, NM integration doesn't work if NM is started after empathy (Sjoerd Simons)
+ - Fixed #587508, Don't use McAccount (Sjoerd Simons)
+ - Fixed #587817, Crash when trying to add a contact while connecting (Guillaume Desmottes)
+ - Fixed #587953, Labels with RTL control code don't right-align
+ - Fixed #587958, please add bug-database to doap (Guillaume Desmottes)
+ - Fixed #588021, typo for enable_network_manager in configure.ac (Ken VanDine)
+ - Fixed #586284, Crasher: click on the microphone once disconnected
+
+Translations:
+ - Updated bn_IN Translation (Runa Bhattacharjee)
+ - Updated es Translation (Jorge Gonzalez)
+ - Updated fr Translation (Claude Paroz)
+ - Updated lt Translation (Žygimantas Beručka)
+ - Updated or Translation (Manoj Kumar Giri)
+ - Updated pa Translation (A S Alam)
+ - Updated sv Translation (Daniel Nylander)
+ - Updated ta Translation (drtvasudevan)
+
NEW in 2.27.3
==============
Bugs fixed:
-AC_INIT(Empathy, 2.27.4, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 2.27.5, http://bugzilla.gnome.org/browse.cgi?product=empathy)
AC_PREREQ(2.59)
AC_COPYRIGHT([
Copyright (C) 2003-2007 Imendio AB
# (Interfaces removed: CURRENT++, AGE=0, REVISION=0)
# (Interfaces added: CURRENT++, AGE++, REVISION=0)
# (No interfaces changed: REVISION++)
-LIBEMPATHY_CURRENT=26
+LIBEMPATHY_CURRENT=27
LIBEMPATHY_AGE=0
LIBEMPATHY_REVISION=0
-LIBEMPATHY_GTK_CURRENT=24
+LIBEMPATHY_GTK_CURRENT=25
LIBEMPATHY_GTK_AGE=0
LIBEMPATHY_GTK_REVISION=0
AC_ARG_ENABLE(network-manager,
AS_HELP_STRING([--enable-network-manager=@<:@no/yes/auto@:>@],
[build with network-manager support]), ,
- enable_webkit=auto)
+ enable_network_manager=auto)
if test "x$enable_network_manager" != "xno"; then
PKG_CHECK_MODULES(NETWORK_MANAGER,
<homepage rdf:resource="http://live.gnome.org/Empathy" />
<mailing-list rdf:resource="http://lists.freedesktop.org/mailman/listinfo/telepathy" />
+ <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=empathy" />
<maintainer>
<foaf:Person>
empathy-theme-boxes.c \
empathy-theme-irc.c \
empathy-theme-manager.c \
+ empathy-kludge-label.c \
empathy-ui-utils.c
libempathy_gtk_la_SOURCES = \
empathy-theme-boxes.h \
empathy-theme-irc.h \
empathy-theme-manager.h \
+ empathy-kludge-label.h \
empathy-ui-utils.h
check_c_sources = \
typedef struct {
EmpathyAccountManager *manager;
gboolean set_active_item;
+ gboolean account_manually_set;
gboolean has_all_option;
EmpathyAccountChooserFilterFunc filter;
gpointer filter_data;
chooser->priv = priv;
priv->set_active_item = FALSE;
+ priv->account_manually_set = FALSE;
priv->filter = NULL;
priv->filter_data = NULL;
empathy_account_chooser_set_account (EmpathyAccountChooser *chooser,
EmpathyAccount *account)
{
+ EmpathyAccountChooserPriv *priv;
GtkComboBox *combobox;
GtkTreeModel *model;
GtkTreeIter iter;
g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), FALSE);
+ priv = GET_PRIV (chooser);
+
combobox = GTK_COMBO_BOX (chooser);
model = gtk_combo_box_get_model (combobox);
gtk_combo_box_get_active_iter (combobox, &iter);
(GtkTreeModelForeachFunc) account_chooser_set_account_foreach,
&data);
+ priv->account_manually_set = data.set;
+
return data.set;
}
-1);
/* set first connected account as active account */
- if (priv->set_active_item == FALSE && is_enabled) {
+ if (priv->account_manually_set == FALSE &&
+ priv->set_active_item == FALSE && is_enabled) {
priv->set_active_item = TRUE;
gtk_combo_box_set_active_iter (combobox, iter);
}
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);
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;
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
{
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 {
}
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
EmpathyCellRendererExpanderPriv *priv;
GtkExpanderStyle expander_style;
gint x_offset, y_offset;
+ guint xpad, ypad;
+
expander = (EmpathyCellRendererExpander *) cell;
priv = GET_PRIV (expander);
&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);
}
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));
}
}
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);
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;
}
GtkRequisition *requisition)
{
GtkBin *bin = GTK_BIN (widget);
+ GtkWidget *child;
- requisition->width = GTK_CONTAINER (widget)->border_width * 2;
- requisition->height = GTK_CONTAINER (widget)->border_width * 2;
+ requisition->width = gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2;
+ requisition->height = gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2;
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ child = gtk_bin_get_child (bin);
+
+ 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;
{
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);
}
}
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);
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);
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,
gboolean result;
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);
+ result = empathy_contact_manager_get_flags_for_connection (contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
g_object_unref (contact_manager);
return result;
void
empathy_new_contact_dialog_show (GtkWindow *parent)
+{
+ empathy_new_contact_dialog_show_with_contact (parent, NULL);
+}
+
+void
+empathy_new_contact_dialog_show_with_contact (GtkWindow *parent,
+ EmpathyContact *contact)
{
GtkWidget *dialog;
GtkWidget *button;
gtk_widget_show (button);
/* Contact info widget */
- contact_widget = empathy_contact_widget_new (NULL,
+ contact_widget = empathy_contact_widget_new (contact,
EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |
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,
void empathy_contact_edit_dialog_show (EmpathyContact *contact,
GtkWindow *parent);
void empathy_contact_personal_dialog_show (GtkWindow *parent);
-void empathy_new_contact_dialog_show (GtkWindow *parent);
+void empathy_new_contact_dialog_show (GtkWindow *parent);
+void empathy_new_contact_dialog_show_with_contact (GtkWindow *parent,
+ EmpathyContact *contact);
G_END_DECLS
#include <telepathy-glib/util.h>
#include <libempathy/empathy-utils.h>
+#include <libempathy/empathy-enum-types.h>
+#include <libempathy/empathy-contact-manager.h>
+
#include "empathy-contact-list-store.h"
#include "empathy-ui-utils.h"
#include "empathy-gtk-enum-types.h"
contact_list_store_setup (EmpathyContactListStore *store)
{
EmpathyContactListStorePriv *priv;
- GType types[] = {G_TYPE_STRING, /* Status icon-name */
- GDK_TYPE_PIXBUF, /* Avatar pixbuf */
- G_TYPE_BOOLEAN, /* Avatar pixbuf visible */
- G_TYPE_STRING, /* Name */
- G_TYPE_STRING, /* Status string */
- G_TYPE_BOOLEAN, /* Show status */
- EMPATHY_TYPE_CONTACT, /* Contact type */
- G_TYPE_BOOLEAN, /* Is group */
- G_TYPE_BOOLEAN, /* Is active */
- G_TYPE_BOOLEAN, /* Is online */
- G_TYPE_BOOLEAN, /* Is separator */
- G_TYPE_BOOLEAN, /* Can make audio calls */
- G_TYPE_BOOLEAN}; /* Can make video calls */
+ GType types[] = {
+ G_TYPE_STRING, /* Status icon-name */
+ GDK_TYPE_PIXBUF, /* Avatar pixbuf */
+ G_TYPE_BOOLEAN, /* Avatar pixbuf visible */
+ G_TYPE_STRING, /* Name */
+ G_TYPE_STRING, /* Status string */
+ G_TYPE_BOOLEAN, /* Show status */
+ EMPATHY_TYPE_CONTACT, /* Contact type */
+ G_TYPE_BOOLEAN, /* Is group */
+ G_TYPE_BOOLEAN, /* Is active */
+ G_TYPE_BOOLEAN, /* Is online */
+ G_TYPE_BOOLEAN, /* Is separator */
+ G_TYPE_BOOLEAN, /* Can make audio calls */
+ G_TYPE_BOOLEAN, /* Can make video calls */
+ EMPATHY_TYPE_CONTACT_LIST_FLAGS, /* Flags */
+ };
priv = GET_PRIV (store);
EmpathyContactListStorePriv *priv;
GtkTreeIter iter;
GList *groups = NULL, *l;
+ TpConnection *connection;
+ EmpathyContactListFlags flags;
priv = GET_PRIV (store);
groups = empathy_contact_list_get_groups (priv->list, contact);
}
+ connection = empathy_contact_get_connection (contact);
+ if (EMPATHY_IS_CONTACT_MANAGER (priv->list)) {
+ flags = empathy_contact_manager_get_flags_for_connection (
+ EMPATHY_CONTACT_MANAGER (priv->list), connection);
+ } else {
+ flags = 0;
+ }
+
/* If no groups just add it at the top level. */
if (!groups) {
gtk_tree_store_append (GTK_TREE_STORE (store), &iter, NULL);
EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
empathy_contact_get_capabilities (contact) &
EMPATHY_CAPABILITIES_VIDEO,
+ EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
-1);
}
EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
empathy_contact_get_capabilities (contact) &
EMPATHY_CAPABILITIES_VIDEO,
+ EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
-1);
g_free (l->data);
}
EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR,
EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
+ EMPATHY_CONTACT_LIST_STORE_COL_FLAGS,
EMPATHY_CONTACT_LIST_STORE_COL_COUNT
} EmpathyContactListStoreCol;
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" : "",
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,
return contact;
}
+EmpathyContactListFlags
+empathy_contact_list_view_get_flags (EmpathyContactListView *view)
+{
+ EmpathyContactListViewPriv *priv;
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ EmpathyContactListFlags flags;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), 0);
+
+ priv = GET_PRIV (view);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+ if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
+ return 0;
+ }
+
+ gtk_tree_model_get (model, &iter,
+ EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, &flags,
+ -1);
+
+ return flags;
+}
+
gchar *
empathy_contact_list_view_get_selected_group (EmpathyContactListView *view)
{
GtkWidget *menu;
GtkWidget *item;
GtkWidget *image;
+ EmpathyContactListFlags flags;
g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
if (!contact) {
return NULL;
}
+ flags = empathy_contact_list_view_get_flags (view);
menu = empathy_contact_menu_new (contact, priv->contact_features);
- if (!(priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE)) {
- g_object_unref (contact);
- return menu;
- }
-
- if (menu) {
- /* Separator */
- item = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
- } else {
- menu = gtk_menu_new ();
- }
-
/* Remove contact */
- if (priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE) {
+ if (priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE &&
+ flags & EMPATHY_CONTACT_LIST_CAN_REMOVE) {
+ /* create the menu if required, or just add a separator */
+ if (!menu) {
+ menu = gtk_menu_new ();
+ } else {
+ item = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
+ }
+
+ /* Remove */
item = gtk_image_menu_item_new_with_mnemonic (_("_Remove"));
image = gtk_image_new_from_icon_name (GTK_STOCK_REMOVE,
GTK_ICON_SIZE_MENU);
EmpathyContactListFeatureFlags list_features,
EmpathyContactFeatureFlags contact_features);
EmpathyContact * empathy_contact_list_view_dup_selected (EmpathyContactListView *view);
+EmpathyContactListFlags empathy_contact_list_view_get_flags (EmpathyContactListView *view);
gchar * empathy_contact_list_view_get_selected_group (EmpathyContactListView *view);
GtkWidget * empathy_contact_list_view_get_contact_menu (EmpathyContactListView *view);
GtkWidget * empathy_contact_list_view_get_group_menu (EmpathyContactListView *view);
#include <libempathy/empathy-call-factory.h>
#include <libempathy/empathy-log-manager.h>
+#include <libempathy/empathy-contact-manager.h>
#include <libempathy/empathy-dispatcher.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-chatroom-manager.h>
+#include <libempathy/empathy-contact-manager.h>
#include "empathy-contact-menu.h"
#include "empathy-images.h"
menu = gtk_menu_new ();
shell = GTK_MENU_SHELL (menu);
+ /* Add Contact */
+ item = empathy_contact_add_menu_item_new (contact);
+ if (item) {
+ gtk_menu_shell_append (shell, item);
+ gtk_widget_show (item);
+ }
+
/* Chat */
if (features & EMPATHY_CONTACT_FEATURE_CHAT) {
item = empathy_contact_chat_menu_item_new (contact);
return menu;
}
+static void
+empathy_contact_add_menu_item_activated (GtkMenuItem *item,
+ EmpathyContact *contact)
+{
+ GtkWidget *toplevel;
+
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item));
+ if (!GTK_WIDGET_TOPLEVEL (toplevel) || !GTK_IS_WINDOW (toplevel)) {
+ toplevel = NULL;
+ }
+
+ empathy_new_contact_dialog_show_with_contact (GTK_WINDOW (toplevel),
+ contact);
+}
+
+GtkWidget *
+empathy_contact_add_menu_item_new (EmpathyContact *contact)
+{
+ GtkWidget *item;
+ GtkWidget *image;
+ EmpathyContactManager *manager;
+ TpConnection *connection;
+ GList *l, *members;
+ gboolean found = FALSE;
+ EmpathyContactListFlags flags;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+
+ if (!empathy_contact_manager_initialized ()) {
+ return NULL;
+ }
+
+ manager = empathy_contact_manager_dup_singleton ();
+ connection = empathy_contact_get_connection (contact);
+
+ flags = empathy_contact_manager_get_flags_for_connection (manager,
+ connection);
+
+ if (!(flags & EMPATHY_CONTACT_LIST_CAN_ADD)) {
+ return NULL;
+ }
+
+ members = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (manager));
+ for (l = members; l; l = l->next) {
+ if (!found && empathy_contact_equal (l->data, contact)) {
+ found = TRUE;
+ /* we keep iterating so that we don't leak contact
+ * refs */
+ }
+
+ g_object_unref (l->data);
+ }
+ g_list_free (members);
+ g_object_unref (manager);
+
+ if (found) {
+ return NULL;
+ }
+
+ item = gtk_image_menu_item_new_with_mnemonic (_("_Add Contact..."));
+ image = gtk_image_new_from_icon_name (GTK_STOCK_ADD,
+ GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+
+ g_signal_connect (item, "activate",
+ G_CALLBACK (empathy_contact_add_menu_item_activated),
+ contact);
+
+ return item;
+}
+
static void
empathy_contact_chat_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
empathy_dispatcher_chat_with_contact (contact, NULL, NULL);
}
-
GtkWidget *
empathy_contact_chat_menu_item_new (EmpathyContact *contact)
{
GtkWidget *
empathy_contact_edit_menu_item_new (EmpathyContact *contact)
{
+ EmpathyContactManager *manager;
GtkWidget *item;
GtkWidget *image;
+ gboolean enable = FALSE;
g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+ if (empathy_contact_manager_initialized ()) {
+ TpConnection *connection;
+ EmpathyContactListFlags flags;
+
+ manager = empathy_contact_manager_dup_singleton ();
+ connection = empathy_contact_get_connection (contact);
+ flags = empathy_contact_manager_get_flags_for_connection (
+ manager, connection);
+
+ enable = (flags & EMPATHY_CONTACT_LIST_CAN_ALIAS ||
+ flags & EMPATHY_CONTACT_LIST_CAN_GROUP);
+
+ g_object_unref (manager);
+ }
+
item = gtk_image_menu_item_new_with_mnemonic (_("_Edit"));
image = gtk_image_new_from_icon_name (GTK_STOCK_EDIT,
GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_widget_show (image);
+ gtk_widget_set_sensitive (item, enable);
+
g_signal_connect_swapped (item, "activate",
G_CALLBACK (contact_edit_menu_item_activate_cb),
contact);
GtkWidget * empathy_contact_menu_new (EmpathyContact *contact,
EmpathyContactFeatureFlags features);
+GtkWidget * empathy_contact_add_menu_item_new (EmpathyContact *contact);
GtkWidget * empathy_contact_chat_menu_item_new (EmpathyContact *contact);
GtkWidget * empathy_contact_audio_call_menu_item_new (EmpathyContact *contact);
GtkWidget * empathy_contact_video_call_menu_item_new (EmpathyContact *contact);
#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>
"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,
information->factory = empathy_tp_contact_factory_dup_singleton (connection);
}
+ /* set the selected account to be the account this contact came from */
+ if (contact && EMPATHY_IS_ACCOUNT_CHOOSER (information->widget_account)) {
+ empathy_account_chooser_set_account (
+ EMPATHY_ACCOUNT_CHOOSER (information->widget_account),
+ empathy_contact_get_account (contact));
+ }
+
/* Update information for widgets */
contact_widget_contact_update (information);
contact_widget_groups_update (information);
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)
{
</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>
--- /dev/null
+/* 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);
+}
--- /dev/null
+/*
+ * 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
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);
}
EmpathySmileyManager *smiley_manager;
EmpathyContact *last_contact;
time_t last_timestamp;
+ gboolean last_is_backlog;
gboolean page_loaded;
GList *message_queue;
+ gchar *hovered_uri;
} EmpathyThemeAdiumPriv;
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;
return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
}
+static void
+theme_adium_hovering_over_link_cb (EmpathyThemeAdium *theme,
+ gchar *title,
+ gchar *uri,
+ gpointer user_data)
+{
+ EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
+
+ if (tp_strdiff (uri, priv->hovered_uri)) {
+ g_free (priv->hovered_uri);
+ priv->hovered_uri = g_strdup (uri);
+ }
+}
+
+static void
+theme_adium_copy_address_cb (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ EmpathyThemeAdium *theme = EMPATHY_THEME_ADIUM (user_data);
+ EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
+ GtkClipboard *clipboard;
+
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ gtk_clipboard_set_text (clipboard, priv->hovered_uri, -1);
+
+ clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+ gtk_clipboard_set_text (clipboard, priv->hovered_uri, -1);
+}
+
+static void
+theme_adium_open_address_cb (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ EmpathyThemeAdium *theme = EMPATHY_THEME_ADIUM (user_data);
+ EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
+
+ empathy_url_show (GTK_WIDGET (menuitem), priv->hovered_uri);
+}
+
static void
theme_adium_populate_popup_cb (WebKitWebView *view,
GtkMenu *menu,
gpointer user_data)
{
GtkWidget *item;
+ GList *items;
+ GtkWidget *icon;
+ gchar *stock_id;
+ gboolean is_link = FALSE;
+
+ /* FIXME: WebKitGTK+'s context menu API clearly needs an
+ * overhaul. There is currently no way to know what is being
+ * clicked, to decide what features to provide. You either
+ * take what it gives you as a menu, or use hacks to figure
+ * out what to display. */
+ items = gtk_container_get_children (GTK_CONTAINER (menu));
+ item = GTK_WIDGET (g_list_nth_data (items, 0));
+ g_list_free (items);
+
+ if (GTK_IS_IMAGE_MENU_ITEM (item)) {
+ icon = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (item));
+ gtk_image_get_stock (GTK_IMAGE (icon), &stock_id, NULL);
+
+ if (!strcmp (stock_id, GTK_STOCK_OPEN))
+ is_link = TRUE;
+ }
/* Remove default menu items */
gtk_container_foreach (GTK_CONTAINER (menu),
G_CALLBACK (empathy_chat_view_clear),
view);
- /* FIXME: Add open_link and copy_link when those bugs are fixed:
- * https://bugs.webkit.org/show_bug.cgi?id=16092
- * https://bugs.webkit.org/show_bug.cgi?id=16562
- */
+ /* We will only add the following menu items if we are
+ * right-clicking a link */
+ if (!is_link)
+ return;
+
+ /* Separator */
+ item = gtk_separator_menu_item_new ();
+ gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
+
+ /* Copy Link Address menu item */
+ item = gtk_menu_item_new_with_mnemonic (_("_Copy Link Address"));
+ g_signal_connect (item, "activate",
+ G_CALLBACK (theme_adium_copy_address_cb),
+ view);
+ gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
+
+ /* Open Link menu item */
+ item = gtk_menu_item_new_with_mnemonic (_("_Open Link"));
+ g_signal_connect (item, "activate",
+ G_CALLBACK (theme_adium_open_address_cb),
+ view);
+ gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
}
static gchar *
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,
}
}
+ 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 */
}
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
EmpathyThemeAdiumPriv *priv = GET_PRIV (object);
empathy_adium_data_unref (priv->data);
+ g_free (priv->hovered_uri);
G_OBJECT_CLASS (empathy_theme_adium_parent_class)->finalize (object);
}
g_signal_connect (theme, "populate-popup",
G_CALLBACK (theme_adium_populate_popup_cb),
NULL);
+ g_signal_connect (theme, "hovering-over-link",
+ G_CALLBACK (theme_adium_hovering_over_link_cb),
+ NULL);
}
EmpathyThemeAdium *
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
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;
}
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);
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);
{
g_return_val_if_fail (data != NULL, NULL);
- data->ref_count++;
+ g_atomic_int_inc (&data->ref_count);
return 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);
#include <string.h>
#include <glib/gi18n-lib.h>
+#include <telepathy-glib/dbus.h>
#include <gtk/gtk.h>
#include <telepathy-glib/util.h>
"simple", N_("Simple"),
"clean", N_("Clean"),
"blue", N_("Blue"),
-#ifdef HAVE_WEBKIT
- "adium", N_("Adium"),
-#endif
NULL
};
return FALSE;
}
+ if (strcmp ("adium", name) == 0) {
+ return TRUE;
+ }
+
for (i = 0; themes[i]; i += 2) {
if (strcmp (themes[i], name) == 0) {
return TRUE;
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 */
+}
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
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;
}
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;
{
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))));
}
}
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));
}
}
+EmpathyContactListFlags
+empathy_contact_list_get_flags (EmpathyContactList *list)
+{
+ g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), 0);
+
+ if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_flags) {
+ return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_flags (list);
+ } else {
+ return 0;
+ }
+}
#define EMPATHY_IS_CONTACT_LIST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONTACT_LIST))
#define EMPATHY_CONTACT_LIST_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), EMPATHY_TYPE_CONTACT_LIST, EmpathyContactListIface))
+typedef enum {
+ EMPATHY_CONTACT_LIST_CAN_ADD = 1 << 0,
+ EMPATHY_CONTACT_LIST_CAN_REMOVE = 1 << 1,
+ EMPATHY_CONTACT_LIST_CAN_ALIAS = 1 << 2,
+ EMPATHY_CONTACT_LIST_CAN_GROUP = 1 << 3,
+} EmpathyContactListFlags;
+
typedef struct _EmpathyContactListIface EmpathyContactListIface;
struct _EmpathyContactListIface {
const gchar *group);
EmpathyContactMonitor *
(*get_monitor) (EmpathyContactList *list);
+ EmpathyContactListFlags
+ (*get_flags) (EmpathyContactList *list);
};
GType empathy_contact_list_get_type (void) G_GNUC_CONST;
EmpathyContactMonitor *
empathy_contact_list_get_monitor (EmpathyContactList *list);
+EmpathyContactListFlags
+ empathy_contact_list_get_flags (EmpathyContactList *list);
+
G_END_DECLS
#endif /* __EMPATHY_CONTACT_LIST_H__ */
return retval;
}
+/**
+ * empathy_contact_manager_initialized:
+ *
+ * Reports whether or not the singleton has already been created.
+ *
+ * There can be instances where you want to access the #EmpathyContactManager
+ * only if it has been set up for this process.
+ *
+ * Returns: %TRUE if the #EmpathyContactManager singleton has previously
+ * been initialized.
+ */
+gboolean
+empathy_contact_manager_initialized (void)
+{
+ return (manager_singleton != NULL);
+}
+
static void
empathy_contact_manager_class_init (EmpathyContactManagerClass *klass)
{
iface->remove_group = contact_manager_remove_group;
}
-gboolean
-empathy_contact_manager_can_add (EmpathyContactManager *manager,
- TpConnection *connection)
+EmpathyContactListFlags
+empathy_contact_manager_get_flags_for_connection (
+ EmpathyContactManager *manager,
+ TpConnection *connection)
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
- EmpathyTpContactList *list;
+ EmpathyContactList *list;
+ EmpathyContactListFlags flags;
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)
+ if (list == NULL) {
return FALSE;
+ }
+ flags = empathy_contact_list_get_flags (list);
- return empathy_tp_contact_list_can_add (list);
+ return flags;
}
};
GType empathy_contact_manager_get_type (void) G_GNUC_CONST;
+gboolean empathy_contact_manager_initialized (void);
EmpathyContactManager *empathy_contact_manager_dup_singleton (void);
EmpathyTpContactList * empathy_contact_manager_get_list (EmpathyContactManager *manager,
TpConnection *connection);
-gboolean empathy_contact_manager_can_add (EmpathyContactManager *manager,
+EmpathyContactListFlags empathy_contact_manager_get_flags_for_connection (
+ EmpathyContactManager *manager,
TpConnection *connection);
G_END_DECLS
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+
+/* FIXME: g_mapped_file_free has been deprecated in GLib 2.22, but the
+ * replacement symbol, g_mapped_file_unref is not available in older Glib
+ * and we're not ready to bump our version requirement just for this. When
+ * we're ready to bump our version requirement, just revert this patch. */
+#undef G_DISABLE_DEPRECATED
#include <glib/gstdio.h>
+#define G_DISABLE_DEPRECATED
#include "empathy-log-store.h"
#include "empathy-log-store-empathy.h"
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);
EmpathyContact *receiver;
gchar *body;
time_t timestamp;
+ gboolean is_backlog;
guint id;
} EmpathyMessagePriv;
PROP_RECEIVER,
PROP_BODY,
PROP_TIMESTAMP,
+ PROP_IS_BACKLOG,
};
static void
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));
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)
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);
GHashTable *pendings; /* handle -> EmpathyContact */
GHashTable *groups; /* group name -> TpChannel */
GHashTable *add_to_group; /* group name -> GArray of handles */
+
+ EmpathyContactListFlags flags;
} EmpathyTpContactListPriv;
typedef enum {
list);
}
+static void
+tp_contact_list_get_alias_flags_cb (TpConnection *connection,
+ guint flags,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
+{
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ return;
+ }
+
+ if (flags & TP_CONNECTION_ALIAS_FLAG_USER_SET) {
+ priv->flags |= EMPATHY_CONTACT_LIST_CAN_ALIAS;
+ }
+}
+
+static void
+tp_contact_list_get_requestablechannelclasses_cb (TpProxy *connection,
+ const GValue *value,
+ const GError *error,
+ gpointer user_data,
+ GObject *list)
+{
+ EmpathyTpContactListPriv *priv = GET_PRIV (list);
+ GPtrArray *classes;
+ int i;
+
+ if (error) {
+ DEBUG ("Error: %s", error->message);
+ return;
+ }
+
+ classes = g_value_get_boxed (value);
+ for (i = 0; i < classes->len; i++) {
+ GValueArray *class = g_ptr_array_index (classes, i);
+ GHashTable *props;
+ const char *channel_type;
+ guint handle_type;
+
+ props = g_value_get_boxed (g_value_array_get_nth (class, 0));
+
+ channel_type = tp_asv_get_string (props,
+ TP_IFACE_CHANNEL ".ChannelType");
+ handle_type = tp_asv_get_uint32 (props,
+ TP_IFACE_CHANNEL ".TargetHandleType", NULL);
+
+ if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST) &&
+ handle_type == TP_HANDLE_TYPE_GROUP) {
+ DEBUG ("Got channel class for a contact group");
+ priv->flags |= EMPATHY_CONTACT_LIST_CAN_GROUP;
+ break;
+ }
+ }
+}
+
static void
tp_contact_list_publish_request_handle_cb (TpConnection *connection,
const GArray *handles,
priv->factory = empathy_tp_contact_factory_dup_singleton (priv->connection);
+ /* call GetAliasFlags */
+ if (tp_proxy_has_interface_by_id (priv->connection,
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING)) {
+ tp_cli_connection_interface_aliasing_call_get_alias_flags (
+ priv->connection,
+ -1,
+ tp_contact_list_get_alias_flags_cb,
+ NULL, NULL,
+ G_OBJECT (list));
+ }
+
+ /* lookup RequestableChannelClasses */
+ if (tp_proxy_has_interface_by_id (priv->connection,
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS)) {
+ tp_cli_dbus_properties_call_get (priv->connection,
+ -1,
+ TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
+ "RequestableChannelClasses",
+ tp_contact_list_get_requestablechannelclasses_cb,
+ NULL, NULL,
+ G_OBJECT (list));
+ } else {
+ /* we just don't know... better mark the flag just in case */
+ priv->flags |= EMPATHY_CONTACT_LIST_CAN_GROUP;
+ }
+
names[0] = "publish";
tp_cli_connection_call_request_handles (priv->connection,
-1,
g_array_free (handles, TRUE);
}
+static EmpathyContactListFlags
+tp_contact_list_get_flags (EmpathyContactList *list)
+{
+ EmpathyTpContactListPriv *priv;
+ EmpathyContactListFlags flags;
+ TpChannelGroupFlags group_flags;
+
+ g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), FALSE);
+
+ priv = GET_PRIV (list);
+ flags = priv->flags;
+
+ group_flags = tp_channel_group_get_flags (priv->subscribe);
+
+ if (group_flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD) {
+ flags |= EMPATHY_CONTACT_LIST_CAN_ADD;
+ }
+
+ if (group_flags & TP_CHANNEL_GROUP_FLAG_CAN_REMOVE) {
+ flags |= EMPATHY_CONTACT_LIST_CAN_REMOVE;
+ }
+
+ return flags;
+}
+
static void
tp_contact_list_iface_init (EmpathyContactListIface *iface)
{
iface->remove_from_group = tp_contact_list_remove_from_group;
iface->rename_group = tp_contact_list_rename_group;
iface->remove_group = tp_contact_list_remove_group;
-}
-
-gboolean
-empathy_tp_contact_list_can_add (EmpathyTpContactList *list)
-{
- EmpathyTpContactListPriv *priv;
- TpChannelGroupFlags flags;
-
- g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), FALSE);
-
- priv = GET_PRIV (list);
-
- if (priv->subscribe == NULL)
- return FALSE;
-
- flags = tp_channel_group_get_flags (priv->subscribe);
- return (flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD) != 0;
+ iface->get_flags = tp_contact_list_get_flags;
}
void
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);
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-adium.c
libempathy-gtk/empathy-theme-boxes.c
libempathy-gtk/empathy-theme-irc.c
libempathy-gtk/empathy-theme-manager.c
"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-23 10:10+0000\n"
-"PO-Revision-Date: 2009-06-27 15:03+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"
"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
#: ../data/empathy.schemas.in.h:36
-#| msgid "Popup notifications if the chat isn't focused"
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 if the chat isn't focused"
msgid "Popup notifications when a contact sign out"
msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta."
"ausente u ocupado."
#: ../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 ""
"se desconecta."
#: ../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 ""
"Indica si se deben mostrar las notificaciones emergentes cuando se conecta."
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"
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"
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"
#. 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"
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:1184
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s fue expulsado por %s"
-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../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:"
#. 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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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"
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."
msgid "Manage Favorite Rooms"
msgstr "Gestionar salas favoritas"
-#: ../src/empathy-event-manager.c:395
+#: ../src/empathy-event-manager.c:321
msgid "Incoming call"
msgstr "Llamada entrante"
-#: ../src/empathy-event-manager.c:398
+#: ../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:405
+#: ../src/empathy-event-manager.c:331
msgid "_Reject"
msgstr "_Rechazar"
-#: ../src/empathy-event-manager.c:411
+#: ../src/empathy-event-manager.c:337
msgid "_Answer"
msgstr "Re_spuesta"
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:452
#, c-format
msgid "Incoming call from %s"
msgstr "Llamada entrante de %s"
-#: ../src/empathy-event-manager.c:563
+#: ../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:569
+#: ../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:574
+#: ../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:701
+#: ../src/empathy-event-manager.c:634
msgid "Room invitation"
msgstr "Invitación a una sala"
-#: ../src/empathy-event-manager.c:704
+#: ../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:712
+#: ../src/empathy-event-manager.c:645
msgid "_Decline"
msgstr "_Rechazar"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:650
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Unirse"
-#: ../src/empathy-event-manager.c:756
+#: ../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:782
+#: ../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:962
+#: ../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:966
+#: ../src/empathy-event-manager.c:899
#, c-format
msgid ""
"\n"
"Mensaje: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:1009
+#: ../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:1025
+#: ../src/empathy-event-manager.c:951
#, c-format
msgid "%s is now online."
msgstr "Ahora %s está conectado."
"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."
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"
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 "
"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"
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
+#: ../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
+#: ../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:13
-#| msgid "Enable notifications when the _chat is not focused"
+#: ../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:14
-#| msgid "Enable notifications when the _chat is not focused"
+#: ../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:15
+#: ../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:16
+#: ../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:17
+#: ../src/empathy-preferences.ui.h:16
msgid "General"
msgstr "General"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:17
msgid "Geoclue Settings"
msgstr "Configuración de Geoclue"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:18
msgid "Location"
msgstr "Ubicación"
-#: ../src/empathy-preferences.ui.h:20
-msgid "Not a valid adium theme"
-msgstr "No es un tema adium válido"
-
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "Notificaciones"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "Reproducir sonido para eventos"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
msgid "Preferences"
msgstr "Preferencias"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
msgid "Privacy"
msgstr "Privacidad"
-#: ../src/empathy-preferences.ui.h:25
+#: ../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 "
"preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
"aleatorio añadido (±0.25°)."
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
msgid "Show _avatars"
msgstr "Mostrar _avatares"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
msgid "Show _smileys as images"
msgstr "Mostrar los _emoticonos como imágenes"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
msgid "Show co_mpact contact list"
msgstr "Mostrar lista de contactos co_mpacta"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
msgid "Show contact _list in rooms"
msgstr "Mostrar _lista de contactos en salas"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:28
msgid "Sort by _name"
msgstr "Ordenar por _nombre"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:29
msgid "Sort by s_tate"
msgstr "Ordenar por es_tado"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:30
msgid "Sounds"
msgstr "Sonidos"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:31
msgid "Spell Checking"
msgstr "Revisión ortográfica"
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:32
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
"La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
"diccionario instalado."
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:33
msgid "Themes"
msgstr "Temas"
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:34
msgid "_Enable bubble notifications"
msgstr "_Activar notificaciones de burbuja"
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:35
msgid "_Enable sound notifications"
msgstr "_Activar notificaciones de sonido"
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "_Abrir charlas nuevas en ventanas separadas"
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:37
msgid "_Publish location to my contacts"
msgstr "_Publicar mi ubicación a mis contactos"
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:38
msgid "_Reduce location accuracy"
msgstr "_Reducir la precisión de la ubicación"
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."
"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>"
# 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"
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."
"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."
"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."
"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."
"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."
"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."
"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."
"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."
"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."
"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 "
"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:1134
+#: ../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: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.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Détails sur le contact</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1253
+msgid "Building:"
+msgstr "Bâtiment :"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Contact</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1255
+msgid "Floor:"
+msgstr "Étage :"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Groupes</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1257
+msgid "Room:"
+msgstr "Salle :"
-#: ../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: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.c:1277
+msgid "Climb Speed:"
+msgstr "Vitesse ascensionnelle :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1279
+msgid "Last Updated on:"
+msgstr "Dernière mise à jour le :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1281
+msgid "Longitude:"
+msgstr "Longitude :"
+
+#: ../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.ui.h:8
+msgid "Contact Details"
+msgstr "Détails sur le contact"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../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."
"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é"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Message :"
+#. 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:3
-msgid "Save message"
-msgstr "Enregistrer le message"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "État :"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Mot"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Suggestions pour le mot"
-
-#: ../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-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "Modifier les messages personnalisés..."
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Simple"
+#: ../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-theme-manager.c:62
-msgid "Clean"
-msgstr "Propre"
+#: ../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-theme-manager.c:63
-msgid "Blue"
-msgstr "Bleu"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "Changer l'état"
-#: ../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
-msgid "Disconnected from server"
-msgstr "Déconnecté du serveur"
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "Déconnecté du serveur"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
+msgstr "Appel vocal entrant"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "Appel vocal sortant"
+
+#: ../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-ui-utils.c:1580
-msgid "Incoming voice call"
-msgstr "Appel vocal entrant"
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Bleu"
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
-msgid "Outgoing voice call"
-msgstr "Appel vocal sortant"
+#: ../libempathy-gtk/empathy-ui-utils.c:1377
+msgid "Unable to open URI"
+msgstr "Impossible d'ouvrir l'URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
-msgid "Voice call ended"
-msgstr "Appel vocal terminé"
+#: ../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 "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 !"
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..."
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 "
"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 "
"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 "
"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"
"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"
"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"
"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.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Aucun protocole installé</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "Ajouter un compte"
-#: ../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."
"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"
"\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."
"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"
"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.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "Autoriser l'utilisation du _GPS"
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Comportement</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:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Liste des contacts</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "Autoriser l'utilisation du _réseau"
-#: ../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.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Jouer un son lors des événements</b>"
-
-#: ../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.ui.h:4
+msgid "Appearance"
+msgstr "Apparence"
-#: ../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 "
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."
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"
#: ../data/empathy.schemas.in.h:1
msgid "Always open a separate chat window for new chats."
-msgstr "ਨਵà©\80à¨\82 à¨\97ੱਲਬਾਤ ਲà¨\88 à¨\87ੱà¨\95 ਵੱà¨\96ਰà©\80 à¨\97ੱਲਬਾਤ à¨\9dਰà©\8bà¨\96ਾ ਵਰਤੋਂ।"
+msgstr "ਨਵà©\80à¨\86à¨\82 à¨\97ੱਲਾà¨\82 ਲà¨\88 ਹਮà©\87ਸ਼ਾ à¨\87ੱà¨\95 ਵੱà¨\96ਰà©\80 à¨\97ੱਲਬਾਤ ਵਿੰਡà©\8b ਵਰਤੋਂ।"
#: ../data/empathy.schemas.in.h:2
msgid ""
#: ../data/empathy.schemas.in.h:3
msgid "Chat window theme"
-msgstr "à¨\97ੱਲਬਾਤ à¨\9dਰà©\8bà¨\96ਾ ਸਰà©\82ਪ"
+msgstr "à¨\97ੱਲਬਾਤ ਵਿੰਡà©\8b ਥà©\80ਮ"
#: ../data/empathy.schemas.in.h:4
msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
#: ../data/empathy.schemas.in.h:5
msgid "Compact contact list"
-msgstr "ਸੰà¨\96à©\87ਪ ਸੰਪਰà¨\95 ਸà©\82à¨\9aà©\80"
+msgstr "ਸੰà¨\96à©\87ਪ ਸੰਪਰà¨\95 ਲਿਸà¨\9f"
#: ../data/empathy.schemas.in.h:6
msgid "Contact list sort criterium"
-msgstr "ਸੰਪਰà¨\95 ਸà©\82à¨\9aà©\80 ਲੜੀਬੱਧ"
+msgstr "ਸੰਪਰà¨\95 ਲਿਸà¨\9f ਲੜੀਬੱਧ"
#: ../data/empathy.schemas.in.h:7
msgid "Default directory to select an avatar image from"
-msgstr "à¨\85ਵਤਾਰ à¨\9aਿੱਤਰ à¨\9aà©\81ਣਨ ਵਾਸਤà©\87 ਮà©\82ਲ ਡਾਇਰੈਕਟਰੀ"
+msgstr "à¨\85ਵਤਾਰ à¨\9aਿੱਤਰ à¨\9aà©\81ਣਨ ਵਾਸਤà©\87 ਡਿਫਾਲà¨\9f ਡਾਇਰੈਕਟਰੀ"
#: ../data/empathy.schemas.in.h:8
msgid "Disable popup notifications when away"
#: ../data/empathy.schemas.in.h:14
msgid "Empathy default download folder"
-msgstr "à¨\87ੰਪà©\88à¨\82ਥà©\80 ਮà©\82ਲ ਡਾਊਨਲੋਡ ਫੋਲਡਰ"
+msgstr "à¨\87ੰਪà©\88à¨\82ਥà©\80 ਡਿਫਾਲà¨\9f ਡਾਊਨਲੋਡ ਫੋਲਡਰ"
#: ../data/empathy.schemas.in.h:15
msgid "Empathy has asked about importing accounts"
-msgstr "à¨\87ੰਪà©\88à¨\82ਥà©\80 à¨\96ਾਤà©\87 à¨\86ਯਾਤ ਕਰਨ ਲਈ ਪੁੱਛੇ"
+msgstr "à¨\87ੰਪà©\88à¨\82ਥà©\80 à¨\85à¨\95ਾà¨\8aà¨\82à¨\9f à¨\87ੰਪà©\8bਰà¨\9f ਕਰਨ ਲਈ ਪੁੱਛੇ"
#: ../data/empathy.schemas.in.h:16
msgid "Empathy should auto-connect on startup"
-msgstr "à¨\87ੰਪà©\88à¨\82ਥà©\80 ਸ਼à©\81ਰà©\82 ਸਮà©\87à¨\82 ਸਵà©\88-à¨\9aਾਲਤ à¨\9cà©\81à©\9cੇ"
+msgstr "à¨\87ੰਪà©\88à¨\82ਥà©\80 ਸ਼à©\81ਰà©\82 ਸਮà©\87à¨\82 à¨\86à¨\9fà©\8bਮà©\88à¨\9fਿà¨\95 à¨\95à©\81ਨà©\88à¨\95à¨\9f ਹà©\8bਵੇ"
#: ../data/empathy.schemas.in.h:17
-#| msgid "Empathy should auto-connect on startup"
msgid "Empathy should reduce the location's accuracy"
msgstr "ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ"
#: ../data/empathy.schemas.in.h:21
msgid "Hide main window"
-msgstr "ਮà©\81ੱà¨\96 à¨\9dਰà©\8bà¨\96ਾ ਓਹਲੇ"
+msgstr "ਮà©\81ੱà¨\96 ਵਿੰਡà©\8b ਓਹਲੇ"
#: ../data/empathy.schemas.in.h:22
msgid "Hide the main window."
-msgstr "ਮà©\81ੱà¨\96 à¨\9dਰà©\8bà¨\96ਾ ਓਹਲੇ ਕਰੋ"
+msgstr "ਮà©\81ੱà¨\96 ਵਿੰਡà©\8b ਓਹਲੇ ਕਰੋ"
#: ../data/empathy.schemas.in.h:23
msgid "NetworkManager should be used"
#: ../data/empathy.schemas.in.h:25
msgid "Open new chats in separate windows"
-msgstr "ਵੱà¨\96ਰà©\87 à¨\9dਰà©\8bà¨\96ਿà¨\86à¨\82 ਵਿੱà¨\9a ਨਵà©\80à¨\86à¨\82 à¨\97ੱਲਬਾਤਾà¨\82 ਖੋਲ੍ਹੋ"
+msgstr "ਨਵà©\80à¨\86à¨\82 à¨\97ੱਲਬਾਤਾà¨\82 ਵੱà¨\96 ਵੱà¨\96 ਵਿੰਡà©\8b ਵਿੱà¨\9a ਖੋਲ੍ਹੋ"
#: ../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 "ਮà©\81ੱà¨\96 à¨\9dਰà©\8bà¨\96ਾ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
+msgstr "ਮà©\81ੱà¨\96 ਵਿੰਡà©\8b ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
-#: ../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 ""
-"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ ਪਹਿਲਾਂ ਖੁੱਲ੍ਹੀ ਹੋਵੇ, "
-"ਪਰ ਫà©\8bà¨\95ਸ ਨਾ ਹà©\8bਵà©\87।"
+"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ ਪਹਿਲਾਂ ਖੁੱਲ੍ਹੀ ਹੋਵੇ, ਪਰ "
+"ਫੋਕਸ ਨਾ ਹੋਵੇ।"
-#: ../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 ""
-"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ ਡਿਫਾਲਟ "
-"ਸੰਪਰà¨\95 ਦà©\87 ਨਾà¨\82 ਨਾਲ \"name (ਨਾà¨\82)\" ਹà©\88। \"state (ਹਾਲਤ)\" ਨà©\82à©° ਸੰਪਰà¨\95 ਦà©\80 ਹਾਲਤ ਮà©\81ਤਾਬà¨\95 ਲà©\9cà©\80ਬੱਧ à¨\95ਰà©\8b"
+"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ ਡਿਫਾਲਟ ਸੰਪਰਕ "
+"ਦੇ ਨਾਂ ਨਾਲ \"name (ਨਾਂ)\" ਹੈ। \"state (ਹਾਲਤ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ"
#: ../libempathy/empathy-ft-handler.c:838
msgid "The hash of the received file and the sent one do not match"
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 "ਆਫਲਾਈਨ"
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 "ਭਵਿੱਖ ਵਿੱਚ"
#: ../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
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:"
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:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "_Room List locale:"
-msgstr "ਰà©\82ਮ ਸà©\82à¨\9aà©\80 ਭਾਸ਼ਾ(_R):"
+msgstr "ਰà©\82ਮ ਲਿਸà¨\9f ਭਾਸ਼ਾ(_R):"
#: ../libempathy-gtk/empathy-avatar-chooser.c:449
#: ../libempathy-gtk/empathy-avatar-chooser.c:525
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 ਰà©\82ਮ ਵਿੱà¨\9a ਦਾà¨\96ਲ ਹà©\8bà¨\87à¨\86"
+msgid "%s was kicked by %s"
+msgstr "%s ਨà©\82à©° %s ਨà©\87 à¨\95ਿੱà¨\95 ਮਾਰà©\80"
-#: ../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 "ਲਿੰà¨\95 ਸਿਰਨਾਵਾà¨\82 ਨà¨\95ਲ ਕਰੋ(_C)"
+msgstr "ਲਿੰà¨\95 à¨\90ਡਰà©\88ੱਸ à¨\95ਾਪà©\80 ਕਰੋ(_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"
msgid "Personal Information"
msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:384
msgid "New Contact"
msgstr "ਨਵਾਂ ਸੰਪਰਕ"
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 "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
msgstr "ਚੁਣੋ"
#: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:905
+#: ../src/empathy-main-window.c:903
msgid "Group"
msgstr "ਗਰੁੱਪ"
#: ../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:"
"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 "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 "ਮਿਤੀ"
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 "ਪਸੰਦੀਦਾ ਸੁਨੇਹਾ ਦਿਓ"
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 "ਮੌਜੂਦਾ ਲੋਕੇਲ"
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 "ਗੱਲ!"
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 ""
-"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਇੱਕ ਮੁਫਤ ਸਾਫਟਵੇਅਰ ਹੈ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ, "
-"à¨\9cਿਸ ਨà©\82à©° ਫਰà©\80 ਸਾਫà¨\9fਵà©\87à¨\85ਰ ਫਾà¨\8aਨਡà©\87ਸ਼ਨ ਨà©\87 ਤਿà¨\86ਰ à¨\95à©\80ਤਾ ਹà©\88, ਦà©\87 ਵਰà¨\9cਨ ੨ à¨\9cਾà¨\82 ਨਵà©\87à¨\82 ਦà©\80à¨\86à¨\82 ਸ਼ਰਤਾà¨\82 "
-"(ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
+"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਇੱਕ ਮੁਫਤ ਸਾਫਟਵੇਅਰ ਹੈ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ, ਜਿਸ ਨੂੰ ਫਰੀ "
+"ਸਾਫà¨\9fਵà©\87à¨\85ਰ ਫਾà¨\8aਨਡà©\87ਸ਼ਨ ਨà©\87 ਤਿà¨\86ਰ à¨\95à©\80ਤਾ ਹà©\88, ਦà©\87 ਵਰà¨\9cਨ ੨ à¨\9cਾà¨\82 ਨਵà©\87à¨\82 ਦà©\80à¨\86à¨\82 ਸ਼ਰਤਾà¨\82 (à¨\89ਹ ਤà©\81ਹਾਡà©\80 à¨\86ਪਣà©\80 ਮਰà¨\9c਼à©\80 "
+"ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
-#: ../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 ""
-"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ, "
-"ਪਰ à¨\87ਸ ਦà©\80 à¨\95à©\8bà¨\88 ਵਾਰੰà¨\9fà©\80 ਨਹà©\80à¨\82 ਲà¨\88 à¨\9cਾ ਰਹà©\80 ਹà©\88, à¨\95ਿਸà©\87 à¨\96ਾਸ à¨\95ੰਮ ਲà¨\88 à¨\85ਨà©\81à¨\95à©\82ਲ ਹà©\8bਣ "
-"à¨\9cਾà¨\82 ਠà©\80à¨\95 ਤਰà©\8dਹਾà¨\82 à¨\95ੰਮ à¨\95ਰਨ ਦà©\80 ਵà©\80 à¨\95à©\8bà¨\88 à¨\97ਾਰੰà¨\9fà©\80 ਨਹà©\80à¨\82 ਹà©\88। ਹà©\8bਰ ਵà©\87ਰਵà©\87 ਲà¨\88 à¨\97ਨà©\82 à¨\9cਰਨਲ ਪਬਲਿà¨\95 ਲਾà¨\87ਸà©\88à¨\82ਸ ਨà©\82à©° ਪà©\9cà©\8dਹà©\8b।"
+"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ, ਪਰ ਇਸ ਦੀ ਕੋਈ ਵਾਰੰਟੀ "
+"ਨਹà©\80à¨\82 ਲà¨\88 à¨\9cਾ ਰਹà©\80 ਹà©\88, à¨\95ਿਸà©\87 à¨\96ਾਸ à¨\95ੰਮ ਲà¨\88 à¨\85ਨà©\81à¨\95à©\82ਲ ਹà©\8bਣ à¨\9cਾà¨\82 ਠà©\80à¨\95 ਤਰà©\8dਹਾà¨\82 à¨\95ੰਮ à¨\95ਰਨ ਦà©\80 ਵà©\80 à¨\95à©\8bà¨\88 à¨\97ਾਰੰà¨\9fà©\80 ਨਹà©\80à¨\82 "
+"ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।"
-#: ../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 ""
"ਇੰਪੈਂਥੀ ਨਾਲ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਦੀ ਕਾਪੀ ਪ੍ਰਾਪਤ ਕਰੋਗੇ, ਜੇਕਰ ਤੁਹਾਨੂੰ ਨਹੀਂ ਮਿਲੀ ਹੈ ਤਾਂ "
-"ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, ਐਮ ਏ "
-"੦੨੧੧੦-੧੩੦੧੫੯, à¨\85ਮਰà©\80à¨\95ਾ ਨà©\82à©° ਲਿà¨\96à©\8b।"
+"ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, ਐਮ ਏ ੦੨੧੧੦-੧੩੦੧੫੯, "
+"ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।"
-#: ../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"
"ਤੁਸੀਂ %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"
"\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 "
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"
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 "ਨਾਂ"
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 "ਤà©\81ਹਾਨà©\82à©° à¨\87ਹ ਹà©\88à¨\82ਡਲ à¨\95ਰਨ ਲà¨\88 ਬਾਹਰà©\80 à¨\95ਾਰà¨\9c ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
+msgstr "ਤà©\81ਹਾਨà©\82à©° à¨\87ਹ ਹà©\88à¨\82ਡਲ à¨\95ਰਨ ਲà¨\88 ਬਾਹਰà©\80 à¨\90ਪਲà©\80à¨\95à©\87ਸ਼ਨ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
-#: ../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 ਤà©\81ਹਾਨà©\82à©° %s ਦਾà¨\96ਲ ਹà©\8bਣ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
+msgstr "%s ਤà©\81ਹਾਨà©\82à©° %s à¨\9cà©\81à¨\86à¨\87ੰਨ à¨\95ਰਨ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
-#: ../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"
"\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
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"
#. 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 "ਫਾਇਲ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
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."
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)"
msgstr "ਡੀਬੱਗ(_D)"
#: ../src/empathy-main-window.ui.h:12
-#| msgid "File transfers"
msgid "_File Transfers"
msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
#: ../src/empathy-main-window.ui.h:14
msgid "_Join..."
-msgstr "ਦਾà¨\96ਲ(_J)..."
+msgstr "à¨\9cà©\81à¨\86à¨\87ੰਨ(_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)"
msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ(_P)"
#: ../src/empathy-main-window.ui.h:19
-#| msgid "Previous Conversations"
msgid "_Previous Conversations"
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 "
"ਪਾਸਵਰਡ ਲੋੜੀਦਾ: %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 "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਰੋਕਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
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 "ਸà©\88ਲ-ਫà©\8bਨ ਵਰਤà©\8bà¨\82 ਮਨà¨\9c਼à©\82ਰ(_C)"
+msgid "Disable sounds when _away or busy"
+msgstr "à¨\9cਦà©\8bà¨\82 ਦà©\82ਰ à¨\9cਾà¨\82 ਰà©\81à¨\9dਿà¨\86/ਰà©\81à¨\9dà©\80 ਹà©\8bਵਾà¨\82 ਤਾà¨\82 ਸਾà¨\8aà¨\82ਡ ਬੰਦ ਰੱà¨\96à©\8b(_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 "à¨\85ਵਤਾਰ ਯà©\82à¨\9c਼ਰਾà¨\82 ਲà¨\88 ਸੰਪਰà¨\95 ਸà©\82à¨\9aà©\80 ਵਿੱà¨\9aà©\8bà¨\82 à¨\9aà©\81ਣà©\87 à¨\9aਿੱਤਰ ਹਨ"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "à¨\9cਦà©\8bà¨\82 à¨\97ੱਲਬਾਤ ਫà©\8bà¨\95ਸ ਨਾ ਹà©\8bਵà©\87 ਤਾà¨\82 ਸà©\82à¨\9aਨਾ ਦਿà¨\93(_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 "à¨\9cਦà©\8bà¨\82 ਦà©\82ਰ à¨\9cਾà¨\82 ਰà©\81ੱà¨\9dਿà¨\86/ਰà©\81à¨\9dà©\80 ਤਾà¨\82 ਨà©\8bà¨\9fà©\80ਫਿà¨\95à©\87ਸ਼ਨ ਬੰਦ ਰੱà¨\96à©\8b(_a)"
+msgid "General"
+msgstr "à¨\86ਮ"
#: ../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)"
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 "ਅਣਜਾਣ"
#~ msgid "Forget password and clear the entry."
#~ msgstr "ਪਾਸਵਰਡ ਭੁੱਲੋ ਅਤੇ ਐਂਟਰੀ ਸਾਫ਼ ਕਰੋ।"
-#~ msgid "Create a new IRC network"
-#~ msgstr "ਇੱਕ ਨਵਾਂ IRC ਨੈੱਟਵਰਕ ਬਣਾਓ"
-
#~ msgid "Edit the selected IRC network"
#~ msgstr "ਚੁਣੇ IRC ਨੈੱਟਵਰਕ ਸੋਧੋ"
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"
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"
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