-
An error message which says "Network error " appears in the main window.
@@ -27,6 +26,12 @@
I get a message that says "Network error"
+
+ shaunm
+ Empathy no longer allows you to create an IRC account without a valid
+ nick. I've removed the guide link. Remove the text.
+
+
This kind of error happens when Empathy cannot communicate
with the instant messaging service for some reason.
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index a979c9e7..c08b49c3 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -523,7 +523,7 @@ chat_message_received_cb (EmpathyTpChat *tp_chat,
static void
chat_send_error_cb (EmpathyTpChat *tp_chat,
- EmpathyMessage *message,
+ const gchar *message_body,
TpChannelTextSendError error_code,
EmpathyChat *chat)
{
@@ -552,7 +552,7 @@ chat_send_error_cb (EmpathyTpChat *tp_chat,
}
str = g_strdup_printf (_("Error sending message '%s': %s"),
- empathy_message_get_body (message),
+ message_body,
error);
empathy_chat_view_append_event (chat->view, str);
g_free (str);
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index ad36ede3..e45b16d8 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -45,6 +45,7 @@ libempathy_la_SOURCES = \
empathy-dispatch-operation.c \
empathy-ft-factory.c \
empathy-ft-handler.c \
+ empathy-handler.c \
empathy-idle.c \
empathy-irc-network.c \
empathy-irc-network-manager.c \
@@ -100,6 +101,7 @@ libempathy_headers = \
empathy-dispatch-operation.h \
empathy-ft-factory.h \
empathy-ft-handler.h \
+ empathy-handler.h \
empathy-idle.h \
empathy-irc-network.h \
empathy-irc-network-manager.h \
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index c1a19f69..67b75278 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -42,6 +42,7 @@
#include
#include "empathy-dispatcher.h"
+#include "empathy-handler.h"
#include "empathy-utils.h"
#include "empathy-tube-handler.h"
#include "empathy-account-manager.h"
@@ -55,6 +56,8 @@
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyDispatcher)
typedef struct
{
+ gboolean dispose_has_run;
+
EmpathyAccountManager *account_manager;
/* connection to connection data mapping */
GHashTable *connections;
@@ -64,33 +67,38 @@ typedef struct
/* channels which the dispatcher is listening "invalidated" */
GList *channels;
+ GPtrArray *array;
+
+ /* main handler */
+ EmpathyHandler *handler;
+
+ /* extra handlers */
+ GList *handlers;
GHashTable *request_channel_class_async_ids;
} EmpathyDispatcherPriv;
-static void empathy_dispatcher_client_handler_iface_init (gpointer g_iface,
- gpointer g_iface_data);
-
-G_DEFINE_TYPE_WITH_CODE (EmpathyDispatcher,
- empathy_dispatcher,
- G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
- tp_dbus_properties_mixin_iface_init);
- G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CLIENT, NULL);
- G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CLIENT_HANDLER,
- empathy_dispatcher_client_handler_iface_init);
- );
-
-static const gchar *empathy_dispatcher_interfaces[] = {
- TP_IFACE_CLIENT_HANDLER,
- NULL
-};
+static GList *
+empathy_dispatcher_get_channels (EmpathyHandler *handler,
+ gpointer user_data);
+
+static gboolean
+empathy_dispatcher_handle_channels (EmpathyHandler *handler,
+ const gchar *account_path,
+ const gchar *connection_path,
+ const GPtrArray *channels,
+ const GPtrArray *requests_satisfied,
+ guint64 timestamp,
+ GHashTable *handler_info,
+ gpointer user_data,
+ GError **error);
+
+G_DEFINE_TYPE (EmpathyDispatcher, empathy_dispatcher, G_TYPE_OBJECT);
enum
{
PROP_INTERFACES = 1,
- PROP_CHANNEL_FILTER,
- PROP_CHANNELS
+ PROP_HANDLER,
};
enum
@@ -865,7 +873,7 @@ dispatcher_constructor (GType type,
GObjectConstructParam *construct_params)
{
GObject *retval;
- TpDBusDaemon *dbus;
+ EmpathyDispatcherPriv *priv;
if (dispatcher != NULL)
return g_object_ref (dispatcher);
@@ -876,18 +884,43 @@ dispatcher_constructor (GType type,
dispatcher = EMPATHY_DISPATCHER (retval);
g_object_add_weak_pointer (retval, (gpointer) &dispatcher);
- dbus = tp_dbus_daemon_dup (NULL);
+ priv = GET_PRIV (dispatcher);
- g_assert (tp_dbus_daemon_request_name (dbus,
- DISPATCHER_BUS_NAME, TRUE, NULL));
- dbus_g_connection_register_g_object (tp_get_bus (),
- DISPATCHER_OBJECT_PATH, retval);
+ empathy_handler_set_handle_channels_func (priv->handler,
+ empathy_dispatcher_handle_channels,
+ dispatcher);
- DEBUG ("Registering at '%s'", DISPATCHER_OBJECT_PATH);
+ empathy_handler_set_channels_func (priv->handler,
+ empathy_dispatcher_get_channels,
+ dispatcher);
return retval;
}
+static void
+dispatcher_dispose (GObject *object)
+{
+ EmpathyDispatcherPriv *priv = GET_PRIV (object);
+ GList *l;
+
+ if (priv->dispose_has_run)
+ return;
+
+ priv->dispose_has_run = TRUE;
+
+ for (l = priv->handlers ; l != NULL; l = g_list_next (l))
+ g_object_unref (G_OBJECT (l->data));
+
+ g_list_free (priv->handlers);
+ priv->handlers = NULL;
+
+ if (priv->handler != NULL)
+ g_object_unref (priv->handler);
+ priv->handler = NULL;
+
+ G_OBJECT_CLASS (empathy_dispatcher_parent_class)->dispose (object);
+}
+
static void
dispatcher_finalize (GObject *object)
{
@@ -936,9 +969,9 @@ dispatcher_finalize (GObject *object)
}
static void
-dispatcher_get_property (GObject *object,
+dispatcher_set_property (GObject *object,
guint property_id,
- GValue *value,
+ const GValue *value,
GParamSpec *pspec)
{
EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object);
@@ -946,37 +979,29 @@ dispatcher_get_property (GObject *object,
switch (property_id)
{
- case PROP_INTERFACES:
- g_value_set_boxed (value, empathy_dispatcher_interfaces);
+ case PROP_HANDLER:
+ priv->handler = g_value_dup_object (value);
break;
- case PROP_CHANNEL_FILTER:
- {
- GPtrArray *filters = g_ptr_array_new ();
- GHashTable *filter = g_hash_table_new (NULL, NULL);
-
- g_ptr_array_add (filters, filter);
-
- g_value_set_boxed (value, filters);
- break;
- }
- case PROP_CHANNELS:
- {
- GPtrArray *accounts;
- GList *l;
-
- accounts = g_ptr_array_new ();
-
- for (l = priv->channels; l != NULL; l = g_list_next (l))
- {
- TpProxy *channel = TP_PROXY (l->data);
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
- g_ptr_array_add (accounts,
- g_strdup (tp_proxy_get_object_path (channel)));
- }
+static void
+dispatcher_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object);
+ EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
- g_value_set_boxed (value, accounts);
- break;
- }
+ switch (property_id)
+ {
+ case PROP_HANDLER:
+ g_value_set_object (value, priv->handler);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@@ -989,53 +1014,19 @@ empathy_dispatcher_class_init (EmpathyDispatcherClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GParamSpec *param_spec;
- static TpDBusPropertiesMixinPropImpl client_props[] = {
- { "Interfaces", "interfaces", NULL },
- { NULL }
- };
- static TpDBusPropertiesMixinPropImpl client_handler_props[] = {
- { "HandlerChannelFilter", "channel-filter", NULL },
- { "HandledChannels", "channels", NULL },
- { NULL }
- };
- static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { TP_IFACE_CLIENT,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- client_props
- },
- { TP_IFACE_CLIENT_HANDLER,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- client_handler_props
- },
- { NULL }
- };
-
+ object_class->dispose = dispatcher_dispose;
object_class->finalize = dispatcher_finalize;
object_class->constructor = dispatcher_constructor;
object_class->get_property = dispatcher_get_property;
+ object_class->set_property = dispatcher_set_property;
- param_spec = g_param_spec_boxed ("interfaces", "interfaces",
- "Available D-Bus interfaces",
- G_TYPE_STRV,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (object_class, PROP_INTERFACES, param_spec);
-
- param_spec = g_param_spec_boxed ("channel-filter", "channel-filter",
- "Filter for channels this handles",
- TP_ARRAY_TYPE_CHANNEL_CLASS_LIST,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (object_class,
- PROP_CHANNEL_FILTER, param_spec);
-
- param_spec = g_param_spec_boxed ("channels", "channels",
- "List of channels we're handling",
- EMPATHY_ARRAY_TYPE_OBJECT,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ param_spec = g_param_spec_object ("handler", "handler",
+ "The main Telepathy Client Hander object",
+ EMPATHY_TYPE_HANDLER,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class,
- PROP_CHANNELS, param_spec);
+ PROP_HANDLER, param_spec);
signals[OBSERVE] =
g_signal_new ("observe",
@@ -1069,10 +1060,6 @@ empathy_dispatcher_class_init (EmpathyDispatcherClass *klass)
g_type_class_add_private (object_class, sizeof (EmpathyDispatcherPriv));
-
- klass->dbus_props_class.interfaces = prop_interfaces;
- tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (EmpathyDispatcherClass, dbus_props_class));
}
static void
@@ -1109,6 +1096,26 @@ empathy_dispatcher_init (EmpathyDispatcher *dispatcher)
g_direct_equal);
}
+EmpathyDispatcher *
+empathy_dispatcher_new (const gchar *name,
+ GPtrArray *filters,
+ GStrv capabilities)
+{
+ g_assert (dispatcher == NULL);
+ EmpathyHandler *handler;
+ EmpathyDispatcher *ret;
+
+ handler = empathy_handler_new (name, filters, capabilities);
+
+ ret = EMPATHY_DISPATCHER (
+ g_object_new (EMPATHY_TYPE_DISPATCHER,
+ "handler", handler,
+ NULL));
+ g_object_unref (handler);
+
+ return ret;
+}
+
EmpathyDispatcher *
empathy_dispatcher_dup_singleton (void)
{
@@ -1797,17 +1804,28 @@ empathy_dispatcher_find_requestable_channel_classes_async
request, GUINT_TO_POINTER (source_id));
}
-static void
-empathy_dispatcher_handle_channels (TpSvcClientHandler *self,
+static GList *
+empathy_dispatcher_get_channels (EmpathyHandler *handler,
+ gpointer user_data)
+{
+ EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (user_data);
+ EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+
+ return priv->channels;
+}
+
+static gboolean
+empathy_dispatcher_handle_channels (EmpathyHandler *handler,
const gchar *account_path,
const gchar *connection_path,
const GPtrArray *channels,
const GPtrArray *requests_satisfied,
guint64 timestamp,
GHashTable *handler_info,
- DBusGMethodInvocation *context)
+ gpointer user_data,
+ GError **error)
{
- EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (self);
+ EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (user_data);
EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
int i;
EmpathyAccount *account;
@@ -1821,10 +1839,9 @@ empathy_dispatcher_handle_channels (TpSvcClientHandler *self,
connection_path);
if (connection == NULL)
{
- GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
- "Invalid connection argument" };
- dbus_g_method_return_error (context, &error);
- return;
+ g_set_error_literal (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+ "Invalid connection argument");
+ return FALSE;
}
for (i = 0; i < channels->len ; i++)
@@ -1840,15 +1857,43 @@ empathy_dispatcher_handle_channels (TpSvcClientHandler *self,
connection, object_path, properties);
}
- tp_svc_client_handler_return_from_handle_channels (context);
+ return TRUE;
}
-static void
-empathy_dispatcher_client_handler_iface_init (gpointer g_iface,
- gpointer g_iface_data)
+
+EmpathyHandler *
+empathy_dispatcher_add_handler (EmpathyDispatcher *dispatcher,
+ const gchar *name,
+ GPtrArray *filters,
+ GStrv capabilities)
{
- TpSvcClientHandlerClass *klass = (TpSvcClientHandlerClass *) g_iface;
+ EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+ EmpathyHandler *handler;
+
+ handler = empathy_handler_new (name, filters, capabilities);
+ priv->handlers = g_list_prepend (priv->handlers, handler);
+
+ /* Only set the handle_channels function, the Channel property on the main
+ * handler will always report all dispatched channels even if they came from
+ * a different Handler */
+ empathy_handler_set_handle_channels_func (handler,
+ empathy_dispatcher_handle_channels,
+ dispatcher);
+
+ return handler;
+}
+
+void
+empathy_dispatcher_remove_handler (EmpathyDispatcher *dispatcher,
+ EmpathyHandler *handler)
+{
+ EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+ GList *h;
+
+ h = g_list_find (priv->handlers, handler);
+ g_return_if_fail (h != NULL);
+
+ priv->handlers = g_list_delete_link (priv->handlers, h);
- tp_svc_client_handler_implement_handle_channels (klass,
- empathy_dispatcher_handle_channels);
+ g_object_unref (handler);
}
diff --git a/libempathy/empathy-dispatcher.h b/libempathy/empathy-dispatcher.h
index 41a1430f..6176ea08 100644
--- a/libempathy/empathy-dispatcher.h
+++ b/libempathy/empathy-dispatcher.h
@@ -26,9 +26,9 @@
#include
#include
-#include
#include "empathy-contact.h"
+#include "empathy-handler.h"
#include "empathy-dispatch-operation.h"
G_BEGIN_DECLS
@@ -52,7 +52,6 @@ struct _EmpathyDispatcher
struct _EmpathyDispatcherClass
{
GObjectClass parent_class;
- TpDBusPropertiesMixinClass dbus_props_class;
};
/* Will be called when the channel is ready for dispatching. The requestor
@@ -98,6 +97,21 @@ GList * empathy_dispatcher_find_requestable_channel_classes
const gchar *channel_type, guint handle_type,
const char *first_property_name, ...);
+/* Create the dispatcher singleton */
+EmpathyDispatcher * empathy_dispatcher_new (const gchar *name,
+ GPtrArray *filters,
+ GStrv capabilities);
+
+EmpathyHandler *
+empathy_dispatcher_add_handler (EmpathyDispatcher *dispatcher,
+ const gchar *name,
+ GPtrArray *filters,
+ GStrv capabilities);
+
+void
+empathy_dispatcher_remove_handler (EmpathyDispatcher *dispatcher,
+ EmpathyHandler *handler);
+
/* Get the dispatcher singleton */
EmpathyDispatcher * empathy_dispatcher_dup_singleton (void);
diff --git a/libempathy/empathy-handler.c b/libempathy/empathy-handler.c
new file mode 100644
index 00000000..64990305
--- /dev/null
+++ b/libempathy/empathy-handler.c
@@ -0,0 +1,369 @@
+/*
+ * Copyright (C) 2007-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: Xavier Claessens
+ * Sjoerd Simons
+ * Cosimo Cecchi
+ */
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "empathy-handler.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
+#include
+
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyHandler)
+typedef struct
+{
+ EmpathyHandlerHandleChannelsFunc *handle_channels;
+ gpointer handle_channels_user_data;
+
+ EmpathyHandlerChannelsFunc *channels;
+ gpointer channels_user_data;
+
+ gchar *name;
+
+ GPtrArray *filters;
+ GStrv *capabilities;
+} EmpathyHandlerPriv;
+
+static void empathy_handler_client_handler_iface_init (gpointer g_iface,
+ gpointer g_iface_data);
+
+G_DEFINE_TYPE_WITH_CODE (EmpathyHandler,
+ empathy_handler,
+ G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
+ tp_dbus_properties_mixin_iface_init);
+ G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CLIENT, NULL);
+ G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CLIENT_HANDLER,
+ empathy_handler_client_handler_iface_init);
+ );
+
+static const gchar *empathy_handler_interfaces[] = {
+ TP_IFACE_CLIENT_HANDLER,
+ NULL
+};
+
+enum
+{
+ PROP_INTERFACES = 1,
+ PROP_CHANNEL_FILTER,
+ PROP_CHANNELS,
+ PROP_CAPABILITIES,
+ PROP_NAME,
+};
+
+static GObject *
+handler_constructor (GType type,
+ guint n_construct_params,
+ GObjectConstructParam *construct_params)
+{
+ GObject *obj =
+ G_OBJECT_CLASS (empathy_handler_parent_class)->constructor
+ (type, n_construct_params, construct_params);
+ EmpathyHandler *handler = EMPATHY_HANDLER (obj);
+ EmpathyHandlerPriv *priv = GET_PRIV (handler);
+ TpDBusDaemon *dbus;
+ gchar *busname;
+ gchar *object_path;
+
+ priv = GET_PRIV (handler);
+
+ busname = g_strdup_printf (TP_CLIENT_BUS_NAME_BASE"%s", priv->name);
+ object_path = g_strdup_printf (TP_CLIENT_OBJECT_PATH_BASE"%s",
+ priv->name);
+
+ dbus = tp_dbus_daemon_dup (NULL);
+
+ g_assert (tp_dbus_daemon_request_name (dbus,
+ busname, TRUE, NULL));
+ dbus_g_connection_register_g_object (tp_get_bus (),
+ object_path, obj);
+
+ DEBUG ("Registered at '%s'", object_path);
+
+ g_free (busname);
+ g_free (object_path);
+ g_object_unref (dbus);
+
+ return G_OBJECT (handler);
+}
+
+static void
+handler_finalize (GObject *object)
+{
+ EmpathyHandlerPriv *priv = GET_PRIV (object);
+
+ if (priv->filters != NULL)
+ g_boxed_free (TP_ARRAY_TYPE_CHANNEL_CLASS_LIST, priv->filters);
+
+ if (priv->capabilities != NULL)
+ g_boxed_free (G_TYPE_STRV, priv->capabilities);
+
+ g_free (priv->name);
+}
+
+static void
+handler_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyHandler *handler = EMPATHY_HANDLER (object);
+ EmpathyHandlerPriv *priv = GET_PRIV (handler);
+
+ switch (property_id)
+ {
+ case PROP_CHANNEL_FILTER:
+ priv->filters = g_value_dup_boxed (value);
+ break;
+ case PROP_CAPABILITIES:
+ priv->capabilities = g_value_dup_boxed (value);
+ break;
+ case PROP_NAME:
+ priv->name = g_value_dup_string (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+handler_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EmpathyHandler *self = EMPATHY_HANDLER (object);
+ EmpathyHandlerPriv *priv = GET_PRIV (self);
+
+ switch (property_id)
+ {
+ case PROP_INTERFACES:
+ g_value_set_boxed (value, empathy_handler_interfaces);
+ break;
+ case PROP_CHANNEL_FILTER:
+ g_value_set_boxed (value, priv->filters);
+ break;
+ case PROP_CAPABILITIES:
+ g_value_set_boxed (value, priv->capabilities);
+ break;
+ case PROP_NAME:
+ g_value_set_string (value, priv->name);
+ break;
+ case PROP_CHANNELS:
+ {
+ GList *l, *channels = NULL;
+ GPtrArray *array = g_ptr_array_new ();
+
+ if (priv->channels != NULL)
+ channels = priv->channels (self, priv->channels_user_data);
+
+ for (l = channels ; l != NULL; l = g_list_next (l))
+ {
+ TpProxy *channel = TP_PROXY (l->data);
+ g_ptr_array_add (array,
+ (gpointer) tp_proxy_get_object_path (channel));
+ }
+ g_value_set_boxed (value, array);
+ g_ptr_array_free (array, TRUE);
+ break;
+ }
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+empathy_handler_class_init (EmpathyHandlerClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GParamSpec *param_spec;
+
+ static TpDBusPropertiesMixinPropImpl client_props[] = {
+ { "Interfaces", "interfaces", NULL },
+ { NULL }
+ };
+ static TpDBusPropertiesMixinPropImpl client_handler_props[] = {
+ { "HandlerChannelFilter", "channel-filter", NULL },
+ { "HandledChannels", "channels", NULL },
+ { "Capabilities", "capabilities", NULL },
+ { NULL }
+ };
+ static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
+ { TP_IFACE_CLIENT,
+ tp_dbus_properties_mixin_getter_gobject_properties,
+ NULL,
+ client_props
+ },
+ { TP_IFACE_CLIENT_HANDLER,
+ tp_dbus_properties_mixin_getter_gobject_properties,
+ NULL,
+ client_handler_props
+ },
+ { NULL }
+ };
+
+ object_class->finalize = handler_finalize;
+ object_class->constructor = handler_constructor;
+
+ object_class->get_property = handler_get_property;
+ object_class->set_property = handler_set_property;
+
+ param_spec = g_param_spec_boxed ("interfaces", "interfaces",
+ "Available D-Bus interfaces",
+ G_TYPE_STRV,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (object_class, PROP_INTERFACES, param_spec);
+
+ param_spec = g_param_spec_boxed ("channel-filter", "channel-filter",
+ "Filter for channels this handles",
+ TP_ARRAY_TYPE_CHANNEL_CLASS_LIST,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+ g_object_class_install_property (object_class,
+ PROP_CHANNEL_FILTER, param_spec);
+
+ param_spec = g_param_spec_boxed ("capabilities", "capabilities",
+ "Filter for channels this handles",
+ G_TYPE_STRV,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+ g_object_class_install_property (object_class,
+ PROP_CAPABILITIES, param_spec);
+
+ param_spec = g_param_spec_boxed ("channels", "channels",
+ "List of channels we're handling",
+ EMPATHY_ARRAY_TYPE_OBJECT,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (object_class,
+ PROP_CHANNELS, param_spec);
+
+ param_spec = g_param_spec_string ("name", "name",
+ "The local name of the handler",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+ g_object_class_install_property (object_class,
+ PROP_NAME, param_spec);
+
+ g_type_class_add_private (object_class, sizeof (EmpathyHandlerPriv));
+
+ klass->dbus_props_class.interfaces = prop_interfaces;
+ tp_dbus_properties_mixin_class_init (object_class,
+ G_STRUCT_OFFSET (EmpathyHandlerClass, dbus_props_class));
+}
+
+static void
+empathy_handler_init (EmpathyHandler *handler)
+{
+ EmpathyHandlerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (handler,
+ EMPATHY_TYPE_HANDLER, EmpathyHandlerPriv);
+
+ handler->priv = priv;
+}
+
+EmpathyHandler *
+empathy_handler_new (const gchar *name,
+ GPtrArray *filters,
+ GStrv capabilities)
+{
+ return EMPATHY_HANDLER (
+ g_object_new (EMPATHY_TYPE_HANDLER,
+ "name", name,
+ "channel-filter", filters,
+ "capabilities", capabilities,
+ NULL));
+}
+
+static void
+empathy_handler_handle_channels (TpSvcClientHandler *self,
+ const gchar *account_path,
+ const gchar *connection_path,
+ const GPtrArray *channels,
+ const GPtrArray *requests_satisfied,
+ guint64 timestamp,
+ GHashTable *handler_info,
+ DBusGMethodInvocation *context)
+{
+ EmpathyHandler *handler = EMPATHY_HANDLER (self);
+ EmpathyHandlerPriv *priv = GET_PRIV (handler);
+ GError *error = NULL;
+
+ if (!priv->handle_channels)
+ {
+ error = g_error_new_literal (TP_ERRORS,
+ TP_ERROR_NOT_AVAILABLE,
+ "No handler function setup");
+ goto error;
+ }
+
+ if (!priv->handle_channels (handler, account_path, connection_path,
+ channels, requests_satisfied, timestamp, handler_info,
+ priv->handle_channels_user_data, &error))
+ goto error;
+
+ tp_svc_client_handler_return_from_handle_channels (context);
+ return;
+
+error:
+ dbus_g_method_return_error (context, error);
+ g_error_free (error);
+}
+
+static void
+empathy_handler_client_handler_iface_init (gpointer g_iface,
+ gpointer g_iface_data)
+{
+ TpSvcClientHandlerClass *klass = (TpSvcClientHandlerClass *) g_iface;
+
+ tp_svc_client_handler_implement_handle_channels (klass,
+ empathy_handler_handle_channels);
+}
+
+void
+empathy_handler_set_handle_channels_func (EmpathyHandler *handler,
+ EmpathyHandlerHandleChannelsFunc *func,
+ gpointer user_data)
+{
+ EmpathyHandlerPriv *priv = GET_PRIV (handler);
+
+ priv->handle_channels = func;
+ priv->handle_channels_user_data = user_data;
+}
+
+void
+empathy_handler_set_channels_func (EmpathyHandler *handler,
+ EmpathyHandlerChannelsFunc *func,
+ gpointer user_data)
+{
+ EmpathyHandlerPriv *priv = GET_PRIV (handler);
+
+ priv->channels = func;
+ priv->channels_user_data = user_data;
+}
+
diff --git a/libempathy/empathy-handler.h b/libempathy/empathy-handler.h
new file mode 100644
index 00000000..684ec0cc
--- /dev/null
+++ b/libempathy/empathy-handler.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2007-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: Sjoerd Simons
+ */
+
+#ifndef __EMPATHY_HANDLER_H__
+#define __EMPATHY_HANDLER_H__
+
+#include
+
+#include
+#include
+
+G_BEGIN_DECLS
+
+#define EMPATHY_TYPE_HANDLER (empathy_handler_get_type ())
+#define EMPATHY_HANDLER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
+ EMPATHY_TYPE_HANDLER, EmpathyHandler))
+#define EMPATHY_HANDLER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
+ EMPATHY_TYPE_HANDLER, EmpathyHandlerClass))
+#define EMPATHY_IS_HANDLER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+ EMPATHY_TYPE_HANDLER))
+#define EMPATHY_IS_HANDLER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
+ EMPATHY_TYPE_HANDLER))
+#define EMPATHY_HANDLER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
+ EMPATHY_TYPE_HANDLER, EmpathyHandlerClass))
+
+GType empathy_handler_get_type (void) G_GNUC_CONST;
+
+typedef struct _EmpathyHandler EmpathyHandler;
+typedef struct _EmpathyHandlerClass EmpathyHandlerClass;
+
+struct _EmpathyHandler
+{
+ GObject parent;
+ gpointer priv;
+};
+
+struct _EmpathyHandlerClass
+{
+ GObjectClass parent_class;
+ TpDBusPropertiesMixinClass dbus_props_class;
+};
+
+
+EmpathyHandler * empathy_handler_new (const gchar *name,
+ GPtrArray *filters,
+ GStrv capabilities);
+
+typedef gboolean (EmpathyHandlerHandleChannelsFunc) (EmpathyHandler *handler,
+ const gchar *account_path,
+ const gchar *connection_path,
+ const GPtrArray *channels,
+ const GPtrArray *requests_satisfied,
+ guint64 timestamp,
+ GHashTable *handler_info,
+ gpointer user_data,
+ GError **error);
+
+void empathy_handler_set_handle_channels_func (EmpathyHandler *handler,
+ EmpathyHandlerHandleChannelsFunc *func,
+ gpointer user_data);
+
+typedef GList * (EmpathyHandlerChannelsFunc) (
+ EmpathyHandler *handler,
+ gpointer user_data);
+
+void empathy_handler_set_channels_func (EmpathyHandler *handler,
+ EmpathyHandlerChannelsFunc func,
+ gpointer user_data);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_HANDLER_H__ */
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 34a46675..a403766e 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -41,6 +41,7 @@ typedef struct {
time_t timestamp;
gboolean is_backlog;
guint id;
+ gboolean incoming;
} EmpathyMessagePriv;
static void empathy_message_finalize (GObject *object);
@@ -63,6 +64,7 @@ enum {
PROP_BODY,
PROP_TIMESTAMP,
PROP_IS_BACKLOG,
+ PROP_INCOMING,
};
static void
@@ -123,6 +125,14 @@ empathy_message_class_init (EmpathyMessageClass *class)
G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_INCOMING,
+ g_param_spec_boolean ("incoming",
+ "Incoming",
+ "If this is an incoming (as opposed to sent) message",
+ FALSE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
g_type_class_add_private (object_class, sizeof (EmpathyMessagePriv));
}
@@ -179,6 +189,9 @@ message_get_property (GObject *object,
case PROP_BODY:
g_value_set_string (value, priv->body);
break;
+ case PROP_INCOMING:
+ g_value_set_boolean (value, priv->incoming);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
@@ -212,6 +225,9 @@ message_set_property (GObject *object,
empathy_message_set_body (EMPATHY_MESSAGE (object),
g_value_get_string (value));
break;
+ case PROP_INCOMING:
+ priv->incoming = g_value_get_boolean (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
@@ -579,6 +595,30 @@ empathy_message_set_id (EmpathyMessage *message, guint id)
priv->id = id;
}
+void
+empathy_message_set_incoming (EmpathyMessage *message, gboolean incoming)
+{
+ EmpathyMessagePriv *priv;
+
+ g_return_if_fail (EMPATHY_IS_MESSAGE (message));
+
+ priv = GET_PRIV (message);
+
+ priv->incoming = incoming;
+
+ g_object_notify (G_OBJECT (message), "incoming");
+}
+
+gboolean
+empathy_message_is_incoming (EmpathyMessage *message)
+{
+ EmpathyMessagePriv *priv = GET_PRIV (message);
+
+ g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
+
+ return priv->incoming;
+}
+
gboolean
empathy_message_equal (EmpathyMessage *message1, EmpathyMessage *message2)
{
diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index f9a48870..7ca62403 100644
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -72,6 +72,10 @@ void empathy_message_set_timestamp (EmpathyMessage
gboolean empathy_message_is_backlog (EmpathyMessage *message);
void empathy_message_set_is_backlog (EmpathyMessage *message,
gboolean is_backlog);
+gboolean empathy_message_is_incoming (EmpathyMessage *message);
+void empathy_message_set_incoming (EmpathyMessage *message,
+ gboolean incoming);
+
gboolean empathy_message_should_highlight (EmpathyMessage *message);
TpChannelTextMessageType empathy_message_type_from_str (const gchar *type_str);
const gchar * empathy_message_type_to_str (TpChannelTextMessageType type);
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 69057a87..a64f06a2 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -227,6 +227,7 @@ tp_chat_got_sender_cb (EmpathyTpContactFactory *factory,
static void
tp_chat_build_message (EmpathyTpChat *chat,
+ gboolean incoming,
guint id,
guint type,
guint timestamp,
@@ -243,6 +244,8 @@ tp_chat_build_message (EmpathyTpChat *chat,
empathy_message_set_receiver (message, priv->user);
empathy_message_set_timestamp (message, timestamp);
empathy_message_set_id (message, id);
+ empathy_message_set_incoming (message, incoming);
+
g_queue_push_tail (priv->messages_queue, message);
if (from_handle == 0) {
@@ -294,6 +297,7 @@ tp_chat_received_cb (TpChannel *channel,
}
tp_chat_build_message (chat,
+ TRUE,
message_id,
message_type,
timestamp,
@@ -318,6 +322,7 @@ tp_chat_sent_cb (TpChannel *channel,
DEBUG ("Message sent: %s", message_body);
tp_chat_build_message (chat,
+ FALSE,
0,
message_type,
timestamp,
@@ -339,14 +344,9 @@ tp_chat_send_error_cb (TpChannel *channel,
if (priv->channel == NULL)
return;
- DEBUG ("Message sent error: %s (%d)", message_body, error_code);
+ DEBUG ("Error sending '%s' (%d)", message_body, error_code);
- tp_chat_build_message (EMPATHY_TP_CHAT (chat),
- 0,
- message_type,
- timestamp,
- 0,
- message_body);
+ g_signal_emit (chat, signals[SEND_ERROR], 0, message_body, error_code);
}
static void
@@ -359,7 +359,8 @@ tp_chat_send_cb (TpChannel *proxy,
if (error) {
DEBUG ("Error: %s", error->message);
- g_signal_emit (chat, signals[SEND_ERROR], 0, message,
+ g_signal_emit (chat, signals[SEND_ERROR], 0,
+ empathy_message_get_body (message),
TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN);
}
}
@@ -460,6 +461,7 @@ tp_chat_list_pending_messages_cb (TpChannel *channel,
}
tp_chat_build_message (chat,
+ TRUE,
message_id,
message_type,
timestamp,
@@ -1168,9 +1170,9 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- _empathy_marshal_VOID__OBJECT_UINT,
+ _empathy_marshal_VOID__STRING_UINT,
G_TYPE_NONE,
- 2, EMPATHY_TYPE_MESSAGE, G_TYPE_UINT);
+ 2, G_TYPE_STRING, G_TYPE_UINT);
signals[CHAT_STATE_CHANGED] =
g_signal_new ("chat-state-changed",
@@ -1373,7 +1375,7 @@ empathy_tp_chat_acknowledge_message (EmpathyTpChat *chat,
g_return_if_fail (EMPATHY_IS_TP_CHAT (chat));
g_return_if_fail (priv->ready);
- if (empathy_message_get_sender (message) == priv->user)
+ if (!empathy_message_is_incoming (message))
goto out;
message_ids = g_array_sized_new (FALSE, FALSE, sizeof (guint), 1);
@@ -1419,7 +1421,7 @@ empathy_tp_chat_acknowledge_messages (EmpathyTpChat *chat,
g_assert (m != NULL);
g_queue_delete_link (priv->pending_messages_queue, m);
- if (empathy_message_get_sender (message) != priv->user) {
+ if (empathy_message_is_incoming (message)) {
guint id = empathy_message_get_id (message);
g_array_append_val (message_ids, id);
}
diff --git a/po/ar.po b/po/ar.po
index 1fbb6a01..19cfd20d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12,23 +12,31 @@ msgid ""
msgstr ""
"Project-Id-Version: gossip.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 12:51+0300\n"
-"PO-Revision-Date: 2009-08-15 13:01+0300\n"
+"POT-Creation-Date: 2009-08-29 15:55+0200\n"
+"PO-Revision-Date: 2009-08-29 15:52+0300\n"
"Last-Translator: Khaled Hosny \n"
"Language-Team: Arabic \n"
-"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Virtaal 0.4.0\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Ø¥Ù
بثÙ"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
msgstr "اÙÙ
رسا٠إÙ
بثÙ"
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
+msgid "IM Client"
+msgstr "Ù
رسا٠Ù
Øادثة ÙÙرÙØ©"
+
+#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
msgstr "أرس٠٠استÙب٠اÙرسائÙ"
@@ -58,336 +66,344 @@ msgid "Compact contact list"
msgstr "ÙائØØ© Ù
ختصرة ÙÙÙ
تراسÙÙÙ"
#: ../data/empathy.schemas.in.h:6
+#, fuzzy
+msgid "Connection managers should be used"
+msgstr "Ùجب استعÙ
ا٠Ù
دÙر اÙشبÙØ©"
+
+#: ../data/empathy.schemas.in.h:7
msgid "Contact list sort criterium"
msgstr "Ù
عÙار ترتÙب ÙائØØ© اÙÙ
تراسÙÙÙ"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/empathy.schemas.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "اÙÙ
جÙد اÙÙ
بدئ٠ÙاختÙار اÙصÙرة اÙشخصÙØ©"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:9
msgid "Disable popup notifications when away"
msgstr "عط٠اÙتÙبÙÙات اÙÙ
ÙبثÙØ© عÙدÙ
ا Ø£ÙÙ٠بعÙدا"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:10
msgid "Disable sounds when away"
msgstr "عط٠اÙأصÙات عÙدÙ
ا Ø£ÙÙ٠بعÙدا"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:11
msgid "Empathy can publish the user's location"
msgstr "ÙستطÙع Ø¥Ù
بث٠Ùشر Ù
Ùا٠اÙÙ
ستخدÙ
"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:12
msgid "Empathy can use the GPS to guess the location"
msgstr "ÙستطÙع Ø¥Ù
بث٠استخداÙ
GPS ÙتخÙ
ÙÙ Ù
Ùا٠اÙÙ
ستخدÙ
"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:13
msgid "Empathy can use the cellular network to guess the location"
msgstr "ÙستطÙع Ø¥Ù
بث٠استخداÙ
شبÙØ© اÙÙات٠اÙÙ
ØÙ
ÙÙ ÙتخÙ
ÙÙ Ù
Ùا٠اÙÙ
ستخدÙ
"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:14
msgid "Empathy can use the network to guess the location"
msgstr "ÙستطÙع Ø¥Ù
بث٠استخداÙ
اÙشبÙØ© ÙتخÙ
ÙÙ Ù
Ùا٠اÙÙ
ستخدÙ
"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:15
msgid "Empathy default download folder"
msgstr "Ù
جÙد اÙتÙزÙ٠اÙÙ
بدئ٠ÙØ¥Ù
بثÙ"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:16
msgid "Empathy has asked about importing accounts"
msgstr "Ø¥Ù
بث٠Ùسأ٠ع٠استÙراد اÙØسابات"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:17
msgid "Empathy should auto-connect on startup"
msgstr "اÙاتصا٠اÙØ¢Ù٠عÙد بدء اÙبرÙاÙ
ج"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:18
msgid "Empathy should reduce the location's accuracy"
msgstr "عÙ٠إÙ
بث٠تÙÙÙ٠دÙØ© تØدÙد اÙÙ
ÙاÙ"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "استخداÙ
اÙصÙر اÙشخصÙÙØ© ÙÙÙ
تراس٠ÙØ£ÙÙÙÙØ© ÙÙاÙذة اÙÙ
Øادثة"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
msgid "Enable WebKit Developer Tools"
msgstr "ÙعÙ٠أدÙات ÙبâÙÙت ÙÙÙ
Ø·ÙرÙÙ"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
msgid "Enable popup notifications for new messages"
msgstr "ÙعÙ٠اÙتÙبÙÙات اÙÙ
ÙبثÙØ© ÙÙرسائ٠اÙجدÙدة"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
msgid "Enable spell checker"
msgstr "ÙعÙ٠اÙتدÙÙ٠اÙØ¥Ù
ÙائÙ"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
msgid "Hide main window"
msgstr "أخÙ٠اÙÙاÙذة اÙرئÙسÙØ©"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Hide the main window."
msgstr "أخÙ٠اÙÙاÙذة اÙرئÙسÙØ©"
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr "Ùجب استعÙ
ا٠Ù
دÙر اÙشبÙØ©"
-
#: ../data/empathy.schemas.in.h:25
+msgid "MC 4 accounts have been imported"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:26
+msgid "MC 4 accounts have been imported."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:27
msgid "Nick completed character"
msgstr "Ù
ÙØر٠اÙÙÙÙØ© اÙتاÙ
"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:28
msgid "Open new chats in separate windows"
msgstr "اÙØªØ Ø§ÙÙ
Øادثات اÙجدÙدة ÙÙ ÙÙاÙØ° Ù
تÙرÙØ©"
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:29
msgid "Path of the adium theme to use"
msgstr "Ù
سار سÙ
Ø© adium ÙتستخدÙ
"
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:30
msgid "Path of the adium theme to use if the theme used for chat is adium."
msgstr "Ù
سار سÙ
Ø© adium اÙت٠ستستخدÙ
إذا ÙاÙت سÙ
Ø© اÙدردشة اÙÙ
ستخدÙ
Ø© adium."
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
msgstr "شغ٠صÙت عÙد ÙصÙ٠اÙرسائÙ"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:32
msgid "Play a sound for new conversations"
msgstr "شغ٠صÙت ÙÙÙ
Øادثات اÙجدÙدة"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for outgoing messages"
msgstr "شغ٠صÙت عÙد إرسا٠اÙرسائÙ"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound when a contact logs in"
msgstr "_شغ٠صÙت عÙدÙ
ا Ùسج٠اÙدخÙ٠أØد جÙات اÙإتصاÙ"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound when a contact logs out"
msgstr "شغ٠صÙت عÙدÙ
ا ÙÙÙÙ
Ø£Øد اÙÙ
تراسÙÙ٠باÙخرÙج"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when we log in"
msgstr "شغ٠صÙت عÙدÙ
ا Ø£Ùج"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when we log out"
msgstr "شغ٠صÙت عÙدÙ
ا أخرج"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:38
msgid "Popup notifications if the chat isn't focused"
msgstr "أظÙر اÙتÙبÙÙات اÙÙ
ÙبثÙØ© إذا ÙÙ
ÙÙ٠اÙترÙÙز عÙ٠اÙÙ
Øادثة"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:39
msgid "Popup notifications when a contact sign in"
msgstr "أظÙر تÙبÙÙات Ù
ÙبثÙØ© عÙد تسجÙ٠اÙÙ
تراسÙ"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:40
msgid "Popup notifications when a contact sign out"
msgstr "أظÙر تÙبÙÙات Ù
ÙبثÙØ© عÙد خرÙج اÙÙ
تراسÙ"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:41
msgid "Salut account is created"
msgstr "Ø£ÙÙشئ Øساب اÙترØÙب"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "أعرض اÙصÙر اÙشخصÙØ©"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:43
msgid "Show contact list in rooms"
msgstr "أظÙر ÙائÙ
Ø© اÙÙ
تراسÙÙÙ Ù٠اÙغرÙ"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:44
msgid "Show hint about closing the main window"
msgstr "أظÙر تÙÙ
ÙØØ© إغÙا٠اÙÙاÙذة اÙرئÙسÙØ©"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:45
msgid "Show offline contacts"
msgstr "أظÙر اÙÙ
تراسÙÙ٠غÙر اÙÙ
تÙÙصÙÙÙ"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Ùغات اÙتدÙÙ٠اÙÙغÙÙ"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "اÙÙ
جÙد اÙÙ
بدئ٠ÙØÙظ اÙÙ
ÙÙات اÙÙ
ÙÙÙÙØ© ÙÙÙ."
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "آخر Ù
جÙد اختÙÙرت Ù
Ù٠اÙصÙرة اÙشخصÙØ©."
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr "اÙسÙÙ
Ø© اÙÙ
ستخدÙ
Ø© Ùعرض اÙÙ
Øادثة ÙÙ ÙÙاÙØ° اÙدردشة."
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "استخدÙ
اÙتعابÙر اÙÙ
رسÙÙ
Ø©"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "استخدÙ
أصÙات اÙتبÙÙغ"
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "استخدÙ
سÙ
Ø© Ùغر٠اÙدردشة"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:53
msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be "
-"enabled."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "ÙÙÙ
ا إذاÙاÙت أدÙات ÙÙبâÙÙت ÙÙÙ
Ø·Ùر -Ù
Ø«Ù ÙاØص اÙÙب- ستÙعÙ٠أÙ
Ùا."
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:54
msgid "Whether or not Empathy can publish the user's location to his contacts."
msgstr "ÙÙÙ
ا Ø¥Ù Ùا٠إÙ
بث٠سÙØ·Ùع اÙÙ
تراسÙÙ٠عÙÙ Ù
Ùا٠اÙÙ
ستخدÙ
."
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
msgid "Whether or not Empathy can use the GPS to guess the location."
msgstr "ÙÙÙ
ا إذا Ùا٠إÙ
بث٠سÙستخدÙ
GPS ÙتخÙ
Ù٠اÙÙ
ÙاÙ."
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
msgid ""
"Whether or not Empathy can use the cellular network to guess the location."
msgstr "ÙÙÙ
ا إذا Ùا٠إÙ
بث٠سÙستخدÙ
شبÙØ© اÙÙات٠اÙÙ
ØÙ
ÙÙ ÙتخÙ
Ù٠اÙÙ
ÙاÙ."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
msgid "Whether or not Empathy can use the network to guess the location."
msgstr "ÙÙÙ
ا إذا Ùا٠إÙ
بث٠سÙستخدÙ
اÙشبÙØ© اÙÙ
ØÙ
ÙÙ ÙتخÙ
Ù٠اÙÙ
ÙاÙ."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
msgid ""
"Whether or not Empathy has asked about importing accounts from other "
"programs."
msgstr "ÙÙÙ
ا إذا Ùا٠إÙ
بث٠Ùد سأ٠ع٠استÙراد اÙØسابات Ù
٠اÙبراÙ
ج اÙأخرÙ."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether or not Empathy should automatically log in to your accounts on "
"startup."
msgstr "ÙÙÙ
ا إذا Ùا٠عÙ٠إÙ
بث٠اÙÙÙÙج Ø¢ÙÙا Ø¥ÙÙ Øسابات٠عÙد بدء اÙتشغÙÙ."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether or not Empathy should reduce the location's accuracy for privacy "
"reasons."
msgstr "ÙÙÙ
ا إذا Ùا٠عÙ٠إÙ
بث٠خÙض دÙØ© تØدÙد اÙÙ
Ùا٠ÙÙØÙاظ عÙ٠اÙخصÙصÙØ©."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether or not Empathy should use the avatar of the contact as the chat "
"window icon."
msgstr "ÙÙÙ
ا إذا Ùا٠عÙ٠إÙ
بث٠استخداÙ
Ø£Ùاتر اÙÙ
تراس٠ÙØ£ÙÙÙÙØ© ÙÙاÙذة اÙÙ
Øادثة."
-#: ../data/empathy.schemas.in.h:60
-msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "ÙÙÙ
ا إذا Ùا٠Ùد Ø£Ùشئ Øساب Salut عÙد Ø£Ù٠تشغÙÙ ÙØ¥Ù
بثÙ."
-
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
+#, fuzzy
msgid ""
-"Whether or not the network manager should be used to automatically "
+"Whether or not connectivity managers should be used to automatically "
"disconnect/reconnect."
msgstr "ÙÙÙ
ا إذا ÙستخدÙ
Ù
دÙر اÙشبÙØ© ÙÙطع اÙاتصا٠أ٠استرجاعÙ."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:63
+msgid ""
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr "ÙÙÙ
ا إذا Ùا٠Ùد Ø£Ùشئ Øساب Salut عÙد Ø£Ù٠تشغÙÙ ÙØ¥Ù
بثÙ."
+
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether or not to check words typed against the languages you want to check "
"with."
msgstr "ÙÙÙ
ا إذا Ùا٠عÙÙ٠اÙتأÙد Ù
٠اÙÙÙÙ
ات اÙÙ
ÙتÙبة باÙÙغة اÙت٠ØددتÙا."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether or not to convert smileys into graphical images in conversations."
msgstr "ÙÙÙ
ا إذا ÙØÙ٠اÙابتساÙ
ات Ø¥Ù٠صÙر Ù
عبÙرة."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
msgid ""
-"Whether or not to play a sound to notify for contacts logging in the "
-"network."
+"Whether or not to play a sound to notify for contacts logging in the network."
msgstr ""
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
msgid ""
"Whether or not to play a sound to notify for contacts logging off the "
"network."
msgstr ""
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
msgid "Whether or not to play a sound to notify for events."
msgstr ""
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
msgid "Whether or not to play a sound to notify for incoming messages."
msgstr ""
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
msgid "Whether or not to play a sound to notify for new conversations."
msgstr ""
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
msgid "Whether or not to play a sound to notify for outgoing messages."
msgstr ""
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
msgid "Whether or not to play a sound when logging in a network."
msgstr ""
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
msgid "Whether or not to play a sound when logging off a network."
msgstr ""
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
msgid "Whether or not to play sound notifications when away or busy."
msgstr ""
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
#, fuzzy
msgid ""
"Whether or not to show a popup notification when a contact goes offline."
msgstr "إظÙار صÙر شخصÙØ© ÙÙÙ
تراسÙÙÙ ÙÙ ÙائØØ© اÙÙ
تراسÙÙÙ ÙÙÙاÙØ° اÙÙ
Øادثة."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
#, fuzzy
msgid "Whether or not to show a popup notification when a contact goes online."
msgstr "إظÙار صÙر شخصÙØ© ÙÙÙ
تراسÙÙÙ ÙÙ ÙائØØ© اÙÙ
تراسÙÙÙ ÙÙÙاÙØ° اÙÙ
Øادثة."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
msgid ""
"Whether or not to show a popup notification when receiving a new message "
"even if the chat is already opened, but not focused."
msgstr ""
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether or not to show a popup notification when receiving a new message."
msgstr ""
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
msgid ""
"Whether or not to show avatars for contacts in the contact list and chat "
"windows."
msgstr "إظÙار صÙر شخصÙØ© ÙÙÙ
تراسÙÙÙ ÙÙ ÙائØØ© اÙÙ
تراسÙÙÙ ÙÙÙاÙØ° اÙÙ
Øادثة."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
msgid "Whether or not to show contacts that are offline in the contact list."
msgstr "عرض اÙÙ
رسÙÙ٠غÙر اÙÙ
تصÙÙÙ ÙÙ ÙائØØ© اÙÙ
تراسÙÙÙ."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
msgid "Whether or not to show popup notifications when away or busy."
msgstr ""
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
#, fuzzy
msgid "Whether or not to show the contact list in chat rooms."
msgstr "عرض ÙائØØ© اÙÙ
تراسÙÙÙ ÙÙ Ø´ÙÙÙا اÙÙ
ختصر."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
msgid ""
"Whether or not to show the message dialog about closing the main window with "
"the 'x' button in the title bar."
@@ -395,15 +411,15 @@ msgstr ""
"عرض ØÙار اÙرسائ٠ØÙ٠إغÙا٠اÙÙاÙذة اÙرئÙسÙØ© اÙت٠بÙا عÙاÙ
Ø© اÙإغÙا٠Ù٠شرÙØ· "
"اÙعÙاÙÙÙ. "
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:84
msgid "Whether to show the contact list in compact mode or not."
msgstr "عرض ÙائØØ© اÙÙ
تراسÙÙÙ ÙÙ Ø´ÙÙÙا اÙÙ
ختصر."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms or not."
msgstr "استخداÙ
سÙ
Ø© Ùغر٠اÙÙ
Øادثة."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
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 "
@@ -412,78 +428,94 @@ msgstr ""
"اÙÙ
عÙار اÙÙ
Ø·ÙÙب استخداÙ
Ù ÙÙرز ÙائØØ© اÙÙ
تراسÙÙÙ. اÙÙ
Ùترض اÙÙرز Øسب اسÙ
"
"اÙÙ
تراسÙ. ÙÙ
Ù٠أÙضا استخداÙ
Ù
عÙار اÙØاÙØ© ÙÙÙرز Øسب ØاÙØ© اÙÙ
تراسÙÙÙ."
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-account.c:1144
+msgid "Can't set an empty display name"
+msgstr "Ùا ÙÙ
Ù٠جع٠اسÙ
اÙعرض خاÙ"
+
+#: ../libempathy/empathy-ft-handler.c:839
msgid "The hash of the received file and the sent one do not match"
msgstr "تÙبÙدة اÙÙ
Ù٠اÙÙ
ÙرسÙÙ ÙÙÙ
ÙستÙÙب٠Ùا تتطابÙاÙ."
-#: ../libempathy/empathy-ft-handler.c:1098
+#: ../libempathy/empathy-ft-handler.c:1099
msgid "File transfer not supported by remote contact"
msgstr "Ùا ÙدعÙ
اÙÙ
تراس٠اÙبعÙد ÙÙ٠اÙÙ
ÙÙات"
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1157
msgid "The selected file is not a regular file"
msgstr "اÙÙ
Ù٠اÙÙ
ختار ÙÙس Ù
ÙÙا اعتÙادÙا"
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1166
msgid "The selected file is empty"
msgstr "اÙÙ
Ù٠اÙÙ
ختار Ùارغ"
-#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
msgid "People nearby"
msgstr "Ù
ع أصدÙاء"
-#: ../libempathy/empathy-tp-file.c:279
+#: ../libempathy/empathy-tp-file.c:280
msgid "Socket type not supported"
msgstr "ÙÙع اÙÙ
Ùبس غÙر Ù
دعÙÙ
"
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:399
msgid "No reason was specified"
msgstr "ÙÙ
ÙØدد أ٠سبب"
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:402
msgid "The change in state was requested"
msgstr "رÙض تغÙÙر اÙØاÙØ©"
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:405
msgid "You canceled the file transfer"
msgstr "Ø£Ùت Ø£ÙغÙت ÙÙ٠اÙÙ
ÙÙ"
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:408
msgid "The other participant canceled the file transfer"
msgstr "اÙشخص اÙآخر ÙاÙ
بإÙغاء ÙÙ٠اÙÙ
ÙÙ"
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:411
msgid "Error while trying to transfer the file"
msgstr "Øدثت Ù
Ø´ÙÙØ© أثÙاء Ù
ØاÙÙØ© ÙÙ٠اÙÙ
ÙÙ"
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:414
msgid "The other participant is unable to transfer the file"
msgstr "اÙشخص اÙآخر غÙر Ùادر عÙÙ ÙÙ٠اÙÙ
ÙÙ"
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:417
msgid "Unknown reason"
msgstr "سبب Ù
جÙÙÙ"
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:235
msgid "Available"
msgstr "Ù
ÙجÙد"
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:237
msgid "Busy"
msgstr "Ù
شغÙÙ"
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:240
msgid "Away"
msgstr "غائب"
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:242
msgid "Hidden"
msgstr "Ù
Ø®ÙÙ"
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:244
msgid "Offline"
msgstr "غÙر Ù
تصÙ"
+#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
+msgid "People Nearby"
+msgstr "اÙأشخاص اÙÙرÙبÙÙ"
+
+#: ../libempathy/empathy-utils.c:384
+msgid "Yahoo! Japan"
+msgstr "ÙاÙÙ! اÙÙاباÙ"
+
+#: ../libempathy/empathy-utils.c:385
+msgid "Facebook Chat"
+msgstr "دردشة ÙÙسبÙÙ"
+
#: ../libempathy/empathy-time.c:137
#, c-format
msgid "%d second ago"
@@ -554,77 +586,118 @@ msgstr[5] "Ù
ÙØ° %d Ø´Ùر"
msgid "in the future"
msgstr "Ù٠اÙÙ
ستÙبÙ"
-#: ../libempathy-gtk/empathy-account-chooser.c:426
+#: ../libempathy-gtk/empathy-account-chooser.c:424
msgid "All"
msgstr "اÙÙÙ"
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:440
+#: ../libempathy-gtk/empathy-account-widget.c:496
#, c-format
msgid "%s:"
msgstr "%s:"
+#: ../libempathy-gtk/empathy-account-widget.c:1239
+msgid "Enabled"
+msgstr "Ù
ÙعÙÙ"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "Example: MyScreenName "
+msgstr "Ù
ثاÙ: MyScreenName "
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
msgid "Advanced"
msgstr "Ù
تÙدÙ
"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "ÙÙÙ
Ø© اÙ_سر:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
msgid "Screen _Name:"
msgstr "اÙاسÙ
اÙÙ
_عرÙض:"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr "Ù
ا ÙÙÙ
Ø© سر٠عÙÙ AIMØ"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr "Ù
ا اسÙ
اÙشاشة ÙÙ AIMØ"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
msgstr "اÙ_Ù
ÙÙÙØ°:"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "اÙ_خادÙÙ
:"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Example: username "
+msgstr "Ù
ثاÙ: username "
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "ا_سÙ
اÙÙ
ستخدÙ
:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "Ù
ا Ù
عرÙÙ٠عÙÙ GroupWiseØ"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "Ù
ا ÙÙÙ
Ø© سر٠عÙÙ GroupWiseØ"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "Example: 123456789 "
+msgstr "Ù
ثاÙ: 123456789 "
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "What is your ICQ UIN?"
+msgstr "Ù
ا Ù
عرÙ٠عÙÙ ICQØ"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr "Ù
ا ÙÙÙ
Ø© سر٠عÙÙ ICQØ"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "_Charset:"
msgstr "_Ø·ÙÙ
اÙÙ
ØارÙ:"
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "شبÙØ© جدÙدة"
@@ -660,84 +733,136 @@ msgstr "اÙاسÙ
اÙØÙÙÙÙ:"
msgid "Servers"
msgstr "اÙØ®ÙادÙÙ
"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "Example: user@jabber.org "
+msgstr "Ù
ثاÙ: user@jabber.org "
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
msgid "Override server settings"
msgstr "تجاÙز إعدادات اÙخادÙÙ
"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "Pri_ority:"
msgstr "اÙØ£Ù_ÙÙÙÙØ©:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Reso_urce:"
msgstr "اÙÙ
_Ùرد:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
msgid "Use old SS_L"
msgstr "استعÙ
Ù SS_L اÙÙدÙÙ
"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "What is your Jabber ID?"
+msgstr "Ù
ا Ù
عرÙ٠عÙ٠جابÙرØ"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Jabber password?"
+msgstr "Ù
ا ÙÙÙ
Ø© سر٠عÙ٠جابÙرØ"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your desired Jabber ID?"
+msgstr "Ù
ا اÙÙ
عر٠اÙذ٠ترÙد٠عÙ٠جابÙرØ"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid "What is your desired Jabber password?"
+msgstr "Ù
ا ÙÙÙ
Ø© اÙسر اÙت٠ترÙدÙا عÙ٠جابÙرØ"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid "_Encryption required (TLS/SSL)"
msgstr "اÙ_تعÙ
ÙØ© Ù
Ø·ÙÙبة (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid "_Ignore SSL certificate errors"
msgstr "_تجاÙ٠أخطاء Ø´Ùادة SSL"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "Example: user@hotmail.com "
+msgstr "Ù
ثاÙ: user@hotmail.com "
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live password?"
+msgstr "Ù
ا ÙÙÙ
Ø© سر٠عÙÙ Windows LiveØ"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live user name?"
+msgstr "Ù
ا اسÙ
اÙÙ
ستخدÙ
عÙÙ Windows LiveØ"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
msgid "_Email:"
msgstr "اÙ_عÙÙا٠اÙØ¥ÙÙÙترÙÙÙ:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
msgstr "اÙا_سÙ
اÙØ£ÙÙ:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_Jabber ID:"
msgstr "Ù
عرÙÙ _Jabber:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Last Name:"
msgstr "اÙاسÙ
اÙ_عائÙÙ:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Nickname:"
msgstr "اÙاسÙ
اÙÙ
ست_عار:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "اÙا_سÙ
اÙÙ
ÙØ´Ùر:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "Example: user@my.sip.server "
+msgstr "Ù
ثاÙ: user@my.sip.server "
+
#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
msgid "Discover STUN"
msgstr "اÙتش٠اÙâSTUN"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "STUN Server:"
msgstr "خادÙÙ
STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "STUN port:"
msgstr "Ù
ÙÙØ° STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "What is your SIP account password?"
+msgstr "Ù
ا ÙÙÙ
Ø© سر Øساب٠عÙÙ SIPØ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "What is your SIP login ID?"
+msgstr "Ù
ا Ù
عر٠ÙÙÙج٠عÙÙ SIPØ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "_Username:"
msgstr "اسÙ
اÙÙ
ست_خدÙ
:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "Use _Yahoo Japan"
msgstr "استخدÙ
Ùا_Ù٠اÙÙاباÙ"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr "Ù
ا Ù
عرÙ٠عÙÙ ÙاÙÙ!Ø"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "What is your Yahoo! password?"
+msgstr "Ù
ا ÙÙÙ
Ø© سر٠عÙÙ ÙاÙÙ!Ø"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "Yahoo I_D:"
msgstr "Ù
ÙعرÙ٠اÙ_ÙاÙÙ:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Ignore conference and chatroom invitations"
msgstr "_تجاÙ٠دعÙات اÙÙ
Øاضرات Ùغر٠اÙدردشة"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "Ù
ØÙÙØ© ÙائØØ© اÙ_غرÙ:"
@@ -774,92 +899,98 @@ msgstr "اÙÙر ÙÙتÙبÙر"
msgid "Failed to reconnect this chat"
msgstr "تعذÙرت إعادة اÙاتصا٠بÙذ٠اÙدردشة"
-#: ../libempathy-gtk/empathy-chat.c:412
+#: ../libempathy-gtk/empathy-chat.c:403
msgid "Unsupported command"
msgstr "Ø£Ù
ر غÙر Ù
دعÙÙ
"
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:535
msgid "offline"
msgstr "غÙر Ù
تÙصÙ"
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:538
msgid "invalid contact"
msgstr "Ù
تراس٠غÙر صØÙØ"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:541
msgid "permission denied"
msgstr "رÙÙض اÙتÙصرÙØ"
-#: ../libempathy-gtk/empathy-chat.c:557
+#: ../libempathy-gtk/empathy-chat.c:544
msgid "too long message"
msgstr "اÙرساÙØ© Ø·ÙÙÙØ© جدا"
-#: ../libempathy-gtk/empathy-chat.c:560
+#: ../libempathy-gtk/empathy-chat.c:547
msgid "not implemented"
msgstr "غÙر Ù
طبÙ"
-#: ../libempathy-gtk/empathy-chat.c:563
+#: ../libempathy-gtk/empathy-chat.c:550
msgid "unknown"
msgstr "Ù
جÙÙÙ"
-#: ../libempathy-gtk/empathy-chat.c:567
+#: ../libempathy-gtk/empathy-chat.c:554
#, c-format
msgid "Error sending message '%s': %s"
msgstr "خطأ Ù٠ارسا٠اÙرساÙØ© '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:597
+#: ../libempathy-gtk/empathy-chat.c:584
#, c-format
msgid "Topic set to: %s"
msgstr "اÙÙ
ÙضÙع: %s"
-#: ../libempathy-gtk/empathy-chat.c:599
+#: ../libempathy-gtk/empathy-chat.c:586
msgid "No topic defined"
msgstr "ÙÙ
ÙØدد Ø£Ù Ù
ÙضÙع"
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:956
msgid "(No Suggestions)"
msgstr "(Ùا اÙتراØات)"
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1010
msgid "Insert Smiley"
msgstr "أدرج اÙتعابÙر اÙÙ
رسÙÙ
Ø©"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1041
-#: ../libempathy-gtk/empathy-ui-utils.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-ui-utils.c:1484
msgid "_Send"
msgstr "Ø£_رسÙ"
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1062
msgid "_Spelling Suggestions"
msgstr "ا_ÙتراØات اÙØ¥Ù
Ùاء"
-#: ../libempathy-gtk/empathy-chat.c:1190
+#: ../libempathy-gtk/empathy-chat.c:1177
#, c-format
msgid "%s has disconnected"
msgstr "â%s Ùطع اÙاتصاÙ"
-#: ../libempathy-gtk/empathy-chat.c:1194
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1184
#, c-format
-msgid "%s was kicked by %s"
-msgstr "â%s طرد٠%s"
+msgid "%1$s was kicked by %2$s"
+msgstr "âطرد %1$sâ %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1197
+#: ../libempathy-gtk/empathy-chat.c:1187
#, c-format
msgid "%s was kicked"
msgstr "â%s Ø·ÙرÙد"
-#: ../libempathy-gtk/empathy-chat.c:1202
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1195
#, c-format
-msgid "%s was banned by %s"
-msgstr "â%s Øظر٠%s"
+msgid "%1$s was banned by %2$s"
+msgstr "Øظر %1$sâ %2$s"
-#: ../libempathy-gtk/empathy-chat.c:1205
+#: ../libempathy-gtk/empathy-chat.c:1198
#, c-format
msgid "%s was banned"
msgstr "â%s ØÙظÙر"
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:1202
#, c-format
msgid "%s has left the room"
msgstr "â%s غادر اÙغرÙØ©"
@@ -869,42 +1000,42 @@ msgstr "â%s غادر اÙغرÙØ©"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1218
+#: ../libempathy-gtk/empathy-chat.c:1211
#, c-format
msgid " (%s)"
msgstr "ââ (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1241
+#: ../libempathy-gtk/empathy-chat.c:1234
#, c-format
msgid "%s has joined the room"
msgstr "اÙضÙ
%s Ø¥Ù٠اÙغرÙØ©"
-#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
msgid "Disconnected"
msgstr "غÙر Ù
تÙصÙ"
-#: ../libempathy-gtk/empathy-chat.c:1809
+#: ../libempathy-gtk/empathy-chat.c:1803
msgid "Connected"
msgstr "Ù
تÙصÙ"
-#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-chat.c:1853
#: ../libempathy-gtk/empathy-log-window.c:502
msgid "Conversation"
msgstr "Ù
Øادثة"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
msgid "Topic:"
msgstr "اÙÙ
ÙضÙع:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-theme-adium.c:276
msgid "_Copy Link Address"
msgstr "ا_Ùسخ عÙÙا٠اÙÙصÙØ©"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-theme-adium.c:284
msgid "_Open Link"
msgstr "ا_ÙØªØ Ø§ÙÙصÙØ©"
@@ -914,16 +1045,16 @@ msgstr "ا_ÙØªØ Ø§ÙÙصÙØ©"
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:177
+#: ../libempathy-gtk/empathy-contact-dialogs.c:236
msgid "Edit Contact Information"
msgstr "عدÙÙ Ù
عÙÙÙ
ات اÙÙ
تراسÙ"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
msgid "Personal Information"
msgstr "اÙÙ
عÙÙÙ
ات اÙشخصÙØ©"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
msgid "New Contact"
msgstr "Ù
تراس٠جدÙد"
@@ -1025,7 +1156,7 @@ msgid "Select"
msgstr "ØدÙد"
#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1023
+#: ../src/empathy-main-window.c:1019
msgid "Group"
msgstr "اÙÙ
جÙ
Ùعة"
@@ -1165,7 +1296,7 @@ msgid "Client:"
msgstr "اÙعÙ
ÙÙ:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
+#: ../src/empathy-main-window.c:1002
msgid "Contact"
msgstr "Ù
تراسÙ"
@@ -1218,24 +1349,24 @@ msgstr "Ù
ÙÙع اÙØ¥ÙترÙت:"
msgid "_Add Group"
msgstr "Ø£_ض٠Ù
جÙ
Ùعة"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
msgid "new server"
msgstr "خادÙÙ
جدÙد"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
msgid "Server"
msgstr "اÙخادÙÙ
"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
msgid "Port"
msgstr "اÙÙ
ÙÙØ°"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
msgid "SSL"
msgstr "SSL"
#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Øساب"
@@ -1281,34 +1412,34 @@ msgstr "Ù
Øادثة جدÙدة"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-#: ../libempathy-gtk/empathy-presence-chooser.c:208
+#: ../libempathy-gtk/empathy-presence-chooser.c:176
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
msgid "Custom Message..."
msgstr "رساÙØ© Ù
خصÙصة..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#: ../libempathy-gtk/empathy-presence-chooser.c:229
+#: ../libempathy-gtk/empathy-presence-chooser.c:231
msgid "Edit Custom Messages..."
msgstr "Øرر اÙرسائ٠اÙÙ
خصÙصة..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:330
msgid "Click to remove this status as a favorite"
msgstr "اÙÙر ÙإزاÙØ© ÙÙÙ Ùذ٠اÙØاÙØ© Ù٠اÙÙ
ÙضÙØ©"
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:339
msgid "Click to make this status a favorite"
msgstr "اÙÙر Ùجع٠Ùذ٠اÙØاÙØ© Ù٠اÙÙ
ÙضÙØ©"
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:373
msgid "Set status"
msgstr "Øدد اÙØاÙØ©"
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:794
msgid "Set your presence and current status"
msgstr "Øدد تÙاجد٠ÙØاÙت٠اÙØاÙÙØ©"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+#: ../libempathy-gtk/empathy-presence-chooser.c:1043
msgid "Custom messages..."
msgstr "اÙرسائ٠اÙÙ
خصصة..."
@@ -1368,14 +1499,6 @@ msgstr "أض٠إعداد Ù
سب٠_جدÙد"
msgid "Saved Presets"
msgstr "اÙإعدادات اÙÙ
سبÙØ© اÙÙ
ØÙÙظة"
-#: ../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 "تÙÙÙدÙ"
@@ -1392,15 +1515,15 @@ msgstr "ÙظÙÙ"
msgid "Blue"
msgstr "أزرÙ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1382
+#: ../libempathy-gtk/empathy-ui-utils.c:1386
msgid "Unable to open URI"
msgstr "تعذÙر ÙØªØ Ø§ÙÙ
سار"
-#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#: ../libempathy-gtk/empathy-ui-utils.c:1476
msgid "Select a file"
msgstr "اختر Ù
ÙÙا"
-#: ../libempathy-gtk/empathy-ui-utils.c:1532
+#: ../libempathy-gtk/empathy-ui-utils.c:1536
msgid "Select a destination"
msgstr "اختر ÙجÙØ©"
@@ -1589,7 +1712,7 @@ msgid "Megaphone"
msgstr "Ù
ÙبÙر اÙصÙت"
#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:518
msgid "Talk!"
msgstr "تÙÙÙ
!"
@@ -1607,11 +1730,11 @@ msgstr "_Ù
عÙÙÙ
ات"
msgid "_Preferences"
msgstr "اÙ_تÙضÙÙات"
-#: ../megaphone/src/megaphone-applet.c:168
+#: ../megaphone/src/megaphone-applet.c:166
msgid "Please configure a contact."
msgstr "Ù
Ù ÙضÙ٠أض٠Ù
تراسÙا."
-#: ../megaphone/src/megaphone-applet.c:258
+#: ../megaphone/src/megaphone-applet.c:256
msgid "Select contact..."
msgstr "Øدد Ù
تراسÙا..."
@@ -1620,23 +1743,23 @@ msgid "Presence"
msgstr "اÙتÙاجد"
#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
+#: ../nothere/src/nothere-applet.c:105
msgid "Set your own presence"
msgstr "اضبط تÙاجدÙ"
-#: ../src/empathy.c:567
+#: ../src/empathy.c:588
msgid "Don't connect on startup"
msgstr "Ùا تتص٠عÙد بدء اÙتشغÙÙ"
-#: ../src/empathy.c:571
+#: ../src/empathy.c:592
msgid "Don't show the contact list on startup"
msgstr "Ùا تعرض ÙائÙ
Ø© اÙÙ
تراسÙÙ٠عÙد بدء اÙتشغÙÙ"
-#: ../src/empathy.c:575
+#: ../src/empathy.c:596
msgid "Show the accounts dialog"
msgstr "أعرض Ù
ربع ØÙار اÙØسابات"
-#: ../src/empathy.c:587
+#: ../src/empathy.c:608
msgid "- Empathy IM Client"
msgstr "- اÙÙ
رسا٠إÙ
بثÙ"
@@ -1686,21 +1809,145 @@ msgstr ""
"Ù
ØÙ
د اÙØبÙÙÙب\t\n"
"خاÙد ØسÙÙ\t"
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "Ù
ÙعÙÙ"
+#: ../src/empathy-account-assistant.c:118
+msgid "There has been an error while importing the accounts."
+msgstr "Øدث خطأ أثÙاء استÙراد اÙØسابات."
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "Øسابات"
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error while parsing the account details."
+msgstr "Øدث خطأ أثÙاء تØÙÙ٠تÙاصÙ٠اÙØساب."
+
+#: ../src/empathy-account-assistant.c:124
+msgid "There has been an error while creating the account."
+msgstr "Øدث خطأ أثÙاء Ø¥Ùشاء اÙØساب."
+#: ../src/empathy-account-assistant.c:126
+msgid "There has been an error."
+msgstr "Øدث خطأ."
+
+#: ../src/empathy-account-assistant.c:141
+#, c-format
+msgid "The error message was: %s "
+msgstr "رساÙØ© اÙخطأ: %s "
+
+#: ../src/empathy-account-assistant.c:149
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"ÙÙ
ÙÙ٠إÙ
ا اÙعÙدة ÙÙØ®ÙÙ ÙÙ
ØاÙÙØ© إدخا٠تÙاصÙ٠اÙØساب Ù
رة ثاÙÙØ©Ø Ø£Ù Ø¥ØºÙا٠Ùذا "
+"اÙÙ
ساعد ÙإضاÙØ© اÙØساب ÙاØÙا Ù
Ù ÙائÙ
Ø© \"تØرÙر\"."
+
+#: ../src/empathy-account-assistant.c:184
+msgid "An error occurred"
+msgstr "Øدث خطأ"
+
+#. Create account
#. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:320
+#: ../src/empathy-accounts-dialog.c:1172
#, c-format
msgid "New %s account"
msgstr "Øساب %s جدÙد"
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-account-assistant.c:386
+msgid "What kind of chat account do you have?"
+msgstr "Ù
ا ÙÙع Øساب اÙدردشة اÙذ٠تÙ
تÙÙÙØ"
+
+#: ../src/empathy-account-assistant.c:392
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "Ø£ÙدÙÙ Øساب دردشة آخر ترÙد إعدادÙØ"
+
+#: ../src/empathy-account-assistant.c:398
+msgid "Enter your account details"
+msgstr "أدخ٠تÙاصÙ٠اÙØساب"
+
+#: ../src/empathy-account-assistant.c:403
+msgid "What kind of chat account do you want to create?"
+msgstr "Ù
ا ÙÙع Øساب اÙدردشة اÙذ٠ترÙد Ø¥ÙشاءÙØ"
+
+#: ../src/empathy-account-assistant.c:409
+msgid "Do you want to create other chat accounts?"
+msgstr "Ù٠ترÙد Ø¥Ùشاء Øسابات دردشة أخرÙØ"
+
+#: ../src/empathy-account-assistant.c:416
+msgid "Enter the details for the new account"
+msgstr "أدخ٠تÙاصÙ٠اÙØساب اÙجدÙد"
+
+#: ../src/empathy-account-assistant.c:502
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"Ù
ع Ø¥Ù
بث٠تستطÙع اÙدردشة Ù
ع أصدÙائ٠ÙزÙ
Ùائ٠اÙØ°ÙÙ ÙستخدÙ
Ù٠جÙج٠تÙÙØ Ø£Ù AIMØ "
+"Ø£Ù Windows Live ÙاÙÙØ«Ùر Ù
٠براÙ
ج اÙدردشة اÙأخرÙ. ÙباستخداÙ
Ù
ÙÙرÙÙÙÙ ÙÙاÙ
Ùرا "
+"تستطÙع إجراء Ù
Øادثات باÙصÙت ÙاÙصÙرة."
+
+#: ../src/empathy-account-assistant.c:519
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "ÙÙ ÙدÙÙ Øساب ÙÙت تستخدÙ
Ù Ù
ع برÙاÙ
ج دردشة آخرØ"
+
+#: ../src/empathy-account-assistant.c:542
+msgid "Yes, import my account details from "
+msgstr "ÙعÙ
Ø Ø§Ø³ØªÙرد Ù
عÙÙÙ
ات Øساب٠Ù
Ù "
+
+#: ../src/empathy-account-assistant.c:563
+msgid "Yes, I'll enter my account details now"
+msgstr "ÙعÙ
Ø Ø³Ø£Ùدخ٠Ù
عÙÙÙ
ات Øساب٠اÙØ¢Ù"
+
+#: ../src/empathy-account-assistant.c:585
+msgid "No, I want a new account"
+msgstr "ÙØ§Ø Ø£Ø±Ùد Øسابا جدÙدا"
+
+#: ../src/empathy-account-assistant.c:595
+msgid "No, I just want to see people online nearby for now"
+msgstr "ÙØ§Ø ØاÙÙا أرÙد رؤÙØ© اÙأشخاص اÙÙ
تصÙÙÙ ÙرÙبا Ù
ÙÙ ÙÙØ·"
+
+#: ../src/empathy-account-assistant.c:616
+msgid "Select the accounts you want to import:"
+msgstr "اختر اÙØسابات اÙت٠ترÙد استÙرادÙا:"
+
+#: ../src/empathy-account-assistant.c:703
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "Yes"
+msgstr "ÙعÙ
"
+
+#: ../src/empathy-account-assistant.c:710
+msgid "No, that's all for now"
+msgstr "ÙØ§Ø ÙÙÙÙ Ùذا اÙØ¢Ù"
+
+#: ../src/empathy-account-assistant.c:903
+msgid "Welcome to Empathy"
+msgstr "Ù
رØبا Ù
ع Ø¥Ù
بثÙ"
+
+#: ../src/empathy-account-assistant.c:912
+msgid "Import your existing accounts"
+msgstr "استÙرد Øسابات٠اÙÙ
ÙجÙدة"
+
+#: ../src/empathy-accounts-dialog.c:206
+#, c-format
+msgid "%s on %s"
+msgstr "â%s عÙÙ %s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../src/empathy-accounts-dialog.c:217
+#, c-format
+msgid "%s Account"
+msgstr "Øساب %s"
+
+#: ../src/empathy-accounts-dialog.c:221
+msgid "New account"
+msgstr "Øساب جدÙد"
+
+#: ../src/empathy-accounts-dialog.c:649
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1709,7 +1956,7 @@ msgstr ""
"Ø¥Ù٠عÙØ© Ùش٠إزاÙØ© Øساب٠%s!\n"
"Ø£Ù
ÙتأÙد Ø£Ù٠ترغب Ù٠إتÙ
اÙ
اÙعÙ
ÙÙØ©Ø"
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:655
msgid ""
"Any associated conversations and chat rooms will NOT be removed if you "
"decide to proceed.\n"
@@ -1721,31 +1968,23 @@ msgstr ""
"\n"
"إذا Ù
ا Ùررت إضاÙØ© اÙØساب ÙاØÙØ§Ø Ø³ÙبÙÙÙ Ù
تÙÙرÙÙ. "
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "Øسابات"
+
#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "أض٠Øسابا"
+msgid "Add new"
+msgstr ""
#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Cr_eate"
msgstr "Ø£_Ùشئ"
#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "جÙÙ
ÙÙ"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "استÙرد اÙØسابات..."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol installed"
msgstr "ÙÙ
ÙثبÙت أ٠برÙتÙÙÙÙ"
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "اÙإعدادات"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -1753,22 +1992,23 @@ msgstr ""
"ÙإضاÙØ© Øساب جدÙØ¯Ø Ø¹ÙÙ٠أÙÙا بتثبÙت اÙØ®ÙÙÙØ© اÙÙ
Ùاسبة ÙÙ٠برÙتÙÙÙ٠تÙد "
"استعÙ
اÙÙ."
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "Type:"
-msgstr "اÙÙÙع:"
-
-#: ../src/empathy-accounts-dialog.ui.h:10
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Add..."
msgstr "Ø£_ضÙ..."
-#: ../src/empathy-accounts-dialog.ui.h:11
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Create a new account"
msgstr "Ø£_Ùشئ Øسابا جدÙدا"
-#: ../src/empathy-accounts-dialog.ui.h:12
+#: ../src/empathy-accounts-dialog.ui.h:8
msgid "_Reuse an existing account"
msgstr "ا_ستخدÙ
Øسابا Ù
ÙجÙدا"
+#: ../src/empathy-accounts-dialog.ui.h:9
+#, fuzzy
+msgid "account"
+msgstr "Øساب"
+
#: ../src/empathy-call-window.c:426
msgid "Contrast"
msgstr "اÙتباÙÙ"
@@ -1805,17 +2045,20 @@ msgstr "Ù
دخÙات اÙصÙت"
msgid "Video input"
msgstr "Ù
دخÙات اÙÙÙدÙÙ"
-#: ../src/empathy-call-window.c:866
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
#, c-format
msgid "Call with %s"
msgstr "اتص٠باستخداÙ
%s"
-#: ../src/empathy-call-window.c:935
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
msgid "Call"
msgstr "اتصÙ"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1387
+#: ../src/empathy-call-window.c:1390
#, c-format
msgid "Connected â %d:%02dm"
msgstr "Ù
تÙص٠â %d:%02dm"
@@ -1848,12 +2091,12 @@ msgstr "_اتصاÙ"
msgid "_View"
msgstr "_عرض"
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:343
#, c-format
msgid "Conversations (%d)"
msgstr "Ù
Øادثات (%d)"
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:475
msgid "Typing a message."
msgstr "ÙÙتب رساÙØ©..."
@@ -1933,75 +2176,75 @@ msgstr "اتص٠تÙÙائÙا"
msgid "Manage Favorite Rooms"
msgstr "أدر اÙغر٠اÙÙ
ÙضÙÙØ©"
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:322
msgid "Incoming call"
msgstr "Ù
ÙاÙÙ
Ø© Ùاردة"
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:325
#, c-format
msgid "%s is calling you, do you want to answer?"
msgstr "Ùتص٠ب٠%sØ Ù٠ترغب باÙإجابةØ"
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:332
msgid "_Reject"
msgstr "_ارÙض"
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:338
msgid "_Answer"
msgstr "_أجب"
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:453
#, c-format
msgid "Incoming call from %s"
msgstr "Ù
ÙاÙÙ
Ø© Ùاردة Ù
Ù %s"
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:497
#, c-format
msgid "%s is offering you an invitation"
msgstr "ÙاÙ
%s بدعÙتÙ"
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:503
msgid "An external application will be started to handle it."
msgstr "سÙÙشغÙ٠برÙاÙ
ج خارج٠ÙÙتعاÙ
Ù Ù
عÙا."
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:508
msgid "You don't have the needed external application to handle it."
msgstr "Ùا تÙ
Ù٠اÙبرÙاÙ
ج اÙÙ
Ø·ÙÙب ÙÙتعاÙ
Ù Ù
عÙا."
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:635
msgid "Room invitation"
msgstr "دعÙØ© غرÙØ©"
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:638
#, c-format
msgid "%s is inviting you to join %s"
msgstr "ÙدعÙÙ %s ÙÙاÙضÙ
اÙ
Ø¥ÙÙ %s"
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:646
msgid "_Decline"
msgstr "ا_رÙض"
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:651
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "اÙ_ضÙ
"
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:690
#, c-format
msgid "%s invited you to join %s"
msgstr "دعا٠%s ÙÙاÙضÙ
اÙ
Ø¥ÙÙ %s"
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:716
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Ù
ÙÙ Ùارد Ù
Ù %s"
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:896
#, c-format
msgid "Subscription requested by %s"
msgstr "Ø·ÙÙÙب٠اÙتسجÙÙ Ù
Ù %s"
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:900
#, c-format
msgid ""
"\n"
@@ -2011,13 +2254,13 @@ msgstr ""
"رساÙØ©: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:936
#, c-format
msgid "%s is now offline."
msgstr "â%s غÙر Ù
تÙص٠اÙØ¢Ù."
#. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:952
#, c-format
msgid "%s is now online."
msgstr "â%s Ù
تÙص٠اÙØ¢Ù."
@@ -2133,91 +2376,96 @@ msgstr "ÙÙ٠اÙÙ
ÙÙات"
msgid "Remove completed, canceled and failed file transfers from the list"
msgstr "أز٠اÙÙ
ÙÙات اÙÙ
رسÙØ© اÙÙاÙ
ÙØ© ÙاÙÙ
ÙغÙØ© ÙاÙت٠ÙØ´Ùت Ù
٠اÙÙائÙ
Ø©"
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"ÙÙ
ÙÙعثر عÙ٠أ٠Øساب ÙاستÙرادÙ. Ø¥Ù
بث٠ÙدعÙ
استÙراد اÙØسابات Ù
٠بدج٠ÙÙØ·."
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "استÙرد اÙØسابات"
+
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "استÙرد"
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "برÙتÙÙÙÙ"
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "اÙÙ
صدر"
-#: ../src/empathy-import-dialog.c:392
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"ÙÙ
ÙÙعثر عÙ٠أ٠Øساب ÙاستÙرادÙ. Ø¥Ù
بث٠ÙدعÙ
استÙراد اÙØسابات Ù
٠بدج٠ÙÙØ·."
-
-#: ../src/empathy-import-dialog.ui.h:1
-msgid "Import Accounts"
-msgstr "استÙرد اÙØسابات"
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
+msgid "%s account"
+msgstr "Øساب %s"
-#: ../src/empathy-main-window.c:402
+#: ../src/empathy-main-window.c:399
msgid "_Edit account"
msgstr "_ØرÙر اÙØساب"
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:502
msgid "No error specified"
msgstr "ÙÙ
ÙØدد أ٠خطأ"
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:505
msgid "Network error"
msgstr "خطأ شبÙÙ"
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:508
msgid "Authentication failed"
msgstr "Ùش٠اÙتØÙÙ"
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:511
msgid "Encryption error"
msgstr "خطأ Ù٠اÙتعÙ
ÙØ©"
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:514
msgid "Name in use"
msgstr "اÙاسÙ
Ù
ستخدÙ
Ù
سبÙا"
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:517
msgid "Certificate not provided"
msgstr "اÙØ´Ùادة غÙر Ù
تÙÙرة"
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:520
msgid "Certificate untrusted"
msgstr "اÙØ´Ùادة غÙر Ù
ÙØ«Ù٠بÙا"
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:523
msgid "Certificate expired"
msgstr "اÙتÙت صÙاØÙØ© اÙØ´Ùادة"
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:526
msgid "Certificate not activated"
msgstr "اÙØ´Ùادة غÙر Ùشطة"
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:529
msgid "Certificate hostname mismatch"
msgstr "عدÙ
تطاب٠اÙØ´Ùادة Ù
ع اسÙ
اÙخادÙÙ
"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:532
msgid "Certificate fingerprint mismatch"
msgstr "عدÙ
تطاب٠اÙØ´Ùادة Ù
ع اÙتÙÙÙع"
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:535
msgid "Certificate self-signed"
msgstr "Ø´Ùادة Ù
ÙÙعة ذاتÙا"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:538
msgid "Certificate error"
msgstr "خطأ Ù٠اÙØ´Ùادة"
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:541
msgid "Unknown error"
msgstr "خطأ Ù
جÙÙÙ"
-#: ../src/empathy-main-window.c:1293
+#: ../src/empathy-main-window.c:1288
msgid "Show and edit accounts"
msgstr "اعرض Ù _ØرÙر اÙØسابات"
@@ -2297,15 +2545,15 @@ msgstr "اÙÙ
Øادثات اÙ_سابÙØ©"
msgid "_Room"
msgstr "_غرÙØ©"
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:328
msgid "Chat Room"
msgstr "غرÙØ© دردشة"
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:344
msgid "Members"
msgstr "اÙأعضاء"
-#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:494
#, c-format
msgctxt ""
"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2321,21 +2569,16 @@ msgstr ""
"Ù
Ø·ÙÙب ÙÙÙ
ة سر: %s\n"
"اÙأعضاء: %s"
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "ÙعÙ
"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
msgid "No"
msgstr "Ùا"
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:524
msgid "Could not start room listing"
msgstr "تعذÙر بدء سرد اÙغرÙ"
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:534
msgid "Could not stop room listing"
msgstr "تعذÙر Ø¥ÙÙا٠سرد اÙغرÙ"
@@ -2483,14 +2726,13 @@ msgid "Privacy"
msgstr "اÙخصÙصÙØ©"
#: ../src/empathy-preferences.ui.h:21
-#, fuzzy
msgid ""
"Reduced location accuracy means that nothing more precise than your city, "
"state and country will be published. GPS coordinates will be accurate to 1 "
"decimal place."
msgstr ""
-"دÙØ© اÙÙ
Ùا٠اÙÙ
ÙØ®Ùضة تعÙ٠أ٠Ùا Ø´ÙØ¡ أد٠Ù
٠اÙÙ
دÙÙØ© ÙاÙÙÙاÙØ© ÙاÙبÙد سÙÙÙشر. "
-"ستÙضا٠ÙÙÙ
Ø© عشÙائÙØ© Ø¥Ù٠إØداثÙات ÙظاÙ
تØدÙد اÙÙ
ÙاÙع (±0.25°)."
+"دÙØ© اÙÙ
Ùا٠اÙÙ
ÙØ®Ùضة تعÙ٠أ٠Ùا Ø´ÙØ¡ أد٠Ù
٠اÙÙ
دÙÙØ© ÙاÙÙ
ØاÙظة ÙاÙدÙÙØ© سÙÙÙشر. "
+"Ø¥ØداثÙات ÙظاÙ
تØدÙد اÙÙ
ÙاÙع ستÙÙ٠بدÙØ© خاÙØ© عشرÙØ© ÙاØدة. "
#: ../src/empathy-preferences.ui.h:22
msgid "Show _smileys as images"
@@ -2546,89 +2788,109 @@ msgstr "اÙØاÙØ©"
msgid "_Quit"
msgstr "Ø£_ÙÙ"
-#: ../src/empathy-tube-dispatch.c:375
+#: ../src/empathy-tube-dispatch.c:376
#, c-format
msgid "Unable to start application for service %s: %s"
msgstr "تعذÙر بدأ اÙتطبÙÙ ÙÙخدÙ
Ø© %s: %s"
-#: ../src/empathy-tube-dispatch.c:446
+#: ../src/empathy-tube-dispatch.c:447
#, c-format
msgid ""
"An invitation was offered for service %s, but you don't have the needed "
"application to handle it"
msgstr "عرضت دعÙØ© ÙخدÙ
Ø© %sØ ÙÙÙÙÙ Ùا تÙ
Ù٠اÙبرÙاÙ
ج اÙÙ
Ø·ÙÙب ÙÙتعاÙ
Ù Ù
عÙا."
-#: ../src/empathy-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr "gtk-leave-fullscreen"
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
msgstr "Ù
Ø´Ùد خرÙطة اÙÙ
تراسÙÙÙÙ"
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
msgid "Error"
msgstr "خطأ"
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
msgid "Critical"
msgstr "ØرÙج"
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
msgid "Warning"
msgstr "تØØ°Ùر"
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
+#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1111
msgid "Message"
msgstr "رساÙØ©"
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
msgid "Info"
msgstr "Ù
عÙÙÙ
ات"
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
msgid "Debug"
msgstr "تÙÙÙØ"
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-window.c:841
msgid "Save"
msgstr "اØÙظ"
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-window.c:944
msgid "Debug Window"
msgstr "ÙاÙذة اÙتÙÙÙØ"
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-window.c:1019
msgid "Pause"
msgstr "Ø£ÙبÙØ«"
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-window.c:1031
msgid "Level "
msgstr "اÙÙ
ستÙÙ"
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1100
msgid "Time"
msgstr "اÙÙÙت"
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1102
msgid "Domain"
msgstr "اÙÙطاÙ"
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-window.c:1104
msgid "Category"
msgstr "اÙÙئة"
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-window.c:1106
msgid "Level"
msgstr "اÙÙ
ستÙÙ"
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-window.c:1138
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr "Ù
دÙر اÙاتصاÙات اÙÙ
ختار Ùا ÙدعÙ
اÙ
تداد اÙتÙÙÙØ Ø¹Ù Ø¨Ø¹Ø¯."
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Add Account"
+#~ msgstr "أض٠Øسابا"
+
+#~ msgid "Gmail"
+#~ msgstr "جÙÙ
ÙÙ"
+
+#~ msgid "Import Accounts..."
+#~ msgstr "استÙرد اÙØسابات..."
+
+#~ msgid "Settings"
+#~ msgstr "اÙإعدادات"
+
+#~ msgid "Type:"
+#~ msgstr "اÙÙÙع:"
+
+#~ msgid "gtk-leave-fullscreen"
+#~ msgstr "gtk-leave-fullscreen"
+
#~ msgid "Empathy Instant Messenger"
#~ msgstr "اÙÙ
رسا٠إÙ
باثÙ"
@@ -2696,9 +2958,6 @@ msgstr "Ù
دÙر اÙاتصاÙات اÙÙ
ختار Ùا ÙدعÙ
اÙ
تداد ا
#~ msgid "New Account "
#~ msgstr "Øساب جدÙد "
-#~ msgid "I already have an account I want to use"
-#~ msgstr "Ùد٠Øساب باÙÙع٠ÙأرÙد استخداÙ
Ù"
-
#~ msgid "New message from %s"
#~ msgstr "رساÙØ© جدÙدة Ù
Ù %s"
@@ -2708,9 +2967,6 @@ msgstr "Ù
دÙر اÙاتصاÙات اÙÙ
ختار Ùا ÙدعÙ
اÙ
تداد ا
#~ msgid "Invite"
#~ msgstr "ادعÙ"
-#~ msgid "Select who would you like to invite:"
-#~ msgstr "اختر Ù
٠ترÙد دعÙتÙ:"
-
#~ msgid "You have been invited to join a chat conference."
#~ msgstr "ÙÙد دÙعÙت ÙÙاÙضÙ
اÙ
Ø¥Ù٠اجتÙ
اع دردشة. "
diff --git a/po/be.po b/po/be.po
index d8b936f1..fc0002cf 100644
--- a/po/be.po
+++ b/po/be.po
@@ -9,8 +9,8 @@ msgstr ""
"Project-Id-Version: Empathy\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2009-08-27 15:09+0000\n"
-"PO-Revision-Date: 2009-08-28 00:07+0300\n"
+"POT-Creation-Date: 2009-08-28 12:11+0000\n"
+"PO-Revision-Date: 2009-08-29 04:11+0300\n"
"Last-Translator: Alexander Nyakhaychyk \n"
"Language-Team: Belarusian \n"
"MIME-Version: 1.0\n"
@@ -21,12 +21,19 @@ msgstr ""
"X-Poedit-Bookmarks: -1,-1,104,-1,-1,-1,-1,-1,-1,-1\n"
#: ../data/empathy.desktop.in.in.h:1
-#| msgid "Empathy Call"
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
msgstr "Empathy IM-клÑенÑ"
-#: ../data/empathy.desktop.in.in.h:2
-#| msgid "Send and receive instant messages"
+#: ../data/empathy.desktop.in.in.h:3
+#| msgid "Client:"
+msgid "IM Client"
+msgstr "IM клÑенÑ"
+
+#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
msgstr "ÐдÑÑлаÑÑ Ñ Ð°ÑÑÑмлÑваÑÑ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑнÑ"
@@ -58,7 +65,6 @@ msgid "Compact contact list"
msgstr "СÑÑÑÑÐ»Ñ ÑÑпÑÑ ÐºÐ°Ð½ÑакÑаÑ"
#: ../data/empathy.schemas.in.h:6
-#| msgid "NetworkManager should be used"
msgid "Connection managers should be used"
msgstr "ÐÑÑÑÑÑ Ð²ÑкаÑÑÑÑоÑваÑÑа кÑÑаÑнÑк далÑÑÑнÑнÑÑ"
@@ -300,9 +306,6 @@ msgstr ""
"ÑазмовÑ."
#: ../data/empathy.schemas.in.h:62
-#| msgid ""
-#| "Whether or not the network manager should be used to automatically "
-#| "disconnect/reconnect."
msgid ""
"Whether or not connectivity managers should be used to automatically "
"disconnect/reconnect."
@@ -509,12 +512,10 @@ msgid "Offline"
msgstr "ÐдлÑÑанÑ"
#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
-#| msgid "People nearby"
msgid "People Nearby"
msgstr "ÐÑÐ´Ð·Ñ Ð¿Ð¾Ð±Ð°Ñ"
#: ../libempathy/empathy-utils.c:384
-#| msgid "Use _Yahoo Japan"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
@@ -958,7 +959,6 @@ msgstr "%s адлÑÑанÑ"
#.
#: ../libempathy-gtk/empathy-chat.c:1198
#, c-format
-#| msgid "%s was kicked by %s"
msgid "%1$s was kicked by %2$s"
msgstr "%1$s бÑÑ Ð²ÑкÑнÑÑÑ %2$s"
@@ -972,7 +972,6 @@ msgstr "%s бÑÑ Ð²ÑкÑнÑÑÑ"
#.
#: ../libempathy-gtk/empathy-chat.c:1209
#, c-format
-#| msgid "%s was banned by %s"
msgid "%1$s was banned by %2$s"
msgstr "%1$s бÑз заблÑÐºÐ°Ð²Ð°Ð½Ñ %2$s"
@@ -1752,7 +1751,6 @@ msgid "Show the accounts dialog"
msgstr "ÐаказваÑÑ Ð´ÑÑлÑÐ³Ñ ÑаÑ
ÑнкаÑ"
#: ../src/empathy.c:608
-#| msgid "%s - Empathy Call"
msgid "- Empathy IM Client"
msgstr "- Empathy - IM клÑенÑ"
@@ -1797,42 +1795,43 @@ msgstr "ÐлÑÐµÐ½Ñ Ð°Ð±Ð¼ÐµÐ½Ñ Ð¿Ð°Ð²ÐµÐ´Ð°Ð¼Ð»ÐµÐ½ÑнÑÐ¼Ñ Ð´Ð»Ñ GNOME"
msgid "translator-credits"
msgstr "insomnia "
-#. translators: this is followed by the "while ..." strings some lines
-#. * down this file.
-#.
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error "
-msgstr "УзÑнÑкла памÑлка"
+#: ../src/empathy-account-assistant.c:118
+#| msgid "while importing the accounts."
+msgid "There has been an error while importing the accounts."
+msgstr "УзÑнÑкла памÑлка Ñ ÑÐ°Ñ ÑмпаÑÑÑ ÑаÑ
ÑнкаÑ."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:125
-msgid "while importing the accounts."
-msgstr "Ñ ÑÐ°Ñ ÑмпаÑÑÑ ÑаÑ
ÑнкаÑ."
+#: ../src/empathy-account-assistant.c:121
+#| msgid "while parsing the account details."
+msgid "There has been an error while parsing the account details."
+msgstr "УзÑнÑкла памÑлка Ñ ÑÐ°Ñ ÑазбоÑÑ Ð´ÑÑалÑÑ ÑаÑ
ÑнкÑ."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:129
-msgid "while parsing the account details."
-msgstr "Ñ ÑÐ°Ñ ÑазбоÑÑ Ð´ÑÑалÑÑ ÑаÑ
ÑнкÑ."
+#: ../src/empathy-account-assistant.c:124
+#| msgid "while creating the account."
+msgid "There has been an error while creating the account."
+msgstr "УзÑнÑкла памÑлка Ñ ÑÐ°Ñ ÑÑваÑÑнÑÐ½Ñ ÑаÑ
Ñнка."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:133
-msgid "while creating the account."
-msgstr "Ñ ÑÐ°Ñ ÑÑваÑÑнÑÐ½Ñ ÑаÑ
Ñнка."
+#: ../src/empathy-account-assistant.c:126
+#| msgid "There has been an error "
+msgid "There has been an error."
+msgstr "УзÑнÑкла памÑлка."
-#: ../src/empathy-account-assistant.c:151
+#: ../src/empathy-account-assistant.c:141
#, c-format
msgid "The error message was: %s "
msgstr "ТÑкÑÑ Ð¿Ð°Ð¼ÑлкÑ: %s "
-#: ../src/empathy-account-assistant.c:159
+#: ../src/empathy-account-assistant.c:149
+#| msgid ""
+#| "You can either go back and try to enter your accounts' details again or "
+#| "quit this wizard and add accounts later from the Edit menu."
msgid ""
"You can either go back and try to enter your accounts' details again or quit "
-"this wizard and add accounts later from the Edit menu."
+"this assistant and add accounts later from the Edit menu."
msgstr ""
"ÐÑ Ð¼Ð¾Ð¶Ð°Ñе алÑбо вÑÑнÑÑÑа назад Ñ ÑвеÑÑÑÑ Ð´ÑÑÐ°Ð»Ñ Ð²Ð°ÑаÑ
а ÑаÑ
ÑÐ½ÐºÑ Ð½Ð°Ð½Ð¾Ð²Ð°, алÑбо "
"вÑйÑÑÑÑ Ð· гÑÑага майÑÑÑÑ Ñ Ð´Ð°Ð´Ð°ÑÑ ÑаÑ
ÑÐ½ÐºÑ Ð¿Ð°Ð·Ñней (пÑаз мÑÐ½Ñ Ð ÑдагаванÑне)."
-#: ../src/empathy-account-assistant.c:194
+#: ../src/empathy-account-assistant.c:184
msgid "An error occurred"
msgstr "УзÑнÑкла памÑлка"
@@ -1842,40 +1841,37 @@ msgstr "УзÑнÑкла памÑлка"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:330
+#: ../src/empathy-account-assistant.c:320
#: ../src/empathy-accounts-dialog.c:1197
#, c-format
msgid "New %s account"
msgstr "ÐÐ¾Ð²Ñ ÑаÑ
Ñнак %s"
-#: ../src/empathy-account-assistant.c:397
+#: ../src/empathy-account-assistant.c:387
msgid "What kind of chat account do you have?"
msgstr "РаÑ
Ñнак Ñкога ÑÑÐ¿Ñ Ð²Ñ Ð¼Ð°ÐµÑе?"
-#: ../src/empathy-account-assistant.c:403
-#| msgid "I already have an account I want to use"
+#: ../src/empathy-account-assistant.c:393
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Ð¦Ñ Ð¼Ð°ÐµÑе ÑнÑÑÑ ÑаÑ
ÑнкÑ, ÑкÑÑ Ð± Ð¶Ð°Ð´Ð°Ð»Ñ Ð½Ð°Ð»Ð°Ð´Ð·ÑÑÑ?"
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:399
msgid "Enter your account details"
msgstr "УвÑдзÑÑе дÑÑÐ°Ð»Ñ Ð²Ð°Ñага ÑаÑ
ÑнкÑ"
-#: ../src/empathy-account-assistant.c:414
-#| msgid "%s is calling you, do you want to answer?"
+#: ../src/empathy-account-assistant.c:404
msgid "What kind of chat account do you want to create?"
msgstr "РаÑ
Ñнак Ñкога ÑÑÐ¿Ñ Ð²Ñ Ð¶Ð°Ð´Ð°ÐµÑе ÑÑваÑÑÑÑ?"
-#: ../src/empathy-account-assistant.c:420
-#| msgid "Do you really want to remove the contact '%s'?"
+#: ../src/empathy-account-assistant.c:410
msgid "Do you want to create other chat accounts?"
msgstr "Ð¦Ñ Ð¶Ð°Ð´Ð°ÐµÑе ÑÑваÑÑÑÑ ÑнÑÑÑ ÑаÑ
ÑнкÑ?"
-#: ../src/empathy-account-assistant.c:427
+#: ../src/empathy-account-assistant.c:417
msgid "Enter the details for the new account"
msgstr "УвÑдзÑÑе дÑÑÐ°Ð»Ñ Ð²Ð°Ñага новага ÑаÑ
ÑнкÑ"
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:503
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -1887,54 +1883,50 @@ msgstr ""
"Live Ñ ÑнÑÑÐ¼Ñ Ð¿ÑагÑамамÑ. РмÑкÑаÑонам Ñ ÐºÐ°Ð¼ÑÑай Ð²Ñ Ð¼Ð¾Ð¶Ð°Ñе ÑабÑÑÑ Ð°ÑдÑÑ Ñ "
"вÑдÑа вÑклÑкÑ."
-#: ../src/empathy-account-assistant.c:530
+#: ../src/empathy-account-assistant.c:520
msgid "Do you have an account you've been using with another chat program?"
msgstr "Ð¦Ñ Ð¼Ð°ÐµÑе ÑаÑ
Ñнак, ÑÐºÑ Ð²ÑкаÑÑÑÑоÑвае ÑнÑÐ°Ñ Ð¿ÑагÑама?"
-#: ../src/empathy-account-assistant.c:553
+#: ../src/empathy-account-assistant.c:543
msgid "Yes, import my account details from "
msgstr "Так, зÑабÑÑе ÑмпаÑÑ Ð¼Ð°ÑÑ
наладак з "
-#: ../src/empathy-account-assistant.c:574
+#: ../src/empathy-account-assistant.c:564
msgid "Yes, I'll enter my account details now"
msgstr "Так, Ñ Ð·Ð°Ð´Ð°Ð¼ мае Ð½Ð°Ð»Ð°Ð´ÐºÑ Ð·Ð°Ñаз"
-#: ../src/empathy-account-assistant.c:596
-#| msgid "_Create a new account"
+#: ../src/empathy-account-assistant.c:586
msgid "No, I want a new account"
msgstr "Ðе, мне паÑÑÑÐ±Ð½Ñ Ð½Ð¾Ð²Ñ ÑаÑ
Ñнак"
-#: ../src/empathy-account-assistant.c:606
+#: ../src/empathy-account-assistant.c:596
msgid "No, I just want to see people online nearby for now"
msgstr "Ðе, ÑолÑÐºÑ Ð¶Ð°Ð´Ð°Ñ Ð±Ð°ÑÑÑÑ Ð»Ñдзей вакол мÑне"
-#: ../src/empathy-account-assistant.c:627
-#| msgid "Select who would you like to invite:"
+#: ../src/empathy-account-assistant.c:617
msgid "Select the accounts you want to import:"
msgstr "ÐÑлÑÑÑÑÑе ÑаÑ
ÑнкÑ, ÑкÑÑ Ð¶Ð°Ð´Ð°ÐµÑе ÑмпаÑÑаваÑÑ:"
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:704
#: ../src/empathy-new-chatroom-dialog.c:496
#: ../src/empathy-new-chatroom-dialog.c:497
msgid "Yes"
msgstr "Так"
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:711
msgid "No, that's all for now"
msgstr "Ðе, покÑÐ»Ñ Ð³ÑÑа ÑÑÑ"
-#: ../src/empathy-account-assistant.c:914
+#: ../src/empathy-account-assistant.c:904
msgid "Welcome to Empathy"
msgstr "ÐÑÑаем Ñ Empathy"
-#: ../src/empathy-account-assistant.c:923
-#| msgid "_Reuse an existing account"
+#: ../src/empathy-account-assistant.c:913
msgid "Import your existing accounts"
msgstr "ÐмпаÑÑ ÑÑнÑÑ
ÑаÑ
ÑнкаÑ"
#: ../src/empathy-accounts-dialog.c:206
#, c-format
-#| msgid "%s of %s"
msgid "%s on %s"
msgstr "%s на %s"
@@ -1942,12 +1934,10 @@ msgstr "%s на %s"
#. * string will be something like: "Jabber Account"
#: ../src/empathy-accounts-dialog.c:217
#, c-format
-#| msgid "Account"
msgid "%s Account"
msgstr "%s ÑаÑ
Ñнак"
#: ../src/empathy-accounts-dialog.c:221
-#| msgid "New %s account"
msgid "New account"
msgstr "ÐÐ¾Ð²Ñ ÑаÑ
Ñнак"
@@ -2010,7 +2000,6 @@ msgid "_Reuse an existing account"
msgstr "_УжÑÑÑ ÑÑÐ½Ñ ÑаÑ
Ñнак"
#: ../src/empathy-accounts-dialog.ui.h:9
-#| msgid "Account"
msgid "account"
msgstr "ÑаÑ
Ñнак"
@@ -2142,7 +2131,6 @@ msgid "_Detach Tab"
msgstr "_ÐдлÑÑÑÑÑ ÑкладкÑ"
#: ../src/empathy-chat-window.ui.h:11
-#| msgid "_Invite to chatroom"
msgid "_Favorite Chatroom"
msgstr "Ул_ÑбÑÐ½Ñ Ð¿Ð°ÐºÐ¾Ð¹"
@@ -2410,7 +2398,6 @@ msgstr "ÐÑÑнÑÑа"
#: ../src/empathy-import-mc4-accounts.c:106
#, c-format
-#| msgid "New %s account"
msgid "%s account"
msgstr "%s ÑаÑ
Ñнак"
@@ -2735,10 +2722,6 @@ msgid "Privacy"
msgstr "ÐдаÑобленаÑÑÑÑ"
#: ../src/empathy-preferences.ui.h:21
-#| 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°)."
msgid ""
"Reduced location accuracy means that nothing more precise than your city, "
"state and country will be published. GPS coordinates will be accurate to 1 "
diff --git a/po/de.po b/po/de.po
index 44076d90..108d3ca1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,9 +14,9 @@ msgstr ""
"Project-Id-Version: Gossip\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2009-08-18 20:22+0000\n"
-"PO-Revision-Date: 2009-08-19 00:31+0200\n"
-"Last-Translator: Christian Kirbach \n"
+"POT-Creation-Date: 2009-08-28 17:02+0000\n"
+"PO-Revision-Date: 2009-08-30 14:11+0100\n"
+"Last-Translator: Mario Blättermann \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,10 +24,18 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
msgstr "Empathy Sofortnachrichtenprogramm"
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
+msgid "IM Client"
+msgstr "Sofortnachrichten-Client"
+
+#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
msgstr "Sofortnachrichten senden und empfangen"
@@ -59,236 +67,242 @@ msgid "Compact contact list"
msgstr "Kompakte Kontaktliste"
#: ../data/empathy.schemas.in.h:6
+msgid "Connection managers should be used"
+msgstr "Verbindungsverwaltung verwenden"
+
+#: ../data/empathy.schemas.in.h:7
msgid "Contact list sort criterium"
msgstr "Kontaktlisten-Sortierkriterium"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/empathy.schemas.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "Vorgabeordner zum Auswählen eines Benutzerbildes"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:9
msgid "Disable popup notifications when away"
msgstr "Einblendende Benachrichtigungen bei Abwesenheit deaktivieren"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:10
msgid "Disable sounds when away"
msgstr "Klänge bei Abwesenheit deaktivieren"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:11
msgid "Empathy can publish the user's location"
msgstr "Empathy darf die Position des Benutzers veröffentlichen"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:12
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy darf das GPS verwenden, um die Position zu schätzen"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:13
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy darf das Mobilfunknetz verwenden, um die Position zu schätzen"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:14
msgid "Empathy can use the network to guess the location"
msgstr "Empathy darf das Netzwerk verwenden, um die Position zu ermitteln"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:15
msgid "Empathy default download folder"
msgstr "Empathy-Vorgabeordner für das Herunterladen"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:16
msgid "Empathy has asked about importing accounts"
msgstr "Empathy hat nach dem Importieren von Benutzerkonten gefragt"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:17
msgid "Empathy should auto-connect on startup"
msgstr "Automatisch beim Start verbinden"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:18
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy soll die Genauigkeit der Ortsangabe verringern"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
"Legt fest, ob Empathy das Benutzerbild des Kontaktes als Symbol des Chat-"
"Fensters verwenden soll"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
msgid "Enable WebKit Developer Tools"
msgstr "WebKit-Entwicklerwerkzeuge aktivieren"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
msgid "Enable popup notifications for new messages"
msgstr "Einblendende Benachrichtigungen für neue Nachrichten aktivieren"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
msgid "Enable spell checker"
msgstr "Rechtschreibprüfung aktivieren"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
msgid "Hide main window"
msgstr "Hauptfenster verstecken"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Hide the main window."
msgstr "Das Hauptfenster verstecken."
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr "NetworkManager verwenden"
-
#: ../data/empathy.schemas.in.h:25
+msgid "MC 4 accounts have been imported"
+msgstr "MC-4-Konten wurden importiert"
+
+#: ../data/empathy.schemas.in.h:26
+msgid "MC 4 accounts have been imported."
+msgstr "MC-4-Konten wurden importiert."
+
+#: ../data/empathy.schemas.in.h:27
msgid "Nick completed character"
msgstr "Zeichen nach der Spitznamen-Vervollständigung"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:28
msgid "Open new chats in separate windows"
msgstr "Neue Chats in eigenen Fenstern öffnen"
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:29
msgid "Path of the adium theme to use"
msgstr "Pfad zum zu verwendenden Adium-Thema"
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:30
msgid "Path of the adium theme to use if the theme used for chat is adium."
msgstr "Pfad zum zu verwendenden Adium-Thema, wenn das Thema »adium« ist."
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
msgstr "Bei einkommender Nachricht Klang abspielen"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:32
msgid "Play a sound for new conversations"
msgstr "Bei neuen Unterhaltungen Klang abspielen"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for outgoing messages"
msgstr "Bei ausgehender Nachricht Klang abspielen"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound when a contact logs in"
msgstr "Bei Anmelden eines Kontaktes Klang abspielen"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound when a contact logs out"
msgstr "Bei Abmelden eines Kontaktes Klang abspielen"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when we log in"
msgstr "Bei eigenem Anmelden Klang abspielen"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when we log out"
msgstr "Bei eigenem Abmelden Klang abspielen"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:38
msgid "Popup notifications if the chat isn't focused"
msgstr "Benachrichtigungen einblenden, wenn der Chat nicht fokussiert ist"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:39
msgid "Popup notifications when a contact sign in"
msgstr "Benachrichtigungen einblenden, wenn sich ein Kontakt anmeldet"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:40
msgid "Popup notifications when a contact sign out"
msgstr "Benachrichtigungen einblenden, wenn sich ein Kontakt abmeldet"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:41
msgid "Salut account is created"
msgstr "Salut-Konto wird erzeugt"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Benutzerbilder anzeigen"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:43
msgid "Show contact list in rooms"
msgstr "Kontaktliste in Chaträumen anzeigen"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:44
msgid "Show hint about closing the main window"
msgstr "Hinweis über das SchlieÃen des Hauptfensters anzeigen"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:45
msgid "Show offline contacts"
msgstr "Abgemeldete Kontakte anzeigen"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Rechtschreibprüfungssprachen"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "Der vorgegebene Ordner zum Speichern der Dateiübertragungen"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "Der letzte Ordner, aus welchem ein Benutzerbild gewählt wurde."
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
"Das Erscheinungsbild, das für das Anzeigen von Unterhaltungen in Chat-"
"Fenstern verwendet wird."
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "Grafische Emoticons verwenden"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "Benachrichtigen mit Klängen"
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "Erscheinungsbild für Chaträume verwenden"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:53
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Legt fest, ob die WebKit-Entwicklerwerkzeuge, wie der Web Inspector, "
"aktiviert werden sollen."
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:54
msgid "Whether or not Empathy can publish the user's location to his contacts."
msgstr ""
"Legt fest, ob Empathy die Position des Benutzers zu seinen Kontakten "
"übermitteln darf."
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr ""
-"Legt fest, ob Empathy das GPS nutzen darf, um die Position zu schätzen."
+msgstr "Legt fest, ob Empathy das GPS nutzen darf, um die Position zu schätzen."
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
msgid ""
"Whether or not Empathy can use the cellular network to guess the location."
msgstr ""
"Legt fest, ob Empathy das Mobilfunknetz nutzen darf, um die Position zu "
"schätzen."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
msgid "Whether or not Empathy can use the network to guess the location."
msgstr ""
"Legt fest, ob Empathy das Netzwerk nutzen darf, um die Position zu schätzen."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
+"Whether or not Empathy has asked about importing accounts from other programs."
msgstr ""
"Legt fest, ob Empathy danach gefragt hat, Benutzerkonten aus anderen "
"Programmen zu importieren."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether or not Empathy should automatically log in to your accounts on "
"startup."
msgstr ""
-"Legt fest, ob Empathy sich automatisch beim Start bei allen Ihren "
-"vorhandenen Konten anmelden soll."
+"Legt fest, ob Empathy sich automatisch beim Start bei allen Ihren vorhandenen "
+"Konten anmelden soll."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether or not Empathy should reduce the location's accuracy for privacy "
"reasons."
@@ -296,7 +310,7 @@ msgstr ""
"Legt fest, ob Empathy die Genauigkeit der Positionsangabe aus "
"Datenschutzgründen reduzieren soll."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether or not Empathy should use the avatar of the contact as the chat "
"window icon."
@@ -304,113 +318,111 @@ msgstr ""
"Legt fest, ob Empathy das Benutzerbild des Kontaktes als Symbol des Chat-"
"Fensters verwenden soll."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:62
msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
+"Whether or not connectivity managers should be used to automatically "
+"disconnect/reconnect."
msgstr ""
-"Legt fest, ob ein Salut-Konto beim ersten Start von Empathy erzeugt wurde."
+"Legt fest, ob Verbindungsverwaltungen für das automatische Verbinden und "
+"Trennen verwendet werden sollen."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:63
msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
+"Whether or not the Salut account has been created on the first Empathy run."
msgstr ""
-"Legt fest, ob der Netzwerk-Manager für das automatische Verbinden und "
-"Trennen der Verbindung verwendet werden soll."
+"Legt fest, ob ein Salut-Konto beim ersten Start von Empathy erzeugt wurde."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether or not to check words typed against the languages you want to check "
"with."
msgstr ""
"Legt fest, ob für eingegebene Wörter die Rechtschreibung geprüft werden soll."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether or not to convert smileys into graphical images in conversations."
msgstr ""
"Legt fest, ob bei Unterhaltungen Emoticons in grafische Bilder umgewandelt "
"werden sollen."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether or not to play a sound to notify for contacts logging in the network."
msgstr ""
"Legt fest, ob ein Klang abgespielt werden soll, um auf das Anmelden von "
"Kontakten am Netzwerk hinzuweisen."
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether or not to play a sound to notify for contacts logging off the network."
msgstr ""
"Legt fest, ob ein Klang abgespielt werden soll, um auf das Abmelden von "
"Kontakten vom Netzwerk hinzuweisen."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
msgid "Whether or not to play a sound to notify for events."
msgstr "Legt fest, ob bei Ereignissen Klänge abgespielt werden sollen."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
msgid "Whether or not to play a sound to notify for incoming messages."
msgstr ""
"Legt fest, ob bei eingehenden Nachrichten ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
msgid "Whether or not to play a sound to notify for new conversations."
msgstr "Legt fest, ob bei neuen Gesprächen ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
msgid "Whether or not to play a sound to notify for outgoing messages."
msgstr ""
"Legt fest, ob bei ausgehenden Nachrichten ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
msgid "Whether or not to play a sound when logging in a network."
msgstr ""
"Legt fest, ob beim Anmelden ans Netzwerk ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
msgid "Whether or not to play a sound when logging off a network."
msgstr ""
"Legt fest, ob beim Abmelden vom Netzwerk ein Klang abgespielt werden soll."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
msgid "Whether or not to play sound notifications when away or busy."
msgstr ""
"Legt fest, ob bei Abwesenheit oder Beschäftigung Klänge abgespielt werden "
"sollen."
-#: ../data/empathy.schemas.in.h:73
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#: ../data/empathy.schemas.in.h:75
+msgid "Whether or not to show a popup notification when a contact goes offline."
msgstr ""
"Legt fest, ob beim Abmelden eines Kontakts eingeblendete Benachrichtigungen "
"erscheinen sollen."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
msgid "Whether or not to show a popup notification when a contact goes online."
msgstr ""
"Legt fest, ob beim Anmelden eines Kontakts eingeblendete Benachrichtigungen "
"erscheinen sollen."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether or not to show a popup notification when receiving a new message even "
+"if the chat is already opened, but not focused."
msgstr ""
"Legt fest, ob eine eingeblendete Benachrichtigung beim Empfang einer neuen "
"Nachricht auch dann angezeigt werden soll, wenn der Chat bereits geöffnet, "
"aber nicht fokussiert ist."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether or not to show a popup notification when receiving a new message."
msgstr ""
"Legt fest, ob beim Empfang einer neuen Nachricht eine eingeblendete "
"Benachrichtigung erscheinen soll."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
msgid ""
"Whether or not to show avatars for contacts in the contact list and chat "
"windows."
@@ -418,21 +430,21 @@ msgstr ""
"Legt fest, ob Benutzerbilder für Kontakte in der Kontaktliste und den Chat-"
"Fenstern angezeigt werden sollen."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
msgid "Whether or not to show contacts that are offline in the contact list."
msgstr "Abgemeldete Kontakte in der Kontaktliste anzeigen."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
msgid "Whether or not to show popup notifications when away or busy."
msgstr ""
"Legt fest, ob bei Abwesenheit oder Beschäftigung eingeblendete "
"Benachrichtigungen erscheinen sollen."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
msgid "Whether or not to show the contact list in chat rooms."
msgstr "Legt fest, ob die Kontaktliste in Chaträumen angezeigt werden soll."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
msgid ""
"Whether or not to show the message dialog about closing the main window with "
"the 'x' button in the title bar."
@@ -440,99 +452,115 @@ msgstr ""
"Legt fest, ob der Dialog über das SchlieÃen des Hauptfensters durch den »x«-"
"Knopf in der Titelleiste angezeigt werden soll."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:84
msgid "Whether to show the contact list in compact mode or not."
msgstr "Legt fest, ob die Kontaktliste im Kompaktmodus angezeigt werden soll."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms or not."
msgstr "Legt fest, ob das Thema für Chaträume verwendet werden soll."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
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."
+"by the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
msgstr ""
"Legt fest, welches Kriterium für das Sortieren der Kontaktliste verwendet "
"werden soll. StandardmäÃig wird bei »name« nach den Namen der Kontakte "
"sortiert, bei »state« wird die Kontaktliste nach dem Status der Kontakte "
"sortiert."
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-account.c:1144
+msgid "Can't set an empty display name"
+msgstr "Leerer Anzeigename kann nicht festgelegt werden"
+
+#: ../libempathy/empathy-ft-handler.c:839
msgid "The hash of the received file and the sent one do not match"
msgstr ""
"Die Hash-Werte der empfangenen und der verschickten Datei stimmen nicht "
"überein"
-#: ../libempathy/empathy-ft-handler.c:1098
+#: ../libempathy/empathy-ft-handler.c:1099
msgid "File transfer not supported by remote contact"
msgstr "Dateiübertragungen werden vom Gegenüber nicht unterstützt"
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1157
msgid "The selected file is not a regular file"
msgstr "Die ausgewählte Datei ist keine normale Datei"
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1166
msgid "The selected file is empty"
msgstr "Die ausgewählte Datei ist leer"
-#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
msgid "People nearby"
msgstr "Personen in der Nähe"
-#: ../libempathy/empathy-tp-file.c:279
+#: ../libempathy/empathy-tp-file.c:280
msgid "Socket type not supported"
msgstr "Socket-Typ nicht unterstützt"
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:399
msgid "No reason was specified"
msgstr "Kein Grund wurde angegeben"
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:402
msgid "The change in state was requested"
-msgstr "Der Zustandswechsel des Zustands wurde angefordert"
+msgstr "Der Wechsel des Zustands wurde angefordert"
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:405
msgid "You canceled the file transfer"
msgstr "Sie haben die Dateiübertragung abgebrochen"
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:408
msgid "The other participant canceled the file transfer"
msgstr "Der andere Teilnehmer hat die Dateiübertragung abgebrochen"
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:411
msgid "Error while trying to transfer the file"
msgstr "Fehler beim Versuch, die Datei zu übertragen"
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:414
msgid "The other participant is unable to transfer the file"
msgstr "Der andere Teilnehmer kann die Datei nicht übertragen"
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:417
msgid "Unknown reason"
msgstr "Unbekannter Grund"
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:235
msgid "Available"
msgstr "Verfügbar"
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:237
msgid "Busy"
msgstr "Beschäftigt"
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:240
msgid "Away"
msgstr "Abwesend"
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:242
msgid "Hidden"
msgstr "Versteckt"
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:244
msgid "Offline"
msgstr "Abgemeldet"
+#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
+msgid "People Nearby"
+msgstr "Personen in der Nähe"
+
+#: ../libempathy/empathy-utils.c:384
+msgid "Yahoo! Japan"
+msgstr "Yahoo! Japan"
+
+#: ../libempathy/empathy-utils.c:385
+msgid "Facebook Chat"
+msgstr "Facebook-Chat"
+
#: ../libempathy/empathy-time.c:137
#, c-format
msgid "%d second ago"
@@ -579,77 +607,118 @@ msgstr[1] "Vor %d Monaten"
msgid "in the future"
msgstr "in der Zukunft"
-#: ../libempathy-gtk/empathy-account-chooser.c:426
+#: ../libempathy-gtk/empathy-account-chooser.c:424
msgid "All"
msgstr "Alle"
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:440
+#: ../libempathy-gtk/empathy-account-widget.c:496
#, c-format
msgid "%s:"
msgstr "%s:"
+#: ../libempathy-gtk/empathy-account-widget.c:1239
+msgid "Enabled"
+msgstr "Aktiviert"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "Example: MyScreenName "
+msgstr "Beispiel: MeinAOLName "
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
msgid "Advanced"
msgstr "Fortgeschritten"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "Pass_wort:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
msgid "Screen _Name:"
msgstr "Anzeige_name:"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr "Wie lautet Ihr AIM-Passwort?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr "Wie lautet Ihr AIM AOL-Name?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
msgstr "P_ort:"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Server:"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Example: username "
+msgstr "Beispiel: Benutzername "
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "Anmelde-I_D:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "Wie lautet Ihr GroupWise-Benutzername?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "Wie lautet Ihr GroupWise-Passwort?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "Example: 123456789 "
+msgstr "Beispiel: 123456789 "
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
+msgstr "ICQ-_UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "What is your ICQ UIN?"
+msgstr "Wie lautet Ihre ICQ-UIN?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr "Wie lautet Ihr ICQ-Passwort?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "_Charset:"
msgstr "_Zeichensatz:"
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "Neues Netzwerk"
@@ -679,91 +748,143 @@ msgstr "Verlassen-Nachricht:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Real name:"
-msgstr "Realname:"
+msgstr "Echter Name:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Servers"
msgstr "Server"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "Example: user@jabber.org "
+msgstr "Beispiel: benutzer@jabber.org "
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
msgid "Override server settings"
msgstr "Server-Einstellungen überschreiben"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "Pri_ority:"
msgstr "P_riorität:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Reso_urce:"
msgstr "_Ressource:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
msgid "Use old SS_L"
msgstr "Alte SS_L-Verschlüsselung verwenden"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "What is your Jabber ID?"
+msgstr "Wie lautet Ihre Jabber-Kennung?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Jabber password?"
+msgstr "Wie lautet Ihr Jabber-Passwort?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your desired Jabber ID?"
+msgstr "Wie lautet Ihre gewünschte Jabber-Kennung?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid "What is your desired Jabber password?"
+msgstr "Wie lautet Ihr gewünschtes Jabber-Passwort?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid "_Encryption required (TLS/SSL)"
msgstr "_Verschlüsselung erforderlich (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid "_Ignore SSL certificate errors"
msgstr "SSL-Zertifikat-_Fehler ignorieren"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "Example: user@hotmail.com "
+msgstr "Beispiel: user@hotmail.com "
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live password?"
+msgstr "Wie lautet Ihr Windows Live-Passwort?"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live user name?"
+msgstr "Wie lautet Ihr Windows Live-Benutzername?"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
msgid "_Email:"
msgstr "_E-Mail:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
msgstr "_Vorname:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_Jabber ID:"
msgstr "_Jabber-Kennung:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Last Name:"
msgstr "_Nachname:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Nickname:"
msgstr "Spit_zname:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "_Veröffentlichter Name:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "Example: user@my.sip.server "
+msgstr "Beispiel: benutzer@my.sip.server "
+
#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
msgid "Discover STUN"
msgstr "STUN entdecken"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "STUN Server:"
msgstr "STUN-Server:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "STUN port:"
msgstr "STUN-Port:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "What is your SIP account password?"
+msgstr "Wie lautet Ihr SIP-Passwort?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "What is your SIP login ID?"
+msgstr "Wie lautet Ihre SIP-Anmeldekennung?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "_Username:"
msgstr "Benutzer_name:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "Use _Yahoo Japan"
msgstr "_Yahoo Japan verwenden"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr "Wie lautet Ihre Yahoo!-ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "What is your Yahoo! password?"
+msgstr "Wie lautet Ihr Yahoo!-Passwort?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "Yahoo I_D:"
msgstr "Yahoo-I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Ignore conference and chatroom invitations"
msgstr "_Konferenz- und Chatraumeinladungen ignorieren"
# CHECK
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "Standorteinstellungen für _Raumliste:"
@@ -798,95 +919,100 @@ msgstr "Zum VergröÃern klicken"
#: ../libempathy-gtk/empathy-chat.c:186
msgid "Failed to reconnect this chat"
-msgstr ""
-"Verbindung für diese Unterhaltung konnte nicht wiederaufgenommen werden"
+msgstr "Verbindung für diese Unterhaltung konnte nicht wiederaufgenommen werden"
-#: ../libempathy-gtk/empathy-chat.c:412
+#: ../libempathy-gtk/empathy-chat.c:403
msgid "Unsupported command"
msgstr "Nicht unterstützter Befehl"
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:535
msgid "offline"
msgstr "Abgemeldet"
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:538
msgid "invalid contact"
msgstr "Ungültiger Kontakt"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:541
msgid "permission denied"
msgstr "Erlaubnis verweigert"
-#: ../libempathy-gtk/empathy-chat.c:557
+#: ../libempathy-gtk/empathy-chat.c:544
msgid "too long message"
msgstr "Zu lange Nachricht"
-#: ../libempathy-gtk/empathy-chat.c:560
+#: ../libempathy-gtk/empathy-chat.c:547
msgid "not implemented"
msgstr "Nicht implementiert"
-#: ../libempathy-gtk/empathy-chat.c:563
+#: ../libempathy-gtk/empathy-chat.c:550
msgid "unknown"
msgstr "Unbekannt"
-#: ../libempathy-gtk/empathy-chat.c:567
+#: ../libempathy-gtk/empathy-chat.c:554
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Fehler beim Senden der Nachricht »%s«: %s"
-#: ../libempathy-gtk/empathy-chat.c:597
+#: ../libempathy-gtk/empathy-chat.c:584
#, c-format
msgid "Topic set to: %s"
msgstr "Thema wurde gesetzt auf: %s"
-#: ../libempathy-gtk/empathy-chat.c:599
+#: ../libempathy-gtk/empathy-chat.c:586
msgid "No topic defined"
msgstr "Kein Thema gesetzt"
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:956
msgid "(No Suggestions)"
msgstr "(Keine Vorschläge)"
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1010
msgid "Insert Smiley"
msgstr "Emoticon einfügen"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1041
-#: ../libempathy-gtk/empathy-ui-utils.c:1483
+#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-ui-utils.c:1484
msgid "_Send"
msgstr "_Senden"
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1062
msgid "_Spelling Suggestions"
msgstr "Vor_schläge zur Rechtschreibung"
-#: ../libempathy-gtk/empathy-chat.c:1190
+#: ../libempathy-gtk/empathy-chat.c:1177
#, c-format
msgid "%s has disconnected"
msgstr "%s hat sich abgemeldet"
-#: ../libempathy-gtk/empathy-chat.c:1194
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1184
#, c-format
-msgid "%s was kicked by %s"
-msgstr "%s wurde von %s rausgeworfen"
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s wurde von %2$s rausgeworfen"
-#: ../libempathy-gtk/empathy-chat.c:1197
+#: ../libempathy-gtk/empathy-chat.c:1187
#, c-format
msgid "%s was kicked"
msgstr "%s wurde rausgeworfen"
-#: ../libempathy-gtk/empathy-chat.c:1202
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1195
#, c-format
-msgid "%s was banned by %s"
-msgstr "%s wurde von %s verbannt"
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s wurde von %2$s verbannt"
-#: ../libempathy-gtk/empathy-chat.c:1205
+#: ../libempathy-gtk/empathy-chat.c:1198
#, c-format
msgid "%s was banned"
msgstr "%s wurde verbannt"
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:1202
#, c-format
msgid "%s has left the room"
msgstr "%s hat den Raum verlassen"
@@ -896,42 +1022,42 @@ msgstr "%s hat den Raum verlassen"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1218
+#: ../libempathy-gtk/empathy-chat.c:1211
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1241
+#: ../libempathy-gtk/empathy-chat.c:1234
#, c-format
msgid "%s has joined the room"
msgstr "%s hat den Raum betreten"
-#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
msgid "Disconnected"
msgstr "Getrennt"
-#: ../libempathy-gtk/empathy-chat.c:1809
+#: ../libempathy-gtk/empathy-chat.c:1803
msgid "Connected"
msgstr "Verbunden"
-#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-chat.c:1853
#: ../libempathy-gtk/empathy-log-window.c:502
msgid "Conversation"
msgstr "Unterhaltung"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
msgid "Topic:"
msgstr "Thema:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-theme-adium.c:276
msgid "_Copy Link Address"
msgstr "Link-Adresse _kopieren"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-theme-adium.c:284
msgid "_Open Link"
msgstr "Link _öffnen"
@@ -941,16 +1067,16 @@ msgstr "Link _öffnen"
msgid "%A %B %d %Y"
msgstr "%A, %d. %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:177
+#: ../libempathy-gtk/empathy-contact-dialogs.c:236
msgid "Edit Contact Information"
msgstr "Kontaktinformationen bearbeiten"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
msgid "Personal Information"
msgstr "Persönliche Informationen"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
msgid "New Contact"
msgstr "Neuer Kontakt"
@@ -1052,7 +1178,7 @@ msgid "Select"
msgstr "Wählen"
#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1023
+#: ../src/empathy-main-window.c:1019
msgid "Group"
msgstr "Gruppe"
@@ -1066,7 +1192,7 @@ msgstr "Land:"
#: ../libempathy-gtk/empathy-contact-widget.c:1264
msgid "State:"
-msgstr "Bundesland:"
+msgstr "Bundesland/Kanton:"
#: ../libempathy-gtk/empathy-contact-widget.c:1266
msgid "City:"
@@ -1192,7 +1318,7 @@ msgid "Client:"
msgstr "Client:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
+#: ../src/empathy-main-window.c:1002
msgid "Contact"
msgstr "Kontakt"
@@ -1245,24 +1371,24 @@ msgstr "Webseite:"
msgid "_Add Group"
msgstr "Gruppe _hinzufügen"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
msgid "new server"
msgstr "neuer Server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
msgid "SSL"
msgstr "SSL"
#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Konto"
@@ -1296,7 +1422,7 @@ msgstr "C_hat"
#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
msgid "Contact ID:"
-msgstr "Kontakt-ID:"
+msgstr "Kontakt-Kennung:"
#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
msgid "New Conversation"
@@ -1308,44 +1434,44 @@ msgstr "Neue Unterhaltung"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-#: ../libempathy-gtk/empathy-presence-chooser.c:208
+#: ../libempathy-gtk/empathy-presence-chooser.c:176
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
msgid "Custom Message..."
msgstr "Benutzerdefinierte Nachricht â¦"
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#: ../libempathy-gtk/empathy-presence-chooser.c:229
+#: ../libempathy-gtk/empathy-presence-chooser.c:231
msgid "Edit Custom Messages..."
msgstr "Benutzerdefinierte Nachrichten bearbeitenâ¦"
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:330
msgid "Click to remove this status as a favorite"
msgstr "Klicken, um den Status als Favorit zu entfernen"
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:339
msgid "Click to make this status a favorite"
msgstr "Klicken, um den Status zu einem Favoriten zu machen"
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:373
msgid "Set status"
msgstr "Status setzen"
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:794
msgid "Set your presence and current status"
msgstr "Ihren gegenwärtigen Anwesenheitsstatus setzen"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+#: ../libempathy-gtk/empathy-presence-chooser.c:1043
msgid "Custom messages..."
msgstr "Benutzerdefinierte Nachrichten â¦"
#: ../libempathy-gtk/empathy-sound.c:51
msgid "Received an instant message"
-msgstr "Eine Sofortnachrichten empfangen"
+msgstr "Eine Sofortnachricht empfangen"
#: ../libempathy-gtk/empathy-sound.c:53
msgid "Sent an instant message"
-msgstr "Eine Sofortnachrichten gesendet"
+msgstr "Eine Sofortnachricht wurde gesendet"
#: ../libempathy-gtk/empathy-sound.c:55
msgid "Incoming chat request"
@@ -1395,14 +1521,6 @@ msgstr "_Neue Voreinstellung hinzufügen"
msgid "Saved Presets"
msgstr "Gespeicherte Voreinstellungen"
-#: ../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 "Klassisch"
@@ -1419,15 +1537,15 @@ msgstr "Sauber"
msgid "Blue"
msgstr "Blau"
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
+#: ../libempathy-gtk/empathy-ui-utils.c:1386
msgid "Unable to open URI"
msgstr "Adresse konnte nicht geöffnet werden"
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
+#: ../libempathy-gtk/empathy-ui-utils.c:1476
msgid "Select a file"
msgstr "Eine Datei auswählen"
-#: ../libempathy-gtk/empathy-ui-utils.c:1535
+#: ../libempathy-gtk/empathy-ui-utils.c:1536
msgid "Select a destination"
msgstr "Ein Ziel auswählen"
@@ -1619,7 +1737,7 @@ msgid "Megaphone"
msgstr "Megafon"
#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:518
msgid "Talk!"
msgstr "Sprich!"
@@ -1637,11 +1755,11 @@ msgstr "_Information"
msgid "_Preferences"
msgstr "_Einstellungen"
-#: ../megaphone/src/megaphone-applet.c:168
+#: ../megaphone/src/megaphone-applet.c:166
msgid "Please configure a contact."
msgstr "Bitte konfigurieren Sie einen Kontakt."
-#: ../megaphone/src/megaphone-applet.c:258
+#: ../megaphone/src/megaphone-applet.c:256
msgid "Select contact..."
msgstr "Kontakt auswählen â¦"
@@ -1650,23 +1768,23 @@ msgid "Presence"
msgstr "Anwesenheit"
#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
+#: ../nothere/src/nothere-applet.c:105
msgid "Set your own presence"
msgstr "Setzen Sie Ihre Anwesenheit"
-#: ../src/empathy.c:567
+#: ../src/empathy.c:588
msgid "Don't connect on startup"
msgstr "Nicht automatisch beim Start verbinden"
-#: ../src/empathy.c:571
+#: ../src/empathy.c:592
msgid "Don't show the contact list on startup"
msgstr "Kontaktliste nicht automatisch beim Start anzeigen"
-#: ../src/empathy.c:575
+#: ../src/empathy.c:596
msgid "Show the accounts dialog"
msgstr "Konten-Dialog anzeigen"
-#: ../src/empathy.c:587
+#: ../src/empathy.c:608
msgid "- Empathy IM Client"
msgstr "- Empathy Sofortnachrichtenprogramm"
@@ -1679,15 +1797,14 @@ msgid ""
msgstr ""
"Empathy ist freie Software, Sie können sie weitergeben und/oder verändern "
"solange Sie sich an die Regeln der GNU General Public License halten, so wie "
-"sie von der Free Software Foundation festgelegt wurden; entweder in Version "
-"2 der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz."
+"sie von der Free Software Foundation festgelegt wurden; entweder in Version 2 "
+"der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz."
#: ../src/empathy-about-dialog.c: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."
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR "
+"A PARTICULAR PURPOSE. See the GNU General Public License for more details."
msgstr ""
"Empathy wurde mit dem Ziel veröffentlicht, dass Sie es nützlich finden, "
"jedoch OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie der "
@@ -1708,7 +1825,7 @@ msgstr ""
#: ../src/empathy-about-dialog.c:119
msgid "An Instant Messaging client for GNOME"
-msgstr "Ein Instant-Messaging-Programm für GNOME"
+msgstr "Ein Sofortnachrichten-Programm für GNOME"
#: ../src/empathy-about-dialog.c:125
msgid "translator-credits"
@@ -1717,23 +1834,150 @@ msgstr ""
"Frank Arnold\n"
"Andre Klapper\n"
"Mario Blättermann\n"
-"Michael Kanis"
+"Michael Kanis\n"
+"Christian Kirbach"
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "Aktiviert"
+#: ../src/empathy-account-assistant.c:118
+msgid "There has been an error while importing the accounts."
+msgstr "Es ist ein Fehler beim Importieren der Konten aufgetreten."
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "Konten"
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error while parsing the account details."
+msgstr "Es ist ein Fehler beim Analysieren der Kontodetails aufgetreten."
+#: ../src/empathy-account-assistant.c:124
+msgid "There has been an error while creating the account."
+msgstr "Es ist ein Fehler beim Anlegen des Kontos aufgetreten."
+
+#: ../src/empathy-account-assistant.c:126
+msgid "There has been an error."
+msgstr "Es ist ein Fehler aufgetreten."
+
+#: ../src/empathy-account-assistant.c:141
+#, c-format
+msgid "The error message was: %s "
+msgstr "Die Fehlermeldung war: %s "
+
+#: ../src/empathy-account-assistant.c:149
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"Sie können zurück gehen und die Kontodetails erneut eingeben oder diesen "
+"Assistenten beenden und später über das »Bearbeiten»-Menü Konten hinzufügen."
+
+#: ../src/empathy-account-assistant.c:184
+msgid "An error occurred"
+msgstr "Ein Fehler ist aufgetreten"
+
+#. Create account
#. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:320 ../src/empathy-accounts-dialog.c:1172
#, c-format
msgid "New %s account"
msgstr "Neues %s-Konto"
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-account-assistant.c:386
+msgid "What kind of chat account do you have?"
+msgstr "Welche Art Chat-Konto haben Sie?"
+
+#: ../src/empathy-account-assistant.c:392
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "Haben Sie weitere Chat-Konten, die Sie einrichten wollen?"
+
+#: ../src/empathy-account-assistant.c:398
+msgid "Enter your account details"
+msgstr "Geben Sie Ihre Kontodetails ein"
+
+#: ../src/empathy-account-assistant.c:403
+msgid "What kind of chat account do you want to create?"
+msgstr "Welche Art von Chat-Konto wollen Sie anlegen?"
+
+#: ../src/empathy-account-assistant.c:409
+msgid "Do you want to create other chat accounts?"
+msgstr "Möchten Sie weitere Chat-Konten anlegen?"
+
+#: ../src/empathy-account-assistant.c:416
+msgid "Enter the details for the new account"
+msgstr "Geben Sie die Details für das neue Konto ein"
+
+#: ../src/empathy-account-assistant.c:502
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"Mit Empathy können Sie mit Personen in der Nähe plaudern, sowie mit Freunden "
+"und Kollegen, die Google Talk, AIM, Windows Live und viele andere Chat-"
+"Programme verwenden. Mit einem Mikrofon oder einer Webcam können Sie auch "
+"Audio- bzw. Videoanrufe tätigen."
+
+#: ../src/empathy-account-assistant.c:519
+msgid "Do you have an account you've been using with another chat program?"
+msgstr ""
+"Haben Sie ein Konto, das Sie zuvor mit einem anderen Chat-Programm verwendet "
+"haben?"
+
+#: ../src/empathy-account-assistant.c:542
+msgid "Yes, import my account details from "
+msgstr "Ja, meine Kontodetails importieren von "
+
+#: ../src/empathy-account-assistant.c:563
+msgid "Yes, I'll enter my account details now"
+msgstr "Ja, ich möchte jetzt meine Kontodetails eingeben"
+
+#: ../src/empathy-account-assistant.c:585
+msgid "No, I want a new account"
+msgstr "Nein, ich möchte ein neues Konto"
+
+#: ../src/empathy-account-assistant.c:595
+msgid "No, I just want to see people online nearby for now"
+msgstr "Nein, ich möchte nur Personen in der Nähe sehen"
+
+#: ../src/empathy-account-assistant.c:616
+msgid "Select the accounts you want to import:"
+msgstr "Wählen Sie die zu importierenden Konten:"
+
+#: ../src/empathy-account-assistant.c:703
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-account-assistant.c:710
+msgid "No, that's all for now"
+msgstr "Nein, das ist alles"
+
+#: ../src/empathy-account-assistant.c:903
+msgid "Welcome to Empathy"
+msgstr "Willkommen bei Empathy"
+
+#: ../src/empathy-account-assistant.c:912
+msgid "Import your existing accounts"
+msgstr "Bestehende Konten importieren"
+
+#: ../src/empathy-accounts-dialog.c:206
+#, c-format
+msgid "%s on %s"
+msgstr "%s auf %s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../src/empathy-accounts-dialog.c:217
+#, c-format
+msgid "%s Account"
+msgstr "%s-Konto"
+
+#: ../src/empathy-accounts-dialog.c:221
+msgid "New account"
+msgstr "Neues Konto"
+
+#: ../src/empathy-accounts-dialog.c:649
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1742,68 +1986,60 @@ msgstr ""
"Sie sind dabei, Ihr %s-Konto zu entfernen!\n"
"Möchten Sie fortfahren?"
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:655
msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
+"Any associated conversations and chat rooms will NOT be removed if you decide "
+"to proceed.\n"
"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
+"Should you decide to add the account back at a later time, they will still be "
+"available."
msgstr ""
-"Jegliche zugehörigen Unterhaltungen und Chaträume werden NICHT entfernt, "
-"wenn Sie fortfahren.\n"
+"Jegliche zugehörigen Unterhaltungen und Chaträume werden NICHT entfernt, wenn "
+"Sie fortfahren.\n"
"\n"
"Falls Sie sich dazu entschlieÃen, das Konto später wieder hinzuzufügen, "
"werden diese weiterhin verfügbar sein."
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "Konten"
+
#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "Konto hnzufügen"
+msgid "Add new"
+msgstr "Neu hinzufügen"
#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Cr_eate"
msgstr "Er_stellen"
#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "Benutzerkonten importieren â¦"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol installed"
msgstr "Kein Protokoll installiert"
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr ""
-"Um ein neues Konto hinzuzufügen müssen Sie zunächst das für das Protokoll "
+"Um ein neues Konto hinzuzufügen, müssen Sie zunächst das für das Protokoll "
"benötigte Backend installieren."
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "Type:"
-msgstr "Typ:"
-
-#: ../src/empathy-accounts-dialog.ui.h:10
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Add..."
msgstr "_Hinzufügen â¦"
-#: ../src/empathy-accounts-dialog.ui.h:11
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Create a new account"
msgstr "Ein _neues Konto anlegen"
-#: ../src/empathy-accounts-dialog.ui.h:12
+#: ../src/empathy-accounts-dialog.ui.h:8
msgid "_Reuse an existing account"
msgstr "Ein _existierendes Konto verwenden"
+#: ../src/empathy-accounts-dialog.ui.h:9
+msgid "account"
+msgstr "Konto"
+
#: ../src/empathy-call-window.c:426
msgid "Contrast"
msgstr "Kontrast"
@@ -1884,14 +2120,14 @@ msgstr "An_rufen"
#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
msgid "_View"
-msgstr "_Ansehen"
+msgstr "_Ansicht"
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:343
#, c-format
msgid "Conversations (%d)"
msgstr "Unterhaltungen (%d)"
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:475
msgid "Typing a message."
msgstr "Schreibt eine Nachricht."
@@ -1971,78 +2207,77 @@ msgstr "Auto-Verbinden"
msgid "Manage Favorite Rooms"
msgstr "Raumfavoriten verwalten"
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:322
msgid "Incoming call"
msgstr "Eingehender Anruf"
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:325
#, c-format
msgid "%s is calling you, do you want to answer?"
msgstr "%s ruft Sie an, möchten Sie den Anruf annehmen?"
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:332
msgid "_Reject"
msgstr "A_bweisen"
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:338
msgid "_Answer"
msgstr "_Annehmen"
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:453
#, c-format
msgid "Incoming call from %s"
msgstr "Eingehender Anruf von %s"
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:497
#, c-format
msgid "%s is offering you an invitation"
msgstr "%s bietet Ihnen eine Einladung an"
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:503
msgid "An external application will be started to handle it."
msgstr ""
"Eine externe Anwendung wird gestartet, um dieses zu bearbeiten/anzunehmen."
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:508
msgid "You don't have the needed external application to handle it."
msgstr ""
-"Sie besitzen die benötigte externe Anwendung nicht, um diesess zu bearbeiten/"
+"Sie besitzen die benötigte externe Anwendung nicht, um dieses zu bearbeiten/"
"anzunehmen."
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:635
msgid "Room invitation"
msgstr "Raumeinladung"
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:638
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s lädt Sie ein, %s beizutreten"
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:646
msgid "_Decline"
msgstr "A_blehnen"
-#: ../src/empathy-event-manager.c:650
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:651 ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Beitreten"
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:690
#, c-format
msgid "%s invited you to join %s"
msgstr "%s hat Sie eingeladen, %s beizutreten"
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:716
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Eingehende Dateiübertragung von %s"
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:896
#, c-format
msgid "Subscription requested by %s"
msgstr "Abonnement angefragt von %s"
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:900
#, c-format
msgid ""
"\n"
@@ -2052,13 +2287,13 @@ msgstr ""
"Nachricht: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:936
#, c-format
msgid "%s is now offline."
msgstr "%s hat sich abgemeldet."
#. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:952
#, c-format
msgid "%s is now online."
msgstr "%s hat sich angemeldet."
@@ -2176,92 +2411,97 @@ msgstr ""
"Abgeschlossene, abgebrochene und gescheiterte Dateiübertragungen aus der "
"Liste entfernen"
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur den "
+"Import von Benutzerkonten aus Pidgin."
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "Benutzerkonten importieren"
+
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "Import"
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "Protokoll"
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "Quelle"
-#: ../src/empathy-import-dialog.c:392
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur "
-"den Import von Benutzerkonten aus Pidgin."
-
-#: ../src/empathy-import-dialog.ui.h:1
-msgid "Import Accounts"
-msgstr "Benutzerkonten importieren"
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
+msgid "%s account"
+msgstr "%s-Konto"
-#: ../src/empathy-main-window.c:402
+#: ../src/empathy-main-window.c:399
msgid "_Edit account"
msgstr "_Konto bearbeiten"
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:502
msgid "No error specified"
msgstr "Kein Fehler angegeben"
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:505
msgid "Network error"
msgstr "Netzwerk-Fehler"
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:508
msgid "Authentication failed"
-msgstr "Authentifizierung fehlgeschlagen"
+msgstr "Legitimierung fehlgeschlagen"
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:511
msgid "Encryption error"
msgstr "Verschlüsselungsfehler"
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:514
msgid "Name in use"
msgstr "Name bereits in Benutzung"
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:517
msgid "Certificate not provided"
msgstr "Zertifikat wurde nicht bereitgestellt"
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:520
msgid "Certificate untrusted"
msgstr "Zertifikat nicht vertrauenswürdig"
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:523
msgid "Certificate expired"
msgstr "Zertifikat ausgelaufen"
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:526
msgid "Certificate not activated"
msgstr "Zertifikat nicht aktiviert"
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:529
msgid "Certificate hostname mismatch"
msgstr "Zertifikat und Hostname unterschiedlich"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:532
msgid "Certificate fingerprint mismatch"
msgstr "Zertifikat und Fingerprint unterschiedlich"
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:535
msgid "Certificate self-signed"
msgstr "Selbstsigniertes Zertifikat"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:538
msgid "Certificate error"
msgstr "Zertifikat-Fehler"
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:541
msgid "Unknown error"
msgstr "Unbekannter Fehler"
-#: ../src/empathy-main-window.c:1293
+#: ../src/empathy-main-window.c:1288
msgid "Show and edit accounts"
msgstr "Konten anzeigen und bearbeiten"
@@ -2341,15 +2581,15 @@ msgstr "_Vorherige Unterhaltungen"
msgid "_Room"
msgstr "_Raum"
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:328
msgid "Chat Room"
msgstr "Chatraum"
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:344
msgid "Members"
msgstr "Teilnehmer"
-#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:494
#, c-format
msgctxt ""
"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2365,21 +2605,16 @@ msgstr ""
"Passwort erforderlich: %s\n"
"Teilnehmer: %s"
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
msgid "No"
msgstr "Nein"
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:524
msgid "Could not start room listing"
msgstr "Raumauflistung konnte nicht begonnen werden"
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:534
msgid "Could not stop room listing"
msgstr "Raumauflistung konnte nicht angehalten werden"
@@ -2477,11 +2712,11 @@ msgstr "Chat-_Erscheinungsbild:"
#: ../src/empathy-preferences.ui.h:8
msgid "Disable notifications when _away or busy"
-msgstr "Klänge bei _Abwesenheit oder Beschäftigung aktivieren"
+msgstr "Benachrichtigungen bei _Abwesenheit oder Beschäftigung deaktivieren"
#: ../src/empathy-preferences.ui.h:9
msgid "Disable sounds when _away or busy"
-msgstr "Klänge bei _Abwesenheit oder Beschäftigung aktivieren"
+msgstr "Klänge bei _Abwesenheit oder Beschäftigung deaktivieren"
#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact comes online"
@@ -2493,7 +2728,7 @@ msgstr "Benachrichtigungen aktivieren, wenn sich ein Kontakt abmeldet"
#: ../src/empathy-preferences.ui.h:12
msgid "Enable notifications when the _chat is not focused"
-msgstr "Benachrichtigungen anzeigen, wenn der _Chat nicht fokussiert ist"
+msgstr "Benachrichtigungen aktivieren, wenn der _Chat nicht fokussiert ist"
#: ../src/empathy-preferences.ui.h:13
msgid "Enable spell checking for languages:"
@@ -2525,7 +2760,7 @@ msgstr "Einstellungen"
#: ../src/empathy-preferences.ui.h:20
msgid "Privacy"
-msgstr "Privatssphäre"
+msgstr "Privatsphäre"
#: ../src/empathy-preferences.ui.h:21
msgid ""
@@ -2534,7 +2769,7 @@ msgid ""
"decimal place."
msgstr ""
"Verringerte Positionsgenauigkeit bedeutet, dass keine präziseren Angaben als "
-"Ihre Stadt, Ihr Bundesland und Ihr Land übermittelt werden. GPS-Koordinaten "
+"Ihre Stadt, Ihr Bundesland und Ihr Land übermittelt werden. GPS-Koordinaten "
"werden auf eine Dezimalstelle genau sein."
#: ../src/empathy-preferences.ui.h:22
@@ -2567,11 +2802,11 @@ msgstr "Erscheinungsbilder"
#: ../src/empathy-preferences.ui.h:28
msgid "_Enable bubble notifications"
-msgstr "Einblendende Benachrichtigungen _aktivieren"
+msgstr "_Benachrichtigungsfenster aktivieren"
#: ../src/empathy-preferences.ui.h:29
msgid "_Enable sound notifications"
-msgstr "Klänge bei Abwesenheit _aktivieren"
+msgstr "Klänge _aktivieren"
#: ../src/empathy-preferences.ui.h:30
msgid "_Open new chats in separate windows"
@@ -2593,12 +2828,12 @@ msgstr "Status"
msgid "_Quit"
msgstr "_Beenden"
-#: ../src/empathy-tube-dispatch.c:375
+#: ../src/empathy-tube-dispatch.c:376
#, c-format
msgid "Unable to start application for service %s: %s"
msgstr "Anwendung für Dienst %s konnte nicht gestartet werden: %s"
-#: ../src/empathy-tube-dispatch.c:446
+#: ../src/empathy-tube-dispatch.c:447
#, c-format
msgid ""
"An invitation was offered for service %s, but you don't have the needed "
@@ -2607,79 +2842,99 @@ msgstr ""
"Ihnen wurde eine Einladung für den Dienst %s angeboten, aber Sie besitzen "
"nicht die benötigte externe Anwendung, um diese zu bearbeiten/anzunehmen."
-#: ../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 "Kartenansicht mit Kontakten"
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
msgid "Error"
msgstr "Fehler"
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
msgid "Critical"
msgstr "Kritisch"
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
msgid "Warning"
msgstr "Warnung"
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
+#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1111
msgid "Message"
msgstr "Nachricht"
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
msgid "Info"
msgstr "Info"
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
msgid "Debug"
msgstr "Fehlerdiagnose"
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-window.c:841
msgid "Save"
msgstr "Speichern"
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-window.c:944
msgid "Debug Window"
msgstr "Fehlerdiagnosefenster"
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-window.c:1019
msgid "Pause"
msgstr "Pause"
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-window.c:1031
msgid "Level "
msgstr "Stufe"
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1100
msgid "Time"
msgstr "Zeit"
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1102
msgid "Domain"
msgstr "Domäne"
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-window.c:1104
msgid "Category"
msgstr "Kategorie"
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-window.c:1106
msgid "Level"
msgstr "Stufe"
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-window.c:1138
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr ""
-"Der ausgewählte Verbindungs-Manager unterstützt die Erweiterung zur "
+"Die ausgewählte Verbindungsverwaltung unterstützt die Erweiterung zur "
"entfernten Fehlerdiagnose nicht."
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Add Account"
+#~ msgstr "Konto hnzufügen"
+
+#~ msgid "Gmail"
+#~ msgstr "Gmail"
+
+#~ msgid "Import Accounts..."
+#~ msgstr "Benutzerkonten importieren â¦"
+
+#~ msgid "Settings"
+#~ msgstr "Einstellungen"
+
+#~ msgid "Type:"
+#~ msgstr "Typ:"
+
+#~ msgid "gtk-leave-fullscreen"
+#~ msgstr "gtk-leave-fullscreen"
+
#~ msgid "Empathy Instant Messenger"
#~ msgstr "Empathy Sofortnachrichtendienst"
@@ -2746,9 +3001,6 @@ msgstr ""
#~ msgid "New Account "
#~ msgstr "Neues Konto "
-#~ msgid "I already have an account I want to use"
-#~ msgstr "Ich besitze bereits ein Konto, das ich verwenden möchte"
-
#~ msgid "New message from %s"
#~ msgstr "Neue Nachricht von %s"
@@ -2758,9 +3010,6 @@ msgstr ""
#~ msgid "Invite"
#~ msgstr "Einladen"
-#~ msgid "Select who would you like to invite:"
-#~ msgstr "Auswählen, wen Sie einladen möchten:"
-
#~ msgid "You have been invited to join a chat conference."
#~ msgstr "Sie wurden eingeladen, einer Chat-Konferenz beizutreten."
@@ -2771,8 +3020,7 @@ msgstr ""
#~ msgstr "Raum beim Start betreten"
#~ msgid "Join this chat room when Empathy starts and you are connected"
-#~ msgstr ""
-#~ "Beim Start von Empathy und einer Verbindung diesen Chatraum betreten"
+#~ msgstr "Beim Start von Empathy und einer Verbindung diesen Chatraum betreten"
#~ msgid "N_ame:"
#~ msgstr "_Name:"
@@ -2976,15 +3224,14 @@ msgstr ""
#~ "To add a new account, you can click on the 'Add' button and a new entry "
#~ "will be created for you to start configuring."
#~ msgstr ""
-#~ "Um ein neues Konto hinzuzufügen klicken Sie auf den »Hinzufügen«-Knopf. "
-#~ "Ein neuer Eintrag wird nun für Sie erstellt, der danach bearbeitet werden "
-#~ "kann."
+#~ "Um ein neues Konto hinzuzufügen klicken Sie auf den »Hinzufügen«-Knopf. Ein "
+#~ "neuer Eintrag wird nun für Sie erstellt, der danach bearbeitet werden kann."
#~ msgid ""
#~ "\n"
#~ "\n"
-#~ "If you do not want to add an account, simply click on the account you "
-#~ "want to configure in the list on the left."
+#~ "If you do not want to add an account, simply click on the account you want "
+#~ "to configure in the list on the left."
#~ msgstr ""
#~ "\n"
#~ "\n"
@@ -2998,19 +3245,16 @@ msgstr ""
#~ "To add a new account, you can click on the 'Add' button and a new entry "
#~ "will be created for you to started configuring.\n"
#~ "\n"
-#~ "If you do not want to add an account, simply click on the account you "
-#~ "want to configure in the list on the left."
+#~ "If you do not want to add an account, simply click on the account you want "
+#~ "to configure in the list on the left."
#~ msgstr ""
-#~ "Um ein neues Konto hinzuzufügen klicken Sie auf den »Hinzufügen«-Knopf. "
-#~ "Ein neuer Eintrag wird nun für Sie erstellt, der danach bearbeitet werden "
+#~ "Um ein neues Konto hinzuzufügen klicken Sie auf den »Hinzufügen«-Knopf. Ein "
+#~ "neuer Eintrag wird nun für Sie erstellt, der danach bearbeitet werden "
#~ "kann.\n"
#~ "\n"
#~ "Falls Sie kein neues Konto erstellen möchten klicken Sie einfach in der "
#~ "Liste links auf das Konto, welches Sie bearbeiten möchten."
-#~ msgid "jabber account settings"
-#~ msgstr "Jabber-Kontoeinstellungen"
-
#~ msgid "msn account settings"
#~ msgstr "MSN-Kontoeinstellungen"
diff --git a/po/es.po b/po/es.po
index a677494d..f9455ecf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: empathy.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2009-08-20 13:44+0000\n"
-"PO-Revision-Date: 2009-08-22 11:45+0200\n"
+"POT-Creation-Date: 2009-08-28 12:11+0000\n"
+"PO-Revision-Date: 2009-08-29 15:03+0200\n"
"Last-Translator: Jorge González \n"
"Language-Team: Español \n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,19 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
msgstr "Cliente de mensajerÃa instantánea Empathy"
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
+#| msgid "Client:"
+msgid "IM Client"
+msgstr "Cliente de mensajerÃa instantánea"
+
+#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
msgstr "EnvÃe y reciba mensajes instantáneos"
@@ -54,7 +63,6 @@ msgid "Compact contact list"
msgstr "Lista compacta de contactos"
#: ../data/empathy.schemas.in.h:6
-#| msgid "NetworkManager should be used"
msgid "Connection managers should be used"
msgstr "Se deberÃan usar gestores de conexión"
@@ -132,139 +140,147 @@ msgid "Hide the main window."
msgstr "Ocultar la ventana principal."
#: ../data/empathy.schemas.in.h:25
+msgid "MC 4 accounts have been imported"
+msgstr "Se han importado las cuentas MC 4"
+
+#: ../data/empathy.schemas.in.h:26
+msgid "MC 4 accounts have been imported."
+msgstr "Se han importado las cuentas MC 4."
+
+#: ../data/empathy.schemas.in.h:27
msgid "Nick completed character"
msgstr "Carácter de completado de apodo"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:28
msgid "Open new chats in separate windows"
msgstr "Abrir chats nuevos en ventanas separadas"
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:29
msgid "Path of the adium theme to use"
msgstr "Ruta del tema adium que usar"
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:30
msgid "Path of the adium theme to use if the theme used for chat is adium."
msgstr "Ruta al tema adium que usar si el tema usado para el chat es adium."
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
msgstr "Reproducir un sonido cuando lleguen mensajes"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:32
msgid "Play a sound for new conversations"
msgstr "Reproducir un sonido para conversaciones nuevas"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for outgoing messages"
msgstr "Reproducir un sonido al enviar mensajes"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound when a contact logs in"
msgstr "Reproducir un sonido cuando un contacto inicie sesión"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound when a contact logs out"
msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when we log in"
msgstr "Reproducir un sonido cuando inicio sesión"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when we log out"
msgstr "Reproducir un sonido cuando finalizo una sesión"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:38
msgid "Popup notifications if the chat isn't focused"
msgstr ""
"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:39
msgid "Popup notifications when a contact sign in"
msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta."
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:40
msgid "Popup notifications when a contact sign out"
msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta."
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:41
msgid "Salut account is created"
msgstr "Se creó la cuenta Salut"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "Mostrar avatares"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:43
msgid "Show contact list in rooms"
msgstr "Mostrar lista de contactos en salas"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:44
msgid "Show hint about closing the main window"
msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:45
msgid "Show offline contacts"
msgstr "Mostrar contactos no conectados"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "Idiomas para revisión ortográfica"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "Ãltimo directorio del que fue elegido un avatar."
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
"El tema que se usará para mostrar la conversación en las ventanas de chat."
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "Usar emoticonos gráficos"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "Usar sonidos de notificación"
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "Usar tema para salas de chat"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:53
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Indica si las herramientas de desarrollo de WebKit, tales como el Inspector "
"web, den activarse."
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:54
msgid "Whether or not Empathy can publish the user's location to his contacts."
msgstr ""
"Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
msgid "Whether or not Empathy can use the GPS to guess the location."
msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
msgid ""
"Whether or not Empathy can use the cellular network to guess the location."
msgstr ""
"Indica si Empathy puede usar la red telefónica móvil para deducir la "
"ubicación."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
msgid "Whether or not Empathy can use the network to guess the location."
msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
msgid ""
"Whether or not Empathy has asked about importing accounts from other "
"programs."
@@ -272,7 +288,7 @@ msgstr ""
"Indica si Empathy ha preguntado acerca de importar cuentas de otros "
"programas."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether or not Empathy should automatically log in to your accounts on "
"startup."
@@ -280,7 +296,7 @@ msgstr ""
"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al "
"inicio."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether or not Empathy should reduce the location's accuracy for privacy "
"reasons."
@@ -288,7 +304,7 @@ msgstr ""
"Indica si Empathy deberÃa reducir la precisión de la ubicación por motivos "
"de privacidad."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether or not Empathy should use the avatar of the contact as the chat "
"window icon."
@@ -296,10 +312,7 @@ msgstr ""
"Indica si Empathy deberÃa usar el avatar del contacto como el icono de la "
"ventana de chat."
-#: ../data/empathy.schemas.in.h:60
-#| msgid ""
-#| "Whether or not the network manager should be used to automatically "
-#| "disconnect/reconnect."
+#: ../data/empathy.schemas.in.h:62
msgid ""
"Whether or not connectivity managers should be used to automatically "
"disconnect/reconnect."
@@ -307,14 +320,14 @@ msgstr ""
"Indica si se debe usan usar gestores de conectividad para desconectarse/"
"reconectarse automáticamente."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:63
msgid ""
"Whether or not the Salut account has been created on the first Empathy run."
msgstr ""
"Indica si la cuenta Salut se ha creado cuando ejecutó por primera vez "
"Empathy."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether or not to check words typed against the languages you want to check "
"with."
@@ -322,21 +335,21 @@ msgstr ""
"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas "
"con los que quiere comprobarlo."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether or not to convert smileys into graphical images in conversations."
msgstr ""
"Indica si se deben convertir los emoticonos en imágenes gráficas en las "
"conversaciones."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether or not to play a sound to notify for contacts logging in the network."
msgstr ""
"Indica si se debe reproducir un sonido para notificar los inicios de sesión "
"de los contactos en la red."
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
msgid ""
"Whether or not to play a sound to notify for contacts logging off the "
"network."
@@ -344,52 +357,52 @@ msgstr ""
"Indica si se debe reproducir un sonido para notificar las finalizaciones de "
"sesión de los contactos en la red."
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
msgid "Whether or not to play a sound to notify for events."
msgstr "Indica si se debe reproducir un sonido para notificar eventos."
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
msgid "Whether or not to play a sound to notify for incoming messages."
msgstr ""
"Indica si se debe reproducir un sonido para notificar mensajes entrantes."
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
msgid "Whether or not to play a sound to notify for new conversations."
msgstr ""
"Indica si se debe reproducir un sonido para notificar conversaciones nuevas."
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
msgid "Whether or not to play a sound to notify for outgoing messages."
msgstr ""
"Indica si se debe reproducir un sonido para notificar mensajes salientes."
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
msgid "Whether or not to play a sound when logging in a network."
msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red."
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
msgid "Whether or not to play a sound when logging off a network."
msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red."
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
msgid "Whether or not to play sound notifications when away or busy."
msgstr ""
"Indica si se deben reproducir sonidos de notificaciones cuando se esté "
"ausente u ocupado."
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
msgid ""
"Whether or not to show a popup notification when a contact goes offline."
msgstr ""
"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
"se desconecta."
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
msgid "Whether or not to show a popup notification when a contact goes online."
msgstr ""
"Indica si se deben mostrar las notificaciones emergentes cuando se conecta."
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
msgid ""
"Whether or not to show a popup notification when receiving a new message "
"even if the chat is already opened, but not focused."
@@ -397,14 +410,14 @@ msgstr ""
"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje "
"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco."
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether or not to show a popup notification when receiving a new message."
msgstr ""
"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje "
"nuevo."
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
msgid ""
"Whether or not to show avatars for contacts in the contact list and chat "
"windows."
@@ -412,23 +425,23 @@ msgstr ""
"Indica si se debe mostrar los avatares para los contactos en la lista de "
"contactos y ventanas de chat."
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
msgid "Whether or not to show contacts that are offline in the contact list."
msgstr ""
"Indica si se debe mostrar los contactos que están desconectados en la lista "
"de contactos."
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
msgid "Whether or not to show popup notifications when away or busy."
msgstr ""
"Indica si se deben mostrar las notificaciones emergentes cuando se esté "
"ausente u ocupado."
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
msgid "Whether or not to show the contact list in chat rooms."
msgstr "Indica si se debe mostrar la lista de contactos en salas de chat."
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
msgid ""
"Whether or not to show the message dialog about closing the main window with "
"the 'x' button in the title bar."
@@ -436,15 +449,15 @@ msgstr ""
"Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana "
"principal con el botón 'x' en la barra de tÃtulo."
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:84
msgid "Whether to show the contact list in compact mode or not."
msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms or not."
msgstr "Indica si se debe usar el tema para salas de chat."
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
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 "
@@ -454,78 +467,96 @@ msgstr ""
"predeterminado es ordenar por el nombre del contacto con el valor \"name"
"\" (nombre). Un valor \"state\" (estado) ordenará la lista por el estado."
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-account.c:1144
+msgid "Can't set an empty display name"
+msgstr "No se puede establecer ningún nombre para mostrar"
+
+#: ../libempathy/empathy-ft-handler.c:839
msgid "The hash of the received file and the sent one do not match"
msgstr "El «hash» del archivo recibido y del enviado no coinciden"
-#: ../libempathy/empathy-ft-handler.c:1098
+#: ../libempathy/empathy-ft-handler.c:1099
msgid "File transfer not supported by remote contact"
msgstr "El contacto remoto no soporta la transferencia de archivos"
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1157
msgid "The selected file is not a regular file"
msgstr "El archivo seleccionado no es un archivo regular"
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1166
msgid "The selected file is empty"
msgstr "El archivo seleccionado está vacÃo"
-#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:290
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
msgid "People nearby"
msgstr "Gente cerca"
-#: ../libempathy/empathy-tp-file.c:279
+#: ../libempathy/empathy-tp-file.c:280
msgid "Socket type not supported"
msgstr "El tipo de socket no está soportado"
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:399
msgid "No reason was specified"
msgstr "No se especificó ninguna razón"
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:402
msgid "The change in state was requested"
msgstr "Se requirió un cambio en el estado"
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:405
msgid "You canceled the file transfer"
msgstr "Canceló la transferencia del archivo"
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:408
msgid "The other participant canceled the file transfer"
msgstr "El otro participante canceló la transferencia del archivo"
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:411
msgid "Error while trying to transfer the file"
msgstr "Error la intentar transferir el archivo"
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:414
msgid "The other participant is unable to transfer the file"
msgstr "El otro participante no puede transferir el archivo"
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:417
msgid "Unknown reason"
msgstr "Razón desconocida"
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:235
msgid "Available"
msgstr "Disponible"
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:237
msgid "Busy"
msgstr "Ocupado"
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:240
msgid "Away"
msgstr "Ausente"
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:242
msgid "Hidden"
msgstr "Oculto"
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:244
msgid "Offline"
msgstr "Desconectado"
+#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
+#| msgid "People nearby"
+msgid "People Nearby"
+msgstr "Gente cerca"
+
+#: ../libempathy/empathy-utils.c:384
+#| msgid "Use _Yahoo Japan"
+msgid "Yahoo! Japan"
+msgstr "Yahoo Japón"
+
+#: ../libempathy/empathy-utils.c:385
+msgid "Facebook Chat"
+msgstr "Chat de Facebook"
+
#: ../libempathy/empathy-time.c:137
#, c-format
msgid "%d second ago"
@@ -572,77 +603,118 @@ msgstr[1] "hace %d meses"
msgid "in the future"
msgstr "en el futuro"
-#: ../libempathy-gtk/empathy-account-chooser.c:426
+#: ../libempathy-gtk/empathy-account-chooser.c:424
msgid "All"
msgstr "Todo"
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:441
+#: ../libempathy-gtk/empathy-account-widget.c:497
#, c-format
msgid "%s:"
msgstr "%s:"
+#: ../libempathy-gtk/empathy-account-widget.c:1213
+msgid "Enabled"
+msgstr "Activada"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "Example: MyScreenName "
+msgstr "Ejemplo: MiNombreEnPantalla "
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
msgid "Advanced"
msgstr "Avanzadas"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "Contra_seña:"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
msgid "Screen _Name:"
msgstr "_Nombre en pantalla:"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr "¿Cuál es su contraseña de AIM?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr "¿Cuál es su nombre en pantalla para AIM?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
msgstr "_Puerto:"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Servidor:"
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Example: username "
+msgstr "Ejemplo: usuario "
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "_ID de sesión:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "¿Cuaĺ es su ID de usuario para GroupWise?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "¿Cuaĺ es su contraseña de GroupWise?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "Example: 123456789 "
+msgstr "Ejemplo: 123456789 "
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
msgstr "_UIN ICQ:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "What is your ICQ UIN?"
+msgstr "¿Cuál es su UIN de ICQ?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr "¿Cuaĺ es su contraseña de ICQ?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "_Charset:"
msgstr "Conjunto de _caracteres:"
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "Red nueva"
@@ -678,84 +750,136 @@ msgstr "Nombre real:"
msgid "Servers"
msgstr "Servidores"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "Example: user@jabber.org "
+msgstr "Ejemplo: usuario@jabber.org "
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
msgid "Override server settings"
msgstr "Sobreescribir los ajustes del servidor"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "Pri_ority:"
msgstr "Pri_oridad:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Reso_urce:"
msgstr "Re_curso:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
msgid "Use old SS_L"
msgstr "Usar SS_L antiguo"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "What is your Jabber ID?"
+msgstr "¿Cuál es su ID de Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Jabber password?"
+msgstr "¿Cuál es su contraseña de Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your desired Jabber ID?"
+msgstr "¿Cuál es el ID de usuario que quiere para Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid "What is your desired Jabber password?"
+msgstr "¿Cuál es la contraseña que quiere para Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid "_Encryption required (TLS/SSL)"
msgstr "Se requiere ci_frado (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid "_Ignore SSL certificate errors"
msgstr "_Ignorar los errores de certificados SSL"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "Example: user@hotmail.com "
+msgstr "Ejemplo: usuario@hotmail.com "
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live password?"
+msgstr "¿Cuál es su contraseña de Windows Live?"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live user name?"
+msgstr "¿Cuaĺ es su usuario de Windows Live?"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
msgid "_Email:"
msgstr "Correo-_e:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
msgstr "_Nombre:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_Jabber ID:"
msgstr "ID _Jabber:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Last Name:"
msgstr "Ape_llidos:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Nickname:"
msgstr "_Apodo:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
-msgstr "Nombre _publicado:"
+msgstr "Nombre p_ublicado:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "Example: user@my.sip.server "
+msgstr "Ejemplo: usuario@mi.servidor.sip "
#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
msgid "Discover STUN"
msgstr "Descubrir STUN"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "STUN Server:"
msgstr "Servidor STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "STUN port:"
msgstr "Puerto STUN:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "What is your SIP account password?"
+msgstr "¿Cuál es la contraseña de su cuenta SIP?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "What is your SIP login ID?"
+msgstr "¿Cuaĺ es su ID de inicio de sesión SIP?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "_Username:"
msgstr "_Usuario:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "Use _Yahoo Japan"
msgstr "User _Yahoo Japan"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr "¿Cuál es su ID de Yahoo!?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "What is your Yahoo! password?"
+msgstr "¿Cuál es su contraseña de Yahoo!?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "Yahoo I_D:"
msgstr "I_D de Yahoo:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Ignore conference and chatroom invitations"
msgstr "_Ignorar invitaciones a conferencias y salas de chat"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "Configuración de la lista de _salas:"
@@ -792,67 +916,67 @@ msgstr "Pulse para agrandar"
msgid "Failed to reconnect this chat"
msgstr "Falló al reconectar a este chat"
-#: ../libempathy-gtk/empathy-chat.c:412
+#: ../libempathy-gtk/empathy-chat.c:413
msgid "Unsupported command"
msgstr "Comando no soportado"
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:549
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:552
msgid "invalid contact"
msgstr "contacto no válido"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:555
msgid "permission denied"
msgstr "permiso denegado"
-#: ../libempathy-gtk/empathy-chat.c:557
+#: ../libempathy-gtk/empathy-chat.c:558
msgid "too long message"
msgstr "mensaje demasiado largo"
-#: ../libempathy-gtk/empathy-chat.c:560
+#: ../libempathy-gtk/empathy-chat.c:561
msgid "not implemented"
msgstr "no implementado"
-#: ../libempathy-gtk/empathy-chat.c:563
+#: ../libempathy-gtk/empathy-chat.c:564
msgid "unknown"
msgstr "desconocido"
-#: ../libempathy-gtk/empathy-chat.c:567
+#: ../libempathy-gtk/empathy-chat.c:568
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error al enviar el mensaje «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:597
+#: ../libempathy-gtk/empathy-chat.c:598
#, c-format
msgid "Topic set to: %s"
msgstr "El tema se ha establecido a: %s"
-#: ../libempathy-gtk/empathy-chat.c:599
+#: ../libempathy-gtk/empathy-chat.c:600
msgid "No topic defined"
msgstr "No se ha definido el tema"
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:970
msgid "(No Suggestions)"
msgstr "(Sin sugerencias)"
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1024
msgid "Insert Smiley"
msgstr "Insertar emoticono"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1041
-#: ../libempathy-gtk/empathy-ui-utils.c:1483
+#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-ui-utils.c:1471
msgid "_Send"
msgstr "E_nviar"
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1076
msgid "_Spelling Suggestions"
msgstr "_Sugerencias ortográficas"
-#: ../libempathy-gtk/empathy-chat.c:1190
+#: ../libempathy-gtk/empathy-chat.c:1191
#, c-format
msgid "%s has disconnected"
msgstr "%s se ha desconectado"
@@ -860,13 +984,12 @@ msgstr "%s se ha desconectado"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1197
+#: ../libempathy-gtk/empathy-chat.c:1198
#, c-format
-#| msgid "%s was kicked by %s"
msgid "%1$s was kicked by %2$s"
msgstr "%2$s expulsó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:1201
#, c-format
msgid "%s was kicked"
msgstr "%s fue expulsado"
@@ -874,18 +997,17 @@ msgstr "%s fue expulsado"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1208
+#: ../libempathy-gtk/empathy-chat.c:1209
#, c-format
-#| msgid "%s was banned by %s"
msgid "%1$s was banned by %2$s"
msgstr "%2$s vetó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1212
#, c-format
msgid "%s was banned"
msgstr "%s fue vetado"
-#: ../libempathy-gtk/empathy-chat.c:1215
+#: ../libempathy-gtk/empathy-chat.c:1216
#, c-format
msgid "%s has left the room"
msgstr "%s ha dejado la sala"
@@ -895,42 +1017,42 @@ msgstr "%s ha dejado la sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1224
+#: ../libempathy-gtk/empathy-chat.c:1225
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1247
+#: ../libempathy-gtk/empathy-chat.c:1248
#, c-format
msgid "%s has joined the room"
msgstr "%s ha entrado en la sala"
-#: ../libempathy-gtk/empathy-chat.c:1380 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:1381 ../src/empathy-call-window.c:1277
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1817
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:1865
+#: ../libempathy-gtk/empathy-chat.c:1867
#: ../libempathy-gtk/empathy-log-window.c:502
msgid "Conversation"
msgstr "Conversación"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
msgid "Topic:"
msgstr "Tema:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-theme-adium.c:266
msgid "_Copy Link Address"
msgstr "_Copiar la dirección del enlace"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-theme-adium.c:274
msgid "_Open Link"
msgstr "_Abrir enlace"
@@ -940,16 +1062,16 @@ msgstr "_Abrir enlace"
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:177
+#: ../libempathy-gtk/empathy-contact-dialogs.c:236
msgid "Edit Contact Information"
msgstr "Editar información del contacto"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
msgid "Personal Information"
msgstr "Información personal"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
msgid "New Contact"
msgstr "Contacto nuevo"
@@ -1051,7 +1173,7 @@ msgid "Select"
msgstr "Seleccionar"
#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1023
+#: ../src/empathy-main-window.c:1019
msgid "Group"
msgstr "Grupo"
@@ -1191,7 +1313,7 @@ msgid "Client:"
msgstr "Cliente:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
+#: ../src/empathy-main-window.c:1002
msgid "Contact"
msgstr "Contacto"
@@ -1244,24 +1366,24 @@ msgstr "Página web:"
msgid "_Add Group"
msgstr "_Añadir grupo"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
msgid "new server"
msgstr "servidor nuevo"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
msgid "Server"
msgstr "Servidor"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
msgid "Port"
msgstr "Puerto"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
msgid "SSL"
msgstr "SSL"
#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Cuenta"
@@ -1410,15 +1532,15 @@ msgstr "Limpio"
msgid "Blue"
msgstr "Azul"
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
+#: ../libempathy-gtk/empathy-ui-utils.c:1373
msgid "Unable to open URI"
msgstr "No se pudo abrir el URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
+#: ../libempathy-gtk/empathy-ui-utils.c:1463
msgid "Select a file"
msgstr "Seleccionar un archivo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1535
+#: ../libempathy-gtk/empathy-ui-utils.c:1523
msgid "Select a destination"
msgstr "Seleccionar un destino"
@@ -1608,7 +1730,7 @@ msgid "Megaphone"
msgstr "Megáfono"
#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:518
msgid "Talk!"
msgstr "Hablar"
@@ -1626,11 +1748,11 @@ msgstr "_Información"
msgid "_Preferences"
msgstr "Prefere_ncias"
-#: ../megaphone/src/megaphone-applet.c:168
+#: ../megaphone/src/megaphone-applet.c:166
msgid "Please configure a contact."
msgstr "Configure un contacto."
-#: ../megaphone/src/megaphone-applet.c:258
+#: ../megaphone/src/megaphone-applet.c:256
msgid "Select contact..."
msgstr "Seleccione un contactoâ¦"
@@ -1639,23 +1761,23 @@ msgid "Presence"
msgstr "Presencia"
#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
+#: ../nothere/src/nothere-applet.c:105
msgid "Set your own presence"
msgstr "Establezca su propia presencia"
-#: ../src/empathy.c:569
+#: ../src/empathy.c:588
msgid "Don't connect on startup"
msgstr "No conectarse automáticamente al inicio"
-#: ../src/empathy.c:573
+#: ../src/empathy.c:592
msgid "Don't show the contact list on startup"
msgstr "No mostrar la lista de contactos al inicio"
-#: ../src/empathy.c:577
+#: ../src/empathy.c:596
msgid "Show the accounts dialog"
msgstr "Mostrar el diálogo de las cuentas"
-#: ../src/empathy.c:589
+#: ../src/empathy.c:608
msgid "- Empathy IM Client"
msgstr "- Cliente de mensajerÃa instantánea Empathy"
@@ -1701,21 +1823,156 @@ msgstr "Un cliente de mensajerÃa instantánea para GNOME"
msgid "translator-credits"
msgstr "Jorge González , 2007-2009"
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "Activada"
+#: ../src/empathy-account-assistant.c:118
+#| msgid "Empathy has asked about importing accounts"
+msgid "There has been an error while importing the accounts."
+msgstr "Hubo un error al importar las cuentas."
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "Cuentas"
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error while parsing the account details."
+msgstr "Hubo un error al analizar los detalles de la cuenta."
+
+#: ../src/empathy-account-assistant.c:124
+msgid "There has been an error while creating the account."
+msgstr "Hubo un error al crear la cuenta."
+#: ../src/empathy-account-assistant.c:126
+msgid "There has been an error."
+msgstr "Hubo un error."
+
+#: ../src/empathy-account-assistant.c:141
+#, c-format
+msgid "The error message was: %s "
+msgstr "El mensaje de error fue: %s "
+
+#: ../src/empathy-account-assistant.c:149
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"Puede volver atrás e intentar introducir los detalles de su cuenta de nuevo "
+"o salir de este asistente y añadir cuentas posteriormente desde el menú "
+"Editar."
+
+#: ../src/empathy-account-assistant.c:184
+msgid "An error occurred"
+msgstr "Ocurrió un error"
+
+#. Create account
#. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:320
+#: ../src/empathy-accounts-dialog.c:1197
#, c-format
msgid "New %s account"
msgstr "Cuenta de %s nueva"
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-account-assistant.c:387
+msgid "What kind of chat account do you have?"
+msgstr "¿Qué tipo de cuenta tiene?"
+
+#: ../src/empathy-account-assistant.c:393
+#| msgid "I already have an account I want to use"
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
+
+#: ../src/empathy-account-assistant.c:399
+msgid "Enter your account details"
+msgstr "Introducir los detalles de su cuenta"
+
+#: ../src/empathy-account-assistant.c:404
+#| msgid "%s is calling you, do you want to answer?"
+msgid "What kind of chat account do you want to create?"
+msgstr "¿Qué tipo de cuenta quiere crear?"
+
+#: ../src/empathy-account-assistant.c:410
+#| msgid "Do you really want to remove the contact '%s'?"
+msgid "Do you want to create other chat accounts?"
+msgstr "¿Quiere crear otras cuentas de chat?"
+
+#: ../src/empathy-account-assistant.c:417
+msgid "Enter the details for the new account"
+msgstr "Introducir los detalles para la cuenta nueva"
+
+#: ../src/empathy-account-assistant.c:503
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"Con Empathy puede charlar con gente cerca y con amigos y colegas que usen "
+"Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
+"micrófono o una cámara web puede hacer incluso llamadas de sonido o vÃdeo."
+
+#: ../src/empathy-account-assistant.c:520
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
+
+#: ../src/empathy-account-assistant.c:543
+msgid "Yes, import my account details from "
+msgstr "SÃ, importar los detalles de mi cuenta desde "
+
+#: ../src/empathy-account-assistant.c:564
+msgid "Yes, I'll enter my account details now"
+msgstr "SÃ, introduciré ahora los detalles de mi cuenta"
+
+#: ../src/empathy-account-assistant.c:586
+#| msgid "_Create a new account"
+msgid "No, I want a new account"
+msgstr "No, quiero crear una cuenta nueva"
+
+#: ../src/empathy-account-assistant.c:596
+msgid "No, I just want to see people online nearby for now"
+msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
+
+#: ../src/empathy-account-assistant.c:617
+#| msgid "Select who would you like to invite:"
+msgid "Select the accounts you want to import:"
+msgstr "Seleccione las cuentas que quiere importar:"
+
+#: ../src/empathy-account-assistant.c:704
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "Yes"
+msgstr "SÃ"
+
+#: ../src/empathy-account-assistant.c:711
+msgid "No, that's all for now"
+msgstr "No, eso es todo por ahora"
+
+#: ../src/empathy-account-assistant.c:904
+msgid "Welcome to Empathy"
+msgstr "Bienvenido a Empathy"
+
+#: ../src/empathy-account-assistant.c:913
+#| msgid "_Reuse an existing account"
+msgid "Import your existing accounts"
+msgstr "Importar sus cuentas existentes"
+
+#: ../src/empathy-accounts-dialog.c:206
+#, c-format
+#| msgid "%s of %s"
+msgid "%s on %s"
+msgstr "%s en %s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../src/empathy-accounts-dialog.c:217
+#, c-format
+#| msgid "Account"
+msgid "%s Account"
+msgstr "Cuenta %s"
+
+#: ../src/empathy-accounts-dialog.c:221
+#| msgid "New %s account"
+msgid "New account"
+msgstr "Cuenta nueva"
+
+#: ../src/empathy-accounts-dialog.c:674
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1724,7 +1981,7 @@ msgstr ""
"Va a eliminar su cuenta %s\n"
"¿Seguro que quiere continuar?"
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:680
msgid ""
"Any associated conversations and chat rooms will NOT be removed if you "
"decide to proceed.\n"
@@ -1737,31 +1994,23 @@ msgstr ""
"\n"
"Si decidiera volver a añadir la cuenta más tarde, estarán aún disponibles."
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "Cuentas"
+
#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "Añadir cuenta"
+msgid "Add new"
+msgstr "Añadir nueva"
#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Cr_eate"
msgstr "Cr_ear"
#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "Importar cuentasâ¦"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol installed"
msgstr "No hay protocolos instalados"
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "Ajustes"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -1769,22 +2018,23 @@ msgstr ""
"Para añadir una nueva cuenta debe instalar primero un «backend» para cada "
"protocolo que quiera usar."
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../src/empathy-accounts-dialog.ui.h:10
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Add..."
msgstr "_Añadirâ¦"
-#: ../src/empathy-accounts-dialog.ui.h:11
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Create a new account"
msgstr "_Crear una cuenta nueva"
-#: ../src/empathy-accounts-dialog.ui.h:12
+#: ../src/empathy-accounts-dialog.ui.h:8
msgid "_Reuse an existing account"
msgstr "_Usar una cuenta ya existente"
+#: ../src/empathy-accounts-dialog.ui.h:9
+#| msgid "Account"
+msgid "account"
+msgstr "cuenta"
+
#: ../src/empathy-call-window.c:426
msgid "Contrast"
msgstr "Contraste"
@@ -1867,12 +2117,12 @@ msgstr "_Llamar"
msgid "_View"
msgstr "_Ver"
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:343
#, c-format
msgid "Conversations (%d)"
msgstr "Conversaciones (%d)"
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:475
msgid "Typing a message."
msgstr "Tecleando un mensaje."
@@ -1952,75 +2202,75 @@ msgstr "Autoconectar"
msgid "Manage Favorite Rooms"
msgstr "Gestionar salas favoritas"
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:322
msgid "Incoming call"
msgstr "Llamada entrante"
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:325
#, c-format
msgid "%s is calling you, do you want to answer?"
msgstr "%s le está llamando, ¿quiere responder?"
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:332
msgid "_Reject"
msgstr "_Rechazar"
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:338
msgid "_Answer"
msgstr "Re_spuesta"
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:453
#, c-format
msgid "Incoming call from %s"
msgstr "Llamada entrante de %s"
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:497
#, c-format
msgid "%s is offering you an invitation"
msgstr "%s le está ofreciendo una invitación"
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:503
msgid "An external application will be started to handle it."
msgstr "Se iniciará una aplicación externa para manejarla."
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:508
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:634
+#: ../src/empathy-event-manager.c:635
msgid "Room invitation"
msgstr "Invitación a una sala"
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:638
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s le está invitando a unirse a %s"
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:646
msgid "_Decline"
msgstr "_Rechazar"
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:651
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Unirse"
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:690
#, c-format
msgid "%s invited you to join %s"
msgstr "%s le ha invitado a unirse a %s"
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:716
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Transferencia de archivo entrante de %s"
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:896
#, c-format
msgid "Subscription requested by %s"
msgstr "Petición de suscripción de %s"
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:900
#, c-format
msgid ""
"\n"
@@ -2030,13 +2280,13 @@ msgstr ""
"Mensaje: %s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:936
#, c-format
msgid "%s is now offline."
msgstr "Ahora %s está desconectado."
#. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:952
#, c-format
msgid "%s is now online."
msgstr "Ahora %s está conectado."
@@ -2154,92 +2404,98 @@ msgstr ""
"Eliminar transferencias de archivo completadas, canceladas y fallidas de la "
"lista"
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"No se pudo encontrar ninguna cuenta que importar. Actualmente Empathy sólo "
+"soporta importar cuentas desde Pidgin."
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "Importar cuentas"
+
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "Importar"
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "Protocolo"
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "Origen"
-#: ../src/empathy-import-dialog.c:392
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"No se pudo encontrar ninguna cuenta que importar. Actualmente Empathy sólo "
-"soporta importar cuentas desde Pidgin."
-
-#: ../src/empathy-import-dialog.ui.h:1
-msgid "Import Accounts"
-msgstr "Importar cuentas"
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
+#| msgid "New %s account"
+msgid "%s account"
+msgstr "Cuenta %s"
-#: ../src/empathy-main-window.c:402
+#: ../src/empathy-main-window.c:399
msgid "_Edit account"
msgstr "_Editar cuenta"
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:502
msgid "No error specified"
msgstr "No se especificó el error"
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:505
msgid "Network error"
msgstr "Error de red"
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:508
msgid "Authentication failed"
msgstr "Falló la autenticación"
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:511
msgid "Encryption error"
msgstr "Error de cifrado"
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:514
msgid "Name in use"
msgstr "Nombre en uso"
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:517
msgid "Certificate not provided"
msgstr "No se proporcionó el certificado"
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:520
msgid "Certificate untrusted"
msgstr "Certificado sin confianza"
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:523
msgid "Certificate expired"
msgstr "El certificado ha expirado"
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:526
msgid "Certificate not activated"
msgstr "El certificado no está activado"
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:529
msgid "Certificate hostname mismatch"
msgstr "El nombre del equipo del certificado no coincide"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:532
msgid "Certificate fingerprint mismatch"
msgstr "La huella del certificado no coincide"
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:535
msgid "Certificate self-signed"
msgstr "Certificado firmado consigo mismo"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:538
msgid "Certificate error"
msgstr "Error del certificado"
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:541
msgid "Unknown error"
msgstr "Error desconocido"
-#: ../src/empathy-main-window.c:1293
+#: ../src/empathy-main-window.c:1288
msgid "Show and edit accounts"
msgstr "Mostrar y editar cuentas"
@@ -2319,15 +2575,15 @@ msgstr "Conversaciones an_teriores"
msgid "_Room"
msgstr "_Sala"
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:328
msgid "Chat Room"
msgstr "Sala de chat"
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:344
msgid "Members"
msgstr "Miembros"
-#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:494
#, c-format
msgctxt ""
"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2343,21 +2599,16 @@ msgstr ""
"Contraseña necesaria: %s\n"
"Miembros: %s"
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "SÃ"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
msgid "No"
msgstr "No"
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:524
msgid "Could not start room listing"
msgstr "No se pudo iniciar la lista de la sala"
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:534
msgid "Could not stop room listing"
msgstr "No se pudo parar la lista de la sala"
@@ -2570,12 +2821,12 @@ msgstr "Estado"
msgid "_Quit"
msgstr "_Salir"
-#: ../src/empathy-tube-dispatch.c:375
+#: ../src/empathy-tube-dispatch.c:376
#, c-format
msgid "Unable to start application for service %s: %s"
msgstr "No se pudo iniciar la aplicación para el servicio %s: %s"
-#: ../src/empathy-tube-dispatch.c:446
+#: ../src/empathy-tube-dispatch.c:447
#, c-format
msgid ""
"An invitation was offered for service %s, but you don't have the needed "
@@ -2588,64 +2839,64 @@ msgstr ""
msgid "Contact Map View"
msgstr "Vista del mapa de contactos"
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
msgid "Error"
msgstr "Error"
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
msgid "Critical"
msgstr "CrÃtico"
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
msgid "Warning"
msgstr "Advertencia"
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
+#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1111
msgid "Message"
msgstr "Mensaje"
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
msgid "Info"
msgstr "Información"
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
msgid "Debug"
msgstr "Depurar"
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-window.c:841
msgid "Save"
msgstr "Guardar"
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-window.c:944
msgid "Debug Window"
msgstr "Depurar ventana"
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-window.c:1019
msgid "Pause"
msgstr "Pausar"
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-window.c:1031
msgid "Level "
msgstr "Nivel "
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1100
msgid "Time"
msgstr "Hora"
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1102
msgid "Domain"
msgstr "Dominio"
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-window.c:1104
msgid "Category"
msgstr "CategorÃa"
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-window.c:1106
msgid "Level"
msgstr "Nivel"
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-window.c:1138
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -2653,6 +2904,21 @@ msgstr ""
"El gestor de conexiones seleccionado no soporta la extensión de depuración "
"remota."
+#~ msgid "Add Account"
+#~ msgstr "Añadir cuenta"
+
+#~ msgid "Gmail"
+#~ msgstr "Gmail"
+
+#~ msgid "Import Accounts..."
+#~ msgstr "Importar cuentasâ¦"
+
+#~ msgid "Settings"
+#~ msgstr "Ajustes"
+
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
+
#~ msgid "gtk-add"
#~ msgstr "gtk-add"
@@ -2718,9 +2984,6 @@ msgstr ""
#~ msgid "Sélectionner un dossier"
#~ msgstr "Seleccionar una carpeta"
-#~ msgid "I already have an account I want to use"
-#~ msgstr "Ya tengo una cuenta que quiero usar"
-
#~ msgctxt "file size"
#~ msgid "Unknown"
#~ msgstr "Desconocido"
@@ -2815,9 +3078,6 @@ msgstr ""
#~ msgid "Invite"
#~ msgstr "Invitar"
-#~ msgid "Select who would you like to invite:"
-#~ msgstr "Seleccione a quién quiere invitar:"
-
#~ msgid "You have been invited to join a chat conference."
#~ msgstr "Le han invitado a unirse a una conferencia por chat."
diff --git a/po/et.po b/po/et.po
index e87a1219..4c204fc1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,9 +1,9 @@
# Empathy'i eesti keele tõlge.
# Estonian translation of Empathy.
#
-# Copyright (C) 2005-2008 Free Software Foundation, Inc.
+# Copyright (C) 2005-2009 Free Software Foundation, Inc.
#
-# Ivar Smolin , 2005-2008.
+# Ivar Smolin , 2005-2009.
# Mattias Põldaru , 2009.
#
msgid ""
@@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
-"POT-Creation-Date: 2009-08-20 13:44+0000\n"
-"PO-Revision-Date: 2009-08-21 15:26+0300\n"
+"POT-Creation-Date: 2009-08-28 12:11+0000\n"
+"PO-Revision-Date: 2009-08-30 12:26+0300\n"
"Last-Translator: Ivar Smolin \n"
"Language-Team: Estonian \n"
"MIME-Version: 1.0\n"
@@ -20,9 +20,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+msgid "Empathy"
+msgstr "Empathy"
+
msgid "Empathy IM Client"
msgstr "Empathy sõnumivahetuse klient"
+msgid "IM Client"
+msgstr "Välksõnumiklient:"
+
msgid "Send and receive messages"
msgstr "Sõnumite saatmine ja vastuvõtt"
@@ -104,6 +110,12 @@ msgstr "Peida peaaken"
msgid "Hide the main window."
msgstr "Peaakna peitmine."
+msgid "MC 4 accounts have been imported"
+msgstr ""
+
+msgid "MC 4 accounts have been imported."
+msgstr ""
+
msgid "Nick completed character"
msgstr "Nimele lisamise märk"
@@ -325,6 +337,9 @@ msgstr ""
"kontaktid nime järgi, selle välja väärtus on \"name\". Kui väärtus on \"state"
"\", sorteeritakse kontaktide nimekiri oleku järgi."
+msgid "Can't set an empty display name"
+msgstr ""
+
msgid "The hash of the received file and the sent one do not match"
msgstr "Vastuvõetud faili ja saadetud faili räsi ei kattu"
@@ -379,6 +394,15 @@ msgstr "Nähtamatu"
msgid "Offline"
msgstr "Ãhendamata"
+msgid "People Nearby"
+msgstr "Lähedalasuvad inimesed"
+
+msgid "Yahoo! Japan"
+msgstr "Jaapani Yahoo!"
+
+msgid "Facebook Chat"
+msgstr "Facebooki vestlus"
+
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
@@ -425,6 +449,12 @@ msgstr "Kõik"
msgid "%s:"
msgstr "%s:"
+msgid "Enabled"
+msgstr "Lubatud"
+
+msgid "Example: MyScreenName "
+msgstr ""
+
msgid "Advanced"
msgstr "Laiendatud"
@@ -434,18 +464,42 @@ msgstr "_Parool:"
msgid "Screen _Name:"
msgstr "Ekraani_nimi:"
+msgid "What is your AIM password?"
+msgstr ""
+
+msgid "What is your AIM screen name?"
+msgstr ""
+
msgid "_Port:"
msgstr "_Port:"
msgid "_Server:"
msgstr "_Server:"
+msgid "Example: username "
+msgstr ""
+
msgid "Login I_D:"
msgstr "Sisselogimise I_D:"
+msgid "What is your GroupWise User ID?"
+msgstr ""
+
+msgid "What is your GroupWise password?"
+msgstr ""
+
+msgid "Example: 123456789 "
+msgstr ""
+
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
+msgid "What is your ICQ UIN?"
+msgstr ""
+
+msgid "What is your ICQ password?"
+msgstr ""
+
msgid "_Charset:"
msgstr "_Kooditabel:"
@@ -476,6 +530,9 @@ msgstr "Pärisnimi:"
msgid "Servers"
msgstr "Serverid"
+msgid "Example: user@jabber.org "
+msgstr ""
+
msgid "Override server settings"
msgstr "Serveri sätete eiramine"
@@ -488,12 +545,33 @@ msgstr "_Vahend:"
msgid "Use old SS_L"
msgstr "Kasutatakse _vana SSL-i"
+msgid "What is your Jabber ID?"
+msgstr ""
+
+msgid "What is your Jabber password?"
+msgstr ""
+
+msgid "What is your desired Jabber ID?"
+msgstr ""
+
+msgid "What is your desired Jabber password?"
+msgstr ""
+
msgid "_Encryption required (TLS/SSL)"
msgstr "_Krüpteeringu nõudmine (TLS/SSL)"
msgid "_Ignore SSL certificate errors"
msgstr "SSL-sertifikaadi vigu _eiratakse"
+msgid "Example: user@hotmail.com "
+msgstr ""
+
+msgid "What is your Windows Live password?"
+msgstr ""
+
+msgid "What is your Windows Live user name?"
+msgstr ""
+
msgid "_Email:"
msgstr "_E-post:"
@@ -512,6 +590,9 @@ msgstr "_Hüüdnimi:"
msgid "_Published Name:"
msgstr "_Avaldatud nimi:"
+msgid "Example: user@my.sip.server "
+msgstr ""
+
#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
msgid "Discover STUN"
msgstr "STUN-i avastamine"
@@ -522,12 +603,24 @@ msgstr "STUN server:"
msgid "STUN port:"
msgstr "STUN port:"
+msgid "What is your SIP account password?"
+msgstr ""
+
+msgid "What is your SIP login ID?"
+msgstr ""
+
msgid "_Username:"
msgstr "_Kasutajanimi:"
msgid "Use _Yahoo Japan"
msgstr "Jaapani _Yahoo kasutamine"
+msgid "What is your Yahoo! ID?"
+msgstr ""
+
+msgid "What is your Yahoo! password?"
+msgstr ""
+
msgid "Yahoo I_D:"
msgstr "Yahoo I_D:"
@@ -1209,19 +1302,112 @@ msgid "An Instant Messaging client for GNOME"
msgstr "Välksõnumivõrkude klient GNOME jaoks"
msgid "translator-credits"
-msgstr "Mattias Põldaru 2009"
+msgstr ""
+"Ivar Smolin , 2005-2009.\n"
+"Mattias Põldaru , 2009."
-msgid "Enabled"
-msgstr "Lubatud"
+msgid "There has been an error while importing the accounts."
+msgstr "Kontode importimise käigus tekkis viga."
-msgid "Accounts"
-msgstr "Kontod"
+msgid "There has been an error while parsing the account details."
+msgstr ""
+
+msgid "There has been an error while creating the account."
+msgstr ""
+
+msgid "There has been an error."
+msgstr ""
+
+#, c-format
+msgid "The error message was: %s "
+msgstr ""
+
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+
+msgid "An error occurred"
+msgstr ""
+#. Create account
#. To translator: %s is the protocol name
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
#, c-format
msgid "New %s account"
msgstr "Uus %s konto"
+msgid "What kind of chat account do you have?"
+msgstr ""
+
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr ""
+
+msgid "Enter your account details"
+msgstr "Määra oma konto üksikasjad"
+
+msgid "What kind of chat account do you want to create?"
+msgstr "Mis liiki vestluskontot sa soovid luua?"
+
+msgid "Do you want to create other chat accounts?"
+msgstr "Kas soovid luua veel mõne vestlemiskonto?"
+
+msgid "Enter the details for the new account"
+msgstr "Määra uue konto üksikasjad"
+
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+
+msgid "Do you have an account you've been using with another chat program?"
+msgstr ""
+
+msgid "Yes, import my account details from "
+msgstr ""
+
+msgid "Yes, I'll enter my account details now"
+msgstr ""
+
+msgid "No, I want a new account"
+msgstr "Ei, mulle on vaja uut kontot"
+
+msgid "No, I just want to see people online nearby for now"
+msgstr ""
+
+msgid "Select the accounts you want to import:"
+msgstr ""
+
+msgid "Yes"
+msgstr "Jah"
+
+msgid "No, that's all for now"
+msgstr ""
+
+msgid "Welcome to Empathy"
+msgstr ""
+
+msgid "Import your existing accounts"
+msgstr ""
+
+#, c-format
+msgid "%s on %s"
+msgstr ""
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#, c-format
+msgid "%s Account"
+msgstr "%s konto"
+
+msgid "New account"
+msgstr "Uus konto"
+
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1241,24 +1427,18 @@ msgstr ""
"\n"
"Kui sa peaksid konto hiljem uuesti lisama, on need andmed ikka alles."
-msgid "Add Account"
-msgstr "Konto lisamine"
+msgid "Accounts"
+msgstr "Kontod"
+
+msgid "Add new"
+msgstr ""
msgid "Cr_eate"
msgstr "_Loo"
-msgid "Gmail"
-msgstr "Gmail"
-
-msgid "Import Accounts..."
-msgstr "Impordi kontod..."
-
msgid "No protocol installed"
msgstr "Ãhtegi protokolli pole paigaldatud"
-msgid "Settings"
-msgstr "Sätted"
-
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
@@ -1266,9 +1446,6 @@ msgstr ""
"Uue konto lisamiseks pead paigaldama tugiprogrammi iga protokolli jaoks, "
"mida tahad kasutada."
-msgid "Type:"
-msgstr "Liik:"
-
msgid "_Add..."
msgstr "_Lisa..."
@@ -1278,6 +1455,9 @@ msgstr "_Luuakse uus konto"
msgid "_Reuse an existing account"
msgstr "_Kasutatakse olemasolevat kontot"
+msgid "account"
+msgstr "konto"
+
msgid "Contrast"
msgstr "Kontrastsus"
@@ -1564,6 +1744,16 @@ msgstr "Failiülekanded"
msgid "Remove completed, canceled and failed file transfers from the list"
msgstr "Lõpetatud, katkestatud ja nurjunud failide eemaldamine loendist"
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Importimiseks ei leitud kontosid. Praegu on toetatud kontode importimine "
+"ainult Pidginist."
+
+msgid "Import Accounts"
+msgstr "Kontode importimine"
+
#. Translators: this is the header of a treeview column
msgid "Import"
msgstr "Importida"
@@ -1574,15 +1764,10 @@ msgstr "Protokoll"
msgid "Source"
msgstr "Allikas"
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"Importimiseks ei leitud kontosid. Praegu on toetatud kontode importimine "
-"ainult Pidginist."
-
-msgid "Import Accounts"
-msgstr "Kontode importimine"
+#, c-format
+#| msgid "New %s account"
+msgid "%s account"
+msgstr "%s konto"
msgid "_Edit account"
msgstr "_Redigeeri kontot"
@@ -1710,9 +1895,6 @@ msgstr ""
"Nõutakse parooli: %s\n"
"Liikmeid: %s"
-msgid "Yes"
-msgstr "Jah"
-
msgid "No"
msgstr "Ei"
@@ -1943,3 +2125,18 @@ msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr "Valitud ühenduse haldur ei toeta kaugsilumise laiendust."
+
+#~ msgid "Add Account"
+#~ msgstr "Konto lisamine"
+
+#~ msgid "Gmail"
+#~ msgstr "Gmail"
+
+#~ msgid "Import Accounts..."
+#~ msgstr "Impordi kontod..."
+
+#~ msgid "Settings"
+#~ msgstr "Sätted"
+
+#~ msgid "Type:"
+#~ msgstr "Liik:"
diff --git a/po/eu.po b/po/eu.po
index 924c2d08..2e30bcd9 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,9 +8,9 @@
msgid ""
msgstr ""
"Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2009-08-27 18:51+0000\n"
-"PO-Revision-Date: 2009-08-27 21:34+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-29 09:39+0200\n"
+"PO-Revision-Date: 2009-08-29 09:40+0200\n"
"Last-Translator: Iñaki Larrañaga Murgoitio \n"
"Language-Team: Basque \n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,18 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
msgstr "Empathy BM bezeroa"
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
+msgid "IM Client"
+msgstr "BM bezeroa"
+
+#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
msgstr "Bidali eta jaso mezuak"
@@ -575,13 +583,13 @@ msgstr "etorkizunean"
msgid "All"
msgstr "Denak"
-#: ../libempathy-gtk/empathy-account-widget.c:441
-#: ../libempathy-gtk/empathy-account-widget.c:497
+#: ../libempathy-gtk/empathy-account-widget.c:440
+#: ../libempathy-gtk/empathy-account-widget.c:496
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1213
+#: ../libempathy-gtk/empathy-account-widget.c:1239
msgid "Enabled"
msgstr "Gaituta"
@@ -886,67 +894,67 @@ msgstr "Egin klik handitzeko"
msgid "Failed to reconnect this chat"
msgstr "Huts egin du berriketa honekin berriro konektatzean"
-#: ../libempathy-gtk/empathy-chat.c:413
+#: ../libempathy-gtk/empathy-chat.c:403
msgid "Unsupported command"
msgstr "Unartu gabeko komandoa"
-#: ../libempathy-gtk/empathy-chat.c:549
+#: ../libempathy-gtk/empathy-chat.c:535
msgid "offline"
msgstr "lineaz kanpo"
-#: ../libempathy-gtk/empathy-chat.c:552
+#: ../libempathy-gtk/empathy-chat.c:538
msgid "invalid contact"
msgstr "kontaktu baliogabea"
-#: ../libempathy-gtk/empathy-chat.c:555
+#: ../libempathy-gtk/empathy-chat.c:541
msgid "permission denied"
msgstr "baimena ukatuta"
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:544
msgid "too long message"
msgstr "mezua luzeegia"
-#: ../libempathy-gtk/empathy-chat.c:561
+#: ../libempathy-gtk/empathy-chat.c:547
msgid "not implemented"
msgstr "inplementatu gabe"
-#: ../libempathy-gtk/empathy-chat.c:564
+#: ../libempathy-gtk/empathy-chat.c:550
msgid "unknown"
msgstr "ezezaguna"
-#: ../libempathy-gtk/empathy-chat.c:568
+#: ../libempathy-gtk/empathy-chat.c:554
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Errorea '%s' mezua bidaltzean: %s"
-#: ../libempathy-gtk/empathy-chat.c:598
+#: ../libempathy-gtk/empathy-chat.c:584
#, c-format
msgid "Topic set to: %s"
msgstr "Gaia honela ezarria: %s"
-#: ../libempathy-gtk/empathy-chat.c:600
+#: ../libempathy-gtk/empathy-chat.c:586
msgid "No topic defined"
msgstr "Ez da gairik definitu"
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:956
msgid "(No Suggestions)"
msgstr "(Iradokizunik ez)"
-#: ../libempathy-gtk/empathy-chat.c:1024
+#: ../libempathy-gtk/empathy-chat.c:1010
msgid "Insert Smiley"
msgstr "Txertatu aurpegiera"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1042
-#: ../libempathy-gtk/empathy-ui-utils.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-ui-utils.c:1484
msgid "_Send"
msgstr "_Bidali"
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1062
msgid "_Spelling Suggestions"
msgstr "Iradokizun _ortografikoak"
-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:1177
#, c-format
msgid "%s has disconnected"
msgstr "%s deskonektatu egin da"
@@ -954,12 +962,12 @@ msgstr "%s deskonektatu egin da"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1184
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s(e)k %1$s kanporatu du"
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1187
#, c-format
msgid "%s was kicked"
msgstr "%s kanporatua izan da"
@@ -967,17 +975,17 @@ msgstr "%s kanporatua izan da"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:1195
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s(e)k %1$s debekatu du"
-#: ../libempathy-gtk/empathy-chat.c:1212
+#: ../libempathy-gtk/empathy-chat.c:1198
#, c-format
msgid "%s was banned"
msgstr "%s debekatua izan da"
-#: ../libempathy-gtk/empathy-chat.c:1216
+#: ../libempathy-gtk/empathy-chat.c:1202
#, c-format
msgid "%s has left the room"
msgstr "%s(e)k gela utzi du"
@@ -987,25 +995,25 @@ msgstr "%s(e)k gela utzi du"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1211
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1234
#, c-format
msgid "%s has joined the room"
msgstr "%s(e)k gelara elkartzea nahi du"
-#: ../libempathy-gtk/empathy-chat.c:1381 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
msgid "Disconnected"
msgstr "Deskonektatuta"
-#: ../libempathy-gtk/empathy-chat.c:1817
+#: ../libempathy-gtk/empathy-chat.c:1803
msgid "Connected"
msgstr "Konektatuta"
-#: ../libempathy-gtk/empathy-chat.c:1867
+#: ../libempathy-gtk/empathy-chat.c:1853
#: ../libempathy-gtk/empathy-log-window.c:502
msgid "Conversation"
msgstr "Berriketa"
@@ -1016,13 +1024,13 @@ msgstr "Gaia:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:266
+#: ../libempathy-gtk/empathy-theme-adium.c:276
msgid "_Copy Link Address"
msgstr "_Kopiatu estekaren helbidea"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:274
+#: ../libempathy-gtk/empathy-theme-adium.c:284
msgid "_Open Link"
msgstr "_Ireki esteka"
@@ -1087,18 +1095,6 @@ msgstr "Gehitu _kontaktua..."
msgid "_Chat"
msgstr "_Berriketa"
-#: ../libempathy-gtk/empathy-contact-menu.c:253
-#| msgid "_Call"
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio-deia"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:285
-#| msgid "_Call"
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Bideo-deia"
-
#: ../libempathy-gtk/empathy-contact-menu.c:324
msgid "_View Previous Conversations"
msgstr "_Ikusi aurreko berriketak"
@@ -1504,15 +1500,15 @@ msgstr "Garbia"
msgid "Blue"
msgstr "Urdina"
-#: ../libempathy-gtk/empathy-ui-utils.c:1373
+#: ../libempathy-gtk/empathy-ui-utils.c:1386
msgid "Unable to open URI"
msgstr "Ezin da URIa ireki"
-#: ../libempathy-gtk/empathy-ui-utils.c:1463
+#: ../libempathy-gtk/empathy-ui-utils.c:1476
msgid "Select a file"
msgstr "Hautatu fitxategia"
-#: ../libempathy-gtk/empathy-ui-utils.c:1523
+#: ../libempathy-gtk/empathy-ui-utils.c:1536
msgid "Select a destination"
msgstr "Hautatu helburua"
@@ -1797,42 +1793,36 @@ msgstr ""
"Mikel Olasagasti \n"
"Iñaki Larrañaga Murgoitio "
-#. translators: this is followed by the "while ..." strings some lines
-#. * down this file.
-#.
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error "
-msgstr "Errore bat gertatu da "
+#: ../src/empathy-account-assistant.c:118
+msgid "There has been an error while importing the accounts."
+msgstr "Errore bat gertatu da kontuak inportatzean."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:125
-msgid "while importing the accounts."
-msgstr "kontuak inportatzean."
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error while parsing the account details."
+msgstr "Errore bat gertatu da kontuaren xehetasunak analizatzean."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:129
-msgid "while parsing the account details."
-msgstr "kontuaren xehetasunak analizatzean."
+#: ../src/empathy-account-assistant.c:124
+msgid "There has been an error while creating the account."
+msgstr "Errore bat gertatu da kontua sortzean."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:133
-msgid "while creating the account."
-msgstr "kontua sortzean."
+#: ../src/empathy-account-assistant.c:126
+msgid "There has been an error."
+msgstr "Errore bat gertatu da."
-#: ../src/empathy-account-assistant.c:151
+#: ../src/empathy-account-assistant.c:141
#, c-format
msgid "The error message was: %s "
msgstr "Errorearen mezua: %s "
-#: ../src/empathy-account-assistant.c:159
+#: ../src/empathy-account-assistant.c:149
msgid ""
"You can either go back and try to enter your accounts' details again or quit "
-"this wizard and add accounts later from the Edit menu."
+"this assistant and add accounts later from the Edit menu."
msgstr ""
"Atzera joan eta kontuko xehetasunak berriro sartzen saia zintezke, edo "
"morroi honetatik irten eta kontuak geroago gehitu Editatu menuan."
-#: ../src/empathy-account-assistant.c:194
+#: ../src/empathy-account-assistant.c:184
msgid "An error occurred"
msgstr "Errore bat gertatu da"
@@ -1842,37 +1832,37 @@ msgstr "Errore bat gertatu da"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:330
-#: ../src/empathy-accounts-dialog.c:1197
+#: ../src/empathy-account-assistant.c:320
+#: ../src/empathy-accounts-dialog.c:1172
#, c-format
msgid "New %s account"
msgstr "%s kontu berria"
-#: ../src/empathy-account-assistant.c:397
+#: ../src/empathy-account-assistant.c:386
msgid "What kind of chat account do you have?"
msgstr "Zein motako berriketa-kontua duzu?"
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:392
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Baduzu beste berriketako konturik konfiguratzeko?"
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:398
msgid "Enter your account details"
msgstr "Sartu kontuaren xehetasunak"
-#: ../src/empathy-account-assistant.c:414
+#: ../src/empathy-account-assistant.c:403
msgid "What kind of chat account do you want to create?"
msgstr "Zein motako berriketako kontua sortzea nahi duzu?"
-#: ../src/empathy-account-assistant.c:420
+#: ../src/empathy-account-assistant.c:409
msgid "Do you want to create other chat accounts?"
msgstr "Nahi duzu beste berriketako kontu bat sortzea?"
-#: ../src/empathy-account-assistant.c:427
+#: ../src/empathy-account-assistant.c:416
msgid "Enter the details for the new account"
msgstr "Sartu kontu berriaren xehetasunak"
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:502
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -1884,45 +1874,45 @@ msgstr ""
"Empathy-rekin. Mikrofono edo web kamera batekin audio edo bideo-deiak egin "
"ditzakezu."
-#: ../src/empathy-account-assistant.c:530
+#: ../src/empathy-account-assistant.c:519
msgid "Do you have an account you've been using with another chat program?"
msgstr "Beste berriketako programa batean erabiltzen duzun konturik baduzu?"
-#: ../src/empathy-account-assistant.c:553
+#: ../src/empathy-account-assistant.c:542
msgid "Yes, import my account details from "
msgstr "Bai, inportatu nire kontuko xehetasunak hemendik: "
-#: ../src/empathy-account-assistant.c:574
+#: ../src/empathy-account-assistant.c:563
msgid "Yes, I'll enter my account details now"
msgstr "Bai, orain sartuko dut nire kontuko xehetasunak"
-#: ../src/empathy-account-assistant.c:596
+#: ../src/empathy-account-assistant.c:585
msgid "No, I want a new account"
msgstr "Ez, kontu berri bat nahi dut"
-#: ../src/empathy-account-assistant.c:606
+#: ../src/empathy-account-assistant.c:595
msgid "No, I just want to see people online nearby for now"
msgstr "Ez, oraingoz inguruko konektatutako jendea ikustea nahi dut"
-#: ../src/empathy-account-assistant.c:627
+#: ../src/empathy-account-assistant.c:616
msgid "Select the accounts you want to import:"
msgstr "Hautatu inportatzea nahi dituzun kontuak:"
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:703
#: ../src/empathy-new-chatroom-dialog.c:496
#: ../src/empathy-new-chatroom-dialog.c:497
msgid "Yes"
msgstr "Bai"
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:710
msgid "No, that's all for now"
msgstr "Ez, hau izan da guztia"
-#: ../src/empathy-account-assistant.c:914
+#: ../src/empathy-account-assistant.c:903
msgid "Welcome to Empathy"
msgstr "Ongietorri Empathy-ra"
-#: ../src/empathy-account-assistant.c:923
+#: ../src/empathy-account-assistant.c:912
msgid "Import your existing accounts"
msgstr "Inportatu dauzkazun kontuak"
@@ -1942,7 +1932,7 @@ msgstr "%s kontua"
msgid "New account"
msgstr "Kontu berria"
-#: ../src/empathy-accounts-dialog.c:674
+#: ../src/empathy-accounts-dialog.c:649
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1951,7 +1941,7 @@ msgstr ""
"Zure %s kontua ezabatzera zoaz.\n"
"Ziur zaude ezabatzea nahi duzula?"
-#: ../src/empathy-accounts-dialog.c:680
+#: ../src/empathy-accounts-dialog.c:655
msgid ""
"Any associated conversations and chat rooms will NOT be removed if you "
"decide to proceed.\n"
@@ -2273,12 +2263,6 @@ msgstr "%u:%02u.%02u"
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:180
-#| msgid "unknown"
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Ezezaguna"
-
#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s at %s/s"
@@ -2553,22 +2537,6 @@ msgstr "Berriketa-gela"
msgid "Members"
msgstr "Kideak"
-#: ../src/empathy-new-chatroom-dialog.c:494
-#, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
-msgid ""
-"%s \n"
-"Invite required: %s\n"
-"Password required: %s\n"
-"Members: %s"
-msgstr ""
-"%s \n"
-"Gonbidapena behar da: %s\n"
-"Pasahitza behar da: %s\n"
-"Kideak: %s"
-
#: ../src/empathy-new-chatroom-dialog.c:496
#: ../src/empathy-new-chatroom-dialog.c:497
msgid "No"
diff --git a/po/gu.po b/po/gu.po
index 8c730d35..fe877467 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy.master.gu\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2009-08-25 14:09+0000\n"
-"PO-Revision-Date: 2009-08-26 14:26+0530\n"
+"POT-Creation-Date: 2009-08-28 12:11+0000\n"
+"PO-Revision-Date: 2009-08-31 11:08+0530\n"
"Last-Translator: Sweta Kothari \n"
"Language-Team: Gujarati\n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,19 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
msgstr "Empathy IM Client"
-#: ../data/empathy.desktop.in.in.h:2
-#| msgid "Send and receive instant messages"
+#: ../data/empathy.desktop.in.in.h:3
+#| msgid "Client:"
+msgid "IM Client"
+msgstr "IM àªà«àª²àª¾àªàª¨à«àª:"
+
+#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
msgstr "સàªàª¦à«àª¶àª¾àª મà«àªàª²à« àª
નૠમà«àª³àªµà«"
@@ -51,7 +59,6 @@ msgid "Compact contact list"
msgstr "સાàªàªàª¡à« સàªàªªàª°à«àª યાદà«"
#: ../data/empathy.schemas.in.h:6
-#| msgid "NetworkManager should be used"
msgid "Connection managers should be used"
msgstr "àªà«àª¡àª¾àª£ વà«àª¯àªµàª¸à«àª¥àª¾àªªàªà« વાપરà«àª² હà«àªµàª¾ àªà«àªàª"
@@ -100,7 +107,6 @@ msgid "Empathy should auto-connect on startup"
msgstr "શરà«àªàª¤àª¥à« àªàª®à«àªªà«àª¥à« àªàªªà«àªàªª àªà«àª¡àª¾àªµà« àªà«àªàª"
#: ../data/empathy.schemas.in.h:18
-#| msgid "Empathy should auto-connect on startup"
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy ઠસà«àª¥àª¾àª¨àª¨à« àªà«àªà«àªàª¸àª¤àª¾àª¨à« àªàªàª¾àª¡àªµà« àªà«àªàª"
@@ -149,7 +155,6 @@ msgid "Path of the adium theme to use"
msgstr "વાપરવા માàªà« àªàª¡àª¿àª¯àª® થà«àª®àª¨à« પાથ"
#: ../data/empathy.schemas.in.h:30
-#| 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 "વાપરવા માàªà« àªàª¡àª¿àª¯àª® થà«àª®àª¨à« પાથ àªà« વાતàªà«àª¤ માàªà« વપરાયà«àª² થà«àª® àªàª¡àª¿àª¯àª® હà«àª¯ તà«."
@@ -186,12 +191,10 @@ msgid "Popup notifications if the chat isn't focused"
msgstr "પà«àªªàª
પ સà«àªàª¨àª¾àª àªà« વાતàªà«àª¤ પà«àª°àªàª¾àª¶àª¿àª¤ થયà«àª² ન હà«àª¯"
#: ../data/empathy.schemas.in.h:39
-#| msgid "Popup notifications if the chat isn't focused"
msgid "Popup notifications when a contact sign in"
msgstr "પà«àªªàª
પ સà«àªàª¨àª¾àª àªà«àª¯àª¾àª°à« સàªàªªàª°à«àª પà«àª°àªµà«àª¶à« તà«àª¯àª¾àª°à«"
#: ../data/empathy.schemas.in.h:40
-#| msgid "Popup notifications if the chat isn't focused"
msgid "Popup notifications when a contact sign out"
msgstr "પà«àªªàª
પ સà«àªàª¨àª¾àª àªà«àª¯àª¾àª°à« સàªàªªàª°à«àª બહાર નà«àªàª³à« તà«àª¯àª¾àª°à«"
@@ -204,7 +207,6 @@ msgid "Show avatars"
msgstr "àª
વતારà«àª¨à« બતાવà«"
#: ../data/empathy.schemas.in.h:43
-#| msgid "_Show Contact List"
msgid "Show contact list in rooms"
msgstr "રà«àª®à«àª®àª¾àª સàªàªªàª°à«àª યાદà«àª¨à« બતાવà«"
@@ -249,29 +251,18 @@ msgid "Whether WebKit developer tools, such as the Web Inspector, should be enab
msgstr "àªà«àª¯àª¾àªàª¤à« WebKit developer tools àªà«àªµàª¾ àªà« Web Inspector સàªà«àª°àª¿àª¯ થયà«àª² હà«àªµàª¾ àªà«àªàª."
#: ../data/empathy.schemas.in.h:54
-#| msgid ""
-#| "Whether or not to show contacts that are offline in the contact list."
msgid "Whether or not Empathy can publish the user's location to his contacts."
msgstr "àªà«àª¯àª¾àªàª¤à« તà«àª¨àª¾àª સàªàªªàª°à«àªà«àª®àª¾àª વપરાશàªàª°à«àª¤àª¾àª¨àª¾àª સà«àª¥àª¾àª¨àª¨à« Empathy ઠપà«àª°àªàª¾àª¶àª¿àª¤ àªàª°à« શàªàª¶à« àªà« નહિàª."
#: ../data/empathy.schemas.in.h:55
-#| msgid ""
-#| "Whether or not Empathy should use the avatar of the contact as the chat "
-#| "window icon."
msgid "Whether or not Empathy can use the GPS to guess the location."
msgstr "àªà«àª¯àª¾àªàª¤à« સà«àª¥àª¾àª¨àª¨à« ધારવા માàªà« Empathy ઠGPS નૠવાપરૠશàªàª¶à« àªà« નહિàª."
#: ../data/empathy.schemas.in.h:56
-#| msgid ""
-#| "Whether or not Empathy should use the avatar of the contact as the chat "
-#| "window icon."
msgid "Whether or not Empathy can use the cellular network to guess the location."
msgstr "àªà«àª¯àª¾àªàª¤à« સà«àª¥àª¾àª¨àª¨à« ધારવા માàªà« Empathy ઠસà«àª²à«àª¯à«àª²àª° નà«àªàªµàª°à«àª નૠવાપરૠશàªàª¶à« àªà« નહિàª."
#: ../data/empathy.schemas.in.h:57
-#| msgid ""
-#| "Whether or not Empathy should use the avatar of the contact as the chat "
-#| "window icon."
msgid "Whether or not Empathy can use the network to guess the location."
msgstr "àªà«àª¯àª¾àªàª¤à« સà«àª¥àª¾àª¨àª¨à« ધારવા માàªà« Empathy ઠનà«àªàªµàª°à«àª વાપરૠશàªàª¶à« àªà« નહિàª."
@@ -288,9 +279,6 @@ msgid ""
msgstr "àªà«àª¯àª¾àªàª¤à« સà«àªàª¾àª°à«àªàª
પરà«àªàª
પ પર Empathy નૠàªàªªà«àªàªª તમારા àªàª¾àª¤àª¾àªàª®àª¾àª પà«àª°àªµà«àª¸ àªàª°àªµà« àªà«àªàª àªà« નહિàª."
#: ../data/empathy.schemas.in.h:60
-#| msgid ""
-#| "Whether or not Empathy should use the avatar of the contact as the chat "
-#| "window icon."
msgid ""
"Whether or not Empathy should reduce the location's accuracy for privacy "
"reasons."
@@ -303,9 +291,6 @@ msgid ""
msgstr "àªà«àª¯àª¾àªàª¤à« વાતàªà«àª¤ વિનà«àª¡à« àªàªàªà«àª¨ તરà«àªà« સàªàªªàª°à«àªàª¨à« àª
વતાર વાપરવૠàªà«àªàª àªà« નહિàª."
#: ../data/empathy.schemas.in.h:62
-#| msgid ""
-#| "Whether or not the network manager should be used to automatically "
-#| "disconnect/reconnect."
msgid ""
"Whether or not connectivity managers should be used to automatically "
"disconnect/reconnect."
@@ -364,12 +349,10 @@ msgid "Whether or not to play sound notifications when away or busy."
msgstr "àªà«àª¯àª¾àªàª¤à« àªà«àª¯àª¾àª°à« દà«àª° હà«àª¯ àª
થવા વà«àª¯àª¸à«àª¤ હà«àª¯ તà«àª¯àª¾àª°à« સાàªàª¨à«àª¡ સà«àªàª¨àª¾àªàª¨à« વàªàª¾àª¡àª¶à« àªà« નહિàª."
#: ../data/empathy.schemas.in.h:75
-#| 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:76
-#| 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 "àªà«àª¯àª¾àªàª¤à« àªà«àª¯àª¾àª°à« સàªàªªàª°à«àª àªàª¨àª²àª¾àªàª¨ àªàª¾àª¯ તà«àª¯àª¾àª°à« પà«àªªàª
પ સà«àªàª¨àª¾àªàª¨à« બતાવશૠàªà« નહિàª."
@@ -400,7 +383,6 @@ msgid "Whether or not to show popup notifications when away or busy."
msgstr "àªà«àª¯àª¾àªàª¤à« àªà«àª¯àª¾àª°à« દà«àª° હà«àª¯ àª
થવા વà«àª¯àª¸à«àª¤ હà«àª¯ તà«àª¯àª¾àª°à« પà«àªªàª
પ સà«àªàª¨àª¾àªàª¨à« બતાવશૠàªà« નહિàª."
#: ../data/empathy.schemas.in.h:82
-#| 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 "àªà«àª¯àª¾àªàª¤à« વાતàªà«àª¤ રà«àª®à«àª®àª¾àª સàªàªªàª°à«àª યાદà«àª¨à« બતાવશૠનહિàª."
@@ -430,7 +412,7 @@ msgstr ""
"વાપરવા માàªà« àªàª¿àªàª®àª¤ \"name\" સાથૠસàªàªªàª°à«àªàª¨àª¾àª નામ દà«àª¦àª¾àª°àª¾ àªà«àª°àª®àª®àª¾àª àªà«. \"state\" નૠàªàª¿àªàª®àª¤ ઠ"
"સà«àª¥àª¿àª¤àª¿ દà«àª¦àª¾àª°àª¾ સàªàªªàª°à«àª યાદૠàªà«àª°àª®àª®àª¾àª હશà«."
-#: ../libempathy/empathy-account.c:1086
+#: ../libempathy/empathy-account.c:1144
msgid "Can't set an empty display name"
msgstr "àªàª¾àª²à« દરà«àª¶àª¾àªµ નામનૠસà«àª¯à«àªàª¿àª¤ àªàª°à« શàªàª¾àª¤à« નથà«"
@@ -507,12 +489,10 @@ msgid "Offline"
msgstr "àªàª«àª²àª¾àªàª¨"
#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
-#| msgid "People nearby"
msgid "People Nearby"
msgstr "નàªà«àª લà«àªà«"
#: ../libempathy/empathy-utils.c:384
-#| msgid "Use _Yahoo Japan"
msgid "Yahoo! Japan"
msgstr "Yahoo! àªàª¾àªªàª¾àª¨"
@@ -570,13 +550,13 @@ msgstr "àªàªµàª¿àª·à«àª¯àª®àª¾àª"
msgid "All"
msgstr "બધા"
-#: ../libempathy-gtk/empathy-account-widget.c:448
-#: ../libempathy-gtk/empathy-account-widget.c:504
+#: ../libempathy-gtk/empathy-account-widget.c:441
+#: ../libempathy-gtk/empathy-account-widget.c:497
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1224
+#: ../libempathy-gtk/empathy-account-widget.c:1213
msgid "Enabled"
msgstr "સàªà«àª°àª¿àª¯ થયà«àª² àªà«"
@@ -593,7 +573,6 @@ msgstr "àªàª¦àª¾àª¹àª°àª£: મારૠસà«àª
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-#| msgid "Advanced "
msgid "Advanced"
msgstr "àªàª¨à«àª¨àª¤ થયà«àª²"
@@ -711,7 +690,6 @@ msgid "Real name:"
msgstr "સાàªà« નામ:"
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-#| msgid "Server"
msgid "Servers"
msgstr "સરà«àªµàª°à«"
@@ -720,7 +698,6 @@ msgid "Example: user@jabber.org "
msgstr "àªàª¦àª¾àª¹àª°àª£: user@jabber.org "
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#| msgid "Override server settings "
msgid "Override server settings"
msgstr "સરà«àªµàª° સà«àª¯à«àªàª¨àª¾àª પર ફરà«àª¥à« લàªà«"
@@ -944,7 +921,6 @@ msgstr "àªà«àª¡àª£à« સલાહૠ(_S)"
#: ../libempathy-gtk/empathy-chat.c:1191
#, c-format
-#| msgid "Contact disconnected"
msgid "%s has disconnected"
msgstr "%s àªà«àª¡àª¾àª¯à«àª² નથà«"
@@ -1085,13 +1061,11 @@ msgid "_Chat"
msgstr "વાતàªà«àª¤ (_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:253
-#| msgid "_Call"
msgctxt "menu item"
msgid "_Audio Call"
msgstr "àªàª¡àª¿àª¯à« àªà«àª² (_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:285
-#| msgid "_Call"
msgctxt "menu item"
msgid "_Video Call"
msgstr "વà«àª¡àª¿àª¯à« àªà«àª² (_V)"
@@ -1151,22 +1125,18 @@ msgid "Country ISO Code:"
msgstr "Country ISO Code:"
#: ../libempathy-gtk/empathy-contact-widget.c:1262
-#| msgid "Account:"
msgid "Country:"
msgstr "દà«àª¶:"
#: ../libempathy-gtk/empathy-contact-widget.c:1264
-#| msgid "Status:"
msgid "State:"
msgstr "રાàªà«àª¯:"
#: ../libempathy-gtk/empathy-contact-widget.c:1266
-#| msgid "Client:"
msgid "City:"
msgstr "શહà«àª°:"
#: ../libempathy-gtk/empathy-contact-widget.c:1268
-#| msgid "Armenian"
msgid "Area:"
msgstr "વિસà«àª¤àª¾àª°:"
@@ -1175,7 +1145,6 @@ msgid "Postal Code:"
msgstr "પà«àª¸à«àªàª² àªà«àª¡:"
#: ../libempathy-gtk/empathy-contact-widget.c:1272
-#| msgid "Select"
msgid "Street:"
msgstr "શà«àª°à«:"
@@ -1184,22 +1153,18 @@ msgid "Building:"
msgstr "બિલà«àª¡à«àªàª:"
#: ../libempathy-gtk/empathy-contact-widget.c:1276
-#| msgid "_For:"
msgid "Floor:"
msgstr "માળ:"
#: ../libempathy-gtk/empathy-contact-widget.c:1278
-#| msgid "_Room:"
msgid "Room:"
msgstr "રà«àª®:"
#: ../libempathy-gtk/empathy-contact-widget.c:1280
-#| msgid "Type:"
msgid "Text:"
msgstr "લàªàª¾àª£:"
#: ../libempathy-gtk/empathy-contact-widget.c:1282
-#| msgid "Version:"
msgid "Description:"
msgstr "વરà«àª£àª¨:"
@@ -1228,7 +1193,6 @@ msgid "Speed:"
msgstr "àªàª¡àªª:"
#: ../libempathy-gtk/empathy-contact-widget.c:1296
-#| msgid "Version:"
msgid "Bearing:"
msgstr "વરà«àª¤àª¨:"
@@ -1253,12 +1217,10 @@ msgid "Altitude:"
msgstr "àªàªà«àªàª¤àª¾:"
#: ../libempathy-gtk/empathy-contact-widget.c:1353
-#| msgid "Contact "
msgid "Location "
msgstr "સà«àª¥àª¾àª¨ "
#: ../libempathy-gtk/empathy-contact-widget.c:1366
-#| msgid "Contact "
msgid "Location , "
msgstr "સà«àª¥àª¾àª¨ , "
@@ -1286,7 +1248,6 @@ msgid "Birthday:"
msgstr "àªàª¨à«àª®àª¦àª¿àªµàª¸:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-#| msgid "Client Information "
msgid "Client Information"
msgstr "àªà«àª²àª¾àªàª¨à«àª àªàª¾àª£àªàª¾àª°à«"
@@ -1300,7 +1261,6 @@ msgid "Contact"
msgstr "સàªàªªàª°à«àª"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#| msgid "Contact Details "
msgid "Contact Details"
msgstr "સàªàªªàª°à«àª વિàªàª¤à«"
@@ -1313,7 +1273,6 @@ msgid "Fullname:"
msgstr "સàªàªªà«àª°à«àª£ નામ:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-#| msgid "Group"
msgid "Groups"
msgstr "àªà«àª¥à«"
@@ -1415,13 +1374,11 @@ msgstr "નવા વારà«àª¤àª¾àª²àª¾àªª"
#. COL_TYPE
#: ../libempathy-gtk/empathy-presence-chooser.c:176
#: ../libempathy-gtk/empathy-presence-chooser.c:212
-#| msgid "Custom messages..."
msgid "Custom Message..."
msgstr "àªàª¸à«àªàª® સàªàª¦à«àª¶..."
#: ../libempathy-gtk/empathy-presence-chooser.c:229
#: ../libempathy-gtk/empathy-presence-chooser.c:231
-#| msgid "Custom messages..."
msgid "Edit Custom Messages..."
msgstr "àªàª¸à«àªàª® સàªàª¦à«àª¶àª¾àªàª®àª¾àª ફà«àª°àª«àª¾àª° àªàª°à«..."
@@ -1434,7 +1391,6 @@ msgid "Click to make this status a favorite"
msgstr "ઠપસàªàª¦à«àª¦àª¾ સà«àª¥àª¿àª¤àª¿àª¨à« બનાવવા માàªà« àªà«àª²àª¿àª àªàª°à«"
#: ../libempathy-gtk/empathy-presence-chooser.c:373
-#| msgid "Status"
msgid "Set status"
msgstr "પરિસà«àª¥àª¿àª¤àª¿àª¨à« સà«àª¯à«àªàª¿àª¤ àªàª°à«"
@@ -1488,12 +1444,10 @@ msgid "Voice call ended"
msgstr "àª
વાઠàªà«àª² નૠàª
àªàª¤ થયà«àª² àªà«"
#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
-#| msgid "Custom message"
msgid "Enter Custom Message"
msgstr "àªàª¸à«àªàª® સàªàª¦à«àª¶ નૠદાàªàª² àªàª°à«"
#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
-#| msgid "Custom message"
msgid "Edit Custom Messages"
msgstr "àªàª¸à«àªàª® સàªàª¦à«àª¶àª¾àªàª¨à« ફà«àª°àª«àª¾àª° àªàª°à«"
@@ -1502,7 +1456,6 @@ msgid "Add _New Preset"
msgstr "નવા પà«àª°à«àªµàª¨àª¿àª¶à«àªàª¿àª¤àª¨à« àªàª®à«àª°à« (_N)"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-#| msgid "Save message"
msgid "Saved Presets"
msgstr "સàªàªà«àª°àª¹à«àª² પà«àª°à«àªµàª¨àª¿àª¶à«àªàª¿àª¤à«"
@@ -1531,7 +1484,6 @@ msgid "Select a file"
msgstr "ફાàªàª² નૠપસàªàª¦ àªàª°à«"
#: ../libempathy-gtk/empathy-ui-utils.c:1523
-#| msgid "Select a contact"
msgid "Select a destination"
msgstr "લàªà«àª·à«àª¯ નૠપસàªàª¦ àªàª°à«"
@@ -1766,7 +1718,6 @@ msgid "Show the accounts dialog"
msgstr "àªàª¾àª¤àª¾àªàª¨àª¾àª સàªàªµàª¾àª¦àª¨à« બતાવà«"
#: ../src/empathy.c:608
-#| msgid "- Empathy Instant Messenger"
msgid "- Empathy IM Client"
msgstr "- Empathy IM Client"
@@ -1810,44 +1761,45 @@ msgstr "GNOME માàªà« àªàªµàª¶à«àª¯àª મà«àª¸à«àª¨à«àªà«àªàª àª
#: ../src/empathy-about-dialog.c:125
msgid "translator-credits"
-msgstr "શà«àª°à«àªµà«àª¤àª¾ àªà«àª ારૠ, શà«àª°à«àªµà«àª¤àª¾ àªà«àª ારૠ"
+msgstr "શà«àª°à«àªµà«àª¤àª¾ àªà«àª ારૠ"
-#. translators: this is followed by the "while ..." strings some lines
-#. * down this file.
-#.
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error "
-msgstr "તà«àª¯àª¾àª àªà«àª² હતà«"
+#: ../src/empathy-account-assistant.c:118
+#| msgid "while importing the accounts."
+msgid "There has been an error while importing the accounts."
+msgstr "àªà«àª¯àª¾àª°à« àªàª¾àª¤àª¾àª નૠàªàª¯àª¾àª¤ àªàª°à« રહà«àª¯àª¾ હà«àª¯ તà«àª¯àª¾àª°à« તà«àª¯àª¾àª àªà«àª² હતà«."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:125
-msgid "while importing the accounts."
-msgstr "àªà«àª¯àª¾àª°à« àªàª¾àª¤àª¾àª નૠàªàª¯àª¾àª¤ àªàª°à« રહà«àª¯àª¾ હà«àª¯."
+#: ../src/empathy-account-assistant.c:121
+#| msgid "while parsing the account details."
+msgid "There has been an error while parsing the account details."
+msgstr "àªà«àª¯àª¾àª°à« àªàª¾àª¤àª¾ વિàªàª¤à«àª¨à« પદàªà«àªà«àª¦àª¨ àªàª°à« રહà«àª¯àª¾ હà«àª¯ તà«àª¯àª¾àª°à« તà«àª¯àª¾àª àªà«àª² હતà«."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:129
-msgid "while parsing the account details."
-msgstr "àªà«àª¯àª¾àª°à« àªàª¾àª¤àª¾ વિàªàª¤à«àª¨à« પદàªà«àªà«àª¦àª¨ àªàª°à« રહà«àª¯àª¾ હà«àª¯."
+#: ../src/empathy-account-assistant.c:124
+#| msgid "while creating the account."
+msgid "There has been an error while creating the account."
+msgstr "àªà«àª¯àª¾àª°à« àªàª¾àª¤àª¾àª¨à« બનાવૠરહà«àª¯àª¾ હà«àª¯ તà«àª¯àª¾àª°à« તà«àª¯àª¾àª àªà«àª² હતà«."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:133
-msgid "while creating the account."
-msgstr "àªà«àª¯àª¾àª°à« àªàª¾àª¤àª¾àª¨à« બનાવૠરહà«àª¯àª¾ હà«àª¯."
+#: ../src/empathy-account-assistant.c:126
+#| msgid "There has been an error "
+msgid "There has been an error."
+msgstr "તà«àª¯àª¾àª àªà«àª² હતà«."
-#: ../src/empathy-account-assistant.c:151
+#: ../src/empathy-account-assistant.c:141
#, c-format
msgid "The error message was: %s "
msgstr "àªà«àª² સàªàª¦à«àª¶à« હતà«: %s "
-#: ../src/empathy-account-assistant.c:159
+#: ../src/empathy-account-assistant.c:149
+#| msgid ""
+#| "You can either go back and try to enter your accounts' details again or "
+#| "quit this wizard and add accounts later from the Edit menu."
msgid ""
"You can either go back and try to enter your accounts' details again or quit "
-"this wizard and add accounts later from the Edit menu."
+"this assistant and add accounts later from the Edit menu."
msgstr ""
"તમૠàªà«àª¯àª¾àªàª¤à« પાàªàª¾ àªàª¾àª àª
નૠફરà«àª¥à« તમારૠàªàª¾àª¤àª¾àª¨à« વિàªàª¤à«àª¨à« દાàªàª² àªàª°àªµàª¾ માàªà« પà«àª°àª¯àª¤à«àª¨ àªàª°à« àª
થવા "
-"ઠવિàªàª¾àª°à«àª¡ માàªàª¥à« બહાર નà«àªàª³à« àª
નૠફà«àª°àª«àª¾àª° મà«àª¨à« માàªàª¥à« પàªà«àª¥à« àªàª¾àª¤àª¾àªàª¨à« àªàª®à«àª°à«."
+"ઠસહાયઠમાàªàª¥à« બહાર નà«àªàª³à« àª
નૠફà«àª°àª«àª¾àª° મà«àª¨à« માàªàª¥à« પàªà«àª¥à« àªàª¾àª¤àª¾àªàª¨à« àªàª®à«àª°à«."
-#: ../src/empathy-account-assistant.c:194
+#: ../src/empathy-account-assistant.c:184
msgid "An error occurred"
msgstr "àªà«àª² àªàª¦à«àªàªµà«"
@@ -1855,98 +1807,111 @@ msgstr "àªà«àª² àªàª¦à«àªàªµà«"
#. To translator: %s is the protocol name
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!
+#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:330
-#: ../src/empathy-accounts-dialog.c:1101
+#: ../src/empathy-account-assistant.c:320
+#: ../src/empathy-accounts-dialog.c:1197
#, c-format
msgid "New %s account"
msgstr "નવૠ%s àªàª¾àª¤à«"
-#: ../src/empathy-account-assistant.c:397
+#: ../src/empathy-account-assistant.c:387
msgid "What kind of chat account do you have?"
msgstr "àªà«àª¯àª¾ પà«àª°àªàª¾àª°àª¨à«àª વાતàªà«àª¤ àªàª¾àª¤à« તમારૠપાસૠàªà«?"
-#: ../src/empathy-account-assistant.c:403
-#| msgid "I already have an account I want to use"
+#: ../src/empathy-account-assistant.c:393
msgid "Do you have any other chat accounts you want to set up?"
msgstr "શà«àª તમારૠપાસૠàª
નà«àª¯ વાતàªà«àª¤ àªàª¾àª¤àª¾àª àªà« àªà« તમૠસà«àª¯à«àªàª¿àª¤ àªàª°àªµàª¾ માàªàªà« àªà«?"
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:399
msgid "Enter your account details"
msgstr "તમારૠàªàª¾àª¤àª¾ વિàªàª¤à«àª¨à« દાàªàª² àªàª°à«"
-#: ../src/empathy-account-assistant.c:414
-#| msgid "%s is calling you, do you want to answer?"
+#: ../src/empathy-account-assistant.c:404
msgid "What kind of chat account do you want to create?"
msgstr "તમૠàªà«àª¯àª¾ પà«àª°àªàª¾àª°àª¨àª¾àª વાતàªà«àª¤ àªàª¾àª¤àª¾àª¨à« બનાવવા માàªàªà« àªà«?"
-#: ../src/empathy-account-assistant.c:420
-#| msgid "Do you really want to remove the contact '%s'?"
+#: ../src/empathy-account-assistant.c:410
msgid "Do you want to create other chat accounts?"
msgstr "શà«àª àªàª°à«àªàª° તમૠàª
નà«àª¯ વાતàªà«àª¤ àªàª¾àª¤àª¾àªàª¨à« બનાવવા માàªàªà« àªà«?"
-#: ../src/empathy-account-assistant.c:427
+#: ../src/empathy-account-assistant.c:417
msgid "Enter the details for the new account"
msgstr "નવા àªàª¾àª¤àª¾ માàªà« વિàªàª¤à«àª¨à« દાàªàª² àªàª°à«"
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:503
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
"programs. With a microphone or a webcam you can also have audio or video "
"calls."
msgstr ""
-"Empathy સાથૠનàªà«àªàª¨àª¾àª àªàª¨àª²àª¾àªàª¨ લà«àªà« àª
નૠમિતà«àª°à« સાથૠàª
નૠસહàªàª¾àª°à«àª¯àªàª¾àª° સાથૠàªà« Google Talk, AIM, Windows Live àª
નૠ"
-"àªàª£àª¾àª¬àª§àª¾ વાતàªà«àª¤ àªàª¾àª°à«àª¯àªà«àª°àª®à« વાપરૠàªà« તà«àª®àª¨à« સાથૠતમૠવાતàªà«àª¤ àªàª°à« શàªà« àªà«. માàªàªà«àª°à«àª«à«àª¨ àª
થવા વà«àª¬àªà«àª® સાથૠતમૠàªàª¡àª¿àª¯à« àª
થવા "
-"વિડà«àª¯à« àªà«àª²à« àªàª°à« શàªà« àªà«."
+"Empathy સાથૠનàªà«àªàª¨àª¾àª àªàª¨àª²àª¾àªàª¨ લà«àªà« àª
નૠમિતà«àª°à« સાથૠàª
નૠસહàªàª¾àª°à«àª¯àªàª¾àª° સાથૠàªà« Google Talk, "
+"AIM, Windows Live àª
નૠàªàª£àª¾àª¬àª§àª¾ વાતàªà«àª¤ àªàª¾àª°à«àª¯àªà«àª°àª®à« વાપરૠàªà« તà«àª®àª¨à« સાથૠતમૠવાતàªà«àª¤ àªàª°à« "
+"શàªà« àªà«. માàªàªà«àª°à«àª«à«àª¨ àª
થવા વà«àª¬àªà«àª® સાથૠતમૠàªàª¡àª¿àª¯à« àª
થવા વિડà«àª¯à« àªà«àª²à« àªàª°à« શàªà« àªà«."
-#: ../src/empathy-account-assistant.c:530
+#: ../src/empathy-account-assistant.c:520
msgid "Do you have an account you've been using with another chat program?"
msgstr "શà«àª તમારૠપાસૠàªàª¾àª¤à« àªà« àªà« તમૠબà«àªàª¾ વાતàªà«àª¤ પà«àª°àªà«àª°àª¿àª¯àª¾ સાથૠવાપરૠરહà«àª¯àª¾ હà«àª¯?"
-#: ../src/empathy-account-assistant.c:553
+#: ../src/empathy-account-assistant.c:543
msgid "Yes, import my account details from "
msgstr "હા, તà«àª®àª¾àªàª¥à« મારૠàªàª¾àª¤àª¾àª¨à« વિàªàª¤à«àª¨à« àªàª¯àª¾àª¤ àªàª°à«"
-#: ../src/empathy-account-assistant.c:574
+#: ../src/empathy-account-assistant.c:564
msgid "Yes, I'll enter my account details now"
msgstr "હા, હà«àª હવૠમારૠàªàª¾àª¤àª¾àª¨à« વિàªàª¤à«àª¨à« દાàªàª² àªàª°à«àª¶"
-#: ../src/empathy-account-assistant.c:596
-#| msgid "Show and edit accounts"
+#: ../src/empathy-account-assistant.c:586
msgid "No, I want a new account"
msgstr "ના, મનૠનવા àªàª¾àª¤àª¾àª¨à« àªàªà«àªàª¾ àªà«"
-#: ../src/empathy-account-assistant.c:606
+#: ../src/empathy-account-assistant.c:596
msgid "No, I just want to see people online nearby for now"
msgstr "ના, હવૠહà«àª નàªà«àªàª¨àª¾àª àªàª¨àª²àª¾àªàª¨ લà«àªà«àª¨à« àªà«àªµàª¾ àªàªà«àªà« àªà«"
-#: ../src/empathy-account-assistant.c:627
-#| msgid "Select who would you like to invite:"
+#: ../src/empathy-account-assistant.c:617
msgid "Select the accounts you want to import:"
msgstr "àªàª¾àª¤àª¾àªàª¨à« પસàªàª¦ àªàª°à« àªà« તમૠàªàª¯àª¾àª¤ àªàª°àªµàª¾ માàªàªà« àªà«:"
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:704
#: ../src/empathy-new-chatroom-dialog.c:496
#: ../src/empathy-new-chatroom-dialog.c:497
msgid "Yes"
msgstr "હા"
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:711
msgid "No, that's all for now"
msgstr "ના, àª
તà«àª¯àª¾àª° માàªà« àªàªàª²à« ઠàªà«"
-#: ../src/empathy-account-assistant.c:914
+#: ../src/empathy-account-assistant.c:904
msgid "Welcome to Empathy"
msgstr "Empathy માઠસà«àªµàª¾àªàª¤ àªà«"
-#: ../src/empathy-account-assistant.c:923
-#| msgid "Import Accounts"
+#: ../src/empathy-account-assistant.c:913
msgid "Import your existing accounts"
msgstr "તમારા હાલનાઠàªàª¾àª¤àª¾àªàª¨à« àªàª¯àª¾àª¤ àªàª°à«"
-#: ../src/empathy-accounts-dialog.c:616
+#: ../src/empathy-accounts-dialog.c:206
+#, c-format
+#| msgid "%s of %s"
+msgid "%s on %s"
+msgstr "%s પર %s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../src/empathy-accounts-dialog.c:217
+#, c-format
+#| msgid "%s account"
+msgid "%s Account"
+msgstr "%s àªàª¾àª¤à«"
+
+#: ../src/empathy-accounts-dialog.c:221
+#| msgid "New %s account"
+msgid "New account"
+msgstr "નવૠàªàª¾àª¤à«"
+
+#: ../src/empathy-accounts-dialog.c:674
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1955,7 +1920,7 @@ msgstr ""
"તમૠતમારા %s àªàª¾àª¤àª¾ નૠદà«àª° àªàª°àªµàª¾ વિશૠàªà«!\n"
"તમૠàªàª°à«àªàª° àªàªàª³ વધવા માàªàªà« àªà«?"
-#: ../src/empathy-accounts-dialog.c:622
+#: ../src/empathy-accounts-dialog.c:680
msgid ""
"Any associated conversations and chat rooms will NOT be removed if you "
"decide to proceed.\n"
@@ -1981,7 +1946,6 @@ msgid "Cr_eate"
msgstr "બનાવૠ(_e)"
#: ../src/empathy-accounts-dialog.ui.h:4
-#| msgid "No protocol installed "
msgid "No protocol installed"
msgstr "પà«àª°à«àªà«àªà«àª² સà«àª¥àª¾àªªàª¿àª¤ થયà«àª² નથà«"
@@ -1994,22 +1958,18 @@ msgstr ""
"બà«àªàªàª¨à«àª¡ નૠસà«àª¥àª¾àªªàª¿àª¤ àªàª°àªµà« ઠàªà«àªàª."
#: ../src/empathy-accounts-dialog.ui.h:6
-#| msgid "_Add Contact..."
msgid "_Add..."
msgstr "àªàª®à«àª°à« (_A)..."
#: ../src/empathy-accounts-dialog.ui.h:7
-#| msgid "Create a new IRC network"
msgid "_Create a new account"
msgstr "નવાઠàªàª¾àª¤àª¾àª¨à« બનાવૠ(_C)"
#: ../src/empathy-accounts-dialog.ui.h:8
-#| msgid "Show and edit accounts"
msgid "_Reuse an existing account"
msgstr "હાલનાઠàªàª¾àª¤àª¾àª¨à« પà«àª¨:વાપરૠ(_R)"
#: ../src/empathy-accounts-dialog.ui.h:9
-#| msgid "Account"
msgid "account"
msgstr "àªàª¾àª¤à«"
@@ -2058,14 +2018,12 @@ msgstr "%s સાથૠàªà«àª² àªàª°à«"
#. translators: Call is a noun. This string is used in the window title
#: ../src/empathy-call-window.c:938
-#| msgid "_Call"
msgid "Call"
msgstr "àªà«àª²"
#. Translators: number of minutes:seconds the caller has been connected
#: ../src/empathy-call-window.c:1390
#, c-format
-#| msgid "Connected -- %d:%02dm"
msgid "Connected â %d:%02dm"
msgstr "àªà«àª¡àª¾àª¯à«àª² â %d:%02dm"
@@ -2290,7 +2248,6 @@ msgstr "àª
àªà«àªàª¾àª¤"
#: ../src/empathy-ft-manager.c:275
#, c-format
-#| msgid "%s of %s"
msgid "%s of %s at %s/s"
msgstr "%s/s પર %s નà«àª %s"
@@ -2315,7 +2272,6 @@ msgstr "%s માઠ\"%s\" નૠમà«àªàª²à« રહà«àª¯àª¾ àªà«"
#. * is the contact name
#: ../src/empathy-ft-manager.c:340
#, c-format
-#| msgid "Receiving \"%s\" from %s"
msgid "Error receiving \"%s\" from %s"
msgstr "%s માàªàª¥à« \"%s\" નૠમà«àª³àªµàª¤à« વàªàª¤à« àªà«àª²"
@@ -2325,12 +2281,10 @@ msgstr "ફાàªàª²àª¨à« મà«àª³àªµà« રહà«àª¯àª¾ હà«àª¯ તà«àª¯
#: ../src/empathy-ft-manager.c:348
#, c-format
-#| msgid "Sending \"%s\" to %s"
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 "ફાàªàª²àª¨à« મà«àªàª²àª¤à« વàªàª¤à« àªà«àª²"
@@ -2353,7 +2307,6 @@ msgid "File transfer completed"
msgstr "ફાàªàª² પરિવહન સમાપà«àª¤ થયà«àª² àªà«"
#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
-#| msgid "Waiting the other participant's response"
msgid "Waiting for the other participant's response"
msgstr "બà«àªàª¾ સહàªàª¾àªà«àªàª¨àª¾àª àªàªµàª¾àª¬ માàªà« રાહ àªà«àª રહà«àª¯àª¾ àªà«"
@@ -2380,7 +2333,6 @@ msgid "Remaining"
msgstr "રહà«àª²à« àªà«"
#: ../src/empathy-ft-manager.ui.h:1
-#| msgid "File transfers"
msgid "File Transfers"
msgstr "ફાàªàª²àª¨à«àª પરિવહન થાય àªà«"
@@ -2415,7 +2367,6 @@ msgstr "સà«àª¤à«àª°à«àª¤"
#: ../src/empathy-import-mc4-accounts.c:106
#, c-format
-#| msgid "New %s account"
msgid "%s account"
msgstr "%s àªàª¾àª¤à«"
@@ -2512,12 +2463,10 @@ msgid "Normal Size With _Avatars"
msgstr "Avatars સાથૠસામાનà«àª¯ માપ (_A)"
#: ../src/empathy-main-window.ui.h:8
-#| msgid "Sort by _name"
msgid "Sort by _Name"
msgstr "નામ વડૠàªà«àªàªà« àªàª°à« (_N)"
#: ../src/empathy-main-window.ui.h:9
-#| msgid "Sort by s_tate"
msgid "Sort by _Status"
msgstr "સà«àª¥àª¿àª¤à« દà«àª¦àª¾àª°àª¾ àªà«àª°àª®àª®àª¾àª લાવૠ(_S)"
@@ -2534,12 +2483,10 @@ msgid "_Debug"
msgstr "ડિબઠ(_D)"
#: ../src/empathy-main-window.ui.h:17
-#| msgid "File transfers"
msgid "_File Transfers"
msgstr "ફાàªàª²àª¨à«àª પરિવહન થાય àªà« (_F)"
#: ../src/empathy-main-window.ui.h:19
-#| msgid "_Join"
msgid "_Join..."
msgstr "àªà«àª¡à« (_J)..."
@@ -2548,7 +2495,6 @@ msgid "_New Conversation..."
msgstr "નવૠવારà«àª¤àª¾àª²àª¾àªª (_N)..."
#: ../src/empathy-main-window.ui.h:21
-#| msgid "Show _Offline Contacts"
msgid "_Offline Contacts"
msgstr "àªàª«àª²àª¾àªàª¨ સàªàªªàª°à«àªà«àª¨à« (_O)"
@@ -2557,7 +2503,6 @@ msgid "_Personal Information"
msgstr "વà«àª¯àªà«àª¤àª¿àªàª¤ àªàª¾àª£àªàª¾àª°à« (_P)"
#: ../src/empathy-main-window.ui.h:24
-#| msgid "Previous Conversations"
msgid "_Previous Conversations"
msgstr "પહà«àª²àª¾àª¨àª¾àª વારà«àª¤àª¾àª²àª¾àªªà« (_P)"
@@ -2566,12 +2511,10 @@ msgid "_Room"
msgstr "રà«àª® (_R)"
#: ../src/empathy-new-chatroom-dialog.c:328
-#| msgid "Chat Rooms"
msgid "Chat Room"
msgstr "વાતàªà«àª¤ રà«àª®"
#: ../src/empathy-new-chatroom-dialog.c:344
-#| msgid "Themes"
msgid "Members"
msgstr "સàªà«àª¯à«"
@@ -2621,12 +2564,10 @@ msgstr ""
"સરà«àªµàª° પર હà«àª¯ તà«"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
-#| msgid "Room"
msgid "Join Room"
msgstr "રà«àª® સાથૠàªà«àª¡àª¾àªµà«"
#: ../src/empathy-new-chatroom-dialog.ui.h:6
-#| msgid "_Room List locale:"
msgid "Room List"
msgstr "રà«àª® યાદà«"
@@ -2679,7 +2620,6 @@ msgid "Allow _network usage"
msgstr "નà«àªàªµàª°à«àª વપરાશનૠપરવાનàªà« àªàªªà« (_n)"
#: ../src/empathy-preferences.ui.h:4
-#| msgid "Appearance "
msgid "Appearance"
msgstr "દà«àªàª¾àªµà«"
@@ -2688,7 +2628,6 @@ msgid "Automatically _connect on startup "
msgstr "સà«àªàª¾àª°à«àªàª
પ પર àªàªªà«àªàªª àªà«àª¡àª¾àªµà« (_c)"
#: ../src/empathy-preferences.ui.h:6
-#| msgid "Behavior "
msgid "Behavior"
msgstr "વરà«àª¤àª£à«àª"
@@ -2705,12 +2644,10 @@ msgid "Disable sounds when _away or busy"
msgstr "àªà«àª¯àª¾àª°à« દà«àª° હà«àª¯ àª
થવા વà«àª¯àª¸à«àª¤ હà«àª¯ તà«àª¯àª¾àª°à« સાàªàª¨à«àª¡ નૠનિષà«àªà«àª°àª¿àª¯ àªàª°à« (_a)"
#: ../src/empathy-preferences.ui.h:10
-#| msgid "Enable notifications when the _chat is not focused"
msgid "Enable notifications when a contact comes online"
msgstr "àªà«àª¯àª¾àª°à« સàªàªªàª°à«àª àªàª¨àª²àª¾àªàª¨ àªàªµà« àªà« તà«àª¯àª¾àª°à« સà«àªàª¨àª¾àª નૠસàªà«àª°àª¿àª¯ àªàª°à«"
#: ../src/empathy-preferences.ui.h:11
-#| msgid "Enable notifications when the _chat is not focused"
msgid "Enable notifications when a contact goes offline"
msgstr "સà«àªàª¨àª¾àªàª¨à« સàªà«àª°àª¿àª¯ àªàª°à« àªà«àª¯àª¾àª°à« સàªàªªàª°à«àª àªàª«àª²àª¾àªàª¨ àªàª¾àª¯ તà«"
@@ -2719,7 +2656,6 @@ msgid "Enable notifications when the _chat is not focused"
msgstr "àªà«àª¯àª¾àª°à« વાતàªà«àª¤ પà«àª°àªàª¾àª¶àª¿àª¤ થયà«àª² ન હà«àª¯ તà«àª¯àª¾àª°à« સà«àªàª¨àª¾àª નૠસàªà«àª°àª¿àª¯ àªàª°à« (_c)"
#: ../src/empathy-preferences.ui.h:13
-#| msgid "Enable spell checking for languages: "
msgid "Enable spell checking for languages:"
msgstr "àªàª¾àª·àª¾àª માàªà« àªà«àª¡àª£à« àªàªàª¾àª¸àªµàª¾àª¨à« સàªà«àª°àª¿àª¯ àªàª°à«:"
@@ -2732,7 +2668,6 @@ msgid "Geoclue Settings"
msgstr "Geoclue સà«àª¯à«àªàª¨à«"
#: ../src/empathy-preferences.ui.h:16
-#| msgid "Notifications"
msgid "Location"
msgstr "સà«àª¥àª¾àª¨"
@@ -2741,7 +2676,6 @@ msgid "Notifications"
msgstr "સà«àªàª¨àª¾"
#: ../src/empathy-preferences.ui.h:18
-#| msgid "Play sound for events "
msgid "Play sound for events"
msgstr "àªàªàª¨àª¾àª માàªà« સાàªàª¨à«àª¡ વàªàª¾àª¡à«"
@@ -2759,15 +2693,14 @@ msgid ""
"state and country will be published. GPS coordinates will be accurate to 1 "
"decimal place."
msgstr ""
-"àªàªà«àª² સà«àª¥àª¾àª¨ àªà«àªà«àªàª¸àª¤àª¾ નૠમતલબ ઠàªà« તમારૠશહà«àª°, રાàªà«àª¯ àª
નૠદà«àª¶ àªàª°àª¤àª¾ વધારૠàªà«àªà«àªàª¸ àªàªàª નથૠતૠપà«àª°àªàª¾àª¶àª¿àª¤ થયà«àª² "
-"હશà«. GPS નિયામàªà« ૧ દશાàªàª¶ સà«àª¥àª¾àª¨àª¨à« àªà«àªà«àªàª¸ àªàª°àª¶à«."
+"àªàªà«àª² સà«àª¥àª¾àª¨ àªà«àªà«àªàª¸àª¤àª¾ નૠમતલબ ઠàªà« તમારૠશહà«àª°, રાàªà«àª¯ àª
નૠદà«àª¶ àªàª°àª¤àª¾ વધારૠàªà«àªà«àªàª¸ àªàªàª નથૠતૠ"
+"પà«àª°àªàª¾àª¶àª¿àª¤ થયà«àª² હશà«. GPS નિયામàªà« ૧ દશાàªàª¶ સà«àª¥àª¾àª¨àª¨à« àªà«àªà«àªàª¸ àªàª°àª¶à«."
#: ../src/empathy-preferences.ui.h:22
msgid "Show _smileys as images"
msgstr "àªàª¿àª¤à«àª°à« તરà«àªà« સà«àª®àª¾àªàª²à«àªàª¨à« બતાવૠ(_s)"
#: ../src/empathy-preferences.ui.h:23
-#| msgid "_Show Contact List"
msgid "Show contact _list in rooms"
msgstr "રà«àª®àª®àª¾àª સàªàªªàª°à«àª યાદà«àª¨à« બતાવૠ(_l)"
@@ -2780,9 +2713,6 @@ msgid "Spell Checking"
msgstr "àªà«àª¡àª£à« àªàªàª¾àª¸à« રહà«àª¯àª¾ àªà«"
#: ../src/empathy-preferences.ui.h:26
-#| msgid ""
-#| "The list of languages reflects only the languages for which you "
-#| "have a dictionary installed. "
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -2833,74 +2763,67 @@ msgid ""
msgstr "સà«àªµàª¾ %s માàªà« àªàª®àªàª¤à«àª°àª£ નૠàªàª«àª° àªàª°à«àª² હતà«, પરàªàª¤à« તà«àª¨à« સàªàªàª¾àª³àªµàª¾ માàªà« àªàª¾àª°à«àª¯àªà«àª°àª®àª¨à« તમારૠàªàª°à«àª°àª¿àª¯àª¾àª¤ નથà«"
#: ../src/empathy-map-view.ui.h:1
-#| msgid "Contact List"
msgid "Contact Map View"
msgstr "નàªà«àª·àª¾ દà«àª¶à«àª¯ નૠસàªàªªàª°à«àª àªàª°à«"
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1079
+#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
msgid "Error"
msgstr "àªà«àª²"
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1073
-#| msgid "Croatian"
+#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
msgid "Critical"
msgstr "àªàª à«àª¨"
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1067
-#| msgid "Remaining"
+#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
msgid "Warning"
msgstr "àªà«àª¤àªµàª£à«"
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1061
-#: ../src/empathy-debug-dialog.c:1109
-#| msgid "Message:"
+#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1111
msgid "Message"
msgstr "સàªàª¦à«àª¶"
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1055
+#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
msgid "Info"
msgstr "àªàª¾àª£àªàª¾àª°à«"
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1049
+#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
msgid "Debug"
msgstr "ડિબàª"
-#: ../src/empathy-debug-dialog.c:841
-#| msgid "Server"
+#: ../src/empathy-debug-window.c:841
msgid "Save"
msgstr "સàªàªà«àª°àª¹à«"
-#: ../src/empathy-debug-dialog.c:944
+#: ../src/empathy-debug-window.c:944
msgid "Debug Window"
msgstr "ડિબઠવિનà«àª¡à«"
-#: ../src/empathy-debug-dialog.c:1017
+#: ../src/empathy-debug-window.c:1019
msgid "Pause"
msgstr "àª
àªàªàª¾àªµà«"
-#: ../src/empathy-debug-dialog.c:1029
+#: ../src/empathy-debug-window.c:1031
msgid "Level "
msgstr "સà«àª¤àª° "
-#: ../src/empathy-debug-dialog.c:1098
-#| msgid "Simple"
+#: ../src/empathy-debug-window.c:1100
msgid "Time"
msgstr "સમય"
-#: ../src/empathy-debug-dialog.c:1100
-#| msgid "Romanian"
+#: ../src/empathy-debug-window.c:1102
msgid "Domain"
msgstr "ડà«àª®à«àªàª¨"
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1104
msgid "Category"
msgstr "વરà«àª"
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1106
msgid "Level"
msgstr "સà«àª¤àª°"
-#: ../src/empathy-debug-dialog.c:1136
+#: ../src/empathy-debug-window.c:1138
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
diff --git a/po/kn.po b/po/kn.po
index 320a8bdc..44885c68 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy.master.kn\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2009-08-27 15:09+0000\n"
-"PO-Revision-Date: 2009-08-28 12:43+0530\n"
+"POT-Creation-Date: 2009-08-28 12:11+0000\n"
+"PO-Revision-Date: 2009-08-31 15:59+0530\n"
"Last-Translator: Shankar Prasad \n"
"Language-Team: Kannada \n"
"MIME-Version: 1.0\n"
@@ -18,11 +18,19 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
msgstr "Empathy IM à²à³à²²à³à²à²à³"
-#: ../data/empathy.desktop.in.in.h:2
-#| msgid "Send and receive instant messages"
+#: ../data/empathy.desktop.in.in.h:3
+#| msgid "Client:"
+msgid "IM Client"
+msgstr "IM à²à³à²²à³à²à²à³"
+
+#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
msgstr "ಸà²à²¦à³à²¶à²à²³à²¨à³à²¨à³ à²à²³à³à²¹à²¿à²¸à²¿ ಹಾà²à³ ಪಡà³à²¦à³à²à³à²³à³à²³à²¿"
@@ -53,7 +61,6 @@ msgid "Compact contact list"
msgstr "à²à²¿à²à³à²à²¦à²¾à²¦ ಸà²à²ªà²°à³à² ವಿಳಾಸà²à²³ ಪà²à³à²à²¿"
#: ../data/empathy.schemas.in.h:6
-#| msgid "NetworkManager should be used"
msgid "Connection managers should be used"
msgstr "ಸà²à²ªà²°à³à² ವà³à²¯à²µà²¸à³à²¥à²¾à²ªà²à²à²³à²¨à³à²¨à³ à²
ನà³à²¨à³ ಬಳಸಬà³à²à³"
@@ -102,7 +109,6 @@ msgid "Empathy should auto-connect on startup"
msgstr "à²à²°à²à²à²à³à²à²¡à²¾à² Empathyಯೠತಾನಾà²à²¿à²¯à³ ಸà²à²ªà²°à³à²à²¿à²¤à²à³à²³à³à²³à²¬à³à²à³"
#: ../data/empathy.schemas.in.h:18
-#| msgid "Empathy should auto-connect on startup"
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathyಯೠಸà³à²¥à²³à²¦ ನಿà²à²°à²¤à³à²¯à²¨à³à²¨à³ à²à²¡à²¿à²®à³ ಮಾಡಬà³à²à³"
@@ -151,9 +157,10 @@ msgid "Path of the adium theme to use"
msgstr "ಬಳಸಬà³à²à²¿à²°à³à²µ à²à²¡à²¿à²¯à²®à³ ಪರಿಸರ ವಿನà³à²¯à²¾à²¸à²¦ ಮಾರà³à²"
#: ../data/empathy.schemas.in.h:30
-#| 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 "à²à²¾à²à³âನಲà³à²²à²¿ ಬಳಸಲಾà²à²¿à²°à³à²µ ಪರಿಸರವಿನà³à²¯à²¾à²¸à²µà³ à²à²¡à²¿à²¯à²®à³ à²à²à²¿à²¦à³à²¦à²°à³, ಬಳಸಬà³à²à²¿à²°à³à²µ à²à²¡à²¿à²¯à²®à³ ಪರಿಸರ ವಿನà³à²¯à²¾à²¸à²¦ ಮಾರà³à²."
+msgstr ""
+"à²à²¾à²à³âನಲà³à²²à²¿ ಬಳಸಲಾà²à²¿à²°à³à²µ ಪರಿಸರವಿನà³à²¯à²¾à²¸à²µà³ à²à²¡à²¿à²¯à²®à³ à²à²à²¿à²¦à³à²¦à²°à³, ಬಳಸಬà³à²à²¿à²°à³à²µ à²à²¡à²¿à²¯à²®à³ ಪರಿಸರ "
+"ವಿನà³à²¯à²¾à²¸à²¦ ಮಾರà³à²."
#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
@@ -188,12 +195,10 @@ msgid "Popup notifications if the chat isn't focused"
msgstr "à²à²¾à²à³âನ ಮà³à²²à³ à²à²®à²¨à²µà²¨à³à²¨à³ à²à³à²à²¦à³à²°à³à²à²°à²¿à²¸à²¦à³ à²à²¦à³à²¦à²²à³à²²à²¿ ಪà³à²à²¿à²à³ ಸà³à²à²¨à³"
#: ../data/empathy.schemas.in.h:39
-#| msgid "Popup notifications if the chat isn't focused"
msgid "Popup notifications when a contact sign in"
msgstr "ಸà²à²ªà²°à³à² ವಿಳಾಸವೠà²à²³à²à³ ಪà³à²°à²µà³à²¶à²¿à²¸à²¿à²¦à²¾à² ಪà³à²à²¿à²à³ ಸà³à²à²¨à³"
#: ../data/empathy.schemas.in.h:40
-#| msgid "Popup notifications if the chat isn't focused"
msgid "Popup notifications when a contact sign out"
msgstr "ಸà²à²ªà²°à³à² ವಿಳಾಸವೠಹà³à²°à²à³ ನಿರà³à²à²®à²¿à²¸à²¿à²¦à²¾à² ಪà³à²à²¿à²à³ ಸà³à²à²¨à³"
@@ -206,7 +211,6 @@ msgid "Show avatars"
msgstr "à²
ವತಾರà²à²³à²¨à³à²¨à³ ತà³à²°à²¿à²¸à³"
#: ../data/empathy.schemas.in.h:43
-#| msgid "_Show Contact List"
msgid "Show contact list in rooms"
msgstr "ರà³à²®à³à²à²³à²²à³à²²à²¿à²¨ ವಿಳಾಸà²à²³ ಪà²à³à²à²¿à²¯à²¨à³à²¨à³ ತà³à²°à²¿à²¸à³(_S)"
@@ -251,29 +255,18 @@ msgid "Whether WebKit developer tools, such as the Web Inspector, should be enab
msgstr "ವà³à²¬à³ à²à²¨à³âಸà³à²ªà³à²à³à²à²°à²¿à²¨à²à²¤à²¹ WebKit ವಿà²à²¸à²¨à²¾ à²à²ªà²à²°à²£à²à²³à²¨à³à²¨à³ ಶà²à³à²¤à²à³à²³à²¿à²¸à²¬à³à²à³."
#: ../data/empathy.schemas.in.h:54
-#| msgid ""
-#| "Whether or not to show contacts that are offline in the contact list."
msgid "Whether or not Empathy can publish the user's location to his contacts."
msgstr "Empathy ಯೠತನà³à²¨ ಸà²à²ªà²°à³à² ವಿಳಾಸà²à²³à²¿à²à³ ಬಳà²à³à²¦à²¾à²°à²° ಸà³à²¥à²³à²µà²¨à³à²¨à³ ತà³à²°à²¿à²¸à²¬à³à²à³ à²
ಥವ ಬà³à²¡à²µà³."
#: ../data/empathy.schemas.in.h:55
-#| msgid ""
-#| "Whether or not Empathy should use the avatar of the contact as the chat "
-#| "window icon."
msgid "Whether or not Empathy can use the GPS to guess the location."
msgstr "ಸà³à²¥à²³à²µà²¨à³à²¨à³ à²à²¹à²¿à²¸à²²à³ EmpathyಯೠGPS à²
ನà³à²¨à³ ಬಳಸಬà³à²à³ à²
ಥವ ಬà³à²¡à²µà³."
#: ../data/empathy.schemas.in.h:56
-#| msgid ""
-#| "Whether or not Empathy should use the avatar of the contact as the chat "
-#| "window icon."
msgid "Whether or not Empathy can use the cellular network to guess the location."
msgstr "ಸà³à²¥à²³à²µà²¨à³à²¨à³ à²à²¹à²¿à²¸à²²à³ Empathyಯೠಸà³à²²à³à²¯à³à²²à²¾à²°à³ à²à²¾à²²à²¬à²à²§à²µà²¨à³à²¨à³ ಬಳಸಬà³à²à³ à²
ಥವ ಬà³à²¡à²µà³."
#: ../data/empathy.schemas.in.h:57
-#| msgid ""
-#| "Whether or not Empathy should use the avatar of the contact as the chat "
-#| "window icon."
msgid "Whether or not Empathy can use the network to guess the location."
msgstr "ಸà³à²¥à²³à²µà²¨à³à²¨à³ à²à²¹à²¿à²¸à²²à³ Empathyಯೠà²à²¾à²²à²¬à²à²§à²µà²¨à³à²¨à³ ಬಳಸಬà³à²à³ à²
ಥವ ಬà³à²¡à²µà³."
@@ -290,9 +283,6 @@ msgid ""
msgstr "Empathyಯೠà²à²°à²à²à²à³à²à²¡à²¾à² à²
ದೠನಿಮà³à²® à²à²¾à²¤à³à²à²³à²¿à²à³ ಲಾà²à²¿à²¨à³ à²à²à²¬à³à²à³ à²
ಥವ ಬà³à²¡à²µà³."
#: ../data/empathy.schemas.in.h:60
-#| msgid ""
-#| "Whether or not Empathy should use the avatar of the contact as the chat "
-#| "window icon."
msgid ""
"Whether or not Empathy should reduce the location's accuracy for privacy "
"reasons."
@@ -305,13 +295,12 @@ msgid ""
msgstr "Empathyಯೠಸà²à²ªà²°à³à² ವಿಳಾಸದ à²
ವತಾರವನà³à²¨à³ à²à²¾à²à³â ವಿà²à²¡à³ à²à²¿à²¹à³à²¨à³à²¯à²¾à²à²¿ ಬಳಸಬà³à²à³ à²
ಥವ ಬà³à²¡à²µà³."
#: ../data/empathy.schemas.in.h:62
-#| msgid ""
-#| "Whether or not the network manager should be used to automatically "
-#| "disconnect/reconnect."
msgid ""
"Whether or not connectivity managers should be used to automatically "
"disconnect/reconnect."
-msgstr "ತಾನಾà²à²¿à²¯à³ ಸà²à²ªà²°à³à²à²µà²¨à³à²¨à³ à²à²²à³à²ªà²¿à²¸à²²à³/à²à²¡à²¿à²¦à³ ಹಾà²à²²à³ ನà³à²à³âವರà³à²à³ ಮà³à²¯à²¾à²¨à³à²à²°à³à²à²³à²¨à³à²¨à³ ಬಳಸಬà³à²à³ à²
ಥವ ಬà³à²¡à²µà³."
+msgstr ""
+"ತಾನಾà²à²¿à²¯à³ ಸà²à²ªà²°à³à²à²µà²¨à³à²¨à³ à²à²²à³à²ªà²¿à²¸à²²à³/à²à²¡à²¿à²¦à³ ಹಾà²à²²à³ ನà³à²à³âವರà³à²à³ ಮà³à²¯à²¾à²¨à³à²à²°à³à²à²³à²¨à³à²¨à³ ಬಳಸಬà³à²à³ à²
ಥವ "
+"ಬà³à²¡à²µà³."
#: ../data/empathy.schemas.in.h:63
msgid "Whether or not the Salut account has been created on the first Empathy run."
@@ -366,12 +355,10 @@ msgid "Whether or not to play sound notifications when away or busy."
msgstr "ನà³à²µà³ ಹà³à²°à²à²¡à³ ಹà³à²¦à²¾à² ಶಬà³à²§à²¦ ಮà³à²²à² ಸà³à²à²¨à³à²¯à²¨à³à²¨à³ ನà³à²¡à²¬à³à²à³ à²
ಥವ ಬà³à²¡à²µà³."
#: ../data/empathy.schemas.in.h:75
-#| 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:76
-#| 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 "ಸà²à²ªà²°à³à² ವಿಳಾಸವೠà²à²¨à³âಲà³à²¨à³âà²à³ ಮರಳಿದಾಠಪà³à²à²¿à²à³ ಸà³à²à²¨à³à²à²³à²¨à³à²¨à³ ನà³à²¡à²¬à³à²à³ à²
ಥವ ಬà³à²¡à²µà³."
@@ -404,7 +391,6 @@ msgid "Whether or not to show popup notifications when away or busy."
msgstr "ನà³à²µà³ ಹà³à²°à²à²¡à³ ಹà³à²¦à²¾à² ಪà³à²à²¿à²à³ ಸà³à²à²¨à³à²à²³à²¨à³à²¨à³ ನà³à²¡à²¬à³à²à³ à²
ಥವ ಬà³à²¡à²µà³."
#: ../data/empathy.schemas.in.h:82
-#| 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 "à²à²¾à²à³â ರà³à²®à³âà²à²³à²²à³à²²à²¿à²¨ ಸà²à²ªà²°à³à² ವಿಳಾಸà²à²³ ಪà²à³à²à²¿à²¯à²¨à³à²¨à³ ತà³à²°à²¿à²¸à²¬à³à²à³ ಬà³à²¡à²µà³."
@@ -511,12 +497,10 @@ msgid "Offline"
msgstr "à²à²«à³âಲà³à²¨à³"
#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
-#| msgid "People nearby"
msgid "People Nearby"
msgstr "ಹತà³à²¤à²¿à²°à²¦ à²à²¨à²°à³"
#: ../libempathy/empathy-utils.c:384
-#| msgid "Use _Yahoo Japan"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan à²
ನà³à²¨à³ ಬಳಸà³"
@@ -1085,13 +1069,11 @@ msgid "_Chat"
msgstr "à²à²¾à²à³ ಮಾಡà³(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:253
-#| msgid "_Call"
msgctxt "menu item"
msgid "_Audio Call"
msgstr "à²à²¡à²¿à²¯à³ à²à²°à³(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:285
-#| msgid "_Call"
msgctxt "menu item"
msgid "_Video Call"
msgstr "ವà³à²¡à²¿à²¯à³ à²à²°à³(_V)"
@@ -1179,7 +1161,6 @@ msgid "Building:"
msgstr "à²à²à³à²à²¡:"
#: ../libempathy-gtk/empathy-contact-widget.c:1276
-#| msgid "_For:"
msgid "Floor:"
msgstr "ಮಹಡಿ:"
@@ -1220,7 +1201,6 @@ msgid "Speed:"
msgstr "ವà³à²:"
#: ../libempathy-gtk/empathy-contact-widget.c:1296
-#| msgid "Version:"
msgid "Bearing:"
msgstr "ಬಿಯರಿà²à²à³:"
@@ -1245,12 +1225,10 @@ msgid "Altitude:"
msgstr "à²à²¤à³à²¤à²°(ಸಮà³à²¦à³à²° ಮà²à³à²à²¦à²¿à²à²¦):"
#: ../libempathy-gtk/empathy-contact-widget.c:1353
-#| msgid "Contact "
msgid "Location "
msgstr "ಸà³à²¥à²³ "
#: ../libempathy-gtk/empathy-contact-widget.c:1366
-#| msgid "Contact "
msgid "Location , "
msgstr "ಸà³à²¥à²³ , "
@@ -1410,7 +1388,6 @@ msgstr "à²à²à³à²à³à²¯ ಸà²à²¦à³à²¶..."
#: ../libempathy-gtk/empathy-presence-chooser.c:229
#: ../libempathy-gtk/empathy-presence-chooser.c:231
-#| msgid "Custom messages..."
msgid "Edit Custom Messages..."
msgstr "à²à²¸à³à²à²®à³ ಸà²à²¦à³à²¶à²à²³à²¨à³à²¨à³ ಸà²à²ªà²¾à²¦à²¿à²¸à³..."
@@ -1423,7 +1400,6 @@ msgid "Click to make this status a favorite"
msgstr "ಠಸà³à²¥à²¿à²¤à²¿à²¯à²¨à³à²¨à³ à²
à²à³à²à³à²®à³à²à³à²à²¿à²¨à²¦à³ à²à²à²¦à³ à²à³à²°à³à²¤à³ ಹಾà²à²²à³ à²à³à²²à²¿à²à³ ಮಾಡಿ"
#: ../libempathy-gtk/empathy-presence-chooser.c:373
-#| msgid "Status"
msgid "Set status"
msgstr "ಸà³à²¥à²¿à²¤à²¿à²¯à²¨à³à²¨à³ ಹà³à²à²¦à²¿à²¸à²¿"
@@ -1477,12 +1453,10 @@ msgid "Voice call ended"
msgstr "ಧà³à²µà²¨à²¿ à²à²°à³ ಪà³à²°à³à²£à²à³à²à²¡à²¿à²¦à³"
#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
-#| msgid "Custom message"
msgid "Enter Custom Message"
msgstr "à²à²¸à³à²à²®à³ ಸà²à²¦à³à²¶à²µà²¨à³à²¨à³ ನಮà³à²¦à²¿à²¸à²¿"
#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
-#| msgid "Custom message"
msgid "Edit Custom Messages"
msgstr "à²à²¸à³à²à²®à³ ಸà²à²¦à³à²¶à²à²³à²¨à³à²¨à³ ಸà²à²ªà²¾à²¦à²¿à²¸à²¿"
@@ -1491,7 +1465,6 @@ msgid "Add _New Preset"
msgstr "ಹà³à²¸ ಪà³à²°à³à²µà²¨à²¿à²°à³à²§à²¾à²°à²¿à²¤à²µà²¨à³à²¨à³(ಪà³à²°à²¿à²¸à³à²à³) ಸà³à²°à²¿à²¸à³(_N)"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-#| msgid "Save message"
msgid "Saved Presets"
msgstr "à²à²³à²¿à²¸à²²à²¾à²¦ ಪà³à²°à³à²µà²¨à²¿à²°à³à²§à²¾à²°à²¿à²¤à²à²³à³(ಪà³à²°à²¿à²¸à³à²à³)"
@@ -1520,7 +1493,6 @@ msgid "Select a file"
msgstr "à²à²à²¦à³ à²à²¡à²¤à²µà²¨à³à²¨à³ à²à²°à²¿à²¸à³"
#: ../libempathy-gtk/empathy-ui-utils.c:1523
-#| msgid "Select a contact"
msgid "Select a destination"
msgstr "à²à²à²¦à³ à²à³à²°à²¿à²¯à²¨à³à²¨à³ à²à²°à²¿à²¸à²¿"
@@ -1759,7 +1731,6 @@ msgid "Show the accounts dialog"
msgstr "à²à²¾à²¤à³à²¯ ಸà²à²µà²¾à²¦à²µà²¨à³à²¨à³ ತà³à²°à²¿à²¸à³"
#: ../src/empathy.c:608
-#| msgid "- Empathy Instant Messenger"
msgid "- Empathy IM Client"
msgstr "- Empathy IM à²à³à²²à³à²à²à³"
@@ -1805,40 +1776,43 @@ msgstr "GNOME ನಲà³à²²à²¿à²¨ à²à²à²¦à³ ತà²à³à²·à²£ ಸà²à²¦à³à²¶
msgid "translator-credits"
msgstr "ಶà²à²à²°à³ ಪà³à²°à²¸à²¾à²¦à³ "
-#. translators: this is followed by the "while ..." strings some lines
-#. * down this file.
-#.
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error "
-msgstr "à²à²à²¦à³ ದà³à²·à²µà³ à²à²¦à³à²°à²¾à²à²¿à²¦à³"
+#: ../src/empathy-account-assistant.c:118
+#| msgid "while importing the accounts."
+msgid "There has been an error while importing the accounts."
+msgstr "à²à²¾à²¤à³à²à²³à²¨à³à²¨à³ à²à²®à²¦à³ ಮಾಡಿà²à³à²³à³à²³à³à²µà²¾à² à²à²à²¦à³ ದà³à²·à²µà³ à²à²¦à³à²°à²¾à²à²¿à²¦à³."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:125
-msgid "while importing the accounts."
-msgstr " à²à²¾à²¤à³à²à²³à²¨à³à²¨à³ à²à²®à²¦à³ ಮಾಡಿà²à³à²³à³à²³à³à²µà²¾à²."
+#: ../src/empathy-account-assistant.c:121
+#| msgid "while parsing the account details."
+msgid "There has been an error while parsing the account details."
+msgstr "à²à²¾à²¤à³à²¯ ವಿವರà²à²³à²¨à³à²¨à³ ಪಾರà³à²¸à³ ಮಾಡà³à²µà²¾à² à²à²à²¦à³ ದà³à²·à²µà³ à²à²¦à³à²°à²¾à²à²¿à²¦à³."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:129
-msgid "while parsing the account details."
-msgstr "à²à²¾à²¤à³à²¯ ವಿವರà²à²³à²¨à³à²¨à³ ಪಾರà³à²¸à³ ಮಾಡà³à²µà²²à³à²²à²¿."
+#: ../src/empathy-account-assistant.c:124
+#| msgid "while creating the account."
+msgid "There has been an error while creating the account."
+msgstr "à²à²¾à²¤à³à²¯à²¨à³à²¨à³ ರà²à²¿à²¸à³à²µà²¾à² à²à²à²¦à³ ದà³à²·à²µà³ à²à²¦à³à²°à²¾à²à²¿à²¦à³."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:133
-msgid "while creating the account."
-msgstr "à²à²¾à²¤à³à²¯à²¨à³à²¨à³ ರà²à²¿à²¸à³à²µà²¾à²."
+#: ../src/empathy-account-assistant.c:126
+#| msgid "There has been an error "
+msgid "There has been an error."
+msgstr "à²à²à²¦à³ ದà³à²·à²µà³ à²à²¦à³à²°à²¾à²à²¿à²¦à³."
-#: ../src/empathy-account-assistant.c:151
+#: ../src/empathy-account-assistant.c:141
#, c-format
msgid "The error message was: %s "
msgstr "ದà³à²· ಸà²à²¦à³à²¶à²µà³: %s "
-#: ../src/empathy-account-assistant.c:159
+#: ../src/empathy-account-assistant.c:149
+#| msgid ""
+#| "You can either go back and try to enter your accounts' details again or "
+#| "quit this wizard and add accounts later from the Edit menu."
msgid ""
"You can either go back and try to enter your accounts' details again or quit "
-"this wizard and add accounts later from the Edit menu."
-msgstr "ನà³à²µà³ ಹಿà²à²¦à³ ಹà³à²à²¿ ನಿಮà³à²® à²à²¾à²¤à³à²à²³ ವಿವರà²à²³à²¨à³à²¨à³ ದಾà²à²²à²¿à²¸à²¬à²¹à³à²¦à³ à²
ಥವ ಠà²à²¾à²°à³à²¡à²¿à²¯à²¿à²à²¦ ನಿರà³à²à²®à²¿à²¸à²¿ ನà²à²¤à²° ಸà²à²ªà²¾à²¦à²¨à³ ಮà³à²¨à³à²µà²¿à²¨à²²à³à²²à²¿ ಹà³à²à²¿ à²à²¾à²¤à³à²à²³à²¨à³à²¨à³ ಸà³à²°à²¿à²¸à²¬à²¹à³à²¦à³."
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"ನà³à²µà³ ಹಿà²à²¦à³ ಹà³à²à²¿ ನಿಮà³à²® à²à²¾à²¤à³à²à²³ ವಿವರà²à²³à²¨à³à²¨à³ ದಾà²à²²à²¿à²¸à²¬à²¹à³à²¦à³ à²
ಥವ ಠಸಹಾಯà²à²¨à²¿à²à²¦ ನಿರà³à²à²®à²¿à²¸à²¿ "
+"ನà²à²¤à²° ಸà²à²ªà²¾à²¦à²¨à³ ಮà³à²¨à³à²µà²¿à²¨à²²à³à²²à²¿ ಹà³à²à²¿ à²à²¾à²¤à³à²à²³à²¨à³à²¨à³ ಸà³à²°à²¿à²¸à²¬à²¹à³à²¦à³."
-#: ../src/empathy-account-assistant.c:194
+#: ../src/empathy-account-assistant.c:184
msgid "An error occurred"
msgstr "à²à²à²¦à³ ದà³à²· à²à²¦à³à²°à²¾à²à²¿à²¦à³"
@@ -1848,93 +1822,92 @@ msgstr "à²à²à²¦à³ ದà³à²· à²à²¦à³à²°à²¾à²à²¿à²¦à³"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:330
+#: ../src/empathy-account-assistant.c:320
#: ../src/empathy-accounts-dialog.c:1197
#, c-format
msgid "New %s account"
msgstr "ಹà³à²¸ %s à²à²¾à²¤à³"
-#: ../src/empathy-account-assistant.c:397
+#: ../src/empathy-account-assistant.c:387
msgid "What kind of chat account do you have?"
msgstr "ಯಾವ ಬà²à³à²¯ à²à²¾à²à³ à²à²¾à²¤à³à²¯à²¨à³à²¨à³ ನà³à²µà³ ಹà³à²à²¦à²¿à²¦à³à²¦à³à²°à²¿?"
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:393
msgid "Do you have any other chat accounts you want to set up?"
msgstr "ನà³à²µà³ ಸಿದà³à²§à²ªà²¡à²¿à²¸à²²à³ ಬಯಸà³à²µ ಬà³à²°à²¾à²µà³à²¦à³ à²à²¾à²¤à³à²¯à²¨à³à²¨à³ ನà³à²µà³ ಹà³à²à²¦à²¿à²¦à³à²¦à³à²°à³?"
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:399
msgid "Enter your account details"
msgstr "ನಿಮà³à²® à²à²¾à²¤à³à²¯ ಮಾಹಿತಿಯನà³à²¨à³ ನಮà³à²¦à²¿à²¸à²¿"
-#: ../src/empathy-account-assistant.c:414
-#| msgid "%s is calling you, do you want to answer?"
+#: ../src/empathy-account-assistant.c:404
msgid "What kind of chat account do you want to create?"
msgstr "ನà³à²µà³ ಯಾವ ಬà²à³à²¯ à²à²¾à²à³ à²à²¾à²¤à³à²¯à²¨à³à²¨à³ ರà²à²¿à²¸à²²à³ ಬಯಸà³à²¤à³à²¤à³à²°à²¿?"
-#: ../src/empathy-account-assistant.c:420
-#| msgid "Do you really want to remove the contact '%s'?"
+#: ../src/empathy-account-assistant.c:410
msgid "Do you want to create other chat accounts?"
msgstr "ನà³à²µà³ à²à²¨à³à²¨à³à²à²¦à³ à²à²¾à²à³ à²à²¾à²¤à³à²à²³à²¨à³à²¨à³ ಬಯಸà³à²¤à³à²¤à³à²°à³?"
-#: ../src/empathy-account-assistant.c:427
+#: ../src/empathy-account-assistant.c:417
msgid "Enter the details for the new account"
msgstr "ಹà³à²¸ à²à²¾à²¤à³à²à²¾à²à²¿ ವಿವರà²à²³à²¨à³à²¨à³ ದಾà²à²²à²¿à²¸à²¿"
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:503
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
"programs. With a microphone or a webcam you can also have audio or video "
"calls."
-msgstr "Empathy ಯನà³à²¨à³ ಬಳಸಿà²à³à²à²¡à³ ನà³à²µà³ à²à²¨à³âಲà³à²¨à²¿à²¨à²²à³à²²à²¿à²°à³à²µ ಹತà³à²¤à²¿à²°à²¦ à²à²¨à²°à³ ಹಾà²à³ Google Talk, AIM, Windows Live ಹಾà²à³ à²à²¨à³à²¨à²¿à²¤à²°à³ à²à²¾à²à³ ಪà³à²°à³à²à³à²°à²¾à²®à³ à²
ನà³à²¨à³ ಬಳಸà³à²µ ನಿಮà³à²® ಸà³à²¨à³à²¹à²¿à²¤à²°à³ ಮತà³à²¤à³ ಸಹà³à²¦à³à²¯à³à²à²¿à²à²³à³à²¡à²¨à³ à²à²¾à²à³â ಮಾಡಬಹà³à²¦à³. à²à²à²¦à³ ಮà³à²à³à²°à³à²«à³à²¨à³ à²
ಥವ à²à²à²¦à³ ವà³à²¬à³âà²à³à²¯à²¾à²®à³ à²à²¦à³à²¦à²²à³à²²à²¿ ನà³à²µà³ à²à²¡à²¿à²¯à³ à²
ಥವ ವà³à²¡à²¿à²¯à³ à²à²°à³à²à²³à²¨à³à²¨à³ ಸಹ ಮಾಡಬಹà³à²¦à³."
+msgstr ""
+"Empathy ಯನà³à²¨à³ ಬಳಸಿà²à³à²à²¡à³ ನà³à²µà³ à²à²¨à³âಲà³à²¨à²¿à²¨à²²à³à²²à²¿à²°à³à²µ ಹತà³à²¤à²¿à²°à²¦ à²à²¨à²°à³ ಹಾà²à³ Google Talk, AIM, "
+"Windows Live ಹಾà²à³ à²à²¨à³à²¨à²¿à²¤à²°à³ à²à²¾à²à³ ಪà³à²°à³à²à³à²°à²¾à²®à³ à²
ನà³à²¨à³ ಬಳಸà³à²µ ನಿಮà³à²® ಸà³à²¨à³à²¹à²¿à²¤à²°à³ ಮತà³à²¤à³ "
+"ಸಹà³à²¦à³à²¯à³à²à²¿à²à²³à³à²¡à²¨à³ à²à²¾à²à³â ಮಾಡಬಹà³à²¦à³. à²à²à²¦à³ ಮà³à²à³à²°à³à²«à³à²¨à³ à²
ಥವ à²à²à²¦à³ ವà³à²¬à³âà²à³à²¯à²¾à²®à³ à²à²¦à³à²¦à²²à³à²²à²¿ ನà³à²µà³ "
+"à²à²¡à²¿à²¯à³ à²
ಥವ ವà³à²¡à²¿à²¯à³ à²à²°à³à²à²³à²¨à³à²¨à³ ಸಹ ಮಾಡಬಹà³à²¦à³."
-#: ../src/empathy-account-assistant.c:530
+#: ../src/empathy-account-assistant.c:520
msgid "Do you have an account you've been using with another chat program?"
msgstr "ನà³à²µà³ ಬà³à²°à³à²à²¦à³ à²à²¾à²à³ ಪà³à²°à³à²à³à²°à²¾à²®à³âನಲà³à²²à²¿ ಬಳಸà³à²¤à³à²¤à²¿à²°à³à²µ à²à²à²¦à³ à²à²¾à²¤à³à²¯à³ ನಿಮà³à²®à²²à³à²²à²¿ à²à²¦à³à²¯à³?"
-#: ../src/empathy-account-assistant.c:553
+#: ../src/empathy-account-assistant.c:543
msgid "Yes, import my account details from "
msgstr "ಹà³à²¦à³, ನನà³à²¨ à²à²¾à²¤à³à²¯ ವಿವರà²à²³à²¨à³à²¨à³ à²à²²à³à²²à²¿à²à²¦ à²à²®à²¦à³ ಮಾಡಿà²à³"
-#: ../src/empathy-account-assistant.c:574
+#: ../src/empathy-account-assistant.c:564
msgid "Yes, I'll enter my account details now"
msgstr "ಹà³à²¦à³, ನಾನೠನನà³à²¨ à²à²¾à²¤à³à²¯ ವಿವರà²à²³à²¨à³à²¨à³ ನಮà³à²¦à²¿à²¸à³à²¤à³à²¤à³à²¨à³"
-#: ../src/empathy-account-assistant.c:596
-#| msgid "Create a new IRC network"
+#: ../src/empathy-account-assistant.c:586
msgid "No, I want a new account"
msgstr "à²à²²à³à²², ನಾನೠà²à²à²¦à³ ಹà³à²¸ à²à²¾à²¤à³à²¯à²¨à³à²¨à³ ನಿರà³à²®à²¿à²¸à²²à³ ಬಯಸà³à²¤à³à²¤à³à²¨à³"
-#: ../src/empathy-account-assistant.c:606
+#: ../src/empathy-account-assistant.c:596
msgid "No, I just want to see people online nearby for now"
msgstr "à²à²²à³à²², ನಾನೠà²à³à²µà²² à²à² à²à²¨à³âಲà³à²¨à²¿à²¨à²²à³à²²à²¿à²°à³à²µ ಹತà³à²¤à²¿à²°à²¦ à²à²¨à²°à²¨à³à²¨à³ ನà³à²¡à²²à³ ಬಯಸà³à²¤à³à²¤à³à²¨à³"
-#: ../src/empathy-account-assistant.c:627
+#: ../src/empathy-account-assistant.c:617
msgid "Select the accounts you want to import:"
msgstr "ನà³à²µà³ à²à²®à²¦à³ ಮಾಡಿà²à³à²³à³à²³à²²à³ ಬಯಸà³à²µ à²à²¾à²¤à³à²à²³à²¨à³à²¨à³ à²à²¯à³à²à³ ಮಾಡಿ:"
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:704
#: ../src/empathy-new-chatroom-dialog.c:496
#: ../src/empathy-new-chatroom-dialog.c:497
msgid "Yes"
msgstr "ಹà³à²¦à³"
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:711
msgid "No, that's all for now"
msgstr "à²à²²à³à²², à²à² à²
ಷà³à²à³ ಸಾà²à³"
-#: ../src/empathy-account-assistant.c:914
+#: ../src/empathy-account-assistant.c:904
msgid "Welcome to Empathy"
msgstr "Empathy à²à³ ಸà³à²¸à³à²µà²¾à²à²¤"
-#: ../src/empathy-account-assistant.c:923
-#| msgid "Show and edit accounts"
+#: ../src/empathy-account-assistant.c:913
msgid "Import your existing accounts"
msgstr "à²à²à²¿à²°à³à²µ à²à²¾à²¤à³à²à²³à²¨à³à²¨à³ à²à²®à²¦à³ ಮಾಡಿà²à³à²³à³à²³à²¿"
#: ../src/empathy-accounts-dialog.c:206
#, c-format
-#| msgid "%s of %s"
msgid "%s on %s"
msgstr "%s, %s ನಲà³à²²à²¿"
@@ -1942,12 +1915,10 @@ msgstr "%s, %s ನಲà³à²²à²¿"
#. * string will be something like: "Jabber Account"
#: ../src/empathy-accounts-dialog.c:217
#, c-format
-#| msgid "Account"
msgid "%s Account"
msgstr "%s à²à²¾à²¤à³"
#: ../src/empathy-accounts-dialog.c:221
-#| msgid "New %s account"
msgid "New account"
msgstr "ಹà³à²¸ à²à²¾à²¤à³"
@@ -2003,17 +1974,14 @@ msgid "_Add..."
msgstr "ಸà³à²°à²¿à²¸à³(_A)..."
#: ../src/empathy-accounts-dialog.ui.h:7
-#| msgid "Create a new IRC network"
msgid "_Create a new account"
msgstr "à²à²à²¦à³ ಹà³à²¸ à²à²¾à²¤à³à²¯à²¨à³à²¨à³ ರà²à²¿à²¸à³(_C)"
#: ../src/empathy-accounts-dialog.ui.h:8
-#| msgid "Show and edit accounts"
msgid "_Reuse an existing account"
msgstr "à²à²à²¿à²°à³à²µ à²à²à²¦à³ à²à²¾à²¤à³à²¯à²¨à³à²¨à³ ಮರಳಿ à²à²ªà²¯à³à²à²¿à²¸à³(_R)"
#: ../src/empathy-accounts-dialog.ui.h:9
-#| msgid "Account"
msgid "account"
msgstr "à²à²¾à²¤à³"
@@ -2068,7 +2036,6 @@ msgstr "à²à²°à³"
#. Translators: number of minutes:seconds the caller has been connected
#: ../src/empathy-call-window.c:1390
#, c-format
-#| msgid "Connected -- %d:%02dm"
msgid "Connected â %d:%02dm"
msgstr "ಸà²à²ªà²°à³à²à²¿à²¤à²à³à²à²¡à²¿à²¦à³ â %d:%02dm"
@@ -2293,7 +2260,6 @@ msgstr "à²à³à²¤à³à²¤à²¿à²²à³à²²à²¦"
#: ../src/empathy-ft-manager.c:275
#, c-format
-#| msgid "%s of %s"
msgid "%s of %s at %s/s"
msgstr "%s, (%s ನಲà³à²²à²¿) %s/s ದರದಲà³à²²à²¿"
@@ -2318,7 +2284,6 @@ msgstr "\"%s\" à²
ನà³à²¨à³ %s à²à³ à²à²³à³à²¹à²¿à²¸à²²à²¾à²à³à²¤à³à²¤
#. * is the contact name
#: ../src/empathy-ft-manager.c:340
#, c-format
-#| msgid "Receiving \"%s\" from %s"
msgid "Error receiving \"%s\" from %s"
msgstr "\"%s\" à²
ನà³à²¨à³ %s à²à²à²¦ ಸà³à²µà³à²à²°à²¿à²¸à³à²µà²²à³à²²à²¿ ದà³à²· à²à²à²à²¾à²à²¿à²¦à³"
@@ -2328,12 +2293,10 @@ msgstr "à²à²à²¦à³ à²à²¡à²¤à²µà²¨à³à²¨à³ ಸà³à²µà³à²à²°à²¿à²¸à³à²µà²²
#: ../src/empathy-ft-manager.c:348
#, c-format
-#| msgid "Sending \"%s\" to %s"
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 "à²à²à²¦à³ à²à²¡à²¤à²µà²¨à³à²¨à³ à²à²³à³à²¹à²¿à²¸à³à²µà²²à³à²²à²¿ ದà³à²· à²à²à²à²¾à²à²¿à²¦à³"
@@ -2356,7 +2319,6 @@ msgid "File transfer completed"
msgstr "à²à²¡à²¤à²¦ ವರà³à²à²¾à²µà²£à³ ಪà³à²°à³à²£à²à³à²à²¡à²¿à²¦à³"
#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
-#| msgid "Waiting the other participant's response"
msgid "Waiting for the other participant's response"
msgstr "à²à²¾à²à²¿à²¯à²¾à²¦ à²à²¤à²°à²° ಪà³à²°à²¤à³à²¯à³à²¤à³à²¤à²°à²à³à²à²¾à²à²¿ à²à²¾à²¯à²²à²¾à²à³à²¤à³à²¤à²¿à²¦à³"
@@ -2417,7 +2379,6 @@ msgstr "ಮà³à²²"
#: ../src/empathy-import-mc4-accounts.c:106
#, c-format
-#| msgid "New %s account"
msgid "%s account"
msgstr "%s à²à²¾à²¤à³"
@@ -2514,12 +2475,10 @@ msgid "Normal Size With _Avatars"
msgstr "à²
ವತಾರà²à²³ ಸಾಮಾನà³à²¯ à²à²¾à²¤à³à²°(_A)"
#: ../src/empathy-main-window.ui.h:8
-#| msgid "Sort by _name"
msgid "Sort by _Name"
msgstr "ಹà³à²¸à²°à²¿à²¨ à²à²§à²¾à²°à²¦à²²à³à²²à²¿ ವಿà²à²à²¡à²¿à²¸à³(_N)"
#: ../src/empathy-main-window.ui.h:9
-#| msgid "Sort by s_tate"
msgid "Sort by _Status"
msgstr "ಸà³à²¥à²¿à²¤à²¿à²¯ à²à²§à²¾à²°à²¦à²²à³à²²à²¿ ವಿà²à²à²¡à²¿à²¸à³(_S)"
@@ -2548,7 +2507,6 @@ msgid "_New Conversation..."
msgstr "ಹà³à²¸ ಸà²à²à²¾à²·à²£à³(_N)..."
#: ../src/empathy-main-window.ui.h:21
-#| msgid "Show _Offline Contacts"
msgid "_Offline Contacts"
msgstr "à²à²«à³âಲà³à²¨à³ ಸà²à²ªà²°à³à² ವಿಳಾಸà²à²³à³(_O)"
@@ -2557,7 +2515,6 @@ msgid "_Personal Information"
msgstr "ವà³à²¯à²à³à²¤à²¿à² ಮಾಹಿತಿ(_P)"
#: ../src/empathy-main-window.ui.h:24
-#| msgid "Previous Conversations"
msgid "_Previous Conversations"
msgstr "ಠಹಿà²à²¦à²¿à²¨ ಸà²à²à²¾à²·à²£à³à²à²³à³(_P)"
@@ -2619,7 +2576,6 @@ msgstr ""
"ಪರಿà²à²¾à²°à²à²¦à²²à³à²²à²¿à²¦à³à²¦à²°à³ à²
ದನà³à²¨à³ à²à²¾à²²à²¿ ಬಿಡಿ"
#: ../src/empathy-new-chatroom-dialog.ui.h:5
-#| msgid "Room"
msgid "Join Room"
msgstr "ರà³à²®à³ à²
ನà³à²¨à³ ಸà³à²°à²¿"
@@ -2700,12 +2656,10 @@ msgid "Disable sounds when _away or busy"
msgstr "ಹà³à²°à²à³ ಹà³à²à²¿à²¦à³à²¦à²¾à² à²
ಥವ à²à²¾à²°à³à²¯à²¨à²¿à²°à²¤à²µà²¾à²à²¿à²¦à³à²¦à²¾à² ಶಬà³à²¦à²à²³à²¨à³à²¨à³ ನಿಷà³à²à³à²°à²¿à²¯à²à³à²³à²¿à²¸à³(_a)"
#: ../src/empathy-preferences.ui.h:10
-#| msgid "Enable notifications when the _chat is not focused"
msgid "Enable notifications when a contact comes online"
msgstr "à²à²à²¦à³ ಸà²à²ªà²°à³à² ವಿಳಾಸವೠà²à²¨à³âಲà³à²¨à³ à²à²¦à³à²¦à²²à³à²²à²¿ ಸà³à²à²¨à³à²à²³à²¨à³à²¨à³ ನà³à²¡à³à²µà²¿à²à³à²¯à²¨à³à²¨à³ ಶà²à³à²¤à²à³à²³à²¿à²¸à³"
#: ../src/empathy-preferences.ui.h:11
-#| msgid "Enable notifications when the _chat is not focused"
msgid "Enable notifications when a contact goes offline"
msgstr "à²à²à²¦à³ ಸà²à²ªà²°à³à² ವಿಳಾಸವೠà²à²«à³âಲà³à²¨à³ à²à²¦à³à²¦à²²à³à²²à²¿ ಸà³à²à²¨à³à²à²³à²¨à³à²¨à³ ನà³à²¡à³à²µà²¿à²à³à²¯à²¨à³à²¨à³ ಶà²à³à²¤à²à³à²³à²¿à²¸à³"
@@ -2750,14 +2704,15 @@ msgid ""
"Reduced location accuracy means that nothing more precise than your city, "
"state and country will be published. GPS coordinates will be accurate to 1 "
"decimal place."
-msgstr "ಸà³à²¥à²³à²¦ à²à²¡à²¿à²®à³ ನಿà²à²°à²¤à³ à²à²à²¦à²°à³ ನಿಮà³à²® à²à²°à³, ರಾà²à³à²¯ ಹಾà²à³ ದà³à²¶à²µà²¨à³à²¨à³ ಹà³à²°à²¤à³à²ªà²¡à²¿à²¸à²¿ ಬà³à²°à³ à²à²¨à²¨à³à²¨à³ ಪà³à²°à²à²à²¿à²¸à³à²µà³à²¦à²¿à²²à³à²². GPS à²
à²à³à²·à²¾à²à²¶à²à²³à³ à²à²à²¦à³ ದಶಾà²à²¶ ಸà³à²¥à²³à²¦à²µà²°à³à²à³ ನಿà²à²°à²µà²¾à²à²¿à²°à³à²¤à³à²¤à²¦à³."
+msgstr ""
+"ಸà³à²¥à²³à²¦ à²à²¡à²¿à²®à³ ನಿà²à²°à²¤à³ à²à²à²¦à²°à³ ನಿಮà³à²® à²à²°à³, ರಾà²à³à²¯ ಹಾà²à³ ದà³à²¶à²µà²¨à³à²¨à³ ಹà³à²°à²¤à³à²ªà²¡à²¿à²¸à²¿ ಬà³à²°à³ à²à²¨à²¨à³à²¨à³ "
+"ಪà³à²°à²à²à²¿à²¸à³à²µà³à²¦à²¿à²²à³à²². GPS à²
à²à³à²·à²¾à²à²¶à²à²³à³ à²à²à²¦à³ ದಶಾà²à²¶ ಸà³à²¥à²³à²¦à²µà²°à³à²à³ ನಿà²à²°à²µà²¾à²à²¿à²°à³à²¤à³à²¤à²¦à³."
#: ../src/empathy-preferences.ui.h:22
msgid "Show _smileys as images"
msgstr "ಸà³à²®à³à²²à²¿à²à²³à²¨à³à²¨à³ à²à²¿à²¤à³à²°à²à²³à²¾à²à²¿ ತà³à²°à²¿à²¸à³(_s)"
#: ../src/empathy-preferences.ui.h:23
-#| msgid "_Show Contact List"
msgid "Show contact _list in rooms"
msgstr "ರà³à²®à³âà²à²³à²²à³à²²à²¿à²¨ ವಿಳಾಸà²à²³ ಪà²à³à²à²¿à²¯à²¨à³à²¨à³ ತà³à²°à²¿à²¸à³(_l)"
@@ -2824,7 +2779,6 @@ msgstr ""
"à²à²²à³à²²"
#: ../src/empathy-map-view.ui.h:1
-#| msgid "Contact List"
msgid "Contact Map View"
msgstr "ಸà²à²ªà²°à³à² ವಿಳಾಸ ನà²à³à²·à³ ನà³à²"
diff --git a/po/ko.po b/po/ko.po
index 35a8302c..52e2cb05 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,7 +3,7 @@
#
# Changwoo Ryu , 2008, 2009.
#
-# ìë¡ ë²ìíìë ë¶ì ìë translator-creditsì ì¶ê°íì¸ì.
+# ìë¡ ë²ìíìë ë¶ì ìë "translator-credits"ì ì¶ê°íì¸ì.
#
# ì°¸ê³ :
# - ì´ íë¡ê·¸ë¨ì ì´ë¦ì¸ "Empathy"ë ì¸êµì´ í기ë²ì ë°ë¼ "ì í¼ì"ë¼ê³ í기
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-18 06:05+0900\n"
-"PO-Revision-Date: 2009-02-18 06:13+0900\n"
+"POT-Creation-Date: 2009-08-29 22:01+0900\n"
+"PO-Revision-Date: 2009-08-29 22:01+0900\n"
"Last-Translator: Changwoo Ryu \n"
"Language-Team: GNOME Korea \n"
"MIME-Version: 1.0\n"
@@ -22,12 +22,22 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "ì í¼ì ì¸ì¤í´ì¤ ë©ì ì "
+msgid "Empathy"
+msgstr "ì í¼ì"
+# IMì ë©ì ì ë¼ê³ ë²ì
#: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "ì¸ì¤í´ì¤ ë©ìì§ë¥¼ ë³´ë´ê³ ë°ìµëë¤"
+msgid "Empathy IM Client"
+msgstr "ì í¼ì ë©ì ì í´ë¼ì´ì¸í¸"
+
+# IMì ë©ì ì ë¼ê³ ë²ì
+#: ../data/empathy.desktop.in.in.h:3
+msgid "IM Client"
+msgstr "ë©ì ì í´ë¼ì´ì¸í¸"
+
+#: ../data/empathy.desktop.in.in.h:4
+msgid "Send and receive messages"
+msgstr "ë©ìì§ë¥¼ ë³´ë´ê³ ë°ìµëë¤"
#: ../data/empathy.schemas.in.h:1
msgid "Always open a separate chat window for new chats."
@@ -54,261 +64,356 @@ msgid "Compact contact list"
msgstr "ê°ëµí ì°ë½ì² 목ë¡"
#: ../data/empathy.schemas.in.h:6
+msgid "Connection managers should be used"
+msgstr "ì°ê²° ê´ë¦¬ì를 ì¬ì©í©ëë¤"
+
+#: ../data/empathy.schemas.in.h:7
msgid "Contact list sort criterium"
msgstr "ì°ë½ì² ëª©ë¡ ì ë ¬ 기ì¤"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/empathy.schemas.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "ìë°í 그림ì ì íí 기본 ëë í°ë¦¬"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:9
msgid "Disable popup notifications when away"
msgstr "ì리 ë¹ìì¼ ë íì
ì림 ì¬ì©íì§ ì기"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:10
msgid "Disable sounds when away"
msgstr "ì리 ë¹ìì¼ ë ì리 ì¬ì©íì§ ì기"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can publish the user's location"
+msgstr "ì¬ì©ìì ìì¹ë¥¼ ê³µê°í ì ììµëë¤"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the GPS to guess the location"
+msgstr "GPS를 ì´ì©í´ ìì¹ë¥¼ íì
í ì ììµëë¤"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "í´ëì í ë¤í¸ìí¬ë¥¼ ì¬ì©í´ ìì¹ë¥¼ íì
í ì ììµëë¤"
+
+#: ../data/empathy.schemas.in.h:14
+msgid "Empathy can use the network to guess the location"
+msgstr "ë¤í¸ìí¬ë¥¼ ì¬ì©í´ ìì¹ë¥¼ íì
í ì ììµëë¤"
+
+#: ../data/empathy.schemas.in.h:15
msgid "Empathy default download folder"
msgstr "ì í¼ì 기본 ë¤ì´ë¡ë í´ë"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:16
msgid "Empathy has asked about importing accounts"
-msgstr "ì í¼ììì ê³ì ì ê°ì ¸ì¬ ì§ ì§ë¬¸"
+msgstr "ì í¼ììì ê³ì ì ê°ì ¸ì¬ì§ ì§ë¬¸"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:17
msgid "Empathy should auto-connect on startup"
msgstr "ì í¼ì ììí ë ìë ì°ê²°"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:18
+msgid "Empathy should reduce the location's accuracy"
+msgstr "ìì¹ë¥¼ ë¶ì ííê² ë§ëëë¤"
+
+#: ../data/empathy.schemas.in.h:19
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "ì í¼ì ì±í
ì°½ ìì´ì½ì¼ë¡ ì°ë½ì²ì ìë°í ì¬ì©"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:20
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit ê°ë° ë구 ì¬ì©"
+
+#: ../data/empathy.schemas.in.h:21
msgid "Enable popup notifications for new messages"
msgstr "ì ë©ìì§ì íì
ì림 ì¬ì©"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:22
msgid "Enable spell checker"
msgstr "ë§ì¶¤ë² ê²ì¬ ì¬ì©"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:23
msgid "Hide main window"
msgstr "ë©ì¸ ì°½ ê°ì¶ê¸°"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:24
msgid "Hide the main window."
msgstr "ë©ì¸ ì°½ì ê°ì¶¥ëë¤."
-#: ../data/empathy.schemas.in.h:18
-msgid "NetworkManager should be used"
-msgstr "ë¤í¸ìí¬ ê´ë¦¬ì를 ì¬ì©í©ëë¤"
+#: ../data/empathy.schemas.in.h:25
+msgid "MC 4 accounts have been imported"
+msgstr "MC 4 ê³ì ì ê°ì ¸ì´"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:26
+msgid "MC 4 accounts have been imported."
+msgstr "MC 4 ê³ì ì ê°ì ¸ììµëë¤."
+
+#: ../data/empathy.schemas.in.h:27
msgid "Nick completed character"
msgstr "ëíëª
ìì± ë¬¸ì"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:28
msgid "Open new chats in separate windows"
msgstr "ìë¡ì´ ëíë ë³ë ì°½ì ì´ê¸°"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:29
+msgid "Path of the adium theme to use"
+msgstr "ì¬ì©í adium í
ë§ì ê²½ë¡"
+
+#: ../data/empathy.schemas.in.h:30
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "ì¬ì©í adium í
ë§ì ê²½ë¡, ì±í
ì ì¬ì©í í
ë§ê° adiumì¼ ê²½ì°."
+
+#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
msgstr "ë©ìì§ë¥¼ ë°ì¼ë©´ ì리 ë´ê¸°"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:32
msgid "Play a sound for new conversations"
msgstr "ì ëíê° ìì¼ë©´ ì리 ë´ê¸°"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for outgoing messages"
msgstr "ë©ìì§ë¥¼ ë³´ë´ë©´ ì리 ë´ê¸°"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound when a contact logs in"
msgstr "ì°ë½ì²ì ëêµ°ê°ê° ë¡ê·¸ì¸íë©´ ì리 ë´ê¸°"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound when a contact logs out"
msgstr "ì°ë½ì²ì ëêµ°ê°ê° ë¡ê·¸ììíë©´ ì리 ë´ê¸°"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when we log in"
msgstr "ë¡ê·¸ì¸íë©´ ì리 ë´ê¸°"
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when we log out"
msgstr "ë¡ê·¸ììíë©´ ì리 ë´ê¸°"
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:38
msgid "Popup notifications if the chat isn't focused"
msgstr "ì±í
ì í¬ì»¤ì¤ê° ìì¼ë©´ íì
ì림"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:39
+msgid "Popup notifications when a contact sign in"
+msgstr "ì°ë½ì²ì ìë ì¬ëì´ ë¤ì´ì¤ë©´ íì
ì림"
+
+#: ../data/empathy.schemas.in.h:40
+msgid "Popup notifications when a contact sign out"
+msgstr "ì°ë½ì²ì ìë ì¬ëì´ ëê°ë©´ íì
ì림"
+
+#: ../data/empathy.schemas.in.h:41
msgid "Salut account is created"
msgstr "Salut ê³ì ì ë§ë¤ììµëë¤"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "ìë°í íì"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:43
+msgid "Show contact list in rooms"
+msgstr "ë°©ì ì°ë½ì² ëª©ë¡ íì"
+
+#: ../data/empathy.schemas.in.h:44
msgid "Show hint about closing the main window"
msgstr "ë©ì¸ ì°½ì ë«ì ë ìë´ë¥¼ íìí©ëë¤."
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:45
msgid "Show offline contacts"
msgstr "ì¤íë¼ì¸ ì°ë½ì² íì"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "ë§ì¶¤ë² ê²ì¬ ì¸ì´"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "ì ì¡ ë°ì íì¼ì ì ì¥í 기본 í´ë."
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "ìµê·¼ì ìë°í 그림ì ì íí ëë í°ë¦¬."
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
-msgstr "ì±í
ì°½ì ëí를 íìíë ë° ì¬ì©íë í
ë§."
+msgstr "ì±í
ì°½ì ëí를 íìíëë° ì¬ì©íë í
ë§."
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "ê·¸ëí½ ì´ëª¨í°ì½ ì¬ì©"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "ì리ë ì리 ì¬ì©"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "ì±í
ë°©ì í
ë§ ì¬ì©"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:53
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "WebKit ê°ë° í´ì (Web Inspector ë°ì) ì¬ì©í ì§ ì¬ë¶."
+
+#: ../data/empathy.schemas.in.h:54
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "ì¬ì©ìì ìì¹ë¥¼ ì°ë½ì²ì ìë ì¬ëë¤ìê² ê³µê°í ì§ ì¬ë¶."
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "GPS를 ì´ì©í´ ìì¹ë¥¼ íì
í ì§ ì¬ë¶."
+
+#: ../data/empathy.schemas.in.h:56
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr "í´ëì í ë¤í¸ìí¬ë¥¼ ì´ì©í´ ìì¹ë¥¼ íì
í ì§ ì¬ë¶."
+
+#: ../data/empathy.schemas.in.h:57
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "ë¤í¸ìí¬ë¥¼ ì´ì©í´ ìì¹ë¥¼ íì
í ì§ ì¬ë¶."
+
+#: ../data/empathy.schemas.in.h:58
msgid ""
"Whether or not Empathy has asked about importing accounts from other "
"programs."
-msgstr "ì í¼ìê° ê³ì ì ë¤ë¥¸ íë¡ê·¸ë¨ìì ê°ì ¸ì¬ ì§ ì§ë¬¸ ì¬ë¶."
+msgstr "ë¤ë¥¸ íë¡ê·¸ë¨ìì ê³ì ì ê°ì ¸ì¬ì§ 물ì´ë´¤ëì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether or not Empathy should automatically log in to your accounts on "
"startup."
-msgstr "ì í¼ìê° ììí ë ê³ì ì ìë ë¡ê·¸ì¸í ì§ ì¬ë¶."
+msgstr "ì í¼ìê° ììí ë ê³ì ì ìë ë¡ê·¸ì¸í ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:60
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "ê°ì¸ ì ë³´ ë³´í¸ë¥¼ ìí´ ìì¹ë¥¼ ë¶ì ííê² ë§ë¤ì§ ì¬ë¶."
+
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether or not Empathy should use the avatar of the contact as the chat "
"window icon."
-msgstr "ì í¼ìì ëí ì°½ ìì´ì½ì¼ë¡ ì°ë½ì²ì ìë°í를 ì¬ì©í ì§ ì¬ë¶."
+msgstr "ì í¼ìì ëí ì°½ ìì´ì½ì¼ë¡ ì°ë½ì²ì ìë°í를 ì¬ì©í ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:62
msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "ì²ì ì í¼ì를 ì¤íí ë Salut ê³ì ì ë§ë¤ ì§ ì¬ë¶."
+"Whether or not connectivity managers should be used to automatically "
+"disconnect/reconnect."
+msgstr "ì°ê²° ê´ë¦¬ì를 ì´ì©í´ ì°ê²°ì ìëì¼ë¡ ëê³ ë¤ì ì°ê²°í ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:63
msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
-msgstr "ì°ê²°ì ëê³ ë¤ì ì°ê²°íë ë° ë¤í¸ìí¬ ê´ë¦¬ì를 ì¬ì©í ì§ ì¬ë¶."
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr "ì²ì ì í¼ì를 ì¤íí ë Salut ê³ì ì ë§ë¤ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether or not to check words typed against the languages you want to check "
"with."
-msgstr "ì¤ì í ì¸ì´ì ë°ë¼ ì
ë ¥íë ì¤ì ë¨ì´ì ë§ì¶¤ë²ì ê²ì¬í ì§ ì¬ë¶."
+msgstr "ì¤ì í ì¸ì´ì ë°ë¼ ì
ë ¥íë ì¤ì ë¨ì´ì ë§ì¶¤ë²ì ê²ì¬í ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether or not to convert smileys into graphical images in conversations."
-msgstr "ëíí ë ì´ëª¨í°ì½ì 그림ì¼ë¡ ë³íí ì§ ì¬ë¶."
+msgstr "ëíí ë ì´ëª¨í°ì½ì 그림ì¼ë¡ ë³íí ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "ì°ë½ì²ì ëêµ°ê°ê° ë¤í¸ìí¬ì ë¡ê·¸ì¸í ë ì림 ì리를 ë¼ ì§ ì¬ë¶."
+msgstr "ì°ë½ì²ì ëêµ°ê°ê° ë¤í¸ìí¬ì ë¡ê·¸ì¸í ë ì림 ì리를 ë¼ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:67
msgid ""
"Whether or not to play a sound to notify for contacts logging off the "
"network."
-msgstr "ì°ë½ì²ì ëêµ°ê°ê° ë¤í¸ìí¬ìì ë¡ê·¸ììí ë ì림 ì리를 ë¼ ì§ ì¬ë¶."
+msgstr "ì°ë½ì²ì ëêµ°ê°ê° ë¤í¸ìí¬ìì ë¡ê·¸ììí ë ì림 ì리를 ë¼ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:68
msgid "Whether or not to play a sound to notify for events."
-msgstr "ì´ë²¤í¸ë¥¼ ì릴 ë ì리를 ë¼ ì§ ì¬ë¶."
+msgstr "ì´ë²¤í¸ë¥¼ ì릴 ë ì리를 ë¼ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:69
msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "ë©ìì§ë¥¼ ë°ì¼ë©´ ì리를 ë¼ ì§ ì¬ë¶."
+msgstr "ë©ìì§ë¥¼ ë°ì¼ë©´ ì리를 ë¼ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:70
msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "ì ëíê° ìì¼ë©´ ì리를 ë¼ ì§ ì¬ë¶."
+msgstr "ì ëíê° ìì¼ë©´ ì리를 ë¼ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:71
msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "ë©ìì§ë¥¼ ë³´ë´ë©´ ì리를 ë¼ ì§ ì¬ë¶."
+msgstr "ë©ìì§ë¥¼ ë³´ë´ë©´ ì리를 ë¼ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:72
msgid "Whether or not to play a sound when logging in a network."
-msgstr "ë¤í¸ìí¬ì ë¡ê·¸ì¸í ë ì리를 ë¼ ì§ ì¬ë¶."
+msgstr "ë¤í¸ìí¬ì ë¡ê·¸ì¸í ë ì리를 ë¼ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:73
msgid "Whether or not to play a sound when logging off a network."
-msgstr "ë¤í¸ìí¬ìì ë¡ê·¸ììí ë ì리를 ë¼ ì§ ì¬ë¶."
+msgstr "ë¤í¸ìí¬ìì ë¡ê·¸ììí ë ì리를 ë¼ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:74
msgid "Whether or not to play sound notifications when away or busy."
-msgstr "ì리 ë¹ìì´ê±°ë ë¤ë¥¸ ì©ë¬´ ì¤ì¼ ë ì림 ì리를 ë¼ ì§ ì¬ë¶."
+msgstr "ì리 ë¹ìì´ê±°ë ë¤ë¥¸ ì©ë¬´ ì¤ì¼ ë ì림 ì리를 ë¼ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:75
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "ì°ë½ì²ì ì¬ëì´ ì°ê²°ì´ ëì´ì§ë©´ íì
ì림 ì°½ì íìí ì§ ì¬ë¶."
+
+#: ../data/empathy.schemas.in.h:76
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "ì°ë½ì²ì ì¬ëì´ ì°ê²°íë©´ íì
ì림 ì°½ì íìí ì§ ì¬ë¶."
+
+#: ../data/empathy.schemas.in.h:77
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 "ì±í
ì ì´ìì§ë§ í¬ì»¤ì¤ê° ìì ê²½ì°ìë ì ë©ìì§ë¥¼ ë°ìì ë íì
ì림 ì°½ì íìí ì§ ì¬ë¶."
+msgstr ""
+"ì±í
ì ì´ìì§ë§ í¬ì»¤ì¤ê° ìì ê²½ì°ìë ì ë©ìì§ë¥¼ ë°ìì ë íì
ì림 ì°½ì "
+"íìí ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether or not to show a popup notification when receiving a new message."
-msgstr "ì ë©ìì§ë¥¼ ë°ìì ë íì
ì림 ì°½ì íìí ì§ ì¬ë¶."
+msgstr "ì ë©ìì§ë¥¼ ë°ìì ë íì
ì림 ì°½ì íìí ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:79
msgid ""
"Whether or not to show avatars for contacts in the contact list and chat "
"windows."
-msgstr "ì°ë½ì² 목ë¡ê³¼ ì±í
ì°½ì ì°ë½ì²ì ìë°í를 íìí ì§ ì¬ë¶."
+msgstr "ì°ë½ì² 목ë¡ê³¼ ì±í
ì°½ì ì°ë½ì²ì ìë°í를 íìí ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:80
msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr "ì°ë½ì² 목ë¡ì ì¤íë¼ì¸ ì°ë½ì²ë¥¼ íìí ì§ ì¬ë¶."
+msgstr "ì°ë½ì² 목ë¡ì ì¤íë¼ì¸ ì°ë½ì²ë¥¼ íìí ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:81
msgid "Whether or not to show popup notifications when away or busy."
-msgstr "ì리 ë¹ìì´ê±°ë ë¤ë¥¸ ì©ë¬´ ì¤ì¼ ë íì
ì림 ì°½ì íìí ì§ ì¬ë¶."
+msgstr "ì리 ë¹ìì´ê±°ë ë¤ë¥¸ ì©ë¬´ ì¤ì¼ ë íì
ì림 ì°½ì íìí ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:82
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "ì±í
ë°©ì ì°ë½ì² 목ë¡ì íìí ì§ ì¬ë¶."
+
+#: ../data/empathy.schemas.in.h:83
msgid ""
"Whether or not to show the message dialog about closing the main window with "
"the 'x' button in the title bar."
msgstr ""
-"ì 목 íìì¤ì 'x' ë¨ì¶ë¡ ë©ì¸ ì°½ì ë«ì ë ì림 ëí ì°½ì íìí ì§ ì¬ë¶."
+"ì 목 íìì¤ì 'x' ë¨ì¶ë¡ ë©ì¸ ì°½ì ë«ì ë ì림 ëí ì°½ì íìí ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:84
msgid "Whether to show the contact list in compact mode or not."
-msgstr "ì°ë½ì² 목ë¡ì ê°ëµíê² íìí ì§ ì¬ë¶."
+msgstr "ì°ë½ì² 목ë¡ì ê°ëµíê² íìí ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms or not."
-msgstr "ì±í
ë°©ì í
ë§ë¥¼ ì¬ì©í ì§ ì¬ë¶."
+msgstr "ì±í
ë°©ì í
ë§ë¥¼ ì¬ì©í ì§ ì¬ë¶."
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:86
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 "
@@ -317,541 +422,878 @@ msgstr ""
"ì°ë½ì² 목ë¡ì ì ë ¬í ë ì¬ì©í 기ì¤. 기본ê°ì \"name\"ì¼ë¡ ì°ë½ì²ì ì´ë¦ì ë°"
"ë¼ ì ë ¬í©ëë¤. \"state\"ë¼ê³ íë©´ ìíì ë°ë¼ ì ë ¬í©ëë¤."
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-account.c:1144
+msgid "Can't set an empty display name"
+msgstr "ëíëª
ì ë¹ìë ì ììµëë¤"
+
+#: ../libempathy/empathy-ft-handler.c:839
+msgid "The hash of the received file and the sent one do not match"
+msgstr "ë°ì íì¼ê³¼ ë³´ë¸ íì¼ì í´ìê° ì¼ì¹íì§ ììµëë¤"
+
+#: ../libempathy/empathy-ft-handler.c:1099
+msgid "File transfer not supported by remote contact"
+msgstr "ì격 ìë 측ìì íì¼ ì ì¡ì ì§ìíì§ ììµëë¤"
+
+#: ../libempathy/empathy-ft-handler.c:1157
+msgid "The selected file is not a regular file"
+msgstr "ì íí íì¼ì ì¼ë° íì¼ì´ ìëëë¤"
+
+#: ../libempathy/empathy-ft-handler.c:1166
+msgid "The selected file is empty"
+msgstr "ì íí íì¼ì´ ë¹ íì¼ì
ëë¤"
+
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
msgid "People nearby"
msgstr "ì£¼ë³ ì¬ë"
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:280
+msgid "Socket type not supported"
+msgstr "ì´ ìì¼ ì¢
ë¥ë¥¼ ì§ìíì§ ììµëë¤"
+
+#: ../libempathy/empathy-tp-file.c:399
+msgid "No reason was specified"
+msgstr "ì´ì 를 ì§ì íì§ ìììµëë¤"
+
+#: ../libempathy/empathy-tp-file.c:402
+msgid "The change in state was requested"
+msgstr "ìí ë°ê¾¸ê¸°ë¥¼ ìì²íìµëë¤"
+
+#: ../libempathy/empathy-tp-file.c:405
+msgid "You canceled the file transfer"
+msgstr "íì¼ ì ì¡ì ì·¨ìíìµëë¤"
+
+#: ../libempathy/empathy-tp-file.c:408
+msgid "The other participant canceled the file transfer"
+msgstr "ìëê° íì¼ ì ì¡ì ì·¨ìíìµëë¤"
+
+#: ../libempathy/empathy-tp-file.c:411
+msgid "Error while trying to transfer the file"
+msgstr "íì¼ì ì ì¡íë ì¤ì ì¤ë¥ê° ë°ìíìµëë¤"
+
+#: ../libempathy/empathy-tp-file.c:414
+msgid "The other participant is unable to transfer the file"
+msgstr "ìëê° íì¼ì ì ì¡í ì ììµëë¤"
+
+#: ../libempathy/empathy-tp-file.c:417
+msgid "Unknown reason"
+msgstr "ì ì ìë ì´ì "
+
+#: ../libempathy/empathy-utils.c:235
msgid "Available"
msgstr "ëí ê°ë¥"
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:237
msgid "Busy"
msgstr "ë¤ë¥¸ ì©ë¬´ ì¤"
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:240
msgid "Away"
msgstr "ì리 ë¹ì"
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:242
msgid "Hidden"
msgstr "ì¨ê¸°"
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:244
msgid "Offline"
msgstr "ì¤íë¼ì¸"
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
+msgid "People Nearby"
+msgstr "ì£¼ë³ ì¬ë"
+
+#: ../libempathy/empathy-utils.c:384
+msgid "Yahoo! Japan"
+msgstr "ì¼í! ì¼ë³¸"
+
+#: ../libempathy/empathy-utils.c:385
+msgid "Facebook Chat"
+msgstr "íì´ì¤ë¶ ì±í
"
+
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%dì´ ì "
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%dë¶ ì "
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%dìê° ì "
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%dì¼ ì "
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d주 ì "
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%dë¬ ì "
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "미ë"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:424
msgid "All"
msgstr "모ë"
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:440
+#: ../libempathy-gtk/empathy-account-widget.c:496
#, 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 "Advanced "
-msgstr "ê³ ê¸ "
-
-#: ../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 "ìí¸ë¥¼ ìì´ë²ë¦¬ê³ ì
ë ¥ ì°½ì ë¹ìëë¤."
-
-#: ../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.c:1239
+msgid "Enabled"
+msgstr "ì¬ì©"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "Example: MyScreenName "
+msgstr "ì: MyScreenName "
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Advanced"
+msgstr "ê³ ê¸"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "ìí¸(_W):"
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
msgid "Screen _Name:"
msgstr "ëíëª
(_N):"
-#: ../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:5
+msgid "What is your AIM password?"
+msgstr "AIM ìí¸ê° 무ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr "AIM ìì´ëê° ë¬´ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
msgstr "í¬í¸(_P):"
-#: ../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:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "ìë²(_S):"
-#: ../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:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Example: username "
+msgstr "ì: username "
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "ë¡ê·¸ì¸ ìì´ë(_D):"
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "그룹ìì´ì¦ ì¬ì©ì IDê° ë¬´ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "그룹ìì´ì¦ ìí¸ê° 무ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "Example: 123456789 "
+msgstr "ì: 123456789 "
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
msgstr "ICQ ì¬ì©ì ë²í¸(_U):"
-#: ../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:5
+msgid "What is your ICQ UIN?"
+msgstr "ICQ ì¬ì©ì ë²í¸ê° 무ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr "ICQ ìí¸ê° 무ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "_Charset:"
msgstr "문ì ì¸í¸(_C):"
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "ì ë¤í¸ìí¬"
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "Network "
-msgstr "ë¤í¸ìí¬ "
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "Servers "
-msgstr "ìë² "
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
msgid "Charset:"
msgstr "문ì ì¸í¸:"
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "ì IRC ë¤í¸ìí¬ë¥¼ ë§ëëë¤"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "ì íí IRC ë¤í¸ìí¬ë¥¼ í¸ì§í©ëë¤"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Network"
msgstr "ë¤í¸ìí¬"
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
msgid "Network:"
msgstr "ë¤í¸ìí¬:"
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Nickname:"
msgstr "ëíëª
:"
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Password:"
msgstr "ìí¸:"
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Quit message:"
msgstr "ëê° ë ë©ìì§:"
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Real name:"
msgstr "ì¤ì ì´ë¦:"
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "ì íí IRC ë¤í¸ìí¬ë¥¼ ì§ìëë¤"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "ìë²"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "Example: user@jabber.org "
+msgstr "ì: user@jabber.org "
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "Override server settings "
-msgstr "ìë² ì¤ì 무ì "
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Override server settings"
+msgstr "ìë² ì¤ì 무ì"
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "Pri_ority:"
msgstr "ì°ì ìì(_O):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Reso_urce:"
msgstr "ìì(_U):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
msgid "Use old SS_L"
msgstr "과거 SSL ì¬ì©(_L)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "What is your Jabber ID?"
+msgstr "ì¬ë² IDê° ë¬´ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Jabber password?"
+msgstr "ì¬ë² ìí¸ê° 무ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your desired Jabber ID?"
+msgstr "í¬ë§íë ì¬ë² IDê° ë¬´ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid "What is your desired Jabber password?"
+msgstr "í¬ë§íë ì¬ë² ìí¸ê° 무ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid "_Encryption required (TLS/SSL)"
msgstr "ìí¸í íì(_E) (TLS/SSL)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid "_Ignore SSL certificate errors"
msgstr "SSL ì¸ì¦ì ì¤ë¥ 무ì(_I)"
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "Example: user@hotmail.com "
+msgstr "ì: user@hotmail.com "
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live password?"
+msgstr "ìëì°ì¦ ë¼ì´ë¸ ìí¸ê° 무ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live user name?"
+msgstr "ìëì°ì¦ ë¼ì´ë¸ ì¬ì©ì ì´ë¦ì´ 무ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
msgid "_Email:"
msgstr "ì ìë©ì¼(_E):"
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
msgstr "ì´ë¦(_F):"
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_Jabber ID:"
msgstr "ì¬ë² ID(_J):"
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Last Name:"
msgstr "ì±(_L):"
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Nickname:"
msgstr "ëíëª
(_N):"
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "ê³µê° ì´ë¦(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "Example: user@my.sip.server "
+msgstr "ì: user@my.sip.server "
+
#. 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:4
msgid "Discover STUN"
msgstr "STUN ê²ì"
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "STUN Server:"
msgstr "STUN ìë²:"
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "STUN port:"
msgstr "STUN í¬í¸:"
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "What is your SIP account password?"
+msgstr "SIP ê³ì ìí¸ê° 무ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "What is your SIP login ID?"
+msgstr "SIP ë¡ê·¸ì¸ IDê° ë¬´ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "_Username:"
msgstr "ì¬ì©ì ì´ë¦(_U):"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "Use _Yahoo Japan"
msgstr "ì¼í ì¼ë³¸ ì¬ì©(_Y)"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr "ì¼í! IDê° ë¬´ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "What is your Yahoo! password?"
+msgstr "ì¼í! ìí¸ê° 무ìì
ëê¹?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "Yahoo I_D:"
msgstr "ì¼í ìì´ë(_D):"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Ignore conference and chatroom invitations"
msgstr "íì ë° ëí ì´ë 무ì(_I)"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "ë°© ëª©ë¡ ë¡ìº(_R):"
-#: ../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 "그림ì ë³íí ì ììµëë¤"
-#: ../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 "íì©íë 그림 íì ì¤ìì ì´ ìì¤í
ìì ì§ìíë íìì´ ììµëë¤"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
msgid "Select Your Avatar Image"
msgstr "ìë°í 그림 ì í"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "No Image"
msgstr "그림 ìì"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
msgid "Images"
msgstr "그림"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
msgid "All Files"
msgstr "모ë íì¼"
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
msgid "Click to enlarge"
msgstr "ë르면 í¬ê² ë´
ëë¤"
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "ì´ ì±í
ì ë¤ì ì°ê²°íëë° ì¤í¨íìµëë¤"
+
+#: ../libempathy-gtk/empathy-chat.c:403
+msgid "Unsupported command"
+msgstr "ì§ìíì§ ìë ëª
ë ¹"
+
+#: ../libempathy-gtk/empathy-chat.c:535
msgid "offline"
msgstr "ì¤íë¼ì¸"
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:538
msgid "invalid contact"
msgstr "ì°ë½ì²ê° ì못ëììµëë¤"
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:541
msgid "permission denied"
msgstr "ê¶íì´ ììµëë¤"
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:544
msgid "too long message"
msgstr "ë©ìì§ê° ë무 ê¹ëë¤"
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:547
msgid "not implemented"
msgstr "구ííì§ ìììµëë¤"
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:550
msgid "unknown"
msgstr "ì ì ìì"
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:554
#, c-format
msgid "Error sending message '%s': %s"
-msgstr "ë©ìì§ë¥¼ ë³´ë´ë ë° ì¤ë¥, '%s': %s"
+msgstr "ë©ìì§ë¥¼ ë³´ë´ëë° ì¤ë¥, '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:584
#, c-format
msgid "Topic set to: %s"
msgstr "주ì 를 ì¤ì íìµëë¤: %s"
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:586
msgid "No topic defined"
msgstr "주ì 를 ì íì§ ìììµëë¤"
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:956
+msgid "(No Suggestions)"
+msgstr "(ì ì ìì)"
+
+#: ../libempathy-gtk/empathy-chat.c:1010
msgid "Insert Smiley"
msgstr "ì´ëª¨í°ì½ ì
ë ¥"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-ui-utils.c:1484
msgid "_Send"
msgstr "ë³´ë´ê¸°(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "ë¨ì´ ë§ì¶¤ë² ê²ì¬(_C)..."
+#: ../libempathy-gtk/empathy-chat.c:1062
+msgid "_Spelling Suggestions"
+msgstr "ë§ì¶¤ë² ì ì(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1177
#, c-format
-msgid "%s has joined the room"
-msgstr "%s ëì´ ë°©ì ë¤ì´ììµëë¤"
+msgid "%s has disconnected"
+msgstr "%s ëì ì°ê²°ì´ ëê²¼ìµëë¤"
+
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1184
+#, c-format
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s ëì´ %2$s ëì ìí´ í´ì¥ë¹íìµëë¤."
+
+#: ../libempathy-gtk/empathy-chat.c:1187
+#, c-format
+msgid "%s was kicked"
+msgstr "%1$s ëì´ í´ì¥ë¹íìµëë¤."
+
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1195
+#, c-format
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s ëì´ %2$s ëì ìí´ ì
ì¥ ê¸ì§ëìµëë¤"
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1198
+#, c-format
+msgid "%s was banned"
+msgstr "%s ëì´ ì
ì¥ ê¸ì§ëìµëë¤"
+
+#: ../libempathy-gtk/empathy-chat.c:1202
#, c-format
msgid "%s has left the room"
msgstr "%s ëì´ ë°©ì ë ë¬ìµëë¤"
-#: ../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:1211
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1234
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s ëì´ ë°©ì ë¤ì´ììµëë¤"
+
+#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
msgid "Disconnected"
msgstr "ì°ê²° ëê¹"
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1803
msgid "Connected"
msgstr "ì°ê²°í¨"
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1853
+#: ../libempathy-gtk/empathy-log-window.c:502
msgid "Conversation"
msgstr "ëí"
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "Topic: "
-msgstr "주ì : "
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "그룹 ì±í
"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+msgid "Topic:"
+msgstr "주ì :"
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:276
msgid "_Copy Link Address"
msgstr "ë§í¬ 주ì ë³µì¬(_C)"
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:284
msgid "_Open Link"
msgstr "ë§í¬ ì´ê¸°(_O)"
-#: ../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 "%Yë
%B %dì¼ %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "ê°ì¸ ì ë³´"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:177
+#: ../libempathy-gtk/empathy-contact-dialogs.c:236
msgid "Edit Contact Information"
msgstr "ì°ë½ì² ì ë³´ í¸ì§"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "ì°ë½ì² ì ë³´"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "ë´ ì¹êµ¬ 목ë¡ì ì¶ê°íë ¤ í©ëë¤."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+msgid "Personal Information"
+msgstr "ê°ì¸ ì ë³´"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
msgid "New Contact"
msgstr "ì ì°ë½ì²"
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
msgid "Decide _Later"
msgstr "ëì¤ì ê²°ì (_L)"
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
msgid "Subscription Request"
msgstr "ê°ì
ìì²"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "ì ë§ë¡ '%s' 그룹ì ì§ì°ìê² ìµëê¹?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
msgid "Removing group"
msgstr "그룹 ì§ì°ê¸°"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
msgid "_Remove"
msgstr "ì ê±°(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "ì ë§ë¡ '%s' ì°ë½ì²ë¥¼ ì§ì°ìê² ìµëê¹?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
msgid "Removing contact"
msgstr "ì°ë½ì²ë¥¼ ì§ìëë¤"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "미ìí©ëë¤. ë´ ì¹êµ¬ 목ë¡ìì ì§ìëë¤."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "ì°ë½ì² ì¶ê°(_A)..."
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
msgid "_Chat"
msgstr "ì±í
(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "í¸ì¶(_C)"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "ìì± í¸ì¶(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "ìì í¸ì¶(_V)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
msgid "_View Previous Conversations"
msgstr "ìì ëí 보기(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
msgid "Send file"
msgstr "íì¼ ë³´ë´ê¸°"
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "ë´ ë°ì¤í¬í ê³µì "
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
msgid "Infor_mation"
msgstr "ì ë³´(_M)"
-#: ../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:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
msgid "_Edit"
msgstr "í¸ì§(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
msgid "Inviting to this room"
msgstr "ì´ ë°©ì ì´ë"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
msgid "_Invite to chatroom"
msgstr "ëíë°©ì ì´ë(_I)"
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "ì°ë½ì² ì í"
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
msgid "Save Avatar"
msgstr "ìë°í ì ì¥"
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
msgid "Unable to save avatar"
msgstr "ìë°í를 ì ì¥í ì ììµëë¤"
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
msgid "Select"
msgstr "ì í"
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
-msgid "Group"
-msgstr "그룹"
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1019
+msgid "Group"
+msgstr "그룹"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr "ISO êµê° ì½ë:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Country:"
+msgstr "êµê°:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "State:"
+msgstr "ì§ì:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "City:"
+msgstr "ëì:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Area:"
+msgstr "구ì:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr "ì°í¸ë²í¸:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Street:"
+msgstr "길:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr "건물:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Floor:"
+msgstr "층ì:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Room:"
+msgstr "ë°©:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Text:"
+msgstr "ê°í:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Description:"
+msgstr "ì¤ëª
:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr "ì íë:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr "ì¤ë¥:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr "ìì§ ì¤ì°¨ (미í°):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr "ìí ì¤ì°¨ (미í°):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr "ìë:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Bearing:"
+msgstr "ê´ê³:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr "ìì¹ ìë:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr "ìµê·¼ ì
ë°ì´í¸ ìê°:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr "ê²½ë:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr "ìë:"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "Client Information "
-msgstr "í´ë¼ì´ì¸í¸ ì ë³´ "
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr "ê³ ë:"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "Contact Details "
-msgstr "ì°ë½ì² ìì¸í "
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+msgid "Location "
+msgstr "ìì¹ "
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "Contact "
-msgstr "ì°ë½ì² "
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+msgid "Location , "
+msgstr "ìì¹ , "
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "Groups "
-msgstr "그룹 "
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+msgstr "%Yë
%B %eì¼ %R UTC"
-#: ../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.ui.h:1
+msgid "Location at (date)\t"
+msgstr "ìì¹ (ë ì§ë³)\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 "ê³ì :"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
msgid "Alias:"
msgstr "ë³ëª
:"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
msgid "Birthday:"
msgstr "ìì¼:"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "í´ë¼ì´ì¸í¸ ì ë³´"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
msgid "Client:"
msgstr "í´ë¼ì´ì¸í¸:"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "ì°ë½ì² ì ë³´"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1002
+msgid "Contact"
+msgstr "ì°ë½ì²"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "ì°ë½ì² ìì¸í"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
msgid "Email:"
msgstr "ì ìë©ì¼:"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Fullname:"
msgstr "ì ì²´ ì´ë¦:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "그룹"
+
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
msgid "Identifier:"
msgstr "ìì´ë:"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
msgid "Information requested..."
msgstr "ìì²í ì ë³´..."
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
msgid "OS:"
msgstr "ì´ì ì²´ì :"
-#: ../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."
@@ -859,179 +1301,196 @@ msgstr ""
"ì´ ì°ë½ì²ê° ëíë 그룹ì ê³ ë¥´ììì¤. ì¬ë¬ ê°ì 그룹ì ê³ ë¥¼ ìë ìê³ ê·¸ë£¹ì "
"ê³ ë¥´ì§ ìì ìë ììµëë¤."
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
msgid "Version:"
msgstr "ë²ì :"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
msgid "Web site:"
msgstr "ì¹ì¬ì´í¸:"
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
msgid "_Add Group"
msgstr "그룹 ì¶ê°(_A)"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
msgid "new server"
msgstr "ì ìë²"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
msgid "Server"
msgstr "ìë²"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
msgid "Port"
msgstr "í¬í¸"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
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-widget.c:321
msgid "Account"
msgstr "ê³ì "
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
msgid "Date"
msgstr "ìê°"
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
msgid "Conversations"
msgstr "ëí"
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
msgid "Previous Conversations"
msgstr "ìì ëí"
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
msgid "Search"
-msgstr "찾기"
+msgstr "ê²ì"
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
msgid "_For:"
-msgstr "ì°¾ì ë§(_F):"
+msgstr "ê²ìí ë§(_F):"
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
msgid "C_all"
msgstr "í¸ì¶(_A)"
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
msgid "C_hat"
msgstr "ì±í
(_H)"
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
msgid "Contact ID:"
msgstr "ì°ë½ì² ID:"
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
msgid "New Conversation"
msgstr "ì ëí"
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
+#. COL_STATUS_TEXT
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:176
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
+msgid "Custom Message..."
msgstr "ì¬ì©ì ì§ì ë©ìì§..."
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "ì¬ì©ì ì§ì ë©ìì§"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "ë©ìì§:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "ë©ìì§ ì ì¥"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "ìí:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "ë¨ì´"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "ë¨ì´ì ëí ì ìì´"
+#: ../libempathy-gtk/empathy-presence-chooser.c:229
+#: ../libempathy-gtk/empathy-presence-chooser.c:231
+msgid "Edit Custom Messages..."
+msgstr "ì¬ì©ì ì§ì ë©ìì§ í¸ì§..."
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "ë§ì¶¤ë² ê²ì¬"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "ë¨ì´ì ëí ì ìì´:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "í´ëì"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "ê°ë¨"
+#: ../libempathy-gtk/empathy-presence-chooser.c:330
+msgid "Click to remove this status as a favorite"
+msgstr "ì´ ìí를 ì í¸íë ê°ìì ì§ì°ë ¤ë©´ ë르ììì¤"
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "ê¹ë"
+#: ../libempathy-gtk/empathy-presence-chooser.c:339
+msgid "Click to make this status a favorite"
+msgstr "ì´ ìí를 ì í¸íë ê°ì¼ë¡ íë ¤ë©´ ë르ììì¤"
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "íë"
+#: ../libempathy-gtk/empathy-presence-chooser.c:373
+msgid "Set status"
+msgstr "ìí ì¤ì "
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "URI를 ì´ ì ììµëë¤"
+#: ../libempathy-gtk/empathy-presence-chooser.c:794
+msgid "Set your presence and current status"
+msgstr "íì¬ ìí를 ì¤ì í©ëë¤"
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "íì¼ì ì ííììì¤"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1043
+msgid "Custom messages..."
+msgstr "ì¬ì©ì ì§ì ë©ìì§..."
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
msgid "Received an instant message"
msgstr "ì¸ì¤í´ì¤ ë©ìì§ë¥¼ ë°ììµëë¤"
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
msgid "Sent an instant message"
msgstr "ì¸ì¤í´ì¤ ë©ìì§ë¥¼ ë³´ëìµëë¤"
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
msgid "Incoming chat request"
msgstr "ëí ìì² ë°ììµëë¤"
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
msgid "Contact connected"
msgstr "ì°ë½ì² ì°ê²°íìµëë¤"
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
msgid "Contact disconnected"
msgstr "ì°ë½ì² ì°ê²° ëììµëë¤"
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
msgid "Connected to server"
msgstr "ìë²ì ì°ê²°íìµëë¤"
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
msgid "Disconnected from server"
msgstr "ìë²ìì ì°ê²°ì ëììµëë¤"
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
msgid "Incoming voice call"
msgstr "ìì± í¸ì¶ ë°ììµëë¤"
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
msgid "Outgoing voice call"
msgstr "ìì± í¸ì¶ ë³´ëìµëë¤"
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.c:69
msgid "Voice call ended"
msgstr "ìì± íµí를 ë§ì³¤ìµëë¤"
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "ì¬ì©ì ì¤ì ë©ìì§ ì
ë ¥"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "ì¬ì©ì ì¤ì ë©ìì§ í¸ì§"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "ì 미리 ì¤ì ê° ì¶ê°(_N)"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "미리 ì¤ì ê° ì ì¥"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "í´ëì"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "ê°ë¨"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "ê¹ë"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "íë"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1386
+msgid "Unable to open URI"
+msgstr "URI를 ì´ ì ììµëë¤"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1476
+msgid "Select a file"
+msgstr "íì¼ì ì ííììì¤"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1536
+msgid "Select a destination"
+msgstr "ëì ì í"
+
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
msgstr "íì¬ ë¡ìº"
@@ -1216,7 +1675,7 @@ msgid "Megaphone"
msgstr "íì±ê¸°"
#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:518
msgid "Talk!"
msgstr "ë§í´!"
@@ -1231,15 +1690,15 @@ msgid "_Information"
msgstr "ì ë³´(_I)"
#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
msgid "_Preferences"
msgstr "기본 ì¤ì (_P)"
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:166
msgid "Please configure a contact."
msgstr "ì°ë½ì²ë¥¼ ì¤ì íììì¤."
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:256
msgid "Select contact..."
msgstr "ì°ë½ì² ì í..."
@@ -1248,27 +1707,28 @@ msgid "Presence"
msgstr "ë´ ìí"
#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
+#: ../nothere/src/nothere-applet.c:105
msgid "Set your own presence"
msgstr "ëì ìí를 ì¤ì í©ëë¤"
-#: ../src/empathy.c:426
+#: ../src/empathy.c:588
msgid "Don't connect on startup"
msgstr "ììí ë ì°ê²°íì§ ììµëë¤"
-#: ../src/empathy.c:430
+#: ../src/empathy.c:592
msgid "Don't show the contact list on startup"
msgstr "ììí ë ì°ë½ì² 목ë¡ì íìíì§ ììµëë¤"
-#: ../src/empathy.c:434
+#: ../src/empathy.c:596
msgid "Show the accounts dialog"
msgstr "ê³ì ëí ì°½ì íìí©ëë¤"
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
-msgstr "- ì í¼ì ì¸ì¤í´ì¤ ë©ì ì "
+# IMì ë©ì ì ë¼ê³ ë²ì
+#: ../src/empathy.c:608
+msgid "- Empathy IM Client"
+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 "
@@ -1280,7 +1740,7 @@ msgstr ""
"Foundation; either version 2 of the License, or (at your option) any later "
"version."
-#: ../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 "
@@ -1292,7 +1752,7 @@ msgstr ""
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
"details."
-#: ../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 "
@@ -1302,30 +1762,155 @@ msgstr ""
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-#: ../src/empathy-about-dialog.c: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 "ë¥ì°½ì° "
-#: ../src/empathy-accounts-dialog.c:391
-msgid "Enabled"
-msgstr "ì¬ì©"
+#: ../src/empathy-account-assistant.c:118
+msgid "There has been an error while importing the accounts."
+msgstr "ê³ì ì ê°ì ¸ì¤ëë° ì¤ë¥ê° ë°ìíìµëë¤."
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
-msgid "Accounts"
-msgstr "ê³ì "
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error while parsing the account details."
+msgstr "ê³ì ì 보를 íì±íëë° ì¤ë¥ê° ë°ìíìµëë¤."
+
+#: ../src/empathy-account-assistant.c:124
+msgid "There has been an error while creating the account."
+msgstr "ê³ì ì ë§ëëë° ì¤ë¥ê° ë°ìíìµëë¤."
+
+#: ../src/empathy-account-assistant.c:126
+msgid "There has been an error."
+msgstr "ì¤ë¥ê° ë°ìíìµëë¤."
+#: ../src/empathy-account-assistant.c:141
+#, c-format
+msgid "The error message was: %s "
+msgstr "ì¤ë¥ ë©ìì§ë: %s "
+
+#: ../src/empathy-account-assistant.c:149
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"ë¤ë¡ ëìê°ì ê³ì ì 보를 ë¤ì ì
ë ¥í ìë ìê³ , ìëë©´ ì´ ëì°ë¯¸ë¥¼ ë§ì¹ê³ ë"
+"ì¤ì í¸ì§ ë©ë´ìì ê³ì ì ì¶ê°í ìë ììµëë¤."
+
+#: ../src/empathy-account-assistant.c:184
+msgid "An error occurred"
+msgstr "ì¤ë¥ê° ë°ìíìµëë¤"
+
+#. Create account
#. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:320
+#: ../src/empathy-accounts-dialog.c:1172
#, c-format
msgid "New %s account"
msgstr "ì %s ê³ì "
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-account-assistant.c:386
+msgid "What kind of chat account do you have?"
+msgstr "ì´ë¤ ì¢
ë¥ì ì±í
ê³ì ì ë³´ì íê³ ììµëê¹?"
+
+#: ../src/empathy-account-assistant.c:392
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "ì¤ì í ë ë¤ë¥¸ ì±í
ê³ì ì´ ììµëê¹?"
+
+# ë구 ì¤ëª
+#: ../src/empathy-account-assistant.c:398
+msgid "Enter your account details"
+msgstr "ê³ì ì 보를 í¸ì§í©ëë¤"
+
+#: ../src/empathy-account-assistant.c:403
+msgid "What kind of chat account do you want to create?"
+msgstr "ì´ë¤ ì¢
ë¥ì ì±í
ê³ì ì ë§ëìê² ìµëê¹?"
+
+#: ../src/empathy-account-assistant.c:409
+msgid "Do you want to create other chat accounts?"
+msgstr "ë¤ë¥¸ ì±í
ê³ì ì ë ë§ëìê² ìµëê¹?"
+
+#: ../src/empathy-account-assistant.c:416
+msgid "Enter the details for the new account"
+msgstr "ì ê³ì ì ì 보를 ì
ë ¥íììì¤"
+
+#: ../src/empathy-account-assistant.c:502
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"ì í¼ì를 ì¬ì©í´ 주ë³ì ì°ê²°ë ì¬ëë¤ ë° êµ¬ê¸ í í¬, AIM, ìëì°ì¦ ë¼ì´ë¸, 기"
+"í ì±í
íë¡ê·¸ë¨ì ì¬ì©íë ì¹êµ¬, ëë£ë¤ê³¼ ëíí ì ììµëë¤. ë§ì´í¬ì ì¹ì¹´"
+"ë©ë¼ë¥¼ ì¬ì©íë©´ ìì± ë° ìì íµíë í ì ììµëë¤."
+
+#: ../src/empathy-account-assistant.c:519
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "ë¤ë¥¸ ì±í
íë¡ê·¸ë¨ìì ì¬ì©íë ê³ì ì´ ììµëê¹?"
+
+#: ../src/empathy-account-assistant.c:542
+msgid "Yes, import my account details from "
+msgstr "ì, ê³ì ì 보를 ë¤ììì ê°ì ¸ìµëë¤: "
+
+#: ../src/empathy-account-assistant.c:563
+msgid "Yes, I'll enter my account details now"
+msgstr "ì, ì§ê¸ ê³ì ì 보를 ì
ë ¥í©ëë¤"
+
+#: ../src/empathy-account-assistant.c:585
+msgid "No, I want a new account"
+msgstr "ìëì¤, ì ê³ì ì ë§ëëë¤"
+
+#: ../src/empathy-account-assistant.c:595
+msgid "No, I just want to see people online nearby for now"
+msgstr "ìëì¤, íì¬ ì£¼ìì ì°ê²°í ì¬ëì ë³´ê³ ì¶ìµëë¤"
+
+#: ../src/empathy-account-assistant.c:616
+msgid "Select the accounts you want to import:"
+msgstr "ê°ì ¸ì¤ë ¤ë ê³ì ì ì ííììì¤:"
+
+#: ../src/empathy-account-assistant.c:703
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "Yes"
+msgstr "ì"
+
+#: ../src/empathy-account-assistant.c:710
+msgid "No, that's all for now"
+msgstr "ìëì¤, ì§ê¸ì ëìµëë¤"
+
+#: ../src/empathy-account-assistant.c:903
+msgid "Welcome to Empathy"
+msgstr "ìë
íì¸ì, ì í¼ìì
ëë¤"
+
+# ë구 ì¤ëª
+#: ../src/empathy-account-assistant.c:912
+msgid "Import your existing accounts"
+msgstr "기존 ê³ì ì ê°ì ¸ìµëë¤"
+
+#: ../src/empathy-accounts-dialog.c:206
+#, c-format
+msgid "%s on %s"
+msgstr "%s (ìë² %s)"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../src/empathy-accounts-dialog.c:217
+#, c-format
+msgid "%s Account"
+msgstr "%s ê³ì "
+
+#: ../src/empathy-accounts-dialog.c:221
+msgid "New account"
+msgstr "ì ê³ì "
+
+#: ../src/empathy-accounts-dialog.c:649
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1334,7 +1919,7 @@ msgstr ""
"%s ê³ì ì ì§ì°ë ¤ í©ëë¤!\n"
"ì ë§ ê³ì íìê² ìµëê¹?"
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:655
msgid ""
"Any associated conversations and chat rooms will NOT be removed if you "
"decide to proceed.\n"
@@ -1347,301 +1932,280 @@ msgstr ""
"ëì¤ì ê³ì ì ë¤ì ë§ë¤ë©´, ê´ë ¨ë ëí ë´ì©ê³¼ ëí ë°©ì ë¤ì ì¬ì©í ì ììµë"
"ë¤."
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "New Account "
-msgstr "ì ê³ì "
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "No protocol installed "
-msgstr "íë¡í ì½ì ì¤ì¹íì§ ìììµëë¤ "
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "ê³ì "
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "Settings "
-msgstr "ì¤ì "
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add new"
+msgstr "ìë¡ ì¶ê°"
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Cr_eate"
msgstr "ë§ë¤ê¸°(_E)"
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "ì´ë¯¸ ì¬ì©í ê³ì ì´ ìì"
-
-#: ../src/empathy-accounts-dialog.glade.h:7
-msgid "Import Accounts..."
-msgstr "ê³ì ê°ì ¸ì¤ê¸°..."
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "No protocol installed"
+msgstr "íë¡í ì½ì ì¤ì¹íì§ ìììµëë¤"
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr "ì ê³ì ì ë§ë¤ë©´, í´ë¹ íë¡í ì½ì ë°±ìë를 먼ì ì¤ì¹í´ì¼ í©ëë¤."
-#: ../src/empathy-accounts-dialog.glade.h:9
-msgid "Type:"
-msgstr "ì¢
ë¥:"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "_Add..."
+msgstr "ì¶ê°(_A)..."
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "_Create a new account"
+msgstr "ì ê³ì ë§ë¤ê¸°(_C)"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
+msgid "_Reuse an existing account"
+msgstr "기존 ê³ì ì¬ì©(_R)"
+
+#: ../src/empathy-accounts-dialog.ui.h:9
+msgid "account"
+msgstr "ê³ì "
+
+#: ../src/empathy-call-window.c:426
msgid "Contrast"
msgstr "ëë¹"
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:429
msgid "Brightness"
msgstr "ë°ê¸°"
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:432
msgid "Gamma"
msgstr "ê°ë§"
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:539
msgid "Volume"
msgstr "볼륨"
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "ì°ê²°íë ì¤..."
+
+#: ../src/empathy-call-window.c:778
msgid "_Sidebar"
msgstr "ê°ì¥ì리 ì°½(_S)"
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:797
msgid "Dialpad"
msgstr "ì«ìí"
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:803
msgid "Audio input"
msgstr "ì¤ëì¤ ì
ë ¥"
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:807
msgid "Video input"
msgstr "ë¹ëì¤ ì
ë ¥"
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "ì°ê²°íë ì¤..."
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
+#, c-format
+msgid "Call with %s"
+msgstr "í¸ì¶: %s"
-#: ../src/empathy-call-window.c:572
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
+msgid "Call"
+msgstr "í¸ì¶"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1390
#, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "ì°ê²°í¨ -- %d:%02d"
+msgid "Connected â %d:%02dm"
+msgstr "ì°ê²°í¨ -- %d:%02dë¶"
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
msgid "Hang up"
msgstr "ë기"
-#: ../src/empathy-call-window.glade.h:2
+#: ../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.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
msgid "Send video"
msgstr "ë¹ëì¤ ë³´ë´ê¸°"
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
msgid "Video preview"
msgstr "ë¹ëì¤ ë¯¸ë¦¬ 보기"
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "í¸ì¶(_C)"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
msgid "_View"
msgstr "보기(_V)"
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:343
#, c-format
msgid "Conversations (%d)"
msgstr "ëí (%d)"
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "주ì :"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:475
msgid "Typing a message."
msgstr "ë©ìì§ë¥¼ ì
ë ¥íë ì¤ì
ëë¤."
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
-#, c-format
-msgid "New message from %s"
-msgstr "%s ëì´ ë³´ë¸ ì ë©ìì§"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
msgid "C_lear"
msgstr "ì§ì°ê¸°(_L)"
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
msgid "Chat"
msgstr "ì±í
"
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
msgid "Insert _Smiley"
msgstr "ì´ëª¨í°ì½ ì
ë ¥(_S)"
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "ì´ë ë©ìì§(_M):"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "ì´ë"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
msgid "Move Tab _Left"
msgstr "í ì¼ìª½ì¼ë¡ ì´ë(_L)"
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
msgid "Move Tab _Right"
msgstr "í ì¤ë¥¸ìª½ì¼ë¡ ì´ë(_R)"
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "ì´ëíë ¤ë ì¬ëì ì ííììì¤:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "ì±í
íìì ì´ë ë°ììµëë¤."
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
msgid "_Contact"
msgstr "ì°ë½ì²(_C)"
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
msgid "_Contents"
msgstr "ì°¨ë¡(_C)"
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
msgid "_Conversation"
msgstr "ëí(_C)"
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
msgid "_Detach Tab"
msgstr "í ë¼ì´ë´ê¸°(_D)"
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
msgid "_Favorite Chatroom"
msgstr "ì¦ê²¨ 찾기 ëíë°©(_F)"
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Help"
msgstr "ëìë§(_H)"
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
msgid "_Next Tab"
msgstr "ë¤ì í(_N)"
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
msgid "_Previous Tab"
msgstr "ì´ì í(_P)"
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "ì°ë½ì² ëª©ë¡ íì(_S)"
+
+#: ../src/empathy-chat-window.ui.h:16
msgid "_Tabs"
msgstr "í(_T)"
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
msgid "Name"
msgstr "ì´ë¦"
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
msgid "Room"
msgstr "ë°©"
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
msgid "Auto-Connect"
msgstr "ìë ì°ê²°"
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "ì¦ê²¨ 찾기 ëíë°© í¸ì§"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "ììí ë ë°©ì ì°¸ê°(_U)"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "ì í¼ìê° ììíê³ ì°ê²°íë©´ ì´ ëí ë°©ì ì°¸ê°í©ëë¤"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
msgid "Manage Favorite Rooms"
msgstr "ì¦ê²¨ 찾기 ëíë°© ê´ë¦¬"
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "ì´ë¦(_A):"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "ìë²(_E):"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "ëíë°©(_R):"
-
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:322
msgid "Incoming call"
msgstr "ë°ë í¸ì¶"
-#: ../src/empathy-event-manager.c:375
+#: ../src/empathy-event-manager.c:325
#, c-format
msgid "%s is calling you, do you want to answer?"
msgstr "%s ëì´ í¸ì¶íê³ ììµëë¤. ìëµíìê² ìµëê¹?"
-#: ../src/empathy-event-manager.c:382
+#: ../src/empathy-event-manager.c:332
msgid "_Reject"
msgstr "ê±°ë¶(_R)"
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:338
msgid "_Answer"
msgstr "ìëµ(_A)"
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:453
#, c-format
msgid "Incoming call from %s"
msgstr "%sìì ì¨ í¸ì¶"
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:497
#, c-format
msgid "%s is offering you an invitation"
msgstr "%s ëì´ ì´ëí©ëë¤"
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:503
msgid "An external application will be started to handle it."
-msgstr "ì²ë¦¬íë ë° íìí ì¸ë¶ íë¡ê·¸ë¨ì ììí©ëë¤."
+msgstr "ì²ë¦¬íëë° íìí ì¸ë¶ íë¡ê·¸ë¨ì ììí©ëë¤."
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:508
msgid "You don't have the needed external application to handle it."
-msgstr "ì²ë¦¬íë ë° íìí ì¸ë¶ íë¡ê·¸ë¨ì´ ììµëë¤."
+msgstr "ì²ë¦¬íëë° íìí ì¸ë¶ íë¡ê·¸ë¨ì´ ììµëë¤."
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:635
msgid "Room invitation"
msgstr "ë°© ì´ë"
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:638
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s ëì´ %s ë°©ì ì´ëí©ëë¤"
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:646
msgid "_Decline"
msgstr "ê±°ì (_D)"
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "ì°¸ì¬(_J)"
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:690
#, c-format
msgid "%s invited you to join %s"
msgstr "%s ëì´ %s ë°©ì ì´ëíìµëë¤"
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:716
#, c-format
msgid "Incoming file transfer from %s"
msgstr "íì¼ ì ì¡ì ë°ììµëë¤ (%sìì)"
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:896
#, c-format
msgid "Subscription requested by %s"
msgstr "%s ëì´ ê°ì
ìì²ì íìµëë¤"
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:900
#, c-format
msgid ""
"\n"
@@ -1650,308 +2214,345 @@ msgstr ""
"\n"
"ë©ìì§: %s"
-#: ../src/empathy-ft-manager.c:113
+#. someone is logging off
+#: ../src/empathy-event-manager.c:936
+#, c-format
+msgid "%s is now offline."
+msgstr "%s ëì´ ì°ê²°ëì´ ìì§ ììµëë¤."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:952
+#, 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 "%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 "ì´ì 를 ì§ì íì§ ìììµëë¤"
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "ìí ë³ê²½ì ìì²íìµëë¤"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "íì¼ ì ì¡ì ì·¨ìíìµëë¤"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "ìëê° íì¼ ì ì¡ì ì·¨ìíìµëë¤"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "Error while trying to transfer the file"
-msgstr "íì¼ì ì ì¡íë ì¤ì ì¤ë¥ê° ë°ìíìµëë¤"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "ì ì ìì"
-#: ../src/empathy-ft-manager.c:174
-msgid "The other participant is unable to transfer the file"
-msgstr "ìëê° íì¼ì ì ì¡í ì ììµëë¤"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s (ì ì²´ %s, ìë %s/s)"
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "ì ì ìë ì´ì "
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s (ì ì²´ %s)"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:224
+#: ../src/empathy-ft-manager.c:307
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "\"%s\" íì¼ ë°ë ì¤ (%sìì)"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:227
+#: ../src/empathy-ft-manager.c:310
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "\"%s\" íì¼ ë³´ë´ë ì¤ (%sìê²)"
-#: ../src/empathy-ft-manager.c:237
-msgctxt "file size"
-msgid "Unknown"
-msgstr "ì ì ìì"
+#. 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 "\"%s\" íì¼ì %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 "íì¼ì ë°ëë° ì¤ë¥"
+
+#: ../src/empathy-ft-manager.c:348
#, c-format
-msgid "%s of %s"
-msgstr "%s (ì ì²´ %s)"
+msgid "Error sending \"%s\" to %s"
+msgstr "\"%s\" íì¼ì %sì ë³´ë´ë ì¤ ì¤ë¥"
-#: ../src/empathy-ft-manager.c:252
-msgid "Waiting the other participant's response"
-msgstr "ìëì ìëµì 기ë¤ë¦¬ë ì¤ì
ëë¤"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "íì¼ì ë³´ë´ëë° ì¤ë¥"
-#: ../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\" íì¼ ë°ì (%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\" íì¼ ë³´ë (%sìê²)"
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
msgid "File transfer completed"
msgstr "íì¼ ì ì¡ ìë£"
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "\"%s\" íì¼ ë°ë ì¤ (%sìì)"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "ë¤ë¥¸ ì°¸ììì ìëµì 기ë¤ë¦¬ë ì¤ì
ëë¤"
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
#, c-format
-msgid "\"%s\" sending to %s"
-msgstr "\"%s\" íì¼ ë³´ë´ë ì¤ (%sìê²)"
+msgid "Checking integrity of \"%s\""
+msgstr "\"%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 "íì¼ ì ì¡ ì·¨ì: %s"
+msgid "Hashing \"%s\""
+msgstr "\"%s\"ì í´ì를 구íë ì¤ì
ëë¤"
-#: ../src/empathy-ft-manager.c:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "ì ì ìì"
-
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "ì ì ìì"
-
-#: ../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 "íì¼"
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
msgid "Remaining"
msgstr "ë¨ì"
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "ì´ ìì¹ì íì¼ì ì ì¥í ì ììµëë¤"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "íì¼ì ë¤ë¥¸ ì´ë¦ì¼ë¡ ì ì¥..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "ì ì ìë í¬ê¸°"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s ëì´ íì¼ì ë³´ë´ë ¤ í©ëë¤"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "\"%s\" (%s) íì¼ì íì©íìê² ìµëê¹?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "íì©(_A)"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
msgstr "íì¼ ì ì¡"
-#: ../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 "목ë¡ìì ìë£íê±°ë, ì·¨ìíê±°ë, ì¤í¨í íì¼ ì ì¡ ì ê±°"
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr "ê°ì ¸ì¬ ê³ì ì´ ììµëë¤. íì¬ ì í¼ìë í¼ì§ ê³ì ê°ì ¸ì¤ê¸°ë§ ì§ìí©ëë¤."
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "ê³ì ê°ì ¸ì¤ê¸°"
+
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:255
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "ê°ì ¸ì¤ê¸°"
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "íë¡í ì½"
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "ìì¤"
-#: ../src/empathy-import-dialog.c:378
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr "ê°ì ¸ì¬ ê³ì ì´ ììµëë¤. íì¬ ì í¼ìë í¼ì§ ê³ì ê°ì ¸ì¤ê¸°ë§ ì§ìí©ëë¤."
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
+msgid "%s account"
+msgstr "%s ê³ì "
-#: ../src/empathy-import-dialog.glade.h:1
-msgid "Import Accounts"
-msgstr "ê³ì ê°ì ¸ì¤ê¸°"
+#: ../src/empathy-main-window.c:399
+msgid "_Edit account"
+msgstr "ê³ì í¸ì§(_E)"
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:502
msgid "No error specified"
msgstr "ì¤ë¥ë¥¼ ì§ì íì§ ìììµëë¤"
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:505
msgid "Network error"
msgstr "ë¤í¸ìí¬ ì¤ë¥"
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:508
msgid "Authentication failed"
msgstr "ì¸ì¦ ì¤í¨"
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:511
msgid "Encryption error"
msgstr "ìí¸í ì¤ë¥"
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:514
msgid "Name in use"
msgstr "ì´ë¦ì´ ì¬ì© ì¤ì
ëë¤"
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:517
msgid "Certificate not provided"
msgstr "ì¸ì¦ìê° ììµëë¤"
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:520
msgid "Certificate untrusted"
msgstr "ì¸ì¦ì를 ì 뢰í ì ììµëë¤"
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:523
msgid "Certificate expired"
msgstr "ì¸ì¦ìê° ë§ë£ëììµëë¤"
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:526
msgid "Certificate not activated"
msgstr "ì¸ì¦ì를 íì±ííì§ ìììµëë¤"
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:529
msgid "Certificate hostname mismatch"
msgstr "ì¸ì¦ì í¸ì¤í¸ ì´ë¦ì´ ë§ì§ ììµëë¤"
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:532
msgid "Certificate fingerprint mismatch"
msgstr "ì¸ì¦ì íê±°í린í¸ê° ë§ì§ ììµëë¤"
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:535
msgid "Certificate self-signed"
msgstr "ìê¸°ë§ ìëª
í ì¸ì¦ìì
ëë¤"
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:538
msgid "Certificate error"
msgstr "ì¸ì¦ì ì¤ë¥"
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:541
msgid "Unknown error"
msgstr "ì ì ìë ì¤ë¥"
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1288
msgid "Show and edit accounts"
msgstr "ê³ì ì ë³´ê³ í¸ì§í©ëë¤"
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "ì°ë½ì²"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "ê³ì í¸ì§(_E)"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
msgid "Contact List"
msgstr "ì°ë½ì² 목ë¡"
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "ì§ë ìì ì°ë½ì²(_M)"
+
# ëì§?
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:3
msgid "Context"
msgstr "컨í
ì¤í¸"
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "ì¦ê²¨ 찾기ì ì°¸ê°(_F)"
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "ìë¡ ì°¸ê°(_N)..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "ì¦ê²¨ 찾기 ê´ë¦¬"
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "ì¤íë¼ì¸ ì°ë½ì² íì(_O)"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "ë³´íµ í¬ê¸°(_O)"
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "ë³´íµ í¬ê¸°, ìë°í í¬í¨(_A)"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "ì´ë¦ ììë¡ ì ë ¬(_N)"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "ìí ììë¡ ì ë ¬(_S)"
+
+#: ../src/empathy-main-window.ui.h:10
msgid "_Accounts"
msgstr "ê³ì (_A)"
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "ì°ë½ì² ì¶ê°(_A)..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "ìì í¬ê¸°(_C)"
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "ëë²ê¹
(_D)"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "íì¼ ì ì¡(_F)"
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "ì°¸ì¬(_J)..."
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation..."
msgstr "ì ëí(_N)..."
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "ì¤íë¼ì¸ ì°ë½ì²(_O)"
+
+#: ../src/empathy-main-window.ui.h:22
msgid "_Personal Information"
msgstr "ê°ì¸ ì ë³´(_P)"
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "ìì ëí(_P)"
+
+#: ../src/empathy-main-window.ui.h:25
msgid "_Room"
msgstr "ë°©(_R)"
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:328
+msgid "Chat Room"
msgstr "ì±í
ë°©"
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "ì´í´ë³´ê¸°:"
+#: ../src/empathy-new-chatroom-dialog.c:344
+msgid "Members"
+msgstr "구ì±ì"
+
+#: ../src/empathy-new-chatroom-dialog.c:494
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"%s \n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"%s \n"
+"ì´ë íì: %s\n"
+"ìí¸ íì: %s\n"
+"구ì±ì: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "No"
+msgstr "ìëì¤"
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:524
+msgid "Could not start room listing"
+msgstr "ë°© 목ë¡ì ììí ì ììµëë¤"
+
+#: ../src/empathy-new-chatroom-dialog.c:534
+msgid "Could not stop room listing"
+msgstr "ë°© 목ë¡ì ì¤ì§í ì ììµëë¤"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "ë°© 목ë¡ì ì½ì´ë¤ì¼ ì ììµëë¤"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
msgid ""
"Enter the room name to join here or click on one or more rooms in the list."
msgstr "ì°¸ê°íë ¤ë ë°© ì´ë¦ì ì
ë ¥íê±°ë 목ë¡ìì ë°©ì ë르ììì¤."
-#: ../src/empathy-new-chatroom-dialog.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"
@@ -1959,256 +2560,271 @@ msgstr ""
"ë°©ì´ ìë ìë²ë¥¼ ì
ë ¥íììì¤. íì¬ ê³ì ì ìë²ì ê·¸ ë°©ì´ ìë ê²½ì° ë¹ì ëì"
"ìì¤."
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "ì°¸ì¬"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "ìë¡ ì°¸ì¬"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "ë°© ì°¸ì¬"
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "ìë¡ ê³ ì¹¨(_F)"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "ë°© 목ë¡"
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr "ì´ ëª©ë¡ì ë¤ì´ê° ìë²ì 모ë ì±í
ë°©ì
ëë¤."
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "ëíë°©(_R):"
# ìí ë©ìì§
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:148
msgid "Message received"
msgstr "ë©ìì§ ë°ì"
# ìí ë©ìì§
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:149
msgid "Message sent"
msgstr "ë©ìì§ ë³´ë"
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:150
msgid "New conversation"
msgstr "ì ëí"
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:151
msgid "Contact goes online"
msgstr "ì°ë½ì²ê° ì¨ë¼ì¸"
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:152
msgid "Contact goes offline"
msgstr "ì°ë½ì²ê° ì¤íë¼ì¸"
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:153
msgid "Account connected"
msgstr "ê³ì ì°ê²°"
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:154
msgid "Account disconnected"
msgstr "ê³ì ì°ê²° ëê¹"
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:394
msgid "Language"
msgstr "ì¸ì´"
-#: ../src/empathy-preferences.glade.h:1
-msgid "Appearance "
-msgstr "모ì "
-
-#: ../src/empathy-preferences.glade.h:2
-msgid "Behavior "
-msgstr "ëì "
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "GPS ì¬ì© íì©(_G)"
-#: ../src/empathy-preferences.glade.h:3
-msgid "Contact List "
-msgstr "ì°ë½ì² ëª©ë¡ "
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "í´ë ì í ì¬ì© íì©(_C)"
-#: ../src/empathy-preferences.glade.h:4
-msgid "Enable spell checking for languages: "
-msgstr "ë§ì¶¤ë² ê²ì¬ë¥¼ ì¬ì©í ì¸ì´: "
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "ë¤í¸ìí¬ ì¬ì© íì©(_N)"
-#: ../src/empathy-preferences.glade.h:5
-msgid "Play sound for events "
-msgstr "ì´ë²¤í¸ ì리 ë´ê¸° "
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "모ì"
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"The list of languages reflects only the languages for which you have "
-"a dictionary installed. "
-msgstr "ì´ ì¸ì´ 목ë¡ì ì¬ì ì ì¤ì¹í ì¸ì´ìë§ ì ì©ë©ëë¤. "
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
msgid "Automatically _connect on startup "
msgstr "ììí ë ìëì¼ë¡ ì°ê²°(_C)"
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "ìë°íë ì¬ì©ìê° ì íí ì°ë½ì² 목ë¡ì íìí 그림ì
ëë¤"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "ëì"
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
msgid "Chat Th_eme:"
msgstr "ì±í
í
ë§(_E):"
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
msgid "Disable notifications when _away or busy"
msgstr "ì리 ë¹ìì´ê±°ë ë¤ë¥¸ ì©ë¬´ ì¤ì¼ ë ìë¦¬ì§ ì기(_A)"
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
msgid "Disable sounds when _away or busy"
msgstr "ì리 ë¹ìì´ê±°ë ë¤ë¥¸ ì©ë¬´ ì¤ì¼ ë ì리 ì¬ì©íì§ ì기(_A)"
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "ì°ë½ì²ì ì¬ëì´ ì°ê²°íë©´ ì리기"
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "ì°ë½ì²ì ì¬ëì´ ì°ê²°ì´ ëì´ì§ë©´ ì리기"
+
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable notifications when the _chat is not focused"
msgstr "ì±í
ì í¬ì»¤ì¤ê° ìì¼ë©´ íì
ì리기(_C)"
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "ë§ì¶¤ë² ê²ì¬ë¥¼ ì¬ì©í ì¸ì´:"
+
+#: ../src/empathy-preferences.ui.h:14
msgid "General"
msgstr "ì¼ë°"
-#: ../src/empathy-preferences.glade.h:14
+# GeoClue - ìíí¸ì¨ì´ ì´ë¦, http://geoclue.freedesktop.org
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "GeoClue ì¤ì "
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "ìì¹"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Notifications"
msgstr "ì림"
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "ì´ë²¤í¸ ì리 ë´ê¸°"
+
+#: ../src/empathy-preferences.ui.h:19
msgid "Preferences"
msgstr "기본 ì¤ì "
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "ìë°í íì(_A)"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "ê°ì¸ ì ë³´"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published. GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"ìì¹ ë¶ì ííê² ë§ë¤ê¸°ë¥¼ ì¬ì©íë©´ ëì, ì§ì, êµê° ì ë ì´ì ìì¸í íìíì§ "
+"ììµëë¤. GPS ì¢íë ììì 1ì리ê¹ì§ë§ íì©í©ëë¤."
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:22
msgid "Show _smileys as images"
msgstr "ì´ëª¨í°ì½ì 그림ì¼ë¡ íì(_S)"
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "ê°ëµí ì°ë½ì² ëª©ë¡ íì(_M)"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "ë°©ì ì°ë½ì² ëª©ë¡ íì(_L)"
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "ì´ë¦ ììë¡ ì ë ¬(_N)"
-
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "ìí ììë¡ ì ë ¬(_T)"
-
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
msgid "Sounds"
msgstr "ì리"
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
msgid "Spell Checking"
msgstr "ë§ì¶¤ë² ê²ì¬"
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "ì´ ì¸ì´ 목ë¡ì ì¬ì ì ì¤ì¹í ì¸ì´ìë§ ì ì©ë©ëë¤."
+
+#: ../src/empathy-preferences.ui.h:27
msgid "Themes"
msgstr "í
ë§"
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable bubble notifications"
msgstr "íì ì림 ì¬ì©(_E)"
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
msgid "_Enable sound notifications"
msgstr "ì¬ì´ë ì림 ì¬ì©(_E)"
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Open new chats in separate windows"
msgstr "ìë¡ì´ ëíë ë³ë ì°½ì ì´ê¸°(_O)"
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "ìì¹ë¥¼ ì°ë½ì²ì ìë ì¬ëë¤ìê² ê³µê°(_P)"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "ìì¹ ë¶ì ííê² ë§ë¤ê¸°(_R)"
+
+#: ../src/empathy-status-icon.ui.h:1
msgid "Status"
msgstr "ìí"
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
msgid "_Quit"
msgstr "ëë´ê¸°(_Q)"
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "ì°ë½ì² ëª©ë¡ íì(_S)"
-
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:376
#, c-format
msgid "Unable to start application for service %s: %s"
msgstr "%s ìë¹ì¤ì ëí íë¡ê·¸ë¨ì ììí ì ììµëë¤: %s"
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:447
#, c-format
msgid ""
"An invitation was offered for service %s, but you don't have the needed "
"application to handle it"
-msgstr "%s ìë¹ì¤ì ì´ë ë°ìì§ë§, ì²ë¦¬íë ë° íìí íë¡ê·¸ë¨ì´ ììµëë¤."
-
-#~ msgid "Enable popup when contact is available"
-#~ msgstr "ì°ë½ì²ê° ëí ê°ë¥íë©´ íì
ì¬ì©"
-
-#~ msgid "Whether or not to show a popup when a contact becomes available."
-#~ msgstr "ì°ë½ì²ì ëêµ°ê°ê° ëí ê°ë¥ ìíê° ëë©´ íì
ì íìí ì§ ì¬ë¶."
+msgstr "%s ìë¹ì¤ì ì´ë ë°ìì§ë§, ì²ë¦¬íëë° íìí íë¡ê·¸ë¨ì´ ììµëë¤."
-#~ msgid "Closed"
-#~ msgstr "ë«í"
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "ì°ë½ì² ì§ë 보기"
-#~ msgid "End this call?"
-#~ msgstr "ì´ í¸ì¶ì ëë´ìê² ìµëê¹?"
+#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
+msgid "Error"
+msgstr "ì¤ë¥"
-#~ msgid "Closing this window will end the call in progress."
-#~ msgstr "ì´ ì°½ì ë«ì¼ë©´ ì§í ì¤ì¸ í¸ì¶ì ëë
ëë¤."
+#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
+msgid "Critical"
+msgstr "ì¹ëª
ì "
-#~ msgid "_End Call"
-#~ msgstr "í¸ì¶ ë(_E)"
+#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
+msgid "Warning"
+msgstr "ê²½ê³ "
-#~ msgid "Empathy Call"
-#~ msgstr "ì í¼ì í¸ì¶"
+#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1111
+msgid "Message"
+msgstr "ë©ìì§"
-#~ msgid "Readying"
-#~ msgstr "ì¤ë¹íë ì¤"
+#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
+msgid "Info"
+msgstr "ì ë³´"
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - ì í¼ì í¸ì¶"
+#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
+msgid "Debug"
+msgstr "ëë²ê¹
"
-#~ msgid "Ringing"
-#~ msgstr "벨ì리"
+#: ../src/empathy-debug-window.c:841
+msgid "Save"
+msgstr "ì ì¥"
-#~ msgid ""
-#~ "Incoming call from %s rejected because there is already a running call."
-#~ msgstr "ì§í ì¤ì¸ í¸ì¶ì´ ì기 ë문ì %sìì ì¨ í¸ì¶ì ê±°ë¶í©ëë¤."
+#: ../src/empathy-debug-window.c:944
+msgid "Debug Window"
+msgstr "ëë²ê¹
ì°½"
-#~ msgid "#"
-#~ msgstr "#"
+#: ../src/empathy-debug-window.c:1019
+msgid "Pause"
+msgstr "ì¼ì ì¤ì§"
-#~ msgid "*"
-#~ msgstr "*"
+#: ../src/empathy-debug-window.c:1031
+msgid "Level "
+msgstr "ë¨ê³ "
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
+#: ../src/empathy-debug-window.c:1100
+msgid "Time"
+msgstr "ìê°"
-#~ msgid "7"
-#~ msgstr "7"
+#: ../src/empathy-debug-window.c:1102
+msgid "Domain"
+msgstr "ë²ì"
-#~ msgid "8"
-#~ msgstr "8"
+#: ../src/empathy-debug-window.c:1104
+msgid "Category"
+msgstr "ë¶ë¥"
-#~ msgid "9"
-#~ msgstr "9"
+#: ../src/empathy-debug-window.c:1106
+msgid "Level"
+msgstr "ë¨ê³"
-#~ msgid "Keypad "
-#~ msgstr "ì«ìí "
+#: ../src/empathy-debug-window.c:1138
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "ì íí ì°ê²° ê´ë¦¬ìë ì격 ëë²ê¹
íì¥ ê¸°ë¥ì ì§ìíì§ ììµëë¤."
diff --git a/po/ta.po b/po/ta.po
index a6c2a40a..5c3c234d 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy.master.ta\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2009-08-25 19:12+0000\n"
-"PO-Revision-Date: 2009-08-26 15:49+0530\n"
+"POT-Creation-Date: 2009-08-28 12:11+0000\n"
+"PO-Revision-Date: 2009-08-31 00:57+0530\n"
"Last-Translator: I. Felix \n"
"Language-Team: Tamil \n"
"MIME-Version: 1.0\n"
@@ -23,12 +23,22 @@ msgstr ""
"\n"
"\n"
"\n"
+"\n"
#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
msgid "Empathy IM Client"
msgstr "Empathy IM à®à®¿à®³à¯à®¯à®©à¯"
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
+#| msgid "Client:"
+msgid "IM Client"
+msgstr "IM à®à®¿à®³à¯à®¯à®©à¯"
+
+#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
msgstr "à®à¯à®¯à¯à®¤à®¿à®à®³à¯ à®
னà¯à®ªà¯à®ªà¯à® மறà¯à®±à¯à®®à¯ பà¯à®±à¯à®"
@@ -408,7 +418,7 @@ msgstr ""
"பà¯à®¯à®°à¯ மதிபà¯à®ªà¯ \"பà¯à®¯à®°à¯\". \"நிலà¯\" à®à®©à¯à®± மதிபà¯à®ªà¯ தà¯à®à®°à¯à®ªà¯ நிலà¯à®¯à¯ பà¯à®°à¯à®¤à¯à®¤à¯ "
"வரிà®à¯à®ªà¯à®ªà®à¯à®¤à¯à®¤à¯à®®à¯."
-#: ../libempathy/empathy-account.c:1103
+#: ../libempathy/empathy-account.c:1144
msgid "Can't set an empty display name"
msgstr "à®à®°à¯ à®à®¾à®²à®¿à®¯à®¾à®© à®à®¾à®à¯à®à®¿à®ªà¯ பà¯à®¯à®°à¯ à®
à®®à¯à®à¯à® à®®à¯à®à®¿à®¯à®¾à®¤à¯"
@@ -489,7 +499,6 @@ msgid "People Nearby"
msgstr "à®
à®°à¯à®à®¿à®²à¯ à®à®³à¯à®³ à®®à®à¯à®à®³à¯"
#: ../libempathy/empathy-utils.c:384
-#| msgid "Use _Yahoo Japan"
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
@@ -547,13 +556,13 @@ msgstr "à®à®¤à®¿à®°à¯à®à®¾à®²à®¤à¯à®¤à®¿à®²à¯"
msgid "All"
msgstr "à®
னà¯à®¤à¯à®¤à¯"
-#: ../libempathy-gtk/empathy-account-widget.c:448
-#: ../libempathy-gtk/empathy-account-widget.c:504
+#: ../libempathy-gtk/empathy-account-widget.c:441
+#: ../libempathy-gtk/empathy-account-widget.c:497
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1224
+#: ../libempathy-gtk/empathy-account-widget.c:1213
msgid "Enabled"
msgstr "à®à¯à®¯à®²à®¾à®à¯à®à®ªà¯à®ªà®à¯à®à®¤à¯"
@@ -1758,43 +1767,44 @@ msgstr "à®à¯à®©à¯à®®à¯à®à¯à®à¯ à®à®°à¯ à®à®à®©à®à®¿ à®à¯à®¯à¯à®¤
msgid "translator-credits"
msgstr "I. Felix . Dr. T. Vasudevan "
-#. translators: this is followed by the "while ..." strings some lines
-#. * down this file.
-#.
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error "
-msgstr "à®
à®à¯à®à¯ à®à®°à¯ பிழà¯à®¯à®¾à® à®à®°à¯à®à¯à®à®²à®¾à®®à¯ "
+#: ../src/empathy-account-assistant.c:118
+#| msgid "while importing the accounts."
+msgid "There has been an error while importing the accounts."
+msgstr "à®à®£à®à¯à®à¯à®à®³à¯ à®à®±à®à¯à®à¯à®®à¯ பà¯à®¤à¯ à®à®°à¯ பிழà¯."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:125
-msgid "while importing the accounts."
-msgstr "à®à®£à®à¯à®à¯à®à®³à¯ à®à®±à®à¯à®à¯à®®à¯ பà¯à®¤à¯."
+#: ../src/empathy-account-assistant.c:121
+#| msgid "while parsing the account details."
+msgid "There has been an error while parsing the account details."
+msgstr "à®à®£à®à¯à®à¯ விவரà®à¯à®à®³à¯ பà®à¯à®à¯à®à¯à®®à¯ பà¯à®¤à¯ à®à®°à¯ பிழà¯."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:129
-msgid "while parsing the account details."
-msgstr "à®à®£à®à¯à®à¯ விவரà®à¯à®à®³à¯ பà®à¯à®à¯à®à¯à®®à¯ பà¯à®¤à¯."
+#: ../src/empathy-account-assistant.c:124
+#| msgid "while creating the account."
+msgid "There has been an error while creating the account."
+msgstr "à®à®£à®à¯à®à¯ à®à®°à¯à®µà®¾à®à¯à®à¯à®®à¯ பà¯à®¤à¯ à®à®°à¯ பிழà¯."
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:133
-msgid "while creating the account."
-msgstr "à®à®£à®à¯à®à¯ à®à®°à¯à®µà®¾à®à¯à®à¯à®®à¯ பà¯à®¤à¯."
+#: ../src/empathy-account-assistant.c:126
+#| msgid "There has been an error "
+msgid "There has been an error."
+msgstr "à®
à®à¯à®à¯ à®à®°à¯ பிழà¯à®¯à®¾à® à®à®°à¯à®à¯à®à®²à®¾à®®à¯."
-#: ../src/empathy-account-assistant.c:151
+#: ../src/empathy-account-assistant.c:141
#, c-format
msgid "The error message was: %s "
msgstr "à®
நà¯à®¤ பிழà¯à®¯à®¾à®© à®à¯à®¯à¯à®¤à®¿à®¯à®¾à®©à®¤à¯: %s "
-#: ../src/empathy-account-assistant.c:159
+#: ../src/empathy-account-assistant.c:149
+#| msgid ""
+#| "You can either go back and try to enter your accounts' details again or "
+#| "quit this wizard and add accounts later from the Edit menu."
msgid ""
"You can either go back and try to enter your accounts' details again or quit "
-"this wizard and add accounts later from the Edit menu."
+"this assistant and add accounts later from the Edit menu."
msgstr ""
"நà¯à®à¯à®à®³à¯ பினà¯à®©à®¾à®²à¯à®®à¯ à®à¯à®©à¯à®±à¯ மறà¯à®±à¯à®®à¯ à®à®à¯à®à®³à®¤à¯ à®à®£à®à¯à®à¯à®à®³à®¿à®©à¯ விவரà®à¯à®à®³à¯ à®®à¯à®£à¯à®à¯à®®à¯ à®à®³à¯à®³à®¿à® à®®à¯à®¯à®±à¯à®à®¿à®à¯à®à®²à®¾à®®à¯ "
"à®
லà¯à®²à®¤à¯ à®à®¨à¯à®¤ வழிà®à®¾à®à¯à®à®¿à®¯à¯ நிறà¯à®¤à¯à®¤à®²à®¾à®®à¯ மறà¯à®±à¯à®®à¯ à®®à¯à®©à¯à®µà¯ திரà¯à®¤à¯à®¤à¯à®µà®¤à®¿à®²à¯à®°à¯à®¨à¯à®¤à¯ பினà¯à®©à®°à¯ à®à®£à®à¯à®à¯à®à®³à¯ "
"à®à¯à®°à¯à®à¯à®à®²à®¾à®®à¯."
-#: ../src/empathy-account-assistant.c:194
+#: ../src/empathy-account-assistant.c:184
msgid "An error occurred"
msgstr "à®à®°à¯ பிழ௠à®à®±à¯à®ªà®à¯à®à®¤à¯"
@@ -1802,39 +1812,39 @@ msgstr "à®à®°à¯ பிழ௠à®à®±à¯à®ªà®à¯à®à®¤à¯"
#. To translator: %s is the protocol name
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!
+#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:330
-#: ../src/empathy-accounts-dialog.c:1101
+#: ../src/empathy-account-assistant.c:320
+#: ../src/empathy-accounts-dialog.c:1197
#, c-format
msgid "New %s account"
msgstr "பà¯à®¤à®¿à®¯ %s à®à®£à®à¯à®à¯"
-#: ../src/empathy-account-assistant.c:397
+#: ../src/empathy-account-assistant.c:387
msgid "What kind of chat account do you have?"
msgstr "à®à®¨à¯à®¤ வà®à¯à®¯à®¾à®© à®
à®°à®à¯à®à¯ à®à®£à®à¯à®à¯ நà¯à®à¯à®à®³à¯ பà¯à®±à¯à®±à®¿à®°à¯à®à¯à®à®¿à®±à¯à®°à¯à®à®³à¯?"
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:393
msgid "Do you have any other chat accounts you want to set up?"
msgstr "நà¯à®à¯à®à®³à¯ à®
à®®à¯à®à¯à® விரà¯à®®à¯à®ªà¯à®µà®¤à®±à¯à®à¯ à®à®à¯à®à®³à¯à®à¯à®à¯ à®à®¤à¯à®©à¯à®®à¯ மறà¯à®± à®
à®°à®à¯à®à¯ à®à®£à®à¯à®à¯à®à®³à¯ à®à®°à¯à®à¯à®à®¿à®±à®¤à®¾?"
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:399
msgid "Enter your account details"
msgstr "à®à®à¯à®à®³à®¤à¯ à®à®£à®à¯à®à¯ விவரà®à¯à®à®³à¯ à®à®³à¯à®³à®¿à®à®µà¯à®®à¯"
-#: ../src/empathy-account-assistant.c:414
+#: ../src/empathy-account-assistant.c:404
msgid "What kind of chat account do you want to create?"
msgstr "à®à®¨à¯à®¤ வà®à¯à®¯à®¾à®© à®
à®°à®à¯à®à¯ à®à®£à®à¯à®à¯ நà¯à®à¯à®à®³à¯ à®à®°à¯à®µà®¾à®à¯à® விரà¯à®®à¯à®ªà¯à®à®¿à®±à¯à®°à¯à®à®³à¯?"
-#: ../src/empathy-account-assistant.c:420
+#: ../src/empathy-account-assistant.c:410
msgid "Do you want to create other chat accounts?"
msgstr "மறà¯à®± à®
à®°à®à¯à®à¯ à®à®£à®à¯à®à¯à®à®³à¯ à®à®°à¯à®µà®¾à®à¯à® நà¯à®à¯à®à®³à¯ விரà¯à®®à¯à®ªà¯à®à®¿à®±à¯à®°à¯à®à®³à®¾?"
-#: ../src/empathy-account-assistant.c:427
+#: ../src/empathy-account-assistant.c:417
msgid "Enter the details for the new account"
msgstr "பà¯à®¤à®¿à®¯ à®à®£à®à¯à®à®¿à®±à¯à®à¯ விவரà®à¯à®à®³à¯ à®à®³à¯à®³à®¿à®à®µà¯à®®à¯"
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:503
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -1846,49 +1856,68 @@ msgstr ""
"à®à¯à®²à®¿à®à¯à®¸à¯ à®à®à®©à¯ à®
à®°à®à¯à®à¯ à®
à®à®¿à®à¯à®à®²à®¾à®®à¯. à®®à¯à®à¯à®°à¯ பà¯à®©à¯ à®
லà¯à®²à®¤à¯ வà¯à®ªà¯à®à¯à®®à®¿à®°à®¾à®µà®¿à®©à®¾à®²à¯ நà¯à®à¯à®à®³à¯à®®à¯ à®à®à®¿à®¯à¯ à®
லà¯à®²à®¤à¯ "
"வà¯à®à®¿à®¯à¯ à®
à®´à¯à®ªà¯à®ªà¯à®à®³à¯ பà¯à®±à®²à®¾à®®à¯. "
-#: ../src/empathy-account-assistant.c:530
+#: ../src/empathy-account-assistant.c:520
msgid "Do you have an account you've been using with another chat program?"
msgstr "மறà¯à®± à®
à®°à®à¯à®à¯ நிரல௠பயனà¯à®ªà®à¯à®¤à¯à®¤à®¿à®à¯ à®à¯à®£à¯à®à®¿à®°à¯à®à¯à®à®¿à®± à®à®à¯à®à®³à¯à®à¯à®à¯ à®à®°à¯ à®à®£à®à¯à®à¯ à®à®³à¯à®³à®¤à®¾?"
-#: ../src/empathy-account-assistant.c:553
+#: ../src/empathy-account-assistant.c:543
msgid "Yes, import my account details from "
msgstr "à®à®®à¯, à®à®©à®¤à¯ à®à®£à®à¯à®à¯ விவரà®à¯à®à®³à¯ à®à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®à®±à®à¯à®à®µà¯à®®à¯ "
-#: ../src/empathy-account-assistant.c:574
+#: ../src/empathy-account-assistant.c:564
msgid "Yes, I'll enter my account details now"
msgstr "à®à®®à¯, à®à®ªà¯à®ªà¯à®¤à¯ à®à®©à®¤à¯ à®à®£à®à¯à®à¯ விவரà®à¯à®à®³à¯ à®à®³à¯à®³à®¿à®à¯à®à®¿à®±à¯à®©à¯"
-#: ../src/empathy-account-assistant.c:596
+#: ../src/empathy-account-assistant.c:586
msgid "No, I want a new account"
msgstr "à®à®²à¯à®²à¯, à®à®©à®à¯à®à¯ à®à®°à¯ பà¯à®¤à®¿à®¯ à®à®£à®à¯à®à¯ வà¯à®£à¯à®à¯à®®à¯"
-#: ../src/empathy-account-assistant.c:606
+#: ../src/empathy-account-assistant.c:596
msgid "No, I just want to see people online nearby for now"
msgstr "à®à®²à¯à®²à¯, à®à®ªà¯à®ªà¯à®¤à¯ à®à®©à¯à®²à¯à®©à®¿à®²à¯ à®à®©à®à¯à®à¯ à®
à®°à¯à®à®¿à®²à®¿à®°à¯à®à¯à®à¯à®®à¯ à®®à®à¯à®à®³à¯ நான௠பாரà¯à®à¯à® விரà¯à®®à¯à®ªà¯à®à®¿à®±à¯à®©à¯"
-#: ../src/empathy-account-assistant.c:627
+#: ../src/empathy-account-assistant.c:617
msgid "Select the accounts you want to import:"
msgstr "நà¯à®à¯à®à®³à¯ à®à®±à®à¯à® விரà¯à®®à¯à®ªà¯à®®à¯ à®à®£à®à¯à®à¯à®à®³à¯ தà¯à®°à¯à®¨à¯à®¤à¯à®à¯à®à¯à®à®µà¯à®®à¯:"
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:704
#: ../src/empathy-new-chatroom-dialog.c:496
#: ../src/empathy-new-chatroom-dialog.c:497
msgid "Yes"
msgstr "à®à®®à¯"
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:711
msgid "No, that's all for now"
msgstr "à®à®²à¯à®²à¯, à®à®ªà¯à®ªà¯à®¤à¯à®à¯à®à¯ à®
வà¯à®µà®³à®µà¯ தானà¯"
-#: ../src/empathy-account-assistant.c:914
+#: ../src/empathy-account-assistant.c:904
msgid "Welcome to Empathy"
msgstr "Empathyà®à¯à®à¯ வரவà¯à®±à¯à®à¯à®±à®¤à¯"
-#: ../src/empathy-account-assistant.c:923
+#: ../src/empathy-account-assistant.c:913
msgid "Import your existing accounts"
msgstr "à®à®à¯à®à®³à®¿à®à®®à¯ à®à®°à¯à®à¯à®à®¿à®± à®à®£à®à¯à®à¯à®à®³à¯ à®à®±à®à¯à®à®µà¯à®®à¯"
-#: ../src/empathy-accounts-dialog.c:616
+#: ../src/empathy-accounts-dialog.c:206
+#, c-format
+#| msgid "%s of %s"
+msgid "%s on %s"
+msgstr "%sà®à®²à¯ %s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../src/empathy-accounts-dialog.c:217
+#, c-format
+#| msgid "%s account"
+msgid "%s Account"
+msgstr "%s à®à®£à®à¯à®à¯"
+
+#: ../src/empathy-accounts-dialog.c:221
+#| msgid "New %s account"
+msgid "New account"
+msgstr "பà¯à®¤à®¿à®¯ à®à®£à®à¯à®à¯"
+
+#: ../src/empathy-accounts-dialog.c:674
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1897,7 +1926,7 @@ msgstr ""
"நà¯à®à¯à®à®³à¯ à®à®à¯à®à®³à¯ %s à®à®£à®à¯à®à¯ நà¯à®à¯à®à®ªà¯à®ªà¯à®à®¿à®±à¯à®°à¯à®à®³à¯!\n"
"நிà®à¯à®à®¯à®®à¯ தà¯à®à®° வà¯à®£à¯à®à¯à®®à®¾?"
-#: ../src/empathy-accounts-dialog.c:622
+#: ../src/empathy-accounts-dialog.c:680
msgid ""
"Any associated conversations and chat rooms will NOT be removed if you "
"decide to proceed.\n"
@@ -2751,64 +2780,64 @@ msgstr ""
msgid "Contact Map View"
msgstr "தà¯à®à®°à¯à®ªà¯à®à®³à¯ பà®à®à¯à®à®¾à®à¯à®à®¿"
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1079
+#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
msgid "Error"
msgstr " பிழà¯"
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1073
+#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
msgid "Critical"
msgstr "à®à®ªà®¤à¯à®¤à®¾à®©à®©à¯"
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1067
+#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
msgid "Warning"
msgstr "à®à®à¯à®à®°à®¿à®à¯à®à¯"
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1061
-#: ../src/empathy-debug-dialog.c:1109
+#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1111
msgid "Message"
msgstr "à®à¯à®¯à¯à®¤à®¿"
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1055
+#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
msgid "Info"
msgstr "தà®à®µà®²à¯"
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1049
+#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
msgid "Debug"
msgstr "வழà¯à®¨à¯à®à¯à®à¯"
-#: ../src/empathy-debug-dialog.c:841
+#: ../src/empathy-debug-window.c:841
msgid "Save"
msgstr "à®à¯à®®à®¿"
-#: ../src/empathy-debug-dialog.c:944
+#: ../src/empathy-debug-window.c:944
msgid "Debug Window"
msgstr "வழ௠நà¯à®à¯à®à¯ à®à®¾à®³à®°à®®à¯"
-#: ../src/empathy-debug-dialog.c:1017
+#: ../src/empathy-debug-window.c:1019
msgid "Pause"
msgstr "தாமதி"
-#: ../src/empathy-debug-dialog.c:1029
+#: ../src/empathy-debug-window.c:1031
msgid "Level "
msgstr "à®®à®à¯à®à®®à¯"
-#: ../src/empathy-debug-dialog.c:1098
+#: ../src/empathy-debug-window.c:1100
msgid "Time"
msgstr "நà¯à®°à®®à¯"
-#: ../src/empathy-debug-dialog.c:1100
+#: ../src/empathy-debug-window.c:1102
msgid "Domain"
msgstr "à®à®³à®®à¯"
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1104
msgid "Category"
msgstr "வà®à¯"
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1106
msgid "Level"
msgstr "à®®à®à¯à®à®®à¯"
-#: ../src/empathy-debug-dialog.c:1136
+#: ../src/empathy-debug-window.c:1138
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0730c8f7..95b52b1f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.27.90\n"
+"Project-Id-Version: empathy 2.27.92\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 16:10+0800\n"
-"PO-Revision-Date: 2009-08-02 16:10+0800\n"
+"POT-Creation-Date: 2009-08-29 16:24+0800\n"
+"PO-Revision-Date: 2009-08-29 16:24+0800\n"
"Last-Translator: Chao-Hsiung Liao \n"
"Language-Team: Chinese (Hong Kong) \n"
"MIME-Version: 1.0\n"
@@ -18,14 +18,20 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy IM Client"
-msgstr ""
+msgid "Empathy"
+msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:2
-#, fuzzy
-#| msgid "Send and receive instant messages"
+msgid "Empathy IM Client"
+msgstr "Empathy IM 客æ¶ç«¯ç¨å¼"
+
+#: ../data/empathy.desktop.in.in.h:3
+msgid "IM Client"
+msgstr "IM 客æ¶ç«¯"
+
+#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
-msgstr "å³éèæ¥æ¶å³æè¨æ¯"
+msgstr "å³éèæ¥æ¶è¨æ¯"
#: ../data/empathy.schemas.in.h:1
msgid "Always open a separate chat window for new chats."
@@ -51,423 +57,447 @@ msgid "Compact contact list"
msgstr "精簡è¯çµ¡äººæ¸
å®"
#: ../data/empathy.schemas.in.h:6
+msgid "Connection managers should be used"
+msgstr "使ç¨é£ç·ç®¡çç¨å¼"
+
+#: ../data/empathy.schemas.in.h:7
msgid "Contact list sort criterium"
msgstr "è¯çµ¡äººæ¸
å®æåºæ¢ä»¶"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/empathy.schemas.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "ç¨ä¾é¸æ大é è²¼åççé è¨ç®é"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:9
msgid "Disable popup notifications when away"
msgstr "ç¶çæ
çºé¢éæåç¨å½åºå¼éç¥"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:10
msgid "Disable sounds when away"
msgstr "ç¶çæ
çºé¢éæåç¨é³æ"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:11
msgid "Empathy can publish the user's location"
msgstr "Empathy å¯ä»¥ç¼ä½ä½¿ç¨è
çä½ç½®"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:12
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy å¯ä»¥å©ç¨ GPS ä¾æ¨æ¸¬ä½ç½®"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:13
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy å¯ä»¥å©ç¨ææ©ç¶²çµ¡åºå°å°ä¾æ¨æ¸¬ä½ç½®"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:14
msgid "Empathy can use the network to guess the location"
msgstr "Empathy å¯ä»¥å©ç¨ç¶²çµ¡ä¾æ¨æ¸¬ä½ç½®"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:15
msgid "Empathy default download folder"
msgstr "Empathy é è¨ä¸è¼è³æ夾"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:16
msgid "Empathy has asked about importing accounts"
msgstr "Empathy 已詢åå¯å
¥å¸³è"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:17
msgid "Empathy should auto-connect on startup"
msgstr "Empathy ååæèªåé£ç·"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:18
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy æéä½ä½ç½®çæºç¢ºåº¦"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy è¦ä½¿ç¨è¯çµ¡äººç大é è²¼åçºè天è¦çªå示"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
msgid "Enable WebKit Developer Tools"
-msgstr ""
+msgstr "åç¨ WebKit éç¼è
å·¥å
·"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
msgid "Enable popup notifications for new messages"
msgstr "åç¨æ°è¨æ¯çå½åºå¼éç¥"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
msgid "Enable spell checker"
msgstr "åç¨æ¼å檢æ¥ç¨å¼"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
msgid "Hide main window"
msgstr "é±è主è¦çª"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Hide the main window."
msgstr "é±è主è¦çªã"
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr "æè©²ä½¿ç¨ NetworkManager"
-
#: ../data/empathy.schemas.in.h:25
+msgid "MC 4 accounts have been imported"
+msgstr "MC 4 帳èå·²ç¶å¯å
¥"
+
+#: ../data/empathy.schemas.in.h:26
+msgid "MC 4 accounts have been imported."
+msgstr "MC 4 帳èå·²ç¶å¯å
¥ã"
+
+#: ../data/empathy.schemas.in.h:27
msgid "Nick completed character"
msgstr "網åè£é½å符"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:28
msgid "Open new chats in separate windows"
msgstr "å¨åå¥è¦çªéåæ°çè天"
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:29
msgid "Path of the adium theme to use"
msgstr "è¦ä½¿ç¨ç adium ä½æ¯ä¸»é¡è·¯å¾"
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:30
msgid "Path of the adium theme to use if the theme used for chat is adium."
msgstr "å¦æè天室使ç¨ç主é¡æ¯ adium æè¦ä½¿ç¨ç adium ä½æ¯ä¸»é¡è·¯å¾ã"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
msgstr "æ¶å°è¨æ¯æææ¾é³æ"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:32
msgid "Play a sound for new conversations"
msgstr "ç¶éåæ°çè«è©±æææ¾é³æ"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for outgoing messages"
msgstr "éåºè¨æ¯æææ¾é³æ"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound when a contact logs in"
msgstr "ç¶è¯çµ¡äººç»å
¥æææ¾é³æ"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound when a contact logs out"
msgstr "ç¶æè¯çµ¡äººç»åºæææ¾é³æ"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when we log in"
msgstr "ç¶æåç»å
¥æææ¾é³æ"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when we log out"
msgstr "ç¶æåç»åºæææ¾é³æ"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:38
msgid "Popup notifications if the chat isn't focused"
msgstr "å¦æè天è¦çªå¤±å»ç¦é»åå½åºéç¥"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:39
msgid "Popup notifications when a contact sign in"
msgstr "ç¶è¯çµ¡äººç»å
¥æå½åºéç¥"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:40
msgid "Popup notifications when a contact sign out"
msgstr "ç¶è¯çµ¡äººç»åºæå½åºéç¥"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:41
msgid "Salut account is created"
msgstr "å·²å»ºç« Salut 帳è"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "顯示大é è²¼"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:43
msgid "Show contact list in rooms"
msgstr "å¨è天室顯示è¯çµ¡äººæ¸
å®"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:44
msgid "Show hint about closing the main window"
msgstr "éé主è¦çªæ顯示æ示"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:45
msgid "Show offline contacts"
msgstr "顯示é¢ç·è¯çµ¡äºº"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "æ¼å檢æ¥èªè¨"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "ç¨ä¾å²åæªæ¡å³è¼¸æ¥æ¶æªæ¡çé è¨è³æ夾ã"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "ä¸æ¬¡é¸æ大é è²¼åççç®éã"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr "ç¨ä¾é¡¯ç¤ºå¨è天è¦çªçè«è©±ä¸çä½æ¯ä¸»é¡ã"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "使ç¨åçå¼è¡¨æ
符è"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "使ç¨éç¥é³æ"
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "å¨è天室使ç¨ä½æ¯ä¸»é¡"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:53
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
+msgstr "æ¯å¦åç¨ WebKit éç¼è
å·¥å
·ï¼ä¾å¦ Web Inspectorã"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:54
msgid "Whether or not Empathy can publish the user's location to his contacts."
msgstr "Empathy æ¯å¦è¦å°ä½¿ç¨è
çä½ç½®ç¼ä½çµ¦ä»çè¯çµ¡äººã"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
msgid "Whether or not Empathy can use the GPS to guess the location."
msgstr "Empathy æ¯å¦ä½¿ç¨ GPS ä¾æ¨æ¸¬ä½ç½®ã"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
msgid ""
"Whether or not Empathy can use the cellular network to guess the location."
msgstr "Empathy æ¯å¦ä½¿ç¨æµåé»è©±ç¶²çµ¡ä¾æ¨æ¸¬ä½ç½®ã"
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
msgid "Whether or not Empathy can use the network to guess the location."
msgstr "Empathy æ¯å¦ä½¿ç¨ç¶²çµ¡ä¾æ¨æ¸¬ä½ç½®ã"
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
msgid ""
"Whether or not Empathy has asked about importing accounts from other "
"programs."
msgstr "Empathy æ¯å¦æè©¢åä½ è¦ä¸è¦å¾å
¶ä»ç¨å¼å¯å
¥å¸³èã"
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether or not Empathy should automatically log in to your accounts on "
"startup."
msgstr "Empathy æ¯å¦æå¨ååæèªåç»å
¥ä½ ç帳èã"
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether or not Empathy should reduce the location's accuracy for privacy "
"reasons."
msgstr "Empathy æ¯å¦åºæ¼ç§é±æ¬ççç±æ¸ä½ä½ç½®çæºç¢ºåº¦ã"
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether or not Empathy should use the avatar of the contact as the chat "
"window icon."
msgstr "Empathy æ¯å¦ä½¿ç¨è¯çµ¡äººå¤§é è²¼åçºè天è¦çªå示ã"
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:62
msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "æ¯å¦å¨ Empathy 第ä¸æ¬¡å·è¡æå»ºç« Salut 帳èã"
+"Whether or not connectivity managers should be used to automatically "
+"disconnect/reconnect."
+msgstr "æ¯å¦ä½¿ç¨é£ç·ç®¡çç¨å¼èªåæ·ç·/éæ°é£ç·ã"
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:63
msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
-msgstr "å¨æ·ç·/éæ°é£ç·ææ¯å¦èªå使ç¨ç¶²çµ¡ç®¡çç¨å¼ã"
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr "æ¯å¦å¨ Empathy 第ä¸æ¬¡å·è¡æå»ºç« Salut 帳èã"
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether or not to check words typed against the languages you want to check "
"with."
msgstr "æ¯å¦ä»¥ä½ è¨å®çèªè¨æª¢æ¥è¼¸å
¥æç¡é¯åã"
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether or not to convert smileys into graphical images in conversations."
msgstr "å¨è«è©±ä¸æ¯å¦å°è¡¨æ
符èè½æçºåçå½¢å¼ã"
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether or not to play a sound to notify for contacts logging in the network."
msgstr "æ¯å¦ææ¾é³æä¾éç¥æè¯çµ¡äººç»å
¥ç¶²çµ¡ã"
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
msgid ""
"Whether or not to play a sound to notify for contacts logging off the "
"network."
msgstr "æ¯å¦ææ¾é³æä¾éç¥æè¯çµ¡äººç»åºç¶²çµ¡ã"
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
msgid "Whether or not to play a sound to notify for events."
msgstr "æ¯å¦ææ¾é³æä¾éç¥æäºä»¶ç¼çã"
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
msgid "Whether or not to play a sound to notify for incoming messages."
msgstr "æ¯å¦ææ¾é³æä¾éç¥æè¨æ¯æµéã"
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
msgid "Whether or not to play a sound to notify for new conversations."
msgstr "æ¯å¦ææ¾é³æä¾éç¥éåæ°çè«è©±ã"
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
msgid "Whether or not to play a sound to notify for outgoing messages."
msgstr "æ¯å¦ææ¾é³æä¾éç¥æè¨æ¯éåºã"
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
msgid "Whether or not to play a sound when logging in a network."
msgstr "ç¶ç»å
¥ç¶²çµ¡ææ¯å¦ææ¾é³æã"
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
msgid "Whether or not to play a sound when logging off a network."
msgstr "ç¶ç»åºç¶²çµ¡ææ¯å¦ææ¾é³æã"
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
msgid "Whether or not to play sound notifications when away or busy."
msgstr "ç¶çæ
çºé¢éæå¿ç¢ææ¯å¦ææ¾é³æéç¥ã"
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
msgid ""
"Whether or not to show a popup notification when a contact goes offline."
msgstr "ç¶è¯çµ¡äººé¢ç·ææ¯å¦é¡¯ç¤ºå½åºå¼éç¥ã"
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
msgid "Whether or not to show a popup notification when a contact goes online."
msgstr "ç¶è¯çµ¡äººä¸ç·ææ¯å¦é¡¯ç¤ºå½åºå¼éç¥ã"
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
msgid ""
"Whether or not to show a popup notification when receiving a new message "
"even if the chat is already opened, but not focused."
msgstr "æ¶å°æ°è¨æ¯ææ¯å¦é¡¯ç¤ºå½åºå¼éç¥ï¼å³ä½¿å·²éåè天è¦çªï¼ä½æ²æç²å¾ç¦é»ï¼ã"
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether or not to show a popup notification when receiving a new message."
msgstr "ç¶æ¶å°æ°è¨æ¯ææ¯å¦é¡¯ç¤ºå½åºå¼éç¥ã"
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
msgid ""
"Whether or not to show avatars for contacts in the contact list and chat "
"windows."
msgstr "æ¯å¦å¨è¯çµ¡äººæ¸
å®èè天è¦çªé¡¯ç¤ºè¯çµ¡äººå¤§é è²¼ã"
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
msgid "Whether or not to show contacts that are offline in the contact list."
msgstr "æ¯å¦å¨è¯çµ¡äººæ¸
å®ä¸é¡¯ç¤ºé¢ç·çè¯çµ¡äººã"
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
msgid "Whether or not to show popup notifications when away or busy."
msgstr "ç¶çæ
çºé¢éæå¿ç¢ææ¯å¦é¡¯ç¤ºå½åºå¼éç¥ã"
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
msgid "Whether or not to show the contact list in chat rooms."
msgstr "æ¯å¦å¨è天室ä¸é¡¯ç¤ºè¯çµ¡äººæ¸
å®ã"
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
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:82
+#: ../data/empathy.schemas.in.h:84
msgid "Whether to show the contact list in compact mode or not."
msgstr "æ¯å¦ä»¥ç²¾ç°¡æ¨¡å¼é¡¯ç¤ºè¯çµ¡äººæ¸
å®ã"
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms or not."
msgstr "æ¯å¦å¨è天室使ç¨ä½æ¯ä¸»é¡ã"
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
msgid ""
"Which criterium to use when sorting the contact list. Default is to use sort "
"by the contact's name with the value \"name\". A value of \"state\" will "
"sort the contact list by state."
msgstr "æåºè¯çµ¡äººæ¸
å®æè¦ä½¿ç¨åªåæ¢ä»¶ãé è¨å¼æ¯ä½¿ç¨è¯çµ¡äººçå稱ãnameãæ¸å¼ä¾æåºãèæ¸å¼ãstateãåæ使ç¨å
¶çæ
ä¾æåºè¯çµ¡äººæ¸
å®ã"
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-account.c:1144
+msgid "Can't set an empty display name"
+msgstr "ä¸è½è¨å®ç©ºç½ç顯示å稱"
+
+#: ../libempathy/empathy-ft-handler.c:839
msgid "The hash of the received file and the sent one do not match"
msgstr "å·²æ¥æ¶æªæ¡çéæ¹å¼èéåºçä¸ç¬¦"
-#: ../libempathy/empathy-ft-handler.c:1098
+#: ../libempathy/empathy-ft-handler.c:1099
msgid "File transfer not supported by remote contact"
msgstr "é 端è¯çµ¡äººä¸æ¯æ´æªæ¡å³è¼¸"
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1157
msgid "The selected file is not a regular file"
msgstr "é¸åçæªæ¡ä¸æ¯æ£è¦çæªæ¡"
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1166
msgid "The selected file is empty"
msgstr "é¸åçæªæ¡æ¯ç©ºç½ç"
-#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
msgid "People nearby"
msgstr "è¨è¿äººå¡"
-#: ../libempathy/empathy-tp-file.c:279
+#: ../libempathy/empathy-tp-file.c:280
msgid "Socket type not supported"
msgstr "Socket é¡åä¸æ¯æ´"
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:399
msgid "No reason was specified"
msgstr "æ²ææå®åå "
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:402
msgid "The change in state was requested"
msgstr "å·²è¦æ±æ´æ¹çæ
"
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:405
msgid "You canceled the file transfer"
msgstr "ä½ å·²åæ¶æªæ¡å³è¼¸"
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:408
msgid "The other participant canceled the file transfer"
msgstr "å
¶ä»çåèè
åæ¶äºæªæ¡å³è¼¸"
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:411
msgid "Error while trying to transfer the file"
msgstr "å試å³è¼¸æªæ¡æç¼çé¯èª¤"
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:414
msgid "The other participant is unable to transfer the file"
msgstr "å
¶ä»çåèè
ç¡æ³å³è¼¸è©²æªæ¡"
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:417
msgid "Unknown reason"
msgstr "ä¸æçåå "
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:235
msgid "Available"
msgstr "æ空"
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:237
msgid "Busy"
msgstr "å¿ç¢"
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:240
msgid "Away"
msgstr "é¢é"
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:242
msgid "Hidden"
msgstr "é±è"
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:244
msgid "Offline"
msgstr "é¢ç·"
+#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
+msgid "People Nearby"
+msgstr "è¨è¿äººå¡"
+
+#: ../libempathy/empathy-utils.c:384
+msgid "Yahoo! Japan"
+msgstr "Yahoo! æ¥æ¬"
+
+#: ../libempathy/empathy-utils.c:385
+msgid "Facebook Chat"
+msgstr "Facebook è天"
+
#: ../libempathy/empathy-time.c:137
#, c-format
msgid "%d second ago"
@@ -508,77 +538,118 @@ msgstr[0] "%d åæ以å"
msgid "in the future"
msgstr "æªä¾"
-#: ../libempathy-gtk/empathy-account-chooser.c:426
+#: ../libempathy-gtk/empathy-account-chooser.c:424
msgid "All"
msgstr "å
¨é¨"
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:440
+#: ../libempathy-gtk/empathy-account-widget.c:496
#, c-format
msgid "%s:"
msgstr "%s:"
+#: ../libempathy-gtk/empathy-account-widget.c:1239
+msgid "Enabled"
+msgstr "å·²åç¨"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "Example: MyScreenName "
+msgstr "ç¯ä¾ï¼ æçè¢å¹å稱 "
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
msgid "Advanced"
msgstr "é²é"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "å¯ç¢¼(_W):"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
msgid "Screen _Name:"
msgstr "è¢å¹å稱(_N):"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr "ä½ ç AIM å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr "ä½ ç AIM è¢å¹å稱æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
msgstr "é£æ¥å (_P):"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "伺æå¨(_S):"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Example: username "
+msgstr "ç¯ä¾ï¼ 使ç¨è
å稱 "
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "ç»å
¥ I_D:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "ä½ ç GroupWise 使ç¨è
ID æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "ä½ ç GroupWise å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "Example: 123456789 "
+msgstr "ç¯ä¾ï¼ 123456789 "
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "What is your ICQ UIN?"
+msgstr "ä½ ç ICQ UIN æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr "ä½ ç ICQ å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "_Charset:"
msgstr "編碼(_C):"
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "æ°ç¶²çµ¡"
@@ -614,84 +685,136 @@ msgstr "ç實å§å:"
msgid "Servers"
msgstr "伺æå¨"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "Example: user@jabber.org "
+msgstr "ç¯ä¾ï¼ user@jabber.org "
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
msgid "Override server settings"
msgstr "è¦è伺æå¨è¨å®å¼"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "Pri_ority:"
msgstr "åªå
æ¬(_O):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Reso_urce:"
msgstr "è³æº(_U):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
msgid "Use old SS_L"
msgstr "使ç¨èç SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "What is your Jabber ID?"
+msgstr "ä½ ç Jabber ID æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Jabber password?"
+msgstr "ä½ ç Jabber å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your desired Jabber ID?"
+msgstr "ä½ æ³è¦ç Jabber ID æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid "What is your desired Jabber password?"
+msgstr "ä½ æ³è¦ç Jabber å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid "_Encryption required (TLS/SSL)"
msgstr "è¦æ±å å¯[TLS/SSL](_E)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid "_Ignore SSL certificate errors"
msgstr "å¿½ç¥ SSL èæ¸é¯èª¤(_I)"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "Example: user@hotmail.com "
+msgstr "ç¯ä¾ï¼ user@hotmail.com "
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live password?"
+msgstr "ä½ ç Windows Live å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live user name?"
+msgstr "ä½ ç Windows Live 使ç¨è
å稱æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
msgid "_Email:"
msgstr "é»åéµä»¶(_E):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
msgstr "åå(_F):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Last Name:"
msgstr "å§æ°(_L):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Nickname:"
msgstr "網å(_N):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "ç¼ä½çå稱(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "Example: user@my.sip.server "
+msgstr "ç¯ä¾ï¼ user@my.sip.server "
+
#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
msgid "Discover STUN"
msgstr "æ¢ç´¢ STUN"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "STUN Server:"
msgstr "STUN 伺æå¨:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "STUN port:"
msgstr "STUN éè¨å :"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "What is your SIP account password?"
+msgstr "ä½ ç SIP 帳èå¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "What is your SIP login ID?"
+msgstr "ä½ æ³è¦ç SIP ç»å
¥ ID æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "_Username:"
msgstr "使ç¨è
å稱(_U):"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "Use _Yahoo Japan"
msgstr "ä½¿ç¨ _Yahoo æ¥æ¬"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr "ä½ ç Yahoo! ID æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "What is your Yahoo! password?"
+msgstr "ä½ ç Yahoo! å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "Yahoo I_D:"
msgstr "Yahoo I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Ignore conference and chatroom invitations"
msgstr "忽ç¥æè°èè天室éè«(_I)"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "è天室æ¸
å®å°å(_R):"
@@ -728,92 +851,98 @@ msgstr "è«æéè£æ¾å¤§"
msgid "Failed to reconnect this chat"
msgstr "ç¡æ³éé£éåè天æè°"
-#: ../libempathy-gtk/empathy-chat.c:404
+#: ../libempathy-gtk/empathy-chat.c:403
msgid "Unsupported command"
msgstr "ä¸æ¯æ´æ¤æ令"
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:535
msgid "offline"
msgstr "é¢ç·"
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:538
msgid "invalid contact"
msgstr "ç¡æçè¯çµ¡äºº"
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:541
msgid "permission denied"
msgstr "æ¬é被æçµ"
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:544
msgid "too long message"
msgstr "太é·çè¨æ¯"
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:547
msgid "not implemented"
msgstr "æªå¯¦ä½"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:550
msgid "unknown"
msgstr "ä¸æ"
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:554
#, c-format
msgid "Error sending message '%s': %s"
msgstr "å³éè¨æ¯ã%sãæç¼çé¯èª¤ï¼%s"
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:584
#, c-format
msgid "Topic set to: %s"
msgstr "主é¡è¨å®çºï¼%s"
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:586
msgid "No topic defined"
msgstr "å°æªå®ç¾©ä¸»é¡"
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:956
msgid "(No Suggestions)"
msgstr "(æ²æ建è°)"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1010
msgid "Insert Smiley"
msgstr "æå
¥è¡¨æ
符è"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
-#: ../libempathy-gtk/empathy-ui-utils.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-ui-utils.c:1484
msgid "_Send"
msgstr "å³é(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1062
msgid "_Spelling Suggestions"
msgstr "æ¼å建è°(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1177
#, c-format
msgid "%s has disconnected"
msgstr "%s å·²æ·ç·"
-#: ../libempathy-gtk/empathy-chat.c:1185
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1184
#, c-format
-msgid "%s was kicked by %s"
-msgstr "%s 被 %s 踢åºå»äº"
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s 被 %2$s 踢åºå»"
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1187
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢åºå»äº"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1195
#, c-format
-msgid "%s was banned by %s"
-msgstr "%s 被 %sè¨çºé»åå®"
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s 被 %2$s è¨çºé»åå®"
-#: ../libempathy-gtk/empathy-chat.c:1196
+#: ../libempathy-gtk/empathy-chat.c:1198
#, c-format
msgid "%s was banned"
msgstr "%s 被è¨çºé»åå®"
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:1202
#, c-format
msgid "%s has left the room"
msgstr "%s å·²ç¶é¢éæ¤è天室"
@@ -823,42 +952,42 @@ msgstr "%s å·²ç¶é¢éæ¤è天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:1211
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:1234
#, c-format
msgid "%s has joined the room"
msgstr "%s å·²ç¶å å
¥æ¤è天室"
-#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
msgid "Disconnected"
msgstr "å·²æ·ç·"
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1803
msgid "Connected"
msgstr "æåé£ç·"
-#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-chat.c:1853
#: ../libempathy-gtk/empathy-log-window.c:502
msgid "Conversation"
msgstr "è«è©±"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
msgid "Topic:"
msgstr "主é¡:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-theme-adium.c:276
msgid "_Copy Link Address"
msgstr "è¤è£½é£çµä½å(_C)"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-theme-adium.c:284
msgid "_Open Link"
msgstr "éåé£çµ(_O)"
@@ -868,16 +997,16 @@ msgstr "éåé£çµ(_O)"
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:177
+#: ../libempathy-gtk/empathy-contact-dialogs.c:236
msgid "Edit Contact Information"
msgstr "編輯è¯çµ¡äººè³è¨"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
msgid "Personal Information"
msgstr "å人è³æ"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
msgid "New Contact"
msgstr "æ°å¢è¯çµ¡äºº"
@@ -889,27 +1018,27 @@ msgstr "ç¨å¾å決å®"
msgid "Subscription Request"
msgstr "è¨é±è¦æ±"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1404
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "æ¯å¦æ³è¦ç§»é¤ç¾£çµã%sãï¼"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1406
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
msgid "Removing group"
msgstr "æ£å¨ç§»é¤ç¾£çµ"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1453
-#: ../libempathy-gtk/empathy-contact-list-view.c:1530
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
msgid "_Remove"
msgstr "移é¤(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1483
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "æ¯å¦æ³è¦ç§»é¤è¯çµ¡äººã%sãï¼"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1485
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
msgid "Removing contact"
msgstr "æ£å¨ç§»é¤è¯çµ¡äºº"
@@ -943,7 +1072,7 @@ msgstr "å³éæªæ¡"
#: ../libempathy-gtk/empathy-contact-menu.c:369
msgid "Share my desktop"
-msgstr ""
+msgstr "å享æçæ¡é¢"
#: ../libempathy-gtk/empathy-contact-menu.c:397
msgid "Infor_mation"
@@ -974,121 +1103,120 @@ msgstr "å²å大é è²¼"
msgid "Unable to save avatar"
msgstr "ç¡æ³å²å大é è²¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
msgid "Select"
msgstr "é¸æ"
-#: ../libempathy-gtk/empathy-contact-widget.c:1005
-#: ../src/empathy-main-window.c:1023
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1019
msgid "Group"
msgstr "ç¾£çµ"
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
msgid "Country ISO Code:"
msgstr "å家 ISO 碼ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
msgid "Country:"
msgstr "å家ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
msgid "State:"
msgstr "å·ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
msgid "City:"
msgstr "å¸ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
msgid "Area:"
msgstr "ååï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
msgid "Postal Code:"
msgstr "éµéåèï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
msgid "Street:"
msgstr "è¡ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
msgid "Building:"
msgstr "建ç¯ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
msgid "Floor:"
msgstr "æ¨å±¤ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
msgid "Room:"
msgstr "室ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
msgid "Text:"
msgstr "æåï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
msgid "Description:"
msgstr "æè¿°ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
msgid "URI:"
msgstr "URIï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
msgid "Accuracy Level:"
msgstr "æºç¢ºåº¦çç´ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
msgid "Error:"
msgstr "é¯èª¤ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
msgid "Vertical Error (meters):"
msgstr "åç´èª¤å·®ï¼ç±³ï¼ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
msgid "Horizontal Error (meters):"
msgstr "水平誤差ï¼ç±³ï¼ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
msgid "Speed:"
msgstr "é度ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
msgid "Bearing:"
-msgstr "çæ¬:"
+msgstr "æ¹ä½ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
msgid "Climb Speed:"
msgstr "ç¬åé度ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
msgid "Last Updated on:"
msgstr "ä¸æ¬¡æ´æ°æ¼ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
msgid "Longitude:"
msgstr "ç¶åº¦:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
msgid "Altitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1349
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
msgid "Location "
msgstr "ä½ç½® "
-#: ../libempathy-gtk/empathy-contact-widget.c:1362
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
msgid "Location , "
msgstr "ä½ç½®ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1412
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y æ¼ %R UTC"
@@ -1120,7 +1248,7 @@ msgid "Client:"
msgstr "客æ¶ç«¯:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
+#: ../src/empathy-main-window.c:1002
msgid "Contact"
msgstr "è¯çµ¡äºº"
@@ -1171,24 +1299,24 @@ msgstr "網ç«:"
msgid "_Add Group"
msgstr "å å
¥ç¾£çµ(_G)"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
msgid "new server"
msgstr "æ°å¢ä¼ºæå¨"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
msgid "Server"
msgstr "伺æå¨"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
msgid "Port"
msgstr "é£æ¥å "
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
msgid "SSL"
msgstr "SSL"
#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳è"
@@ -1234,34 +1362,34 @@ msgstr "æ°å¢è«è©±"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-#: ../libempathy-gtk/empathy-presence-chooser.c:208
+#: ../libempathy-gtk/empathy-presence-chooser.c:176
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
msgid "Custom Message..."
msgstr "èªé¸è¨æ¯..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#: ../libempathy-gtk/empathy-presence-chooser.c:229
+#: ../libempathy-gtk/empathy-presence-chooser.c:231
msgid "Edit Custom Messages..."
msgstr "編輯èªé¸è¨æ¯..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:330
msgid "Click to remove this status as a favorite"
msgstr "æéè£å°éåçæ
å¾å好ä¸ç§»é¤"
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:339
msgid "Click to make this status a favorite"
msgstr "æéè£å°éåçæ
è¨çºå好"
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:373
msgid "Set status"
msgstr "è¨å®çæ
"
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:794
msgid "Set your presence and current status"
msgstr "è¨å®ä½ çä¸ç·èç®åççæ
"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+#: ../libempathy-gtk/empathy-presence-chooser.c:1043
msgid "Custom messages..."
msgstr "èªé¸è¨æ¯..."
@@ -1321,14 +1449,6 @@ msgstr "å å
¥æ°çé å
è¨å®(_N)"
msgid "Saved Presets"
msgstr "å·²å²åçé å
è¨å®"
-#: ../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 "å¤å
¸"
@@ -1345,15 +1465,15 @@ msgstr "æ¸
é¤"
msgid "Blue"
msgstr "èè²"
-#: ../libempathy-gtk/empathy-ui-utils.c:1382
+#: ../libempathy-gtk/empathy-ui-utils.c:1386
msgid "Unable to open URI"
msgstr "ç¡æ³éå URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#: ../libempathy-gtk/empathy-ui-utils.c:1476
msgid "Select a file"
msgstr "é¸æä¸åæªæ¡"
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
+#: ../libempathy-gtk/empathy-ui-utils.c:1536
msgid "Select a destination"
msgstr "é¸åç®çå°"
@@ -1541,7 +1661,7 @@ msgid "Megaphone"
msgstr "話ç"
#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:518
msgid "Talk!"
msgstr "è¬è©±ï¼"
@@ -1559,11 +1679,11 @@ msgstr "è³è¨(_I)"
msgid "_Preferences"
msgstr "å好è¨å®(_P)"
-#: ../megaphone/src/megaphone-applet.c:168
+#: ../megaphone/src/megaphone-applet.c:166
msgid "Please configure a contact."
msgstr "è«è¨å®è¯çµ¡äººã"
-#: ../megaphone/src/megaphone-applet.c:258
+#: ../megaphone/src/megaphone-applet.c:256
msgid "Select contact..."
msgstr "é¸æè¯çµ¡äºº..."
@@ -1572,27 +1692,25 @@ msgid "Presence"
msgstr "ä¸ç·çæ
"
#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
+#: ../nothere/src/nothere-applet.c:105
msgid "Set your own presence"
msgstr "è¨å®ä½ èªå·±çä¸ç·çæ
"
-#: ../src/empathy.c:567
+#: ../src/empathy.c:588
msgid "Don't connect on startup"
msgstr "ååæä¸è¦èªåé£ç·"
-#: ../src/empathy.c:571
+#: ../src/empathy.c:592
msgid "Don't show the contact list on startup"
msgstr "ååæä¸é¡¯ç¤ºè¯çµ¡äººæ¸
å®"
-#: ../src/empathy.c:575
+#: ../src/empathy.c:596
msgid "Show the accounts dialog"
msgstr "顯示帳èå°è©±ç"
-#: ../src/empathy.c:587
-#, fuzzy
-#| msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:608
msgid "- Empathy IM Client"
-msgstr "- Empathy å³æéè¨ç¨å¼"
+msgstr "- Empathy IM 客æ¶ç«¯ç¨å¼"
#: ../src/empathy-about-dialog.c:83
msgid ""
@@ -1632,21 +1750,140 @@ msgstr ""
"Craig Jeffares , 2004\n"
"Joe Man , 2001"
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "å·²åç¨"
+#: ../src/empathy-account-assistant.c:118
+msgid "There has been an error while importing the accounts."
+msgstr "å¯å
¥å¸³èæç¼çé¯èª¤ã"
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "帳è"
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error while parsing the account details."
+msgstr "解æ帳è詳細è³ææç¼çé¯èª¤ã"
+
+#: ../src/empathy-account-assistant.c:124
+msgid "There has been an error while creating the account."
+msgstr "建ç«å¸³èæç¼çé¯èª¤ã"
+
+#: ../src/empathy-account-assistant.c:126
+msgid "There has been an error."
+msgstr "æé¯èª¤ç¼çã"
+
+#: ../src/empathy-account-assistant.c:141
+#, c-format
+msgid "The error message was: %s "
+msgstr "é¯èª¤è¨æ¯çºï¼ %s "
+
+#: ../src/empathy-account-assistant.c:149
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr "ä½ å¯ä»¥åå°åé å次輸å
¥å¸³èç詳細è³ææçµææ¤å©çï¼ç¨å¾åå¾ã編輯ãé¸å®å å
¥å¸³èã"
+#: ../src/empathy-account-assistant.c:184
+msgid "An error occurred"
+msgstr "ç¼çé¯èª¤"
+
+#. Create account
#. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:320
+#: ../src/empathy-accounts-dialog.c:1172
#, c-format
msgid "New %s account"
msgstr "æ°å¢ %s 帳è"
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-account-assistant.c:386
+msgid "What kind of chat account do you have?"
+msgstr "ä½ çè天帳èæ¯åªä¸ç¨®ï¼"
+
+#: ../src/empathy-account-assistant.c:392
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "ä½ éæ³è¦è¨å®å
¶ä»çè天帳èåï¼"
+
+#: ../src/empathy-account-assistant.c:398
+msgid "Enter your account details"
+msgstr "è«è¼¸å
¥ä½ ç帳è詳細è³æ"
+
+#: ../src/empathy-account-assistant.c:403
+msgid "What kind of chat account do you want to create?"
+msgstr "ä½ æ³è¦å»ºç«ä½ç¨®è天帳èï¼"
+
+#: ../src/empathy-account-assistant.c:409
+msgid "Do you want to create other chat accounts?"
+msgstr "æ¯å¦æ³è¦å»ºç«å
¶ä»è天帳èï¼"
+
+#: ../src/empathy-account-assistant.c:416
+msgid "Enter the details for the new account"
+msgstr "è«è¼¸å
¥æ°å¸³èç詳細è³æ"
+
+#: ../src/empathy-account-assistant.c:502
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr "ä½¿ç¨ Empathy å¯ä»¥å¨ç¶²ä¸è·é°è¿ç人å¡è天ï¼ææ¯åä½¿ç¨ Google TalkãAIMãWindows Live çå
¶ä»è天ç¨å¼çæåååäºè天ãå©ç¨éº¥å
風æ網絡æå½±æ©éå¯ä»¥é²è¡èªé³æè¦åé話ã"
+
+#: ../src/empathy-account-assistant.c:519
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "ä½ æ¯å¦æ使ç¨å
¶ä»è天ç¨å¼ç帳èï¼"
+
+#: ../src/empathy-account-assistant.c:542
+msgid "Yes, import my account details from "
+msgstr "æ¯çï¼è«å¯å
¥æç帳è詳細è³ææ¼"
+
+#: ../src/empathy-account-assistant.c:563
+msgid "Yes, I'll enter my account details now"
+msgstr "æ¯çï¼æç¾å¨è¦è¼¸å
¥å¸³èç詳細è³æ"
+
+#: ../src/empathy-account-assistant.c:585
+msgid "No, I want a new account"
+msgstr "ä¸ï¼ææ³è¦æ°ç帳è"
+
+#: ../src/empathy-account-assistant.c:595
+msgid "No, I just want to see people online nearby for now"
+msgstr "ä¸ï¼æç¾å¨åªæ³ççéè¿æ誰ä¸ç·"
+
+#: ../src/empathy-account-assistant.c:616
+msgid "Select the accounts you want to import:"
+msgstr "é¸æè¦å¯å
¥ç帳èï¼"
+
+#: ../src/empathy-account-assistant.c:703
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "Yes"
+msgstr "æ¯"
+
+#: ../src/empathy-account-assistant.c:710
+msgid "No, that's all for now"
+msgstr "ä¸ï¼ç®åå°±é樣"
+
+#: ../src/empathy-account-assistant.c:903
+msgid "Welcome to Empathy"
+msgstr "æ¡è¿ä½¿ç¨ Empathy"
+
+#: ../src/empathy-account-assistant.c:912
+msgid "Import your existing accounts"
+msgstr "å¯å
¥ç¾æç帳è"
+
+#: ../src/empathy-accounts-dialog.c:206
+#, c-format
+msgid "%s on %s"
+msgstr "%s æ¼ %s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../src/empathy-accounts-dialog.c:217
+#, c-format
+msgid "%s Account"
+msgstr "%s 帳è"
+
+#: ../src/empathy-accounts-dialog.c:221
+msgid "New account"
+msgstr "æ°å¢å¸³è"
+
+#: ../src/empathy-accounts-dialog.c:649
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1655,7 +1892,7 @@ msgstr ""
"ä½ å³å°ç§»é¤ä½ ç %s 帳èï¼\n"
"確å®è¦ç¹¼çºï¼"
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:655
msgid ""
"Any associated conversations and chat rooms will NOT be removed if you "
"decide to proceed.\n"
@@ -1667,99 +1904,94 @@ msgstr ""
"\n"
"ç¶ä½ å¾å¾æ±ºå®è¦å°è©²å¸³èéæ°å å
¥æï¼ä¸è¿°è³æºå°ä»ç¶å¯ä»¥åç¨ã"
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "帳è"
+
#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "å å
¥å¸³è"
+msgid "Add new"
+msgstr "å å
¥æ°ç"
#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Cr_eate"
msgstr "建ç«(_E)"
#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "å¯å
¥å¸³è..."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol installed"
msgstr "å°æªå®è£éè¨åå®"
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "è¨å®å¼"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr "è¦å å
¥æ°ç帳èï¼ä½ å¿
é å
å®è£æ¯åæç¨å°çéè¨åå®å¾ç«¯ç¨å¼ã"
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "Type:"
-msgstr "é¡å:"
-
-#: ../src/empathy-accounts-dialog.ui.h:10
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Add..."
msgstr "å å
¥(_A)..."
-#: ../src/empathy-accounts-dialog.ui.h:11
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Create a new account"
msgstr "建ç«æ°ç使ç¨è
帳è(_C)"
-#: ../src/empathy-accounts-dialog.ui.h:12
+#: ../src/empathy-accounts-dialog.ui.h:8
msgid "_Reuse an existing account"
msgstr "éè¤ä½¿ç¨æ¢åç帳è(_R)"
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-accounts-dialog.ui.h:9
+msgid "account"
+msgstr "帳è"
+
+#: ../src/empathy-call-window.c:426
msgid "Contrast"
msgstr "å°æ¯"
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:429
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:432
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:539
msgid "Volume"
msgstr "é³é"
-#: ../src/empathy-call-window.c:662
+#: ../src/empathy-call-window.c:671
msgid "Connecting..."
msgstr "é£ç·ä¸..."
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:778
msgid "_Sidebar"
msgstr "å´éå(_S)"
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:797
msgid "Dialpad"
msgstr "æèç¤"
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:803
msgid "Audio input"
msgstr "é³æ輸å
¥"
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:807
msgid "Video input"
msgstr "è¦å輸å
¥"
-#: ../src/empathy-call-window.c:835
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
#, c-format
msgid "Call with %s"
msgstr "è %s é話ä¸"
-#: ../src/empathy-call-window.c:904
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
msgid "Call"
msgstr "é話"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1335
+#: ../src/empathy-call-window.c:1390
#, c-format
msgid "Connected â %d:%02dm"
msgstr "å·²é£ç· â %d:%02dm"
@@ -1792,66 +2024,54 @@ msgstr "é話(_C)"
msgid "_View"
msgstr "檢è¦(_V)"
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:343
#, c-format
msgid "Conversations (%d)"
msgstr "è«è©± (%d)"
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:475
msgid "Typing a message."
msgstr "æ£å¨è¼¸å
¥è¨æ¯ã"
#: ../src/empathy-chat-window.ui.h:1
-#, fuzzy
-#| msgid "Clean"
msgid "C_lear"
-msgstr "æ¸
é¤"
+msgstr "æ¸
é¤(_L)"
#: ../src/empathy-chat-window.ui.h:2
-#, fuzzy
-#| msgid "_Chat"
msgid "Chat"
-msgstr "è天(_C)"
+msgstr "è天"
#: ../src/empathy-chat-window.ui.h:3
-#, fuzzy
-#| msgid "Insert Smiley"
msgid "Insert _Smiley"
-msgstr "æå
¥è¡¨æ
符è"
+msgstr "æå
¥è¡¨æ
符è(_S)"
#: ../src/empathy-chat-window.ui.h:4
msgid "Move Tab _Left"
-msgstr ""
+msgstr "å°åé 左移(_L)"
#: ../src/empathy-chat-window.ui.h:5
msgid "Move Tab _Right"
-msgstr ""
+msgstr "å°åé å³ç§»(_R)"
#: ../src/empathy-chat-window.ui.h:6
-#, fuzzy
-#| msgid "Contact"
msgid "_Contact"
-msgstr "è¯çµ¡äºº"
+msgstr "è¯çµ¡äºº(_C)"
#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
msgid "_Contents"
msgstr "å
§å®¹(_C)"
#: ../src/empathy-chat-window.ui.h:8
-#, fuzzy
-#| msgid "Conversation"
msgid "_Conversation"
-msgstr "è«è©±"
+msgstr "è«è©±(_C)"
#: ../src/empathy-chat-window.ui.h:9
msgid "_Detach Tab"
-msgstr ""
+msgstr "åé¢åé (_D)"
#: ../src/empathy-chat-window.ui.h:11
-#, fuzzy
-#| msgid "_Invite to chatroom"
msgid "_Favorite Chatroom"
-msgstr "éè«å°éåè天室(_I)"
+msgstr "å好çè天室(_F)"
#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Help"
@@ -1859,13 +2079,11 @@ msgstr "æ±å©(_H)"
#: ../src/empathy-chat-window.ui.h:13
msgid "_Next Tab"
-msgstr ""
+msgstr "ä¸ååé (_N)"
#: ../src/empathy-chat-window.ui.h:14
-#, fuzzy
-#| msgid "_Previous Conversations"
msgid "_Previous Tab"
-msgstr "ä¸ä¸æ¬¡è«è©±(_P)"
+msgstr "ä¸ååé (_P)"
#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
msgid "_Show Contact List"
@@ -1873,7 +2091,7 @@ msgstr "顯示è¯çµ¡äººæ¸
å®(_S)"
#: ../src/empathy-chat-window.ui.h:16
msgid "_Tabs"
-msgstr ""
+msgstr "åé (_T)"
#: ../src/empathy-chatrooms-window.c:258
msgid "Name"
@@ -1891,75 +2109,75 @@ msgstr "èªåé£ç·"
msgid "Manage Favorite Rooms"
msgstr "管çå好çè天室"
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:322
msgid "Incoming call"
msgstr "ä¾é»"
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:325
#, c-format
msgid "%s is calling you, do you want to answer?"
msgstr "%s è¦èä½ é話ï¼æ¯å¦è¦æ¥è½ï¼"
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:332
msgid "_Reject"
msgstr "æçµ(_R)"
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:338
msgid "_Answer"
msgstr "æ¥è½(_A)"
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:453
#, c-format
msgid "Incoming call from %s"
msgstr "%s çä¾é»"
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:497
#, c-format
msgid "%s is offering you an invitation"
msgstr "%s æ£å¨éè«ä½ "
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:503
msgid "An external application will be started to handle it."
msgstr "å°ååå¤é¨æç¨ç¨å¼ä¾èçå®ã"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:508
msgid "You don't have the needed external application to handle it."
msgstr "ä½ æ²æèçå®æéçå¤é¨æç¨ç¨å¼ã"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:635
msgid "Room invitation"
msgstr "è天éè«"
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:638
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s æ£å¨éè«ä½ å å
¥ %s"
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:646
msgid "_Decline"
msgstr "æçµ(_D)"
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:651
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "å å
¥(_J)"
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:690
#, c-format
msgid "%s invited you to join %s"
msgstr "%s æ¾éè«ä½ å å
¥ %s"
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:716
#, c-format
msgid "Incoming file transfer from %s"
msgstr "æ¶å°ä¾èª %s çæªæ¡å³è¼¸"
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:896
#, c-format
msgid "Subscription requested by %s"
msgstr "ä¾èª %s çè¨é±è¦æ±"
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:900
#, c-format
msgid ""
"\n"
@@ -1969,13 +2187,13 @@ msgstr ""
"è¨æ¯ï¼%s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:936
#, c-format
msgid "%s is now offline."
msgstr "%s ç¾å¨é¢ç·ã"
#. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:952
#, c-format
msgid "%s is now online."
msgstr "%s ç¾å¨ä¸ç·ã"
@@ -2091,90 +2309,95 @@ msgstr "æªæ¡å³è¼¸"
msgid "Remove completed, canceled and failed file transfers from the list"
msgstr "å¾æ¸
å®ä¸ç§»é¤å·²å®æãå·²åæ¶å失æçæªæ¡å³è¼¸"
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr "æ¾ä¸å°å¯å¯å
¥ç帳èãEmpathy ç®ååªæ¯æ´å¾ Pidgin å¯å
¥å¸³èã"
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "å¯å
¥å¸³è"
+
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "å¯å
¥"
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "éè¨åå®"
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "ä¾æº"
-#: ../src/empathy-import-dialog.c:392
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr "æ¾ä¸å°å¯å¯å
¥ç帳èãEmpathy ç®ååªæ¯æ´å¾ Pidgin å¯å
¥å¸³èã"
-
-#: ../src/empathy-import-dialog.ui.h:1
-msgid "Import Accounts"
-msgstr "å¯å
¥å¸³è"
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
+msgid "%s account"
+msgstr "%s 帳è"
-#: ../src/empathy-main-window.c:402
+#: ../src/empathy-main-window.c:399
msgid "_Edit account"
msgstr "編輯帳è(_E)"
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:502
msgid "No error specified"
msgstr "æ²ææå®çé¯èª¤"
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:505
msgid "Network error"
msgstr "網絡é¯èª¤"
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:508
msgid "Authentication failed"
msgstr "é©è失æ"
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:511
msgid "Encryption error"
msgstr "å å¯ç¼çé¯èª¤"
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:514
msgid "Name in use"
msgstr "使ç¨ä¸çå稱"
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:517
msgid "Certificate not provided"
msgstr "æ²ææä¾èæ¸"
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:520
msgid "Certificate untrusted"
msgstr "èæ¸ä¸è¢«ä¿¡ä»»"
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:523
msgid "Certificate expired"
msgstr "èæ¸å·²é¾æ"
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:526
msgid "Certificate not activated"
msgstr "èæ¸å°æªä½¿ç¨"
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:529
msgid "Certificate hostname mismatch"
msgstr "èæ¸ä¸»æ©å稱ä¸ç¬¦"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:532
msgid "Certificate fingerprint mismatch"
msgstr "èæ¸æç´æªä¸ç¬¦"
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:535
msgid "Certificate self-signed"
msgstr "èæ¸çºèªæ簽署"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:538
msgid "Certificate error"
msgstr "èæ¸é¯èª¤"
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:541
msgid "Unknown error"
msgstr "ä¸æçé¯èª¤"
-#: ../src/empathy-main-window.c:1293
+#: ../src/empathy-main-window.c:1288
msgid "Show and edit accounts"
msgstr "顯示並編輯帳è"
@@ -2200,23 +2423,19 @@ msgstr "管çå好"
#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
-msgstr ""
+msgstr "æ£å¸¸å¤§å°(_O)"
#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
-msgstr ""
+msgstr "æ£å¸¸å¤§å°å 大é è²¼(_A)"
#: ../src/empathy-main-window.ui.h:8
-#, fuzzy
-#| msgid "Sort by _name"
msgid "Sort by _Name"
msgstr "æ ¹æå稱æåº(_N)"
#: ../src/empathy-main-window.ui.h:9
-#, fuzzy
-#| msgid "Sort by s_tate"
msgid "Sort by _Status"
-msgstr "æ ¹æçæ
æåº(_T)"
+msgstr "æ ¹æçæ
æåº(_S)"
#: ../src/empathy-main-window.ui.h:10
msgid "_Accounts"
@@ -2224,7 +2443,7 @@ msgstr "帳è(_A)"
#: ../src/empathy-main-window.ui.h:13
msgid "_Compact Size"
-msgstr ""
+msgstr "精簡大å°(_C)"
#: ../src/empathy-main-window.ui.h:15
msgid "_Debug"
@@ -2258,15 +2477,15 @@ msgstr "ä¸ä¸æ¬¡è«è©±(_P)"
msgid "_Room"
msgstr "è天室(_R)"
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:328
msgid "Chat Room"
msgstr "è天室"
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:344
msgid "Members"
msgstr "æå¡"
-#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:494
#, c-format
msgctxt ""
msgid ""
@@ -2281,21 +2500,16 @@ msgstr ""
"éè¦å¯ç¢¼ï¼%s\n"
"æå¡ï¼%s"
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "æ¯"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
msgid "No"
msgstr "å¦"
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:524
msgid "Could not start room listing"
msgstr "ç¡æ³éå§ååºè天室æ¸
å®"
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:534
msgid "Could not stop room listing"
msgstr "ç¡æ³åæ¢ååºè天室æ¸
å®"
@@ -2326,35 +2540,35 @@ msgstr "è天室æ¸
å®"
msgid "_Room:"
msgstr "è天室(_R):"
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:148
msgid "Message received"
msgstr "è¨æ¯å·²æ¶å°"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:149
msgid "Message sent"
msgstr "è¨æ¯å·²éåº"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:150
msgid "New conversation"
msgstr "æ°å¢è«è©±"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:151
msgid "Contact goes online"
msgstr "è¯çµ¡äººä¸ç·"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:152
msgid "Contact goes offline"
msgstr "è¯çµ¡äººé¢ç·"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:153
msgid "Account connected"
msgstr "帳èå·²é£ç·"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:154
msgid "Account disconnected"
msgstr "帳èå·²æ·ç·"
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:394
msgid "Language"
msgstr "èªè¨"
@@ -2441,9 +2655,9 @@ msgstr "ç§é±"
#: ../src/empathy-preferences.ui.h:21
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 "éä½ä½ç½®æºç¢ºåº¦ææé¤äºä½ æå¨çåå¸ãæ´²åå家æ被å
¬éä¹å¤ï¼ä¸ææä¾å
¶ä»è¨æ¯ãå
¨çå®ä½ç³»çµ±ç座æ¨å°æé¨æ©å å
¥æ¸å¼(±0.25°)ã"
+"state and country will be published. GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr "éä½ä½ç½®æºç¢ºåº¦ææé¤äºä½ æå¨çåå¸ãæ´²åå家æ被å
¬éä¹å¤ï¼ä¸ææä¾å
¶ä»è¨æ¯ãGPS ç座æ¨æºç¢ºåº¦å°æéçºåä½æ¸ã"
#: ../src/empathy-preferences.ui.h:22
msgid "Show _smileys as images"
@@ -2499,92 +2713,118 @@ msgstr "çæ
"
msgid "_Quit"
msgstr "çµæ(_Q)"
-#: ../src/empathy-tube-dispatch.c:375
+#: ../src/empathy-tube-dispatch.c:376
#, c-format
msgid "Unable to start application for service %s: %s"
msgstr "ç¡æ³ååæå %s çæç¨ç¨å¼ï¼%s"
-#: ../src/empathy-tube-dispatch.c:446
+#: ../src/empathy-tube-dispatch.c:447
#, c-format
msgid ""
"An invitation was offered for service %s, but you don't have the needed "
"application to handle it"
msgstr "ææåºæå %s çéè«ï¼ä½æ¯ä½ æ²æèçå®æéçå¤é¨æç¨ç¨å¼ã"
-#: ../src/empathy-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr "gtk-leave-fullscreen"
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
msgstr "è¯çµ¡äººå°å檢è¦"
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
msgid "Error"
msgstr "é¯èª¤"
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
msgid "Critical"
msgstr "å´é"
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
msgid "Warning"
msgstr "è¦å"
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
+#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1111
msgid "Message"
msgstr "è¨æ¯"
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
msgid "Info"
msgstr "è³è¨"
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
msgid "Debug"
msgstr "åµé¯"
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-window.c:841
msgid "Save"
msgstr "å²å"
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-window.c:944
msgid "Debug Window"
msgstr "åµé¯è¦çª"
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-window.c:1019
msgid "Pause"
msgstr "æ«å"
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-window.c:1031
msgid "Level "
msgstr "çç´"
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1100
msgid "Time"
msgstr "æå»"
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1102
msgid "Domain"
msgstr "網å"
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-window.c:1104
msgid "Category"
msgstr "åé¡"
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-window.c:1106
msgid "Level"
msgstr "çç´"
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-window.c:1138
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr "é¸åçé£ç·ç®¡çç¨å¼ä¸æ¯æ´é 端åµé¯æ´å
åè½ã"
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Add Account"
+#~ msgstr "å å
¥å¸³è"
+
+#~ msgid "Gmail"
+#~ msgstr "Gmail"
+
+#~ msgid "Import Accounts..."
+#~ msgstr "å¯å
¥å¸³è..."
+
+#~ msgid "Settings"
+#~ msgstr "è¨å®å¼"
+
+#~ msgid "Type:"
+#~ msgstr "é¡å:"
+
+#~ msgid "gtk-leave-fullscreen"
+#~ msgstr "gtk-leave-fullscreen"
+
#~ msgid "Empathy Instant Messenger"
#~ msgstr "Empathy å³æéè¨ç¨å¼"
+#~ msgid "Send and receive instant messages"
+#~ msgstr "å³éèæ¥æ¶å³æè¨æ¯"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Empathy å³æéè¨ç¨å¼"
+
#~ msgid "Avatars are user chosen images shown in the contact list"
#~ msgstr "å¨é£ç·äººæ¸
å®ä¸é¡¯ç¤ºä½¿ç¨è
é¸æç大é è²¼"
@@ -2593,3 +2833,9 @@ msgstr "é¸åçé£ç·ç®¡çç¨å¼ä¸æ¯æ´é 端åµé¯æ´å
åè½ã"
#~ msgid "Show co_mpact contact list"
#~ msgstr "顯示精簡é£çµ¡äººæ¸
å®(_M)"
+
+#~ msgid "Sort by _name"
+#~ msgstr "ä¾å稱æåº(_N)"
+
+#~ msgid "Sort by s_tate"
+#~ msgstr "ä¾çæ
æåº(_T)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5dabbf59..8eed7850 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: empathy 2.27.90\n"
+"Project-Id-Version: empathy 2.27.92\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 16:10+0800\n"
-"PO-Revision-Date: 2009-06-19 08:17+0800\n"
+"POT-Creation-Date: 2009-08-29 16:24+0800\n"
+"PO-Revision-Date: 2009-08-29 08:49+0800\n"
"Last-Translator: Chao-Hsiung Liao \n"
"Language-Team: Chinese (traditional) \n"
"MIME-Version: 1.0\n"
@@ -18,14 +18,20 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy IM Client"
-msgstr ""
+msgid "Empathy"
+msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:2
-#, fuzzy
-#| msgid "Send and receive instant messages"
+msgid "Empathy IM Client"
+msgstr "Empathy IM 客æ¶ç«¯ç¨å¼"
+
+#: ../data/empathy.desktop.in.in.h:3
+msgid "IM Client"
+msgstr "IM 客æ¶ç«¯"
+
+#: ../data/empathy.desktop.in.in.h:4
msgid "Send and receive messages"
-msgstr "å³éèæ¥æ¶å³æè¨æ¯"
+msgstr "å³éèæ¥æ¶è¨æ¯"
#: ../data/empathy.schemas.in.h:1
msgid "Always open a separate chat window for new chats."
@@ -51,345 +57,353 @@ msgid "Compact contact list"
msgstr "精簡é£çµ¡äººæ¸
å®"
#: ../data/empathy.schemas.in.h:6
+msgid "Connection managers should be used"
+msgstr "使ç¨é£ç·ç®¡çç¨å¼"
+
+#: ../data/empathy.schemas.in.h:7
msgid "Contact list sort criterium"
msgstr "é£çµ¡äººæ¸
å®æåºæ¢ä»¶"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/empathy.schemas.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "ç¨ä¾é¸æ大é è²¼åççé è¨ç®é"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:9
msgid "Disable popup notifications when away"
msgstr "ç¶çæ
çºé¢éæåç¨å½åºå¼éç¥"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:10
msgid "Disable sounds when away"
msgstr "ç¶çæ
çºé¢éæåç¨é³æ"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:11
msgid "Empathy can publish the user's location"
msgstr "Empathy å¯ä»¥ç¼ä½ä½¿ç¨è
çä½ç½®"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:12
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy å¯ä»¥å©ç¨ GPS ä¾æ¨æ¸¬ä½ç½®"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:13
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy å¯ä»¥å©ç¨ææ©ç¶²è·¯åºå°å°ä¾æ¨æ¸¬ä½ç½®"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:14
msgid "Empathy can use the network to guess the location"
msgstr "Empathy å¯ä»¥å©ç¨ç¶²è·¯ä¾æ¨æ¸¬ä½ç½®"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:15
msgid "Empathy default download folder"
msgstr "Empathy é è¨ä¸è¼è³æ夾"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:16
msgid "Empathy has asked about importing accounts"
msgstr "Empathy 已詢åå¯å
¥å¸³è"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:17
msgid "Empathy should auto-connect on startup"
msgstr "Empathy ååæèªåé£ç·"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:18
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy æéä½ä½ç½®çæºç¢ºåº¦"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy è¦ä½¿ç¨é£çµ¡äººç大é è²¼åçºè天è¦çªå示"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
msgid "Enable WebKit Developer Tools"
-msgstr ""
+msgstr "åç¨ WebKit éç¼è
å·¥å
·"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
msgid "Enable popup notifications for new messages"
msgstr "åç¨æ°è¨æ¯çå½åºå¼éç¥"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
msgid "Enable spell checker"
msgstr "åç¨æ¼å檢æ¥ç¨å¼"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
msgid "Hide main window"
msgstr "é±è主è¦çª"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Hide the main window."
msgstr "é±è主è¦çªã"
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr "æè©²ä½¿ç¨ NetworkManager"
-
#: ../data/empathy.schemas.in.h:25
+msgid "MC 4 accounts have been imported"
+msgstr "MC 4 帳èå·²ç¶å¯å
¥"
+
+#: ../data/empathy.schemas.in.h:26
+msgid "MC 4 accounts have been imported."
+msgstr "MC 4 帳èå·²ç¶å¯å
¥ã"
+
+#: ../data/empathy.schemas.in.h:27
msgid "Nick completed character"
msgstr "æ±ç¨±è£é½åå
"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:28
msgid "Open new chats in separate windows"
msgstr "å¨åå¥è¦çªéåæ°çè天"
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:29
msgid "Path of the adium theme to use"
msgstr "è¦ä½¿ç¨ç adium ä½æ¯ä¸»é¡è·¯å¾"
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:30
msgid "Path of the adium theme to use if the theme used for chat is adium."
msgstr "å¦æè天室使ç¨ç主é¡æ¯ adium æè¦ä½¿ç¨ç adium ä½æ¯ä¸»é¡è·¯å¾ã"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
msgstr "æ¶å°è¨æ¯æææ¾é³æ"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:32
msgid "Play a sound for new conversations"
msgstr "ç¶éåæ°çè«è©±æææ¾é³æ"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for outgoing messages"
msgstr "éåºè¨æ¯æææ¾é³æ"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound when a contact logs in"
msgstr "ç¶é£çµ¡äººç»å
¥æææ¾é³æ"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound when a contact logs out"
msgstr "ç¶æé£çµ¡äººç»åºæææ¾é³æ"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when we log in"
msgstr "ç¶æåç»å
¥æææ¾é³æ"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when we log out"
msgstr "ç¶æåç»åºæææ¾é³æ"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:38
msgid "Popup notifications if the chat isn't focused"
msgstr "å¦æè天è¦çªå¤±å»ç¦é»åå½åºéç¥"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:39
msgid "Popup notifications when a contact sign in"
msgstr "ç¶é£çµ¡äººç»å
¥æå½åºéç¥"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:40
msgid "Popup notifications when a contact sign out"
msgstr "ç¶é£çµ¡äººç»åºæå½åºéç¥"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:41
msgid "Salut account is created"
msgstr "å·²å»ºç« Salut 帳è"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "顯示大é è²¼"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:43
msgid "Show contact list in rooms"
msgstr "å¨è天室顯示é£çµ¡äººæ¸
å®"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:44
msgid "Show hint about closing the main window"
msgstr "éé主è¦çªæ顯示æ示"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:45
msgid "Show offline contacts"
msgstr "顯示é¢ç·é£çµ¡äºº"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "æ¼å檢æ¥èªè¨"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "ç¨ä¾å²åæªæ¡å³è¼¸æ¥æ¶æªæ¡çé è¨è³æ夾ã"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "ä¸æ¬¡é¸æ大é è²¼åççç®éã"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr "ç¨ä¾é¡¯ç¤ºå¨è天è¦çªçè«è©±ä¸çä½æ¯ä¸»é¡ã"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "使ç¨åçå¼è¡¨æ
符è"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "使ç¨éç¥é³æ"
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "å¨è天室使ç¨ä½æ¯ä¸»é¡"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:53
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
+msgstr "æ¯å¦åç¨ WebKit éç¼è
å·¥å
·ï¼ä¾å¦ Web Inspectorã"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:54
msgid "Whether or not Empathy can publish the user's location to his contacts."
msgstr "Empathy æ¯å¦è¦å°ä½¿ç¨è
çä½ç½®ç¼ä½çµ¦ä»çé£çµ¡äººã"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
msgid "Whether or not Empathy can use the GPS to guess the location."
msgstr "Empathy æ¯å¦ä½¿ç¨ GPS ä¾æ¨æ¸¬ä½ç½®ã"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
msgid ""
"Whether or not Empathy can use the cellular network to guess the location."
msgstr "Empathy æ¯å¦ä½¿ç¨è¡åé»è©±ç¶²è·¯ä¾æ¨æ¸¬ä½ç½®ã"
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
msgid "Whether or not Empathy can use the network to guess the location."
msgstr "Empathy æ¯å¦ä½¿ç¨ç¶²è·¯ä¾æ¨æ¸¬ä½ç½®ã"
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
msgid ""
"Whether or not Empathy has asked about importing accounts from other "
"programs."
msgstr "Empathy æ¯å¦æè©¢åæ¨è¦ä¸è¦å¾å
¶ä»ç¨å¼å¯å
¥å¸³èã"
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether or not Empathy should automatically log in to your accounts on "
"startup."
msgstr "Empathy æ¯å¦æå¨ååæèªåç»å
¥æ¨ç帳èã"
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether or not Empathy should reduce the location's accuracy for privacy "
"reasons."
msgstr "Empathy æ¯å¦åºæ¼é±ç§æ¬ççç±æ¸ä½ä½ç½®çæºç¢ºåº¦ã"
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether or not Empathy should use the avatar of the contact as the chat "
"window icon."
msgstr "Empathy æ¯å¦ä½¿ç¨é£çµ¡äººå¤§é è²¼åçºè天è¦çªå示ã"
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:62
msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "æ¯å¦å¨ Empathy 第ä¸æ¬¡å·è¡æå»ºç« Salut 帳èã"
+"Whether or not connectivity managers should be used to automatically "
+"disconnect/reconnect."
+msgstr "æ¯å¦ä½¿ç¨é£ç·ç®¡çç¨å¼èªåæ·ç·/éæ°é£ç·ã"
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:63
msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
-msgstr "å¨æ·ç·/éæ°é£ç·ææ¯å¦èªå使ç¨ç¶²è·¯ç®¡çç¨å¼ã"
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr "æ¯å¦å¨ Empathy 第ä¸æ¬¡å·è¡æå»ºç« Salut 帳èã"
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether or not to check words typed against the languages you want to check "
"with."
msgstr "æ¯å¦ä»¥æ¨è¨å®çèªè¨æª¢æ¥è¼¸å
¥æç¡é¯åã"
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether or not to convert smileys into graphical images in conversations."
msgstr "å¨è«è©±ä¸æ¯å¦å°è¡¨æ
符èè½æçºåçå½¢å¼ã"
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether or not to play a sound to notify for contacts logging in the network."
msgstr "æ¯å¦ææ¾é³æä¾éç¥æé£çµ¡äººç»å
¥ç¶²è·¯ã"
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
msgid ""
"Whether or not to play a sound to notify for contacts logging off the "
"network."
msgstr "æ¯å¦ææ¾é³æä¾éç¥æé£çµ¡äººç»åºç¶²è·¯ã"
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
msgid "Whether or not to play a sound to notify for events."
msgstr "æ¯å¦ææ¾é³æä¾éç¥æäºä»¶ç¼çã"
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
msgid "Whether or not to play a sound to notify for incoming messages."
msgstr "æ¯å¦ææ¾é³æä¾éç¥æè¨æ¯æµéã"
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
msgid "Whether or not to play a sound to notify for new conversations."
msgstr "æ¯å¦ææ¾é³æä¾éç¥éåæ°çè«è©±ã"
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
msgid "Whether or not to play a sound to notify for outgoing messages."
msgstr "æ¯å¦ææ¾é³æä¾éç¥æè¨æ¯éåºã"
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
msgid "Whether or not to play a sound when logging in a network."
msgstr "ç¶ç»å
¥ç¶²è·¯ææ¯å¦ææ¾é³æã"
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
msgid "Whether or not to play a sound when logging off a network."
msgstr "ç¶ç»åºç¶²è·¯ææ¯å¦ææ¾é³æã"
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
msgid "Whether or not to play sound notifications when away or busy."
msgstr "ç¶çæ
çºé¢éæå¿ç¢ææ¯å¦ææ¾é³æéç¥ã"
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
msgid ""
"Whether or not to show a popup notification when a contact goes offline."
msgstr "ç¶é£çµ¡äººé¢ç·ææ¯å¦é¡¯ç¤ºå½åºå¼éç¥ã"
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
msgid "Whether or not to show a popup notification when a contact goes online."
msgstr "ç¶é£çµ¡äººä¸ç·ææ¯å¦é¡¯ç¤ºå½åºå¼éç¥ã"
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
msgid ""
"Whether or not to show a popup notification when receiving a new message "
"even if the chat is already opened, but not focused."
msgstr "æ¶å°æ°è¨æ¯ææ¯å¦é¡¯ç¤ºå½åºå¼éç¥ï¼å³ä½¿å·²éåè天è¦çªï¼ä½æ²æç²å¾ç¦é»ï¼ã"
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether or not to show a popup notification when receiving a new message."
msgstr "ç¶æ¶å°æ°è¨æ¯ææ¯å¦é¡¯ç¤ºå½åºå¼éç¥ã"
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
msgid ""
"Whether or not to show avatars for contacts in the contact list and chat "
"windows."
msgstr "æ¯å¦å¨é£çµ¡äººæ¸
å®èè天è¦çªé¡¯ç¤ºé£çµ¡äººå¤§é è²¼ã"
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
msgid "Whether or not to show contacts that are offline in the contact list."
msgstr "æ¯å¦å¨é£çµ¡äººæ¸
å®ä¸é¡¯ç¤ºé¢ç·çé£çµ¡äººã"
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
msgid "Whether or not to show popup notifications when away or busy."
msgstr "ç¶çæ
çºé¢éæå¿ç¢ææ¯å¦é¡¯ç¤ºå½åºå¼éç¥ã"
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
msgid "Whether or not to show the contact list in chat rooms."
msgstr "æ¯å¦å¨è天室ä¸é¡¯ç¤ºé£çµ¡äººæ¸
å®ã"
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
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:82
+#: ../data/empathy.schemas.in.h:84
msgid "Whether to show the contact list in compact mode or not."
msgstr "æ¯å¦ä»¥ç²¾ç°¡æ¨¡å¼é¡¯ç¤ºé£çµ¡äººæ¸
å®ã"
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms or not."
msgstr "æ¯å¦å¨è天室使ç¨ä½æ¯ä¸»é¡ã"
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
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 "
@@ -398,78 +412,94 @@ msgstr ""
"æåºé£çµ¡äººæ¸
å®æè¦ä½¿ç¨åªåæ¢ä»¶ãé è¨å¼æ¯ä½¿ç¨é£çµ¡äººçå稱ãnameãæ¸å¼ä¾æåºã"
"èæ¸å¼ãstateãåæ使ç¨å
¶çæ
ä¾æåºé£çµ¡äººæ¸
å®ã"
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-account.c:1144
+msgid "Can't set an empty display name"
+msgstr "ä¸è½è¨å®ç©ºç½ç顯示å稱"
+
+#: ../libempathy/empathy-ft-handler.c:839
msgid "The hash of the received file and the sent one do not match"
msgstr "å·²æ¥æ¶æªæ¡çéæ¹å¼èéåºçä¸ç¬¦"
-#: ../libempathy/empathy-ft-handler.c:1098
+#: ../libempathy/empathy-ft-handler.c:1099
msgid "File transfer not supported by remote contact"
msgstr "é 端é£çµ¡äººä¸æ¯æ´æªæ¡å³è¼¸"
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1157
msgid "The selected file is not a regular file"
msgstr "é¸åçæªæ¡ä¸æ¯æ£è¦çæªæ¡"
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1166
msgid "The selected file is empty"
msgstr "é¸åçæªæ¡æ¯ç©ºç½ç"
-#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
msgid "People nearby"
msgstr "è¨è¿äººå¡"
-#: ../libempathy/empathy-tp-file.c:279
+#: ../libempathy/empathy-tp-file.c:280
msgid "Socket type not supported"
msgstr "Socket é¡åä¸æ¯æ´"
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:399
msgid "No reason was specified"
msgstr "æ²ææå®åå "
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:402
msgid "The change in state was requested"
msgstr "å·²è¦æ±è®æ´çæ
"
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:405
msgid "You canceled the file transfer"
msgstr "æ¨å·²åæ¶æªæ¡å³è¼¸"
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:408
msgid "The other participant canceled the file transfer"
msgstr "å
¶ä»çåèè
åæ¶äºæªæ¡å³è¼¸"
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:411
msgid "Error while trying to transfer the file"
msgstr "å試å³è¼¸æªæ¡æç¼çé¯èª¤"
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:414
msgid "The other participant is unable to transfer the file"
msgstr "å
¶ä»çåèè
ç¡æ³å³è¼¸è©²æªæ¡"
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:417
msgid "Unknown reason"
msgstr "ä¸æçåå "
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:235
msgid "Available"
msgstr "æ空"
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:237
msgid "Busy"
msgstr "å¿ç¢"
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:240
msgid "Away"
msgstr "é¢é"
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:242
msgid "Hidden"
msgstr "é±è"
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:244
msgid "Offline"
msgstr "é¢ç·"
+#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
+msgid "People Nearby"
+msgstr "è¨è¿äººå¡"
+
+#: ../libempathy/empathy-utils.c:384
+msgid "Yahoo! Japan"
+msgstr "Yahoo! æ¥æ¬"
+
+#: ../libempathy/empathy-utils.c:385
+msgid "Facebook Chat"
+msgstr "Facebook è天"
+
#: ../libempathy/empathy-time.c:137
#, c-format
msgid "%d second ago"
@@ -510,77 +540,118 @@ msgstr[0] "%d åæ以å"
msgid "in the future"
msgstr "æªä¾"
-#: ../libempathy-gtk/empathy-account-chooser.c:426
+#: ../libempathy-gtk/empathy-account-chooser.c:424
msgid "All"
msgstr "å
¨é¨"
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:440
+#: ../libempathy-gtk/empathy-account-widget.c:496
#, c-format
msgid "%s:"
msgstr "%s:"
+#: ../libempathy-gtk/empathy-account-widget.c:1239
+msgid "Enabled"
+msgstr "å·²åç¨"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "Example: MyScreenName "
+msgstr "ç¯ä¾ï¼ æçè¢å¹å稱 "
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../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
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
msgid "Advanced"
msgstr "é²é"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "å¯ç¢¼(_W):"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
msgid "Screen _Name:"
msgstr "è¢å¹å稱(_N):"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr "æ¨ç AIM å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr "æ¨ç AIM è¢å¹å稱æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
msgstr "é£æ¥å (_P):"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "伺æå¨(_S):"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Example: username "
+msgstr "ç¯ä¾ï¼ 使ç¨è
å稱 "
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "ç»å
¥ I_D:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "æ¨ç GroupWise 使ç¨è
ID æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "æ¨ç GroupWise å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "Example: 123456789 "
+msgstr "ç¯ä¾ï¼ 123456789 "
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "What is your ICQ UIN?"
+msgstr "æ¨ç ICQ UIN æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr "æ¨ç ICQ å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "_Charset:"
msgstr "編碼(_C):"
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "æ°ç¶²è·¯"
@@ -616,84 +687,136 @@ msgstr "ç實å§å:"
msgid "Servers"
msgstr "伺æå¨"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "Example: user@jabber.org "
+msgstr "ç¯ä¾ï¼ user@jabber.org "
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
msgid "Override server settings"
msgstr "è¦è伺æå¨è¨å®å¼"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "Pri_ority:"
msgstr "åªå
æ¬(_O):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Reso_urce:"
msgstr "è³æº(_U):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
msgid "Use old SS_L"
msgstr "使ç¨èç SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "What is your Jabber ID?"
+msgstr "æ¨ç Jabber ID æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Jabber password?"
+msgstr "æ¨ç Jabber å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your desired Jabber ID?"
+msgstr "æ¨æ³è¦ç Jabber ID æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid "What is your desired Jabber password?"
+msgstr "æ¨æ³è¦ç Jabber å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid "_Encryption required (TLS/SSL)"
msgstr "è¦æ±å å¯[TLS/SSL](_E)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid "_Ignore SSL certificate errors"
msgstr "å¿½ç¥ SSL æèé¯èª¤(_I)"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "Example: user@hotmail.com "
+msgstr "ç¯ä¾ï¼ user@hotmail.com "
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live password?"
+msgstr "æ¨ç Windows Live å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live user name?"
+msgstr "æ¨ç Windows Live 使ç¨è
å稱æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
msgid "_Email:"
msgstr "é»åéµä»¶(_E):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
msgstr "åå(_F):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Last Name:"
msgstr "å§æ°(_L):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Nickname:"
msgstr "æ±ç¨±(_N):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "ç¼ä½çå稱(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "Example: user@my.sip.server "
+msgstr "ç¯ä¾ï¼ user@my.sip.server "
+
#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
msgid "Discover STUN"
msgstr "æ¢ç´¢ STUN"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "STUN Server:"
msgstr "STUN 伺æå¨:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "STUN port:"
msgstr "STUN éè¨å :"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "What is your SIP account password?"
+msgstr "æ¨ç SIP 帳èå¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "What is your SIP login ID?"
+msgstr "æ¨æ³è¦ç SIP ç»å
¥ ID æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "_Username:"
msgstr "使ç¨è
å稱(_U):"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "Use _Yahoo Japan"
msgstr "ä½¿ç¨ _Yahoo æ¥æ¬"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr "æ¨ç Yahoo! ID æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "What is your Yahoo! password?"
+msgstr "æ¨ç Yahoo! å¯ç¢¼æ¯ï¼"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "Yahoo I_D:"
msgstr "Yahoo I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Ignore conference and chatroom invitations"
msgstr "忽ç¥æè°èè天室éè«(_I)"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "è天室æ¸
å®å°å(_R):"
@@ -730,92 +853,98 @@ msgstr "è«æé裡æ¾å¤§"
msgid "Failed to reconnect this chat"
msgstr "ç¡æ³éé£éåè天æè°"
-#: ../libempathy-gtk/empathy-chat.c:404
+#: ../libempathy-gtk/empathy-chat.c:403
msgid "Unsupported command"
msgstr "ä¸æ¯æ´æ¤æ令"
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:535
msgid "offline"
msgstr "é¢ç·"
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:538
msgid "invalid contact"
msgstr "ç¡æçé£çµ¡äºº"
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:541
msgid "permission denied"
msgstr "æ¬é被æçµ"
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:544
msgid "too long message"
msgstr "太é·çè¨æ¯"
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:547
msgid "not implemented"
msgstr "æªå¯¦ä½"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:550
msgid "unknown"
msgstr "ä¸æ"
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:554
#, c-format
msgid "Error sending message '%s': %s"
msgstr "å³éè¨æ¯ã%sãæç¼çé¯èª¤ï¼%s"
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:584
#, c-format
msgid "Topic set to: %s"
msgstr "主é¡è¨å®çºï¼%s"
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:586
msgid "No topic defined"
msgstr "å°æªå®ç¾©ä¸»é¡"
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:956
msgid "(No Suggestions)"
msgstr "(æ²æ建è°)"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1010
msgid "Insert Smiley"
msgstr "æå
¥è¡¨æ
符è"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
-#: ../libempathy-gtk/empathy-ui-utils.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-ui-utils.c:1484
msgid "_Send"
msgstr "å³é(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1062
msgid "_Spelling Suggestions"
msgstr "æ¼å建è°(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1177
#, c-format
msgid "%s has disconnected"
msgstr "%s å·²æ·ç·"
-#: ../libempathy-gtk/empathy-chat.c:1185
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1184
#, c-format
-msgid "%s was kicked by %s"
-msgstr "%s 被 %s 踢åºå»äº"
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s 被 %2$s 踢åºå»"
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1187
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢åºå»äº"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1195
#, c-format
-msgid "%s was banned by %s"
-msgstr "%s 被 %sè¨çºé»åå®"
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s 被 %2$s è¨çºé»åå®"
-#: ../libempathy-gtk/empathy-chat.c:1196
+#: ../libempathy-gtk/empathy-chat.c:1198
#, c-format
msgid "%s was banned"
msgstr "%s 被è¨çºé»åå®"
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:1202
#, c-format
msgid "%s has left the room"
msgstr "%s å·²ç¶é¢éæ¤è天室"
@@ -825,42 +954,42 @@ msgstr "%s å·²ç¶é¢éæ¤è天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:1211
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:1234
#, c-format
msgid "%s has joined the room"
msgstr "%s å·²ç¶å å
¥æ¤è天室"
-#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
msgid "Disconnected"
msgstr "å·²æ·ç·"
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1803
msgid "Connected"
msgstr "æåé£ç·"
-#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-chat.c:1853
#: ../libempathy-gtk/empathy-log-window.c:502
msgid "Conversation"
msgstr "è«è©±"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
msgid "Topic:"
msgstr "主é¡:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-theme-adium.c:276
msgid "_Copy Link Address"
msgstr "è¤è£½é£çµä½å(_C)"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-theme-adium.c:284
msgid "_Open Link"
msgstr "éåé£çµ(_O)"
@@ -870,16 +999,16 @@ msgstr "éåé£çµ(_O)"
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:177
+#: ../libempathy-gtk/empathy-contact-dialogs.c:236
msgid "Edit Contact Information"
msgstr "編輯é£çµ¡äººè³è¨"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
msgid "Personal Information"
msgstr "å人è³è¨"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
msgid "New Contact"
msgstr "æ°å¢é£çµ¡äºº"
@@ -891,27 +1020,27 @@ msgstr "ç¨å¾å決å®"
msgid "Subscription Request"
msgstr "è¨é±è¦æ±"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1404
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "æ¯å¦æ³è¦ç§»é¤ç¾¤çµã%sãï¼"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1406
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
msgid "Removing group"
msgstr "æ£å¨ç§»é¤ç¾¤çµ"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1453
-#: ../libempathy-gtk/empathy-contact-list-view.c:1530
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
msgid "_Remove"
msgstr "移é¤(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1483
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "æ¯å¦æ³è¦ç§»é¤é£çµ¡äººã%sãï¼"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1485
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
msgid "Removing contact"
msgstr "æ£å¨ç§»é¤é£çµ¡äºº"
@@ -945,7 +1074,7 @@ msgstr "å³éæªæ¡"
#: ../libempathy-gtk/empathy-contact-menu.c:369
msgid "Share my desktop"
-msgstr ""
+msgstr "å享æçæ¡é¢"
#: ../libempathy-gtk/empathy-contact-menu.c:397
msgid "Infor_mation"
@@ -976,121 +1105,120 @@ msgstr "å²å大é è²¼"
msgid "Unable to save avatar"
msgstr "ç¡æ³å²å大é è²¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
msgid "Select"
msgstr "é¸æ"
-#: ../libempathy-gtk/empathy-contact-widget.c:1005
-#: ../src/empathy-main-window.c:1023
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1019
msgid "Group"
msgstr "群çµ"
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
msgid "Country ISO Code:"
msgstr "å家 ISO 碼ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
msgid "Country:"
msgstr "å家ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
msgid "State:"
msgstr "å·ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
msgid "City:"
msgstr "å¸ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
msgid "Area:"
msgstr "ååï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
msgid "Postal Code:"
msgstr "éµéåèï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
msgid "Street:"
msgstr "è¡ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
msgid "Building:"
msgstr "建ç¯ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
msgid "Floor:"
msgstr "æ¨å±¤ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
msgid "Room:"
msgstr "室ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
msgid "Text:"
msgstr "æåï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
msgid "Description:"
msgstr "æè¿°ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
msgid "URI:"
msgstr "URIï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
msgid "Accuracy Level:"
msgstr "æºç¢ºåº¦çç´ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
msgid "Error:"
msgstr "é¯èª¤ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
msgid "Vertical Error (meters):"
msgstr "åç´èª¤å·®ï¼å
¬å°ºï¼ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
msgid "Horizontal Error (meters):"
msgstr "水平誤差ï¼å
¬å°ºï¼ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
msgid "Speed:"
msgstr "é度ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
msgid "Bearing:"
-msgstr "çæ¬:"
+msgstr "æ¹ä½ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
msgid "Climb Speed:"
msgstr "ç¬åé度ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
msgid "Last Updated on:"
msgstr "ä¸æ¬¡æ´æ°æ¼ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
msgid "Longitude:"
msgstr "ç¶åº¦:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
msgid "Latitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
msgid "Altitude:"
msgstr "緯度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1349
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
msgid "Location "
msgstr "ä½ç½® "
-#: ../libempathy-gtk/empathy-contact-widget.c:1362
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
msgid "Location , "
msgstr "ä½ç½®ï¼"
-#: ../libempathy-gtk/empathy-contact-widget.c:1412
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y æ¼ %R UTC"
@@ -1122,7 +1250,7 @@ msgid "Client:"
msgstr "客æ¶ç«¯:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
+#: ../src/empathy-main-window.c:1002
msgid "Contact"
msgstr "é£çµ¡äºº"
@@ -1174,24 +1302,24 @@ msgstr "網ç«:"
msgid "_Add Group"
msgstr "å å
¥ç¾¤çµ(_G)"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
msgid "new server"
msgstr "æ°å¢ä¼ºæå¨"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
msgid "Server"
msgstr "伺æå¨"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
msgid "Port"
msgstr "é£æ¥å "
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
msgid "SSL"
msgstr "SSL"
#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳è"
@@ -1237,34 +1365,34 @@ msgstr "æ°å¢è«è©±"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-#: ../libempathy-gtk/empathy-presence-chooser.c:208
+#: ../libempathy-gtk/empathy-presence-chooser.c:176
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
msgid "Custom Message..."
msgstr "èªè¨è¨æ¯..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#: ../libempathy-gtk/empathy-presence-chooser.c:229
+#: ../libempathy-gtk/empathy-presence-chooser.c:231
msgid "Edit Custom Messages..."
msgstr "編輯èªè¨è¨æ¯..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:330
msgid "Click to remove this status as a favorite"
msgstr "æé裡å°éåçæ
å¾å好ä¸ç§»é¤"
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:339
msgid "Click to make this status a favorite"
msgstr "æé裡å°éåçæ
è¨çºå好"
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:373
msgid "Set status"
msgstr "è¨å®çæ
"
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:794
msgid "Set your presence and current status"
msgstr "è¨å®æ¨çä¸ç·èç®åççæ
"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+#: ../libempathy-gtk/empathy-presence-chooser.c:1043
msgid "Custom messages..."
msgstr "èªè¨è¨æ¯..."
@@ -1324,14 +1452,6 @@ msgstr "å å
¥æ°çé å
è¨å®(_N)"
msgid "Saved Presets"
msgstr "å·²å²åçé å
è¨å®"
-#: ../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 "å¤å
¸"
@@ -1348,15 +1468,15 @@ msgstr "æ¸
é¤"
msgid "Blue"
msgstr "èè²"
-#: ../libempathy-gtk/empathy-ui-utils.c:1382
+#: ../libempathy-gtk/empathy-ui-utils.c:1386
msgid "Unable to open URI"
msgstr "ç¡æ³éå URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#: ../libempathy-gtk/empathy-ui-utils.c:1476
msgid "Select a file"
msgstr "é¸æä¸åæªæ¡"
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
+#: ../libempathy-gtk/empathy-ui-utils.c:1536
msgid "Select a destination"
msgstr "é¸åç®çå°"
@@ -1544,7 +1664,7 @@ msgid "Megaphone"
msgstr "話ç"
#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:518
msgid "Talk!"
msgstr "è¬è©±ï¼"
@@ -1562,11 +1682,11 @@ msgstr "è³è¨(_I)"
msgid "_Preferences"
msgstr "å好è¨å®(_P)"
-#: ../megaphone/src/megaphone-applet.c:168
+#: ../megaphone/src/megaphone-applet.c:166
msgid "Please configure a contact."
msgstr "è«è¨å®é£çµ¡äººã"
-#: ../megaphone/src/megaphone-applet.c:258
+#: ../megaphone/src/megaphone-applet.c:256
msgid "Select contact..."
msgstr "é¸æé£çµ¡äºº..."
@@ -1575,27 +1695,25 @@ msgid "Presence"
msgstr "ä¸ç·çæ
"
#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
+#: ../nothere/src/nothere-applet.c:105
msgid "Set your own presence"
msgstr "è¨å®æ¨èªå·±çä¸ç·çæ
"
-#: ../src/empathy.c:567
+#: ../src/empathy.c:588
msgid "Don't connect on startup"
msgstr "ååæä¸è¦èªåé£ç·"
-#: ../src/empathy.c:571
+#: ../src/empathy.c:592
msgid "Don't show the contact list on startup"
msgstr "ååæä¸é¡¯ç¤ºé£çµ¡äººæ¸
å®"
-#: ../src/empathy.c:575
+#: ../src/empathy.c:596
msgid "Show the accounts dialog"
msgstr "顯示帳èå°è©±ç"
-#: ../src/empathy.c:587
-#, fuzzy
-#| msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:608
msgid "- Empathy IM Client"
-msgstr "- Empathy å³æéè¨ç¨å¼"
+msgstr "- Empathy IM 客æ¶ç«¯ç¨å¼"
#: ../src/empathy-about-dialog.c:83
msgid ""
@@ -1643,21 +1761,145 @@ msgstr ""
"Craig Jeffares , 2004\n"
"Joe Man , 2001"
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "å·²åç¨"
+#: ../src/empathy-account-assistant.c:118
+msgid "There has been an error while importing the accounts."
+msgstr "å¯å
¥å¸³èæç¼çé¯èª¤ã"
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "帳è"
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error while parsing the account details."
+msgstr "解æ帳è詳細è³ææç¼çé¯èª¤ã"
+
+#: ../src/empathy-account-assistant.c:124
+msgid "There has been an error while creating the account."
+msgstr "建ç«å¸³èæç¼çé¯èª¤ã"
+
+#: ../src/empathy-account-assistant.c:126
+msgid "There has been an error."
+msgstr "æé¯èª¤ç¼çã"
+
+#: ../src/empathy-account-assistant.c:141
+#, c-format
+msgid "The error message was: %s "
+msgstr "é¯èª¤è¨æ¯çºï¼ %s "
+
+#: ../src/empathy-account-assistant.c:149
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"æ¨å¯ä»¥åå°åé å次輸å
¥å¸³èç詳細è³ææçµææ¤å©çï¼ç¨å¾åå¾ã編輯ãé¸å®å å
¥å¸³"
+"èã"
+#: ../src/empathy-account-assistant.c:184
+msgid "An error occurred"
+msgstr "ç¼çé¯èª¤"
+
+#. Create account
#. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:320
+#: ../src/empathy-accounts-dialog.c:1172
#, c-format
msgid "New %s account"
msgstr "æ°å¢ %s 帳è"
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-account-assistant.c:386
+msgid "What kind of chat account do you have?"
+msgstr "æ¨çè天帳èæ¯åªä¸ç¨®ï¼"
+
+#: ../src/empathy-account-assistant.c:392
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "æ¨éæ³è¦è¨å®å
¶ä»çè天帳èåï¼"
+
+#: ../src/empathy-account-assistant.c:398
+msgid "Enter your account details"
+msgstr "è«è¼¸å
¥æ¨ç帳è詳細è³æ"
+
+#: ../src/empathy-account-assistant.c:403
+msgid "What kind of chat account do you want to create?"
+msgstr "æ¨æ³è¦å»ºç«ä½ç¨®è天帳èï¼"
+
+#: ../src/empathy-account-assistant.c:409
+msgid "Do you want to create other chat accounts?"
+msgstr "æ¯å¦æ³è¦å»ºç«å
¶ä»è天帳èï¼"
+
+#: ../src/empathy-account-assistant.c:416
+msgid "Enter the details for the new account"
+msgstr "è«è¼¸å
¥æ°å¸³èç詳細è³æ"
+
+#: ../src/empathy-account-assistant.c:502
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"ä½¿ç¨ Empathy å¯ä»¥å¨ç·ä¸è·é°è¿ç人å¡è天ï¼ææ¯åä½¿ç¨ Google TalkãAIMã"
+"Windows Live çå
¶ä»è天ç¨å¼çæåååäºè天ãå©ç¨éº¥å
風æ網路æå½±æ©éå¯ä»¥é²è¡"
+"èªé³æè¦è¨é話ã"
+
+#: ../src/empathy-account-assistant.c:519
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "æ¨æ¯å¦æ使ç¨å
¶ä»è天ç¨å¼ç帳èï¼"
+
+#: ../src/empathy-account-assistant.c:542
+msgid "Yes, import my account details from "
+msgstr "æ¯çï¼è«å¯å
¥æç帳è詳細è³ææ¼"
+
+#: ../src/empathy-account-assistant.c:563
+msgid "Yes, I'll enter my account details now"
+msgstr "æ¯çï¼æç¾å¨è¦è¼¸å
¥å¸³èç詳細è³æ"
+
+#: ../src/empathy-account-assistant.c:585
+msgid "No, I want a new account"
+msgstr "ä¸ï¼ææ³è¦æ°ç帳è"
+
+#: ../src/empathy-account-assistant.c:595
+msgid "No, I just want to see people online nearby for now"
+msgstr "ä¸ï¼æç¾å¨åªæ³ççéè¿æ誰ä¸ç·"
+
+#: ../src/empathy-account-assistant.c:616
+msgid "Select the accounts you want to import:"
+msgstr "é¸æè¦å¯å
¥ç帳èï¼"
+
+#: ../src/empathy-account-assistant.c:703
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "Yes"
+msgstr "æ¯"
+
+#: ../src/empathy-account-assistant.c:710
+msgid "No, that's all for now"
+msgstr "ä¸ï¼ç®åå°±é樣"
+
+#: ../src/empathy-account-assistant.c:903
+msgid "Welcome to Empathy"
+msgstr "æ¡è¿ä½¿ç¨ Empathy"
+
+#: ../src/empathy-account-assistant.c:912
+msgid "Import your existing accounts"
+msgstr "å¯å
¥ç¾æç帳è"
+
+#: ../src/empathy-accounts-dialog.c:206
+#, c-format
+msgid "%s on %s"
+msgstr "%s æ¼ %s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../src/empathy-accounts-dialog.c:217
+#, c-format
+msgid "%s Account"
+msgstr "%s 帳è"
+
+#: ../src/empathy-accounts-dialog.c:221
+msgid "New account"
+msgstr "æ°å¢å¸³è"
+
+#: ../src/empathy-accounts-dialog.c:649
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1666,7 +1908,7 @@ msgstr ""
"æ¨å³å°ç§»é¤æ¨ç %s 帳èï¼\n"
"確å®è¦ç¹¼çºï¼"
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:655
msgid ""
"Any associated conversations and chat rooms will NOT be removed if you "
"decide to proceed.\n"
@@ -1678,99 +1920,94 @@ msgstr ""
"\n"
"ç¶æ¨å¾å¾æ±ºå®è¦å°è©²å¸³èéæ°å å
¥æï¼ä¸è¿°è³æºå°ä»ç¶å¯ä»¥åç¨ã"
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "帳è"
+
#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "å å
¥å¸³è"
+msgid "Add new"
+msgstr "å å
¥æ°ç"
#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Cr_eate"
msgstr "建ç«(_E)"
#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "å¯å
¥å¸³è..."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol installed"
msgstr "å°æªå®è£éè¨åå®"
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "è¨å®å¼"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr "è¦å å
¥æ°ç帳èï¼æ¨å¿
é å
å®è£æ¯åæç¨å°çéè¨åå®å¾ç«¯ç¨å¼ã"
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "Type:"
-msgstr "é¡å:"
-
-#: ../src/empathy-accounts-dialog.ui.h:10
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Add..."
msgstr "å å
¥(_A)..."
-#: ../src/empathy-accounts-dialog.ui.h:11
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Create a new account"
msgstr "建ç«æ°ç使ç¨è
帳è(_C)"
-#: ../src/empathy-accounts-dialog.ui.h:12
+#: ../src/empathy-accounts-dialog.ui.h:8
msgid "_Reuse an existing account"
msgstr "éè¤ä½¿ç¨æ¢åç帳è(_R)"
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-accounts-dialog.ui.h:9
+msgid "account"
+msgstr "帳è"
+
+#: ../src/empathy-call-window.c:426
msgid "Contrast"
msgstr "å°æ¯"
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:429
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:432
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:539
msgid "Volume"
msgstr "é³é"
-#: ../src/empathy-call-window.c:662
+#: ../src/empathy-call-window.c:671
msgid "Connecting..."
msgstr "é£ç·ä¸..."
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:778
msgid "_Sidebar"
msgstr "å´éå(_S)"
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:797
msgid "Dialpad"
msgstr "æèç¤"
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:803
msgid "Audio input"
msgstr "é³æ輸å
¥"
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:807
msgid "Video input"
msgstr "è¦è¨è¼¸å
¥"
-#: ../src/empathy-call-window.c:835
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
#, c-format
msgid "Call with %s"
msgstr "è %s é話ä¸"
-#: ../src/empathy-call-window.c:904
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
msgid "Call"
msgstr "é話"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1335
+#: ../src/empathy-call-window.c:1390
#, c-format
msgid "Connected â %d:%02dm"
msgstr "å·²é£ç· â %d:%02dm"
@@ -1803,66 +2040,54 @@ msgstr "é話(_C)"
msgid "_View"
msgstr "檢è¦(_V)"
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:343
#, c-format
msgid "Conversations (%d)"
msgstr "è«è©± (%d)"
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:475
msgid "Typing a message."
msgstr "æ£å¨è¼¸å
¥è¨æ¯ã"
#: ../src/empathy-chat-window.ui.h:1
-#, fuzzy
-#| msgid "Clean"
msgid "C_lear"
-msgstr "æ¸
é¤"
+msgstr "æ¸
é¤(_L)"
#: ../src/empathy-chat-window.ui.h:2
-#, fuzzy
-#| msgid "_Chat"
msgid "Chat"
-msgstr "è天(_C)"
+msgstr "è天"
#: ../src/empathy-chat-window.ui.h:3
-#, fuzzy
-#| msgid "Insert Smiley"
msgid "Insert _Smiley"
-msgstr "æå
¥è¡¨æ
符è"
+msgstr "æå
¥è¡¨æ
符è(_S)"
#: ../src/empathy-chat-window.ui.h:4
msgid "Move Tab _Left"
-msgstr ""
+msgstr "å°åé 左移(_L)"
#: ../src/empathy-chat-window.ui.h:5
msgid "Move Tab _Right"
-msgstr ""
+msgstr "å°åé å³ç§»(_R)"
#: ../src/empathy-chat-window.ui.h:6
-#, fuzzy
-#| msgid "Contact"
msgid "_Contact"
-msgstr "é£çµ¡äºº"
+msgstr "é£çµ¡äºº(_C)"
#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
msgid "_Contents"
msgstr "å
§å®¹(_C)"
#: ../src/empathy-chat-window.ui.h:8
-#, fuzzy
-#| msgid "Conversation"
msgid "_Conversation"
-msgstr "è«è©±"
+msgstr "è«è©±(_C)"
#: ../src/empathy-chat-window.ui.h:9
msgid "_Detach Tab"
-msgstr ""
+msgstr "åé¢åé (_D)"
#: ../src/empathy-chat-window.ui.h:11
-#, fuzzy
-#| msgid "_Invite to chatroom"
msgid "_Favorite Chatroom"
-msgstr "éè«å°éåè天室(_I)"
+msgstr "å好çè天室(_F)"
#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Help"
@@ -1870,13 +2095,11 @@ msgstr "æ±å©(_H)"
#: ../src/empathy-chat-window.ui.h:13
msgid "_Next Tab"
-msgstr ""
+msgstr "ä¸ååé (_N)"
#: ../src/empathy-chat-window.ui.h:14
-#, fuzzy
-#| msgid "_Previous Conversations"
msgid "_Previous Tab"
-msgstr "ä¸ä¸æ¬¡è«è©±(_P)"
+msgstr "ä¸ååé (_P)"
#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
msgid "_Show Contact List"
@@ -1884,7 +2107,7 @@ msgstr "顯示é£çµ¡äººæ¸
å®(_S)"
#: ../src/empathy-chat-window.ui.h:16
msgid "_Tabs"
-msgstr ""
+msgstr "åé (_T)"
#: ../src/empathy-chatrooms-window.c:258
msgid "Name"
@@ -1902,75 +2125,75 @@ msgstr "èªåé£ç·"
msgid "Manage Favorite Rooms"
msgstr "管çå好çè天室"
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:322
msgid "Incoming call"
msgstr "ä¾é»"
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:325
#, c-format
msgid "%s is calling you, do you want to answer?"
msgstr "%s è¦èæ¨é話ï¼æ¯å¦è¦æ¥è½ï¼"
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:332
msgid "_Reject"
msgstr "æçµ(_R)"
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:338
msgid "_Answer"
msgstr "æ¥è½(_A)"
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:453
#, c-format
msgid "Incoming call from %s"
msgstr "%s çä¾é»"
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:497
#, c-format
msgid "%s is offering you an invitation"
msgstr "%s æ£å¨éè«æ¨"
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:503
msgid "An external application will be started to handle it."
msgstr "å°ååå¤é¨æç¨ç¨å¼ä¾èçå®ã"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:508
msgid "You don't have the needed external application to handle it."
msgstr "æ¨æ²æèçå®æéçå¤é¨æç¨ç¨å¼ã"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:635
msgid "Room invitation"
msgstr "è天éè«"
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:638
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s æ£å¨éè«æ¨å å
¥ %s"
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:646
msgid "_Decline"
msgstr "æçµ(_D)"
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:651
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "å å
¥(_J)"
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:690
#, c-format
msgid "%s invited you to join %s"
msgstr "%s æ¾éè«æ¨å å
¥ %s"
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:716
#, c-format
msgid "Incoming file transfer from %s"
msgstr "æ¶å°ä¾èª %s çæªæ¡å³è¼¸"
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:896
#, c-format
msgid "Subscription requested by %s"
msgstr "ä¾èª %s çè¨é±è¦æ±"
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:900
#, c-format
msgid ""
"\n"
@@ -1980,13 +2203,13 @@ msgstr ""
"è¨æ¯ï¼%s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:936
#, c-format
msgid "%s is now offline."
msgstr "%s ç¾å¨é¢ç·ã"
#. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:952
#, c-format
msgid "%s is now online."
msgstr "%s ç¾å¨ä¸ç·ã"
@@ -2102,90 +2325,95 @@ msgstr "æªæ¡å³è¼¸"
msgid "Remove completed, canceled and failed file transfers from the list"
msgstr "å¾æ¸
å®ä¸ç§»é¤å·²å®æãå·²åæ¶å失æçæªæ¡å³è¼¸"
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr "æ¾ä¸å°å¯å¯å
¥ç帳èãEmpathy ç®ååªæ¯æ´å¾ Pidgin å¯å
¥å¸³èã"
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "å¯å
¥å¸³è"
+
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "å¯å
¥"
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "éè¨åå®"
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "ä¾æº"
-#: ../src/empathy-import-dialog.c:392
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr "æ¾ä¸å°å¯å¯å
¥ç帳èãEmpathy ç®ååªæ¯æ´å¾ Pidgin å¯å
¥å¸³èã"
-
-#: ../src/empathy-import-dialog.ui.h:1
-msgid "Import Accounts"
-msgstr "å¯å
¥å¸³è"
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
+msgid "%s account"
+msgstr "%s 帳è"
-#: ../src/empathy-main-window.c:402
+#: ../src/empathy-main-window.c:399
msgid "_Edit account"
msgstr "編輯帳è(_E)"
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:502
msgid "No error specified"
msgstr "æ²ææå®çé¯èª¤"
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:505
msgid "Network error"
msgstr "網路é¯èª¤"
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:508
msgid "Authentication failed"
msgstr "é©è失æ"
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:511
msgid "Encryption error"
msgstr "å å¯ç¼çé¯èª¤"
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:514
msgid "Name in use"
msgstr "使ç¨ä¸çå稱"
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:517
msgid "Certificate not provided"
msgstr "æ²ææä¾æè"
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:520
msgid "Certificate untrusted"
msgstr "æèä¸è¢«ä¿¡ä»»"
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:523
msgid "Certificate expired"
msgstr "æèå·²é¾æ"
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:526
msgid "Certificate not activated"
msgstr "æèå°æªä½¿ç¨"
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:529
msgid "Certificate hostname mismatch"
msgstr "æè主æ©å稱ä¸ç¬¦"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:532
msgid "Certificate fingerprint mismatch"
msgstr "æèæç´æªä¸ç¬¦"
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:535
msgid "Certificate self-signed"
msgstr "æèçºèªæ簽署"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:538
msgid "Certificate error"
msgstr "æèé¯èª¤"
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:541
msgid "Unknown error"
msgstr "ä¸æçé¯èª¤"
-#: ../src/empathy-main-window.c:1293
+#: ../src/empathy-main-window.c:1288
msgid "Show and edit accounts"
msgstr "顯示並編輯帳è"
@@ -2211,23 +2439,19 @@ msgstr "管çå好"
#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
-msgstr ""
+msgstr "æ£å¸¸å¤§å°(_O)"
#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
-msgstr ""
+msgstr "æ£å¸¸å¤§å°å 大é è²¼(_A)"
#: ../src/empathy-main-window.ui.h:8
-#, fuzzy
-#| msgid "Sort by _name"
msgid "Sort by _Name"
msgstr "ä¾å稱æåº(_N)"
#: ../src/empathy-main-window.ui.h:9
-#, fuzzy
-#| msgid "Sort by s_tate"
msgid "Sort by _Status"
-msgstr "ä¾çæ
æåº(_T)"
+msgstr "ä¾çæ
æåº(_S)"
#: ../src/empathy-main-window.ui.h:10
msgid "_Accounts"
@@ -2235,7 +2459,7 @@ msgstr "帳è(_A)"
#: ../src/empathy-main-window.ui.h:13
msgid "_Compact Size"
-msgstr ""
+msgstr "精簡大å°(_C)"
#: ../src/empathy-main-window.ui.h:15
msgid "_Debug"
@@ -2269,15 +2493,15 @@ msgstr "ä¸ä¸æ¬¡è«è©±(_P)"
msgid "_Room"
msgstr "è天室(_R)"
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:328
msgid "Chat Room"
msgstr "è天室"
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:344
msgid "Members"
msgstr "æå¡"
-#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:494
#, c-format
msgctxt ""
"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2293,21 +2517,16 @@ msgstr ""
"éè¦å¯ç¢¼ï¼%s\n"
"æå¡ï¼%s"
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "æ¯"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
msgid "No"
msgstr "å¦"
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:524
msgid "Could not start room listing"
msgstr "ç¡æ³éå§ååºè天室æ¸
å®"
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:534
msgid "Could not stop room listing"
msgstr "ç¡æ³åæ¢ååºè天室æ¸
å®"
@@ -2339,35 +2558,35 @@ msgstr "è天室æ¸
å®"
msgid "_Room:"
msgstr "è天室(_R):"
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:148
msgid "Message received"
msgstr "è¨æ¯å·²æ¶å°"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:149
msgid "Message sent"
msgstr "è¨æ¯å·²éåº"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:150
msgid "New conversation"
msgstr "æ°å¢è«è©±"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:151
msgid "Contact goes online"
msgstr "é£çµ¡äººä¸ç·"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:152
msgid "Contact goes offline"
msgstr "é£çµ¡äººé¢ç·"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:153
msgid "Account connected"
msgstr "帳èå·²é£ç·"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:154
msgid "Account disconnected"
msgstr "帳èå·²æ·ç·"
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:394
msgid "Language"
msgstr "èªè¨"
@@ -2454,11 +2673,11 @@ msgstr "é±ç§"
#: ../src/empathy-preferences.ui.h:21
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°)."
+"state and country will be published. GPS coordinates will be accurate to 1 "
+"decimal place."
msgstr ""
"éä½ä½ç½®æºç¢ºåº¦ææé¤äºä½ æå¨çåå¸ãæ´²åå家æ被å
¬éä¹å¤ï¼ä¸ææä¾å
¶ä»è¨æ¯ã"
-"å
¨çå®ä½ç³»çµ±ç座æ¨å°æé¨æ©å å
¥æ¸å¼(±0.25°)ã"
+"GPS ç座æ¨æºç¢ºåº¦å°æéçºåä½æ¸ã"
#: ../src/empathy-preferences.ui.h:22
msgid "Show _smileys as images"
@@ -2514,92 +2733,118 @@ msgstr "çæ
"
msgid "_Quit"
msgstr "çµæ(_Q)"
-#: ../src/empathy-tube-dispatch.c:375
+#: ../src/empathy-tube-dispatch.c:376
#, c-format
msgid "Unable to start application for service %s: %s"
msgstr "ç¡æ³ååæå %s çæç¨ç¨å¼ï¼%s"
-#: ../src/empathy-tube-dispatch.c:446
+#: ../src/empathy-tube-dispatch.c:447
#, c-format
msgid ""
"An invitation was offered for service %s, but you don't have the needed "
"application to handle it"
msgstr "ææåºæå %s çéè«ï¼ä½æ¯æ¨æ²æèçå®æéçå¤é¨æç¨ç¨å¼ã"
-#: ../src/empathy-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr "gtk-leave-fullscreen"
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
msgstr "é£çµ¡äººå°å檢è¦"
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
msgid "Error"
msgstr "é¯èª¤"
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
msgid "Critical"
msgstr "å´é"
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
msgid "Warning"
msgstr "è¦å"
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
+#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1111
msgid "Message"
msgstr "è¨æ¯"
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
msgid "Info"
msgstr "è³è¨"
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
msgid "Debug"
msgstr "åµé¯"
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-window.c:841
msgid "Save"
msgstr "å²å"
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-window.c:944
msgid "Debug Window"
msgstr "åµé¯è¦çª"
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-window.c:1019
msgid "Pause"
msgstr "æ«å"
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-window.c:1031
msgid "Level "
msgstr "çç´"
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1100
msgid "Time"
msgstr "æå»"
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1102
msgid "Domain"
msgstr "網å"
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-window.c:1104
msgid "Category"
msgstr "åé¡"
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-window.c:1106
msgid "Level"
msgstr "çç´"
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-window.c:1138
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr "é¸åçé£ç·ç®¡çç¨å¼ä¸æ¯æ´é 端åµé¯æ´å
åè½ã"
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Add Account"
+#~ msgstr "å å
¥å¸³è"
+
+#~ msgid "Gmail"
+#~ msgstr "Gmail"
+
+#~ msgid "Import Accounts..."
+#~ msgstr "å¯å
¥å¸³è..."
+
+#~ msgid "Settings"
+#~ msgstr "è¨å®å¼"
+
+#~ msgid "Type:"
+#~ msgstr "é¡å:"
+
+#~ msgid "gtk-leave-fullscreen"
+#~ msgstr "gtk-leave-fullscreen"
+
#~ msgid "Empathy Instant Messenger"
#~ msgstr "Empathy å³æéè¨ç¨å¼"
+#~ msgid "Send and receive instant messages"
+#~ msgstr "å³éèæ¥æ¶å³æè¨æ¯"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Empathy å³æéè¨ç¨å¼"
+
#~ msgid "Avatars are user chosen images shown in the contact list"
#~ msgstr "å¨é£ç·äººæ¸
å®ä¸é¡¯ç¤ºä½¿ç¨è
é¸æç大é è²¼"
@@ -2608,3 +2853,9 @@ msgstr "é¸åçé£ç·ç®¡çç¨å¼ä¸æ¯æ´é 端åµé¯æ´å
åè½ã"
#~ msgid "Show co_mpact contact list"
#~ msgstr "顯示精簡é£çµ¡äººæ¸
å®(_M)"
+
+#~ msgid "Sort by _name"
+#~ msgstr "ä¾å稱æåº(_N)"
+
+#~ msgid "Sort by s_tate"
+#~ msgstr "ä¾çæ
æåº(_T)"
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index c90074ba..a00c1b5e 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -229,9 +229,11 @@ get_default_display_name (EmpathyAccountSettings *settings)
/* To translators: The first parameter is the login id and the
* second one is the server. The resulting string will be something
- * like: "MyUserName on chat.freenode.net" */
- default_display_name =
- g_strdup_printf (_("%s on %s"), login_id, server);
+ * like: "MyUserName on chat.freenode.net".
+ * You should reverse the order of these arguments if the
+ * server should come before the login id in your locale.*/
+ default_display_name = g_strdup_printf (_("%1$s on %2$s"),
+ login_id, server);
}
else
{
diff --git a/src/empathy.c b/src/empathy.c
index 38fd56c5..84bdfdd9 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -558,6 +558,75 @@ account_manager_ready_cb (EmpathyAccountManager *manager,
}
}
+static EmpathyDispatcher *
+setup_dispatcher (void)
+{
+ EmpathyDispatcher *d;
+ GPtrArray *filters;
+ struct {
+ const gchar *channeltype;
+ TpHandleType handletype;
+ } types[] = {
+ /* Text channels with handle types none, contact and room */
+ { TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_NONE },
+ { TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_CONTACT },
+ { TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_ROOM },
+ /* file transfer to contacts */
+ { TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, TP_HANDLE_TYPE_CONTACT },
+ /* stream media to contacts */
+ { TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, TP_HANDLE_TYPE_CONTACT },
+ /* stream tubes to contacts and rooms */
+ { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE, TP_HANDLE_TYPE_CONTACT },
+ { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE, TP_HANDLE_TYPE_ROOM },
+ /* d-bus tubes to contacts and rooms */
+ { TP_IFACE_CHANNEL_TYPE_DBUS_TUBE, TP_HANDLE_TYPE_CONTACT },
+ { TP_IFACE_CHANNEL_TYPE_DBUS_TUBE, TP_HANDLE_TYPE_ROOM },
+ /* roomlists */
+ { TP_IFACE_CHANNEL_TYPE_ROOM_LIST, TP_HANDLE_TYPE_NONE },
+ };
+ gchar *capabilities[] = {
+ "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp",
+ "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p",
+ NULL };
+ GHashTable *asv;
+ int i;
+
+ /* Setup the basic Client.Handler that matches our client filter */
+ filters = g_ptr_array_new ();
+ asv = tp_asv_new (
+ TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING,
+ TP_IFACE_CHANNEL_TYPE_TEXT,
+ TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_INT,
+ TP_HANDLE_TYPE_CONTACT,
+ NULL);
+ g_ptr_array_add (filters, asv);
+
+ d = empathy_dispatcher_new (PACKAGE_NAME, filters, NULL);
+
+ g_ptr_array_foreach (filters, (GFunc) g_hash_table_destroy, NULL);
+ g_ptr_array_free (filters, TRUE);
+
+ /* Setup the an extended Client.Handler that matches everything we can do */
+ filters = g_ptr_array_new ();
+ for (i = 0 ; i < G_N_ELEMENTS (types); i++)
+ {
+ asv = tp_asv_new (
+ TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING, types[i].channeltype,
+ TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_INT, types[i].handletype,
+ NULL);
+
+ g_ptr_array_add (filters, asv);
+ }
+
+ empathy_dispatcher_add_handler (d, PACKAGE_NAME"MoreThenMeetsTheEye",
+ filters, capabilities);
+
+ g_ptr_array_foreach (filters, (GFunc) g_hash_table_destroy, NULL);
+ g_ptr_array_free (filters, TRUE);
+
+ return d;
+}
+
int
main (int argc, char *argv[])
{
@@ -699,6 +768,10 @@ main (int argc, char *argv[])
g_signal_connect (account_manager, "notify::ready",
G_CALLBACK (account_manager_ready_cb), NULL);
+ /* Handle channels */
+ dispatcher = setup_dispatcher ();
+ g_signal_connect (dispatcher, "dispatch", G_CALLBACK (dispatch_cb), NULL);
+
migrate_config_to_xdg_dir ();
/* Setting up UI */
@@ -708,10 +781,6 @@ main (int argc, char *argv[])
g_signal_connect (unique_app, "message-received",
G_CALLBACK (unique_app_message_cb), window);
- /* Handle channels */
- dispatcher = empathy_dispatcher_dup_singleton ();
- g_signal_connect (dispatcher, "dispatch", G_CALLBACK (dispatch_cb), NULL);
-
/* Logging */
log_manager = empathy_log_manager_dup_singleton ();
empathy_log_manager_observe (log_manager, dispatcher);