aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS40
-rw-r--r--configure.ac4
-rw-r--r--libempathy-gtk/empathy-contact-widget.c10
-rw-r--r--libempathy-gtk/empathy-individual-menu.c4
-rw-r--r--libempathy-gtk/empathy-individual-store.c27
-rw-r--r--libempathy-gtk/empathy-individual-view.c47
-rw-r--r--libempathy-gtk/empathy-individual-widget.c37
-rw-r--r--libempathy-gtk/empathy-linking-dialog.c10
-rw-r--r--libempathy-gtk/empathy-persona-store.c19
-rw-r--r--libempathy-gtk/empathy-ui-utils.c6
-rw-r--r--libempathy/empathy-contact.c20
-rw-r--r--libempathy/empathy-individual-manager.c4
-rw-r--r--libempathy/empathy-tls-verifier.c2
-rw-r--r--po/en_GB.po1256
-rw-r--r--po/es.po426
-rw-r--r--po/gl.po468
-rw-r--r--po/he.po139
-rw-r--r--po/nb.po432
-rw-r--r--po/sl.po564
-rw-r--r--po/zh_HK.po905
-rw-r--r--po/zh_TW.po905
-rw-r--r--src/empathy-main-window.c1
22 files changed, 2852 insertions, 2474 deletions
diff --git a/NEWS b/NEWS
index 977a23615..5568a1ed5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,43 @@
+NEW in 2.91.3.1 (14/12/2010)
+===============
+
+This release fixes a lot of nasty bugs, including crashes and infinite
+loops.
+
+Dependencies:
+ • telepathy-glib ≥ 0.13.7
+ • folks ≥ 0.3.3
+
+Bugs fixed:
+ - Fixed #608806, empathy doesn't let me see or get to contact details during subscription request (Guillaume Desmottes)
+ - Fixed #626507, Connection error message is not shown completely (Robert Sajdok)
+ - Fixed #630146, Add Ovi account profile (Guillaume Desmottes)
+ - Fixed #631096, Should not mention "meta contacts" in UI (Philip Withnall)
+ - Fixed #635513, Message displayed TWICE (in chat msg overlay) when opening a chat window for unread msg (Guillaume Desmottes)
+ - Fixed #636067, Add an EmpathySoundManager (Guillaume Desmottes)
+ - Fixed #636123, gtk_menu_detach(): menu is not attached when right closing contact context menu (Guillaume Desmottes)
+ - Fixed #636202, "Invite to chatroom" menu broken (Guillaume Desmottes)
+ - Fixed #636203, Crash when trying to create an IRC account (Guillaume Desmottes)
+ - Fixed #636207, Avatar not always displayed in a MUC (Guillaume Desmottes)
+ - Fixed #636360, Favorite chatrooms list is not updated (Guillaume Desmottes)
+ - Fixed #636613, Become a server SASL handler (Jonny Lamb)
+ - Fixed #636700, Add an extra warning when deleting a metacontact (Philip Withnall)
+ - Fixed #636802, Doesn't compile with --without-ca-file (Will Thompson)
+ - Fixed #637097, Port to latest folks API changes (Philip Withnall)
+
+Translations:
+ - Updated en_GB Translation (Philip Withnall)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
+Documentation translations:
+ - Updated hu Documentation translation (Gabor Kelemen)
+
NEW in 2.91.3 (29/11/2010)
=============
diff --git a/configure.ac b/configure.ac
index b0ef0edca..00087c6ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ m4_define(empathy_released, 0)
m4_define([empathy_major_version], [2])
m4_define([empathy_minor_version], [91])
m4_define([empathy_micro_version], [3])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_nano_version], [1])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],
@@ -31,7 +31,7 @@ AC_COPYRIGHT([
# Minimal version required
# Hardp deps
-FOLKS_REQUIRED=0.3.2
+FOLKS_REQUIRED=0.3.3
GLIB_REQUIRED=2.27.2
GNUTLS_REQUIRED=2.8.5
GTK_REQUIRED=2.91.3
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 26713ebe4..3ebaa9dee 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -1345,10 +1345,10 @@ contact_widget_contact_update (EmpathyContactWidget *information)
FolksPersona *persona = empathy_contact_get_persona (
information->contact);
- if (persona != NULL && FOLKS_IS_FAVOURITE (persona))
+ if (persona != NULL && FOLKS_IS_FAVOURITABLE (persona))
{
- gboolean is_favourite = folks_favourite_get_is_favourite (
- FOLKS_FAVOURITE (persona));
+ gboolean is_favourite = folks_favouritable_get_is_favourite (
+ FOLKS_FAVOURITABLE (persona));
contact_widget_favourites_changed_cb (information->manager,
information->contact, is_favourite, information);
}
@@ -1479,10 +1479,10 @@ favourite_toggled_cb (GtkToggleButton *button,
{
FolksPersona *persona = empathy_contact_get_persona (information->contact);
- if (persona != NULL && FOLKS_IS_FAVOURITE (persona))
+ if (persona != NULL && FOLKS_IS_FAVOURITABLE (persona))
{
gboolean active = gtk_toggle_button_get_active (button);
- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (persona), active);
+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (persona), active);
}
}
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index e3159b401..29ead4fb0 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -749,7 +749,7 @@ static void
favourite_menu_item_toggled_cb (GtkCheckMenuItem *item,
FolksIndividual *individual)
{
- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (individual),
+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual),
gtk_check_menu_item_get_active (item));
}
@@ -761,7 +761,7 @@ empathy_individual_favourite_menu_item_new (FolksIndividual *individual)
item = gtk_check_menu_item_new_with_label (_("Favorite"));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
- folks_favourite_get_is_favourite (FOLKS_FAVOURITE (individual)));
+ folks_favouritable_get_is_favourite (FOLKS_FAVOURITABLE (individual)));
g_signal_connect (item, "toggled",
G_CALLBACK (favourite_menu_item_toggled_cb), individual);
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 4b07131a6..0add70ce3 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -164,20 +164,21 @@ individual_get_client_types (FolksIndividual *individual)
personas = folks_individual_get_personas (individual);
for (l = personas; l != NULL; l = l->next)
{
- FolksPresence *presence;
+ FolksHasPresence *presence;
- /* We only want personas which implement FolksPresence */
- if (!FOLKS_IS_PRESENCE (l->data))
+ /* We only want personas which implement FolksHasPresence */
+ if (!FOLKS_IS_HAS_PRESENCE (l->data))
continue;
- presence = FOLKS_PRESENCE (l->data);
+ presence = FOLKS_HAS_PRESENCE (l->data);
- if (folks_presence_typecmp (folks_presence_get_presence_type (presence),
+ if (folks_has_presence_typecmp (
+ folks_has_presence_get_presence_type (presence),
presence_type) > 0)
{
TpContact *tp_contact;
- presence_type = folks_presence_get_presence_type (presence);
+ presence_type = folks_has_presence_get_presence_type (presence);
tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data));
types = tp_contact_get_client_types (tp_contact);
@@ -477,7 +478,7 @@ individual_store_add_individual (EmpathyIndividualStore *self,
g_list_free (groups);
if (priv->show_groups &&
- folks_favourite_get_is_favourite (FOLKS_FAVOURITE (individual)))
+ folks_favouritable_get_is_favourite (FOLKS_FAVOURITABLE (individual)))
{
/* Add contact to the fake 'Favorites' group */
GtkTreeIter iter_group;
@@ -705,7 +706,7 @@ individual_store_contact_update (EmpathyIndividualStore *self,
}
/* Get online state now. */
- now_online = folks_presence_is_online (FOLKS_PRESENCE (individual));
+ now_online = folks_has_presence_is_online (FOLKS_HAS_PRESENCE (individual));
if (!in_list)
{
@@ -795,9 +796,11 @@ individual_store_contact_update (EmpathyIndividualStore *self,
EMPATHY_INDIVIDUAL_STORE_COL_NAME,
folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)),
EMPATHY_INDIVIDUAL_STORE_COL_PRESENCE_TYPE,
- folks_presence_get_presence_type (FOLKS_PRESENCE (individual)),
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (individual)),
EMPATHY_INDIVIDUAL_STORE_COL_STATUS,
- folks_presence_get_presence_message (FOLKS_PRESENCE (individual)),
+ folks_has_presence_get_presence_message (
+ FOLKS_HAS_PRESENCE (individual)),
EMPATHY_INDIVIDUAL_STORE_COL_COMPACT, priv->is_compact,
EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE,
EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, now_online,
@@ -1464,9 +1467,9 @@ individual_store_state_sort_func (GtkTreeModel *model,
* the presences.
*/
folks_presence_type_a =
- folks_presence_get_presence_type (FOLKS_PRESENCE (individual_a));
+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual_a));
folks_presence_type_b =
- folks_presence_get_presence_type (FOLKS_PRESENCE (individual_b));
+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual_b));
tp_presence_a = empathy_folks_presence_type_to_tp (folks_presence_type_a);
tp_presence_b = empathy_folks_presence_type_to_tp (folks_presence_type_b);
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 39dc3b34b..30098e534 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -377,14 +377,14 @@ real_drag_individual_received_cb (EmpathyIndividualView *self,
if (!tp_strdiff (new_group, EMPATHY_INDIVIDUAL_STORE_FAVORITE))
{
/* Mark contact as favourite */
- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (individual), TRUE);
+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual), TRUE);
return;
}
if (!tp_strdiff (old_group, EMPATHY_INDIVIDUAL_STORE_FAVORITE))
{
/* Remove contact as favourite */
- folks_favourite_set_is_favourite (FOLKS_FAVOURITE (individual), FALSE);
+ folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual), FALSE);
/* Don't try to remove it */
old_group = NULL;
@@ -681,7 +681,7 @@ individual_view_drag_motion (GtkWidget *widget,
}
if (individual != NULL &&
- folks_presence_is_online (FOLKS_PRESENCE (individual)) &&
+ folks_has_presence_is_online (FOLKS_HAS_PRESENCE (individual)) &&
(caps & EMPATHY_CAPABILITIES_FT))
{
gdk_drag_status (context, GDK_ACTION_COPY, time_);
@@ -2345,12 +2345,45 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem,
{
gchar *text;
GtkWindow *parent;
+ GList *l, *personas;
+ guint persona_count = 0;
+
+ personas = folks_individual_get_personas (individual);
+
+ /* If we have more than one TpfPersona, display a different message
+ * ensuring the user knows that *all* of the meta-contacts' personas will
+ * be removed. */
+ for (l = personas; l != NULL; l = l->next)
+ {
+ if (!TPF_IS_PERSONA (l->data))
+ continue;
+
+ persona_count++;
+ if (persona_count >= 2)
+ break;
+ }
+
+ if (persona_count < 2)
+ {
+ /* Not a meta-contact */
+ text =
+ g_strdup_printf (
+ _("Do you really want to remove the contact '%s'?"),
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
+ }
+ else
+ {
+ /* Meta-contact */
+ text =
+ g_strdup_printf (
+ _("Do you really want to remove the linked contact '%s'? "
+ "Note that this will remove all the contacts which make up "
+ "this linked contact."),
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
+ }
parent = empathy_get_toplevel_window (GTK_WIDGET (view));
- text =
- g_strdup_printf (_
- ("Do you really want to remove the contact '%s'?"),
- folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
+
if (individual_view_remove_dialog_show (parent, _("Removing contact"),
text))
{
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 863ce021e..44e7f9572 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -220,19 +220,20 @@ update_weak_contact (EmpathyIndividualWidget *self)
personas = folks_individual_get_personas (priv->individual);
for (l = personas; l != NULL; l = l->next)
{
- FolksPresence *presence;
+ FolksHasPresence *presence;
/* We only want personas which implement FolksPresence */
- if (!FOLKS_IS_PRESENCE (l->data))
+ if (!FOLKS_IS_HAS_PRESENCE (l->data))
continue;
- presence = FOLKS_PRESENCE (l->data);
+ presence = FOLKS_HAS_PRESENCE (l->data);
- if (folks_presence_typecmp (folks_presence_get_presence_type (presence),
+ if (folks_has_presence_typecmp (
+ folks_has_presence_get_presence_type (presence),
presence_type) > 0
&& TPF_IS_PERSONA (presence))
{
- presence_type = folks_presence_get_presence_type (presence);
+ presence_type = folks_has_presence_get_presence_type (presence);
tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data));
}
}
@@ -896,7 +897,7 @@ individual_dup_avatar (FolksIndividual *individual)
/* FIXME: We just choose the first Persona which has an avatar, and save that.
* The avatar handling in EmpathyContact needs to be moved into libfolks as
- * much as possible, and this code rewritten to use FolksAvatar.
+ * much as possible, and this code rewritten to use FolksHasAvatar.
* (bgo#627401) */
personas = folks_individual_get_personas (individual);
for (l = personas; l != NULL; l = l->next)
@@ -1150,8 +1151,8 @@ favourite_toggled_cb (GtkToggleButton *button,
EmpathyIndividualWidget *self)
{
gboolean active = gtk_toggle_button_get_active (button);
- folks_favourite_set_is_favourite (
- FOLKS_FAVOURITE (GET_PRIV (self)->individual), active);
+ folks_favouritable_set_is_favourite (
+ FOLKS_FAVOURITABLE (GET_PRIV (self)->individual), active);
}
static void
@@ -1247,11 +1248,13 @@ notify_presence_cb (gpointer folks_object,
state_image = g_object_get_data (table, "state-image");
/* FIXME: Default messages should be moved into libfolks (bgo#627403) */
- message = folks_presence_get_presence_message (FOLKS_PRESENCE (folks_object));
+ message = folks_has_presence_get_presence_message (
+ FOLKS_HAS_PRESENCE (folks_object));
if (EMP_STR_EMPTY (message))
{
message = empathy_presence_get_default_message (
- folks_presence_get_presence_type (FOLKS_PRESENCE (folks_object)));
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (folks_object)));
}
if (message != NULL)
@@ -1261,7 +1264,8 @@ notify_presence_cb (gpointer folks_object,
gtk_image_set_from_icon_name (GTK_IMAGE (state_image),
empathy_icon_name_for_presence (
- folks_presence_get_presence_type (FOLKS_PRESENCE (folks_object))),
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (folks_object))),
GTK_ICON_SIZE_BUTTON);
gtk_widget_show (state_image);
}
@@ -1290,7 +1294,8 @@ notify_is_favourite_cb (gpointer folks_object,
if (GTK_IS_TOGGLE_BUTTON (favourite_widget))
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (favourite_widget),
- folks_favourite_get_is_favourite (FOLKS_FAVOURITE (folks_object)));
+ folks_favouritable_get_is_favourite (
+ FOLKS_FAVOURITABLE (folks_object)));
}
}
@@ -1646,8 +1651,12 @@ individual_table_set_up (EmpathyIndividualWidget *self)
num_personas++;
}
- message = g_strdup_printf (ngettext ("Meta-contact containing %u contact",
- "Meta-contact containing %u contacts", num_personas), num_personas);
+ /* Translators: the plurality applies to both instances of the word
+ * "contact" */
+ message = g_strdup_printf (
+ ngettext ("Linked contact containing %u contact",
+ "Linked contacts containing %u contacts", num_personas),
+ num_personas);
label = gtk_label_new (message);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
g_free (message);
diff --git a/libempathy-gtk/empathy-linking-dialog.c b/libempathy-gtk/empathy-linking-dialog.c
index 323ec4e03..e6d408fb4 100644
--- a/libempathy-gtk/empathy-linking-dialog.c
+++ b/libempathy-gtk/empathy-linking-dialog.c
@@ -119,7 +119,7 @@ empathy_linking_dialog_init (EmpathyLinkingDialog *self)
button = gtk_button_new_with_mnemonic (
C_("Unlink individual (button)", "_Unlink…"));
gtk_widget_set_tooltip_text (button, _("Completely split the displayed "
- "meta-contact into the contacts it contains."));
+ "linked contacts into the separate contacts."));
gtk_dialog_add_action_widget (dialog, button, RESPONSE_UNLINK);
gtk_widget_show (button);
@@ -179,12 +179,12 @@ linking_response_cb (EmpathyLinkingDialog *self,
/* Show a confirmation dialogue first */
dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_MODAL,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("Unlink meta-contact '%s'?"),
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ _("Unlink linked contacts '%s'?"),
folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- _("Are you sure you want to unlink this meta-contact? This will "
- "completely split the meta-contact into the contacts it "
- "contains."));
+ _("Are you sure you want to unlink these linked contacts? This will "
+ "completely split the linked contacts into separate contacts."));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
C_("Unlink individual (button)", "_Unlink"), GTK_RESPONSE_OK,
diff --git a/libempathy-gtk/empathy-persona-store.c b/libempathy-gtk/empathy-persona-store.c
index fbeeb6991..b77e34d4b 100644
--- a/libempathy-gtk/empathy-persona-store.c
+++ b/libempathy-gtk/empathy-persona-store.c
@@ -438,7 +438,7 @@ update_persona (EmpathyPersonaStore *self,
gtk_tree_path_free (path);
/* Get online state now. */
- now_online = folks_presence_is_online (FOLKS_PRESENCE (persona));
+ now_online = folks_has_presence_is_online (FOLKS_HAS_PRESENCE (persona));
/* Get online state before. */
gtk_tree_model_get (GTK_TREE_MODEL (self), &iter,
@@ -484,9 +484,11 @@ update_persona (EmpathyPersonaStore *self,
EMPATHY_PERSONA_STORE_COL_DISPLAY_ID,
folks_persona_get_display_id (persona),
EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE,
- folks_presence_get_presence_type (FOLKS_PRESENCE (persona)),
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (persona)),
EMPATHY_PERSONA_STORE_COL_STATUS,
- folks_presence_get_presence_message (FOLKS_PRESENCE (persona)),
+ folks_has_presence_get_presence_message (
+ FOLKS_HAS_PRESENCE (persona)),
EMPATHY_PERSONA_STORE_COL_IS_ONLINE, now_online,
EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL,
empathy_contact_get_capabilities (contact) &
@@ -532,6 +534,11 @@ individual_personas_changed_cb (GObject *object,
{
GList *l;
+ /* One of the personas' row references might hold the last reference to the
+ * PersonaStore, so we need to keep a reference ourselves so we don't get
+ * finalised. */
+ g_object_ref (self);
+
/* Remove the old personas. */
for (l = removed; l != NULL; l = l->next)
remove_persona_and_disconnect (self, FOLKS_PERSONA (l->data));
@@ -539,6 +546,8 @@ individual_personas_changed_cb (GObject *object,
/* Add each of the new personas to the tree model */
for (l = added; l != NULL; l = l->next)
add_persona_and_connect (self, FOLKS_PERSONA (l->data));
+
+ g_object_unref (self);
}
static gint
@@ -619,8 +628,8 @@ state_sort_func (GtkTreeModel *model,
* the presences.
*/
ret_val = -tp_connection_presence_type_cmp_availability (
- folks_presence_get_presence_type (FOLKS_PRESENCE (persona_a)),
- folks_presence_get_presence_type (FOLKS_PRESENCE (persona_b)));
+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (persona_a)),
+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (persona_b)));
if (ret_val == 0) {
/* Fallback: compare by name et al. */
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 4c1287424..043c03eb3 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -232,7 +232,8 @@ empathy_icon_name_for_individual (FolksIndividual *individual)
TpConnectionPresenceType presence;
folks_presence =
- folks_presence_get_presence_type (FOLKS_PRESENCE (individual));
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (individual));
presence = empathy_folks_presence_type_to_tp (folks_presence);
return empathy_icon_name_for_presence (presence);
@@ -632,7 +633,8 @@ empathy_pixbuf_avatar_from_individual_scaled_async (
callback, user_data,
empathy_pixbuf_avatar_from_individual_scaled_async);
- avatar_file = folks_avatar_get_avatar (FOLKS_AVATAR (individual));
+ avatar_file =
+ folks_has_avatar_get_avatar (FOLKS_HAS_AVATAR (individual));
if (avatar_file == NULL)
goto out;
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 5383187c1..86bb9f5a8 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -510,8 +510,8 @@ empathy_contact_set_presence_message (EmpathyContact *contact,
if (priv->persona != NULL)
{
- folks_presence_set_presence_message (FOLKS_PRESENCE (priv->persona),
- message);
+ folks_has_presence_set_presence_message (
+ FOLKS_HAS_PRESENCE (priv->persona), message);
}
}
@@ -991,7 +991,10 @@ empathy_contact_get_presence_message (EmpathyContact *contact)
priv = GET_PRIV (contact);
if (priv->persona != NULL)
- return folks_presence_get_presence_message (FOLKS_PRESENCE (priv->persona));
+ {
+ return folks_has_presence_get_presence_message (
+ FOLKS_HAS_PRESENCE (priv->persona));
+ }
return NULL;
}
@@ -1791,15 +1794,16 @@ static int
presence_cmp_func (EmpathyContact *a,
EmpathyContact *b)
{
- FolksPresence *presence_a, *presence_b;
+ FolksHasPresence *presence_a, *presence_b;
- presence_a = FOLKS_PRESENCE (empathy_contact_get_persona (a));
- presence_b = FOLKS_PRESENCE (empathy_contact_get_persona (b));
+ presence_a = FOLKS_HAS_PRESENCE (empathy_contact_get_persona (a));
+ presence_b = FOLKS_HAS_PRESENCE (empathy_contact_get_persona (b));
/* We negate the result because we're sorting in reverse order (i.e. such that
* the Personas with the highest presence are at the beginning of the list. */
- return -folks_presence_typecmp (folks_presence_get_presence_type (presence_a),
- folks_presence_get_presence_type (presence_b));
+ return -folks_has_presence_typecmp (
+ folks_has_presence_get_presence_type (presence_a),
+ folks_has_presence_get_presence_type (presence_b));
}
static gint
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 82884e4d1..29470b87e 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -82,8 +82,8 @@ individual_notify_is_favourite_cb (FolksIndividual *individual,
GParamSpec *pspec,
EmpathyIndividualManager *self)
{
- gboolean is_favourite = folks_favourite_get_is_favourite (
- FOLKS_FAVOURITE (individual));
+ gboolean is_favourite = folks_favouritable_get_is_favourite (
+ FOLKS_FAVOURITABLE (individual));
g_signal_emit (self, signals[FAVOURITES_CHANGED], 0, individual,
is_favourite);
}
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index ca1726144..224150533 100644
--- a/libempathy/empathy-tls-verifier.c
+++ b/libempathy/empathy-tls-verifier.c
@@ -44,7 +44,9 @@ enum {
};
static const gchar* system_ca_paths[] = {
+#ifdef GTLS_SYSTEM_CA_FILE
GTLS_SYSTEM_CA_FILE,
+#endif
NULL,
};
diff --git a/po/en_GB.po b/po/en_GB.po
index 37df61300..fe0f961d5 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-22 19:36+0100\n"
+"POT-Creation-Date: 2010-12-12 11:18+0000\n"
"PO-Revision-Date: 2010-09-22 19:37+0100\n"
-"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
+"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
"Language-Team: British English <en@li.org>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
@@ -114,217 +114,208 @@ msgid "Empathy default download folder"
msgstr "Empathy default download folder"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy has asked about importing accounts"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy has migrated butterfly logs"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy should auto-away when idle"
msgstr "Empathy should auto-away when idle"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-connect on startup"
msgstr "Empathy should auto-connect on startup"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should reduce the location's accuracy"
msgstr "Empathy should reduce the location's accuracy"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy should use the avatar of the contact as the chat window icon"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
msgstr "Enable WebKit Developer Tools"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable popup notifications for new messages"
msgstr "Enable popup notifications for new messages"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
msgstr "Enable spell checker"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "Hide main window"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "Hide the main window."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "Nick completed character"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Open new chats in separate windows"
msgstr "Open new chats in separate windows"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Path of the Adium theme to use"
msgstr "Path of the Adium theme to use"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Play a sound for incoming messages"
msgstr "Play a sound for incoming messages"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for new conversations"
msgstr "Play a sound for new conversations"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for outgoing messages"
msgstr "Play a sound for outgoing messages"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound when a contact logs in"
msgstr "Play a sound when a contact logs in"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs out"
msgstr "Play a sound when a contact logs out"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when we log in"
msgstr "Play a sound when we log in"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log out"
msgstr "Play a sound when we log out"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Pop up notifications if the chat isn't focused"
msgstr "Pop up notifications if the chat isn't focused"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications when a contact logs in"
msgstr "Pop up notifications when a contact logs in"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs out"
msgstr "Pop up notifications when a contact logs out"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "Show avatars"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show contact list in rooms"
msgstr "Show contact list in rooms"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show hint about closing the main window"
msgstr "Show hint about closing the main window"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "Show offline contacts"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "Show protocols"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "Spell checking languages"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "The default folder to save file transfers in."
msgstr "The default folder to save file transfers in."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The last directory that an avatar image was chosen from."
msgstr "The last directory that an avatar image was chosen from."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The position for the chat window side pane"
msgstr "The position for the chat window side pane"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "The stored position (in pixels) of the chat window side pane."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The theme that is used to display the conversation in chat windows."
msgstr "The theme that is used to display the conversation in chat windows."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "Use graphical smileys"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "Use notification sounds"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use theme for chat rooms"
msgstr "Use theme for chat rooms"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Whether Empathy can publish the user's location to their contacts."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Whether Empathy can use the GPS to guess the location."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
"Whether Empathy can use the mobile phone network to guess the location."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the network to guess the location."
msgstr "Whether Empathy can use the network to guess the location."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr ""
-"Whether Empathy has asked about importing accounts from other programs."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Whether Empathy has migrated butterfly logs."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
"Whether Empathy should automatically log into your accounts on startup."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
"Whether Empathy should go into away mode automatically if the user is idle."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
@@ -332,64 +323,64 @@ msgstr ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
"Whether to check words typed against the languages you want to check with."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Whether to convert smileys into graphical images in conversations."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
"Whether to play a sound to notify of contacts logging into the network."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
"Whether to play a sound to notify of contacts logging out of the network."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of events."
msgstr "Whether to play a sound to notify of events."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Whether to play a sound to notify of incoming messages."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of new conversations."
msgstr "Whether to play a sound to notify of new conversations."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Whether to play a sound to notify of outgoing messages."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound when logging into a network."
msgstr "Whether to play a sound when logging into a network."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound when logging out of a network."
msgstr "Whether to play a sound when logging out of a network."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play sound notifications when away or busy."
msgstr "Whether to play sound notifications when away or busy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Whether to show a popup notification when a contact goes offline."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Whether to show a popup notification when a contact goes online."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
@@ -397,37 +388,37 @@ msgstr ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Whether to show a popup notification when receiving a new message."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
"Whether to show avatars for contacts in the contact list and chat windows."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Whether to show contacts that are offline in the contact list."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show popup notifications when away or busy."
msgstr "Whether to show popup notifications when away or busy."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Whether to show protocols for contacts in the contact list."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show the contact list in chat rooms."
msgstr "Whether to show the contact list in chat rooms."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show the contact list in compact mode."
msgstr "Whether to show the contact list in compact mode."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
@@ -435,11 +426,11 @@ msgstr ""
"Whether to show the message dialogue about closing the main window with the "
"'x' button in the title bar."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to use the theme for chat rooms."
msgstr "Whether to use the theme for chat rooms."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -455,23 +446,23 @@ msgstr "Manage Messaging and VoIP accounts"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2105
msgid "Messaging and VoIP Accounts"
msgstr "Messaging and VoIP Accounts"
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr "The hash of the received file and the sent one do not match"
+#: ../libempathy/empathy-ft-handler.c:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr "File transfer completed, but the file was corrupted"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1121
msgid "File transfer not supported by remote contact"
msgstr "File transfer not supported by remote contact"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1177
msgid "The selected file is not a regular file"
msgstr "The selected file is not a regular file"
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1186
msgid "The selected file is empty"
msgstr "The selected file is empty"
@@ -527,9 +518,9 @@ msgstr "Invisible"
msgid "Offline"
msgstr "Offline"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
-#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
-#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Unknown"
@@ -645,16 +636,20 @@ msgstr ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "People Nearby"
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:548
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgstr "Facebook Chat"
@@ -704,71 +699,85 @@ msgstr[1] "%d months ago"
msgid "in the future"
msgstr "in the future"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
msgid "All"
msgstr "All"
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../libempathy-gtk/empathy-account-widget.c:670
+#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Account"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:671
msgid "Password"
msgstr "Password"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:672
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Server"
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:673
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-account-widget.c:589
-#: ../libempathy-gtk/empathy-account-widget.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1127
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "The account %s is edited via My Web Accounts."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1133
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "The account %s cannot be edited in Empathy."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1153
+msgid "Launch My Web Accounts"
+msgstr "Launch My Web Accounts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1465
msgid "Username:"
msgstr "Username:"
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "A_pply"
msgstr "A_pply"
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "L_og in"
msgstr "L_og in"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Account:"
-#: ../libempathy-gtk/empathy-account-widget.c:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1913
msgid "_Enabled"
msgstr "_Enabled"
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1978
msgid "This account already exists on the server"
msgstr "This account already exists on the server"
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1981
msgid "Create a new account on the server"
msgstr "Create a new account on the server"
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2095
msgid "Ca_ncel"
msgstr "Ca_ncel"
@@ -777,19 +786,19 @@ msgstr "Ca_ncel"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2392
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s on %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2418
#, c-format
msgid "%s Account"
msgstr "%s Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2422
msgid "New account"
msgstr "New account"
@@ -1168,28 +1177,28 @@ msgstr "Yahoo! I_D:"
msgid "_Room List locale:"
msgstr "_Room List locale:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "Couldn't convert image"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "None of the accepted image formats are supported on your system"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Select Your Avatar Image"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "No Image"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Images"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "All Files"
@@ -1197,51 +1206,51 @@ msgstr "All Files"
msgid "Click to enlarge"
msgstr "Click to enlarge"
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Failed to open private chat"
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "Topic not supported on this conversation"
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "You are not allowed to change the topic"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: clear all messages from the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>: set the topic of the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chat room ID>: join a new chat room"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact ID> [<message>]: open a private chat"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact ID> <message>: open a private chat"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>: change your nickname on the current server"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>: send an ACTION message to the current conversation"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:851
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1251,7 +1260,7 @@ msgstr ""
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1259,84 +1268,98 @@ msgstr ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Usage: %s"
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Unknown command"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Unknown command; see /help for the available commands"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "offline"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "invalid contact"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "permission denied"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "too long message"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "not implemented"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "unknown"
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error sending message '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "Topic:"
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "Topic set to: %s"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "No topic defined"
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(No Suggestions)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1818
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Add '%s' to Dictionary"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1855
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Add '%s' to %s Dictionary"
+
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Insert Smiley"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
msgid "_Send"
msgstr "_Send"
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "_Spelling Suggestions"
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Failed to retrieve recent logs"
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s has disconnected"
@@ -1344,12 +1367,12 @@ msgstr "%s has disconnected"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s was kicked by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s was kicked"
@@ -1357,17 +1380,17 @@ msgstr "%s was kicked"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s was banned by %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s was banned"
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s has left the room"
@@ -1377,79 +1400,79 @@ msgstr "%s has left the room"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s has joined the room"
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s is now known as %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Disconnected"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "Wrong password; please try again:"
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Retry"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "This room is protected by a password:"
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Join"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Connected"
-#: ../libempathy-gtk/empathy-chat.c:3134
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Conversation"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Copy Link Address"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Open Link"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Edit Contact Information"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Personal Information"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "New Contact"
@@ -1469,101 +1492,101 @@ msgstr "Ungrouped"
msgid "Favorite People"
msgstr "Favourite People"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Do you really want to remove the group '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
msgid "Removing group"
msgstr "Removing group"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Remove"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Do you really want to remove the contact '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
msgid "Removing contact"
msgstr "Removing contact"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Add Contact…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:516
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "_Chat"
-#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-contact-menu.c:261
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audio Call"
-#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-contact-menu.c:292
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Video Call"
-#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
-#: ../src/empathy-main-window.ui.h:25
+#: ../libempathy-gtk/empathy-contact-menu.c:333
+#: ../libempathy-gtk/empathy-individual-menu.c:644
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "_Previous Conversations"
-#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-contact-menu.c:355
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "Send File"
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "Share My Desktop"
-#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1539
-#: ../libempathy-gtk/empathy-individual-menu.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
msgid "Favorite"
msgstr "Favourite"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:447
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "Infor_mation"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Edit"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr "Inviting you to this room"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr "_Invite to Chat Room"
@@ -1571,178 +1594,178 @@ msgstr "_Invite to Chat Room"
msgid "Select a contact"
msgstr "Select a contact"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Full name:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Phone number:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "E-mail address:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Website:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Birthday:"
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Country ISO Code:"
msgstr "Country ISO Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "Country:"
msgstr "Country:"
-#: ../libempathy-gtk/empathy-contact-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "State:"
msgstr "County:"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "City:"
msgstr "City:"
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Area:"
msgstr "Area:"
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Postal Code:"
msgstr "Postal Code:"
-#: ../libempathy-gtk/empathy-contact-widget.c:590
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Street:"
msgstr "Street:"
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Building:"
msgstr "Building:"
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Floor:"
msgstr "Floor:"
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Room:"
msgstr "Room:"
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Text:"
msgstr "Text:"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Description:"
msgstr "Description:"
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Accuracy Level:"
msgstr "Accuracy Level:"
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Vertical Error (meters):"
msgstr "Vertical Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Horizontal Error (meters):"
msgstr "Horizontal Error (metres):"
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Speed:"
msgstr "Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "Bearing:"
msgstr "Bearing:"
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Climb Speed:"
msgstr "Climb Speed:"
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Last Updated on:"
msgstr "Last Updated on:"
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Longitude:"
msgstr "Longitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:687
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:621
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Location"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:623
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:672
msgid "%B %e, %Y at %R UTC"
msgstr "%e %B, %Y at %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:921
msgid "Save Avatar"
msgstr "Save Avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:979
msgid "Unable to save avatar"
msgstr "Unable to save avatar"
@@ -1752,7 +1775,7 @@ msgstr "<b>Location</b> at (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
msgid "Alias:"
msgstr "Alias:"
@@ -1772,7 +1795,7 @@ msgstr "Contact Details"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "Identifier:"
@@ -1805,18 +1828,18 @@ msgstr ""
msgid "_Add Group"
msgstr "_Add Group"
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "Select"
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1247
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1276
msgid "Group"
msgstr "Group"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
msgstr "Linked Contacts"
@@ -1840,19 +1863,19 @@ msgstr "Contacts selected in the list on the left will be linked together."
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:836
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Edit"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Link Contacts…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1649
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1863,6 +1886,10 @@ msgstr[1] "Meta-contact containing %u contacts"
msgid "<b>Location</b> at (date)"
msgstr "<b>Location</b> at (date)"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "Online from a phone or mobile device"
+
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
msgstr "New Network"
@@ -1871,6 +1898,11 @@ msgstr "New Network"
msgid "Choose an IRC network"
msgstr "Choose an IRC network"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Select"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "new server"
@@ -1882,16 +1914,16 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:116
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
msgid "Link Contacts"
msgstr "Link Contacts"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
msgstr "_Unlink…"
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
"Completely split the displayed meta-contact into the contacts it contains."
msgstr ""
@@ -1901,16 +1933,16 @@ msgstr ""
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:137
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
msgid "_Link"
msgstr "_Link"
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "Unlink meta-contact '%s'?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
msgid ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
@@ -1918,12 +1950,12 @@ msgstr ""
"Are you sure you want to unlink this meta-contact? This will completely "
"split the meta-contact into the contacts it contains."
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Unlink"
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgstr "Date"
@@ -1933,10 +1965,12 @@ msgid "Conversations"
msgstr "Conversations"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Find Next"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Find Previous"
@@ -1959,116 +1993,139 @@ msgid "Contact ID:"
msgstr "Contact ID:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "C_hat"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "New Conversation"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "Send _Video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "C_all"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "New Call"
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Enter your password for account\n"
+"<b>%s</b>"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr "Remember password"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
msgstr "Custom Message…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
msgstr "Edit Custom Messages…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
msgstr "Click to remove this status as a favourite"
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
msgid "Click to make this status a favorite"
msgstr "Click to make this status a favourite"
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
msgid "Set status"
msgstr "Set status"
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
msgid "Set your presence and current status"
msgstr "Set your presence and current status"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
msgstr "Custom messages…"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "New %s account"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Find:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Match case"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Phrase not found"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Received an instant message"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Sent an instant message"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Incoming chat request"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Contact connected"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Contact disconnected"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Connected to server"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Disconnected from server"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Incoming voice call"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Outgoing voice call"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Voice call ended"
@@ -2081,12 +2138,12 @@ msgid "Edit Custom Messages"
msgstr "Edit Custom Messages"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "Add _New Preset"
+msgid "Save _New Status Message"
+msgstr "Save _New Status Message"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "Saved Presets"
+msgid "Saved Status Messages"
+msgstr "Saved Status Messages"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
@@ -2105,85 +2162,86 @@ msgid "Blue"
msgstr "Blue"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "The identity provided by the chat server cannot be verified.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "The identity provided by the chat server cannot be verified."
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "The certificate is not signed by a Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "The certificate is not signed by a Certification Authority."
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "The certificate has expired"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "The certificate has expired."
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "The certificate hasn't yet been activated"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "The certificate hasn't yet been activated."
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "The certificate does not have the expected fingerprint"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "The certificate does not have the expected fingerprint."
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr "The hostname verified by the certificate doesn't match the server name"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "The hostname verified by the certificate doesn't match the server name."
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
-msgstr "The certificate is self-signed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "The certificate is self-signed."
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
msgstr ""
-"The certificate has been revoked by the issuing Certification Authority"
+"The certificate has been revoked by the issuing Certification Authority."
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "The certificate is cryptographically weak"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "The certificate is cryptographically weak."
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "The certificate length exceeds verifiable limits"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "The certificate length exceeds verifiable limits."
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
-msgstr "The certificate is malformed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "The certificate is malformed."
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "Expected hostname: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "Certificate hostname: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "Continue"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "This connection is untrusted. Would you like to continue anyway?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "Remember this choice for future connections"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "Certificate Details"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
msgid "Unable to open URI"
msgstr "Unable to open URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "Select a file"
msgstr "Select a file"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
#, c-format
msgid "Incoming file from %s"
msgstr "Incoming file from %s"
@@ -2371,19 +2429,36 @@ msgstr "No error message"
msgid "Instant Message (Empathy)"
msgstr "Instant Message (Empathy)"
-#: ../src/empathy.c:414
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Don't connect on startup"
-#: ../src/empathy.c:418
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Don't display the contact list or any other dialogues on startup"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy IM Client"
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy.c:500
+msgid "Error contacting the Account Manager"
+msgstr "Error contacting the Account Manager"
+
+#: ../src/empathy.c:502
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
"terms of the GNU General Public License as published by the Free Software "
@@ -2395,7 +2470,7 @@ msgstr ""
"Foundation; either version 2 of the Licence, or (at your option) any later "
"version."
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
msgid ""
"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2407,7 +2482,7 @@ msgstr ""
"FOR A PARTICULAR PURPOSE. See the GNU General Public Licence for more "
"details."
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
msgid ""
"You should have received a copy of the GNU General Public License along with "
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -2417,11 +2492,11 @@ 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:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "An Instant Messaging client for GNOME"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"David Lodge <dave@cirt.net>\n"
@@ -2458,45 +2533,35 @@ msgstr ""
"this assistant and add accounts later from the Edit menu."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "An error occurred"
-#. To translator: %s is the protocol name
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
-#, c-format
-msgid "New %s account"
-msgstr "New %s account"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "What kind of chat account do you have?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:473
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Do you have any other chat accounts you want to set up?"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "Enter your account details"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr "What kind of chat account do you want to create?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "Do you want to create other chat accounts?"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "Enter the details for the new account"
-#: ../src/empathy-account-assistant.c:660
+#: ../src/empathy-account-assistant.c:612
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2508,41 +2573,41 @@ msgstr ""
"programs. With a microphone or a webcam you can also have audio or video "
"calls."
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:629
msgid "Do you have an account you've been using with another chat program?"
msgstr "Do you have an account you've been using with another chat program?"
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "Yes, import my account details from "
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "Yes, I'll enter my account details now"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "No, I want a new account"
-#: ../src/empathy-account-assistant.c:753
+#: ../src/empathy-account-assistant.c:705
msgid "No, I just want to see people online nearby for now"
msgstr "No, I just want to see people online nearby for now"
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "Select the accounts you want to import:"
-#: ../src/empathy-account-assistant.c:858
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-account-assistant.c:810
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "Yes"
msgstr "Yes"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "No, that's all for now"
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1082
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2554,16 +2619,16 @@ msgstr ""
"details below are correct. You can easily change these details later or "
"disable this feature by using the 'Accounts' dialogue"
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1088
+#: ../src/empathy-account-assistant.c:1144
msgid "Edit->Accounts"
msgstr "Edit->Accounts"
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1104
msgid "I don't want to enable this feature for now"
msgstr "I don't want to enable this feature for now"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1140
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2575,66 +2640,66 @@ msgstr ""
"install the telepathy-salut package and create a People Nearby account from "
"the Accounts dialogue"
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut not installed"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Messaging and VoIP Accounts Assistant"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "Welcome to Empathy"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "Import your existing accounts"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgstr "Please enter personal details"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "There are unsaved modifications to your %s account."
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
msgstr "Your new account has not been saved yet."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "Connecting…"
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline — %s"
msgstr "Offline — %s"
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected — %s"
msgstr "Disconnected — %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline — No Network Connection"
msgstr "Offline — No Network Connection"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "Unknown Status"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline — Account Disabled"
msgstr "Offline — Account Disabled"
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:759
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2642,16 +2707,16 @@ msgstr ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Do you want to remove %s from your computer?"
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr "This will not remove your account on the server."
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1348
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2659,7 +2724,7 @@ msgstr ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:1951
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2695,11 +2760,11 @@ msgstr "_Add…"
msgid "_Import…"
msgstr "_Import…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr " - Empathy authentication client"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Empathy authentication client"
@@ -2707,94 +2772,94 @@ msgstr "Empathy authentication client"
msgid "People nearby"
msgstr "People nearby"
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy Audio/Video Client"
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
msgid "Empathy Audio/Video Client"
msgstr "Empathy Audio/Video Client"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Contrast"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Brightness"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "_Sidebar"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Audio input"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Video input"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Dialpad"
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1201
msgid "Details"
msgstr "Details"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1273
+#: ../src/empathy-call-window.c:1270
#, c-format
msgid "Call with %s"
msgstr "Call with %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1352
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "Call"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "The IP address as seen by the machine"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "The IP address as seen by a server on the Internet"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "The IP address of the peer as seen by the other side"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "The IP address of a relay server"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr "The IP address of the multicast group"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Connected — %d:%02dm"
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Technical Details"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2803,7 +2868,7 @@ msgstr ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
-#: ../src/empathy-call-window.c:2351
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2812,7 +2877,7 @@ msgstr ""
"%s's software does not understand any of the video formats supported by your "
"computer"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2821,23 +2886,23 @@ msgstr ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
-#: ../src/empathy-call-window.c:2363
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "There was a failure on the network"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"The audio formats necessary for this call are not installed on your computer"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"The video formats necessary for this call are not installed on your computer"
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2848,19 +2913,19 @@ msgstr ""
"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
"the Help menu."
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "There was a failure in the call engine"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "The end of the stream was reached"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "Can't establish audio stream"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "Can't establish video stream"
@@ -2956,39 +3021,39 @@ msgstr "Video Preview"
msgid "_Call"
msgstr "_Call"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "_View"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d unread)"
msgstr[1] "%s (%d unread)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (and %u other)"
msgstr[1] "%s (and %u others)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d unread from others)"
msgstr[1] "%s (%d unread from others)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d unread from all)"
msgstr[1] "%s (%d unread from all)"
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr "Typing a message."
@@ -3024,7 +3089,7 @@ msgstr "Move Tab _Right"
msgid "Notify for All Messages"
msgstr "Notify for All Messages"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "_Contents"
@@ -3036,7 +3101,7 @@ msgstr "_Conversation"
msgid "_Detach Tab"
msgstr "_Detach Tab"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
msgid "_Edit"
msgstr "_Edit"
@@ -3044,7 +3109,7 @@ msgstr "_Edit"
msgid "_Favorite Chat Room"
msgstr "_Favourite Chat Room"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "_Help"
@@ -3084,86 +3149,86 @@ msgstr "Auto-Connect"
msgid "Manage Favorite Rooms"
msgstr "Manage Favourite Rooms"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming video call"
msgstr "Incoming video call"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming call"
msgstr "Incoming call"
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s is video calling you. Do you want to answer?"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:477
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s is calling you. Do you want to answer?"
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming call from %s"
msgstr "Incoming call from %s"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:505
msgid "_Reject"
msgstr "_Reject"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511
msgid "_Answer"
msgstr "_Answer"
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming video call from %s"
msgstr "Incoming video call from %s"
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:702
msgid "Room invitation"
msgstr "Room invitation"
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "Invitation to join %s"
msgstr "Invitation to join %s"
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:711
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s is inviting you to join %s"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:719
msgid "_Decline"
msgstr "_Decline"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:724
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Join"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:751
#, c-format
msgid "%s invited you to join %s"
msgstr "%s invited you to join %s"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:757
#, c-format
msgid "You have been invited to join %s"
msgstr "You have been invited to join %s"
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:807
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Incoming file transfer from %s"
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1018
#, c-format
-msgid "Subscription requested by %s"
-msgstr "Subscription requested by %s"
+msgid "%s would like permission to see when you are available"
+msgstr "%s would like permission to see when you are available"
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1022
#, c-format
msgid ""
"\n"
@@ -3172,12 +3237,12 @@ msgstr ""
"\n"
"Message: %s"
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1066
#, c-format
msgid "%s is now offline."
msgstr "%s is now offline."
-#: ../src/empathy-event-manager.c:1072
+#: ../src/empathy-event-manager.c:1087
#, c-format
msgid "%s is now online."
msgstr "%s is now online."
@@ -3306,43 +3371,43 @@ msgid "Import Accounts"
msgstr "Import Accounts"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "Import"
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "Protocol"
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "Source"
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:385
msgid "No match found"
msgstr "No match found"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:540
msgid "Reconnect"
msgstr "Reconnect"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:546
msgid "Edit Account"
msgstr "Edit Account"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:552
msgid "Close"
msgstr "Close"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1258
msgid "Contact"
msgstr "Contact"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1585
msgid "Contact List"
msgstr "Contact List"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1695
msgid "Show and edit accounts"
msgstr "Show and edit accounts"
@@ -3355,88 +3420,92 @@ msgid "Context"
msgstr "Context"
#: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "Find in Contact _List"
+
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "Join _Favourites"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "Manage Favourites"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "N_ormal Size"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "New _Call…"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Normal Size With _Avatars"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "P_references"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "Show P_rotocols"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Sort by _Name"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Sort by _Status"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Accounts"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "_Compact Size"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "_Debug"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "_File Transfers"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
msgstr "_Join…"
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_New Conversation…"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "_Offline Contacts"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "_Personal Information"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "_Room"
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
msgid "Chat Room"
msgstr "Chat Room"
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
msgid "Members"
msgstr "Members"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:634
#, c-format
msgid ""
"%s\n"
@@ -3449,16 +3518,16 @@ msgstr ""
"Password required: %s\n"
"Members: %s"
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "No"
msgstr "No"
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
msgid "Could not start room listing"
msgstr "Could not start room listing"
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
msgid "Could not stop room listing"
msgstr "Could not stop room listing"
@@ -3492,39 +3561,39 @@ msgstr "Room List"
msgid "_Room:"
msgstr "_Room:"
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
msgid "Message received"
msgstr "Message received"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
msgstr "Message sent"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr "New conversation"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr "Contact goes online"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr "Contact goes offline"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr "Account connected"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr "Account disconnected"
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "Language"
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
msgid "Preferences"
msgstr "Preferences"
@@ -3667,26 +3736,6 @@ msgstr "_Publish location to my contacts"
msgid "_Reduce location accuracy"
msgstr "_Reduce location accuracy"
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "Respond"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "Reject"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "Answer"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "Decline"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "Accept"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Status"
@@ -3776,35 +3825,83 @@ msgstr "Choose a contact to invite into the conversation:"
msgid "Invite"
msgstr "Invite"
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Don't display any dialogues; do any work (eg, importing) and exit"
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "Don't display any dialogues if there are any non-Salut accounts"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Don't display any dialogues unless there are only \"People Nearby\" accounts"
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Empathy Accounts"
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Empathy Accounts"
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Empathy Debugger"
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy Chat Client"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Respond"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Reject"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Answer"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Decline"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Accept"
+
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy has asked about importing accounts"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "The hash of the received file and the sent one do not match"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "Add _New Preset"
+
+#~ msgid "Saved Presets"
+#~ msgstr "Saved Presets"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "Subscription requested by %s"
+
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "Use _Yahoo! Japan"
@@ -4194,9 +4291,6 @@ msgstr "Empathy Debugger"
#~ msgid "unknown size"
#~ msgstr "unknown size"
-#~ msgid "%s would like to send you a file"
-#~ msgstr "%s would like to send you a file"
-
#~ msgid "Do you want to accept the file \"%s\" (%s)?"
#~ msgstr "Do you want to accept the file \"%s\" (%s)?"
@@ -4520,12 +4614,6 @@ msgstr "Empathy Debugger"
#~ msgid "Clear List"
#~ msgstr "Clear List"
-#~ msgid "Enter status message:"
-#~ msgstr "Enter status message:"
-
-#~ msgid "Status Message Presets"
-#~ msgstr "Status Message Presets"
-
#~ msgid "_Add to status message list"
#~ msgstr "_Add to status message list"
diff --git a/po/es.po b/po/es.po
index 7e0908f6e..c7ae7bf60 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,8 +9,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: 2010-11-18 14:22+0000\n"
-"PO-Revision-Date: 2010-11-18 17:01+0100\n"
+"POT-Creation-Date: 2010-12-07 13:44+0000\n"
+"PO-Revision-Date: 2010-12-08 17:56+0100\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -554,9 +554,9 @@ msgstr "Invisible"
msgid "Offline"
msgstr "Desconectado"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Desconocido"
@@ -742,60 +742,60 @@ msgstr "en el futuro"
msgid "All"
msgstr "Todo"
-#: ../libempathy-gtk/empathy-account-widget.c:637
+#: ../libempathy-gtk/empathy-account-widget.c:670
#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Cuenta"
-#: ../libempathy-gtk/empathy-account-widget.c:638
+#: ../libempathy-gtk/empathy-account-widget.c:671
msgid "Password"
msgstr "Contraseña"
-#: ../libempathy-gtk/empathy-account-widget.c:639
+#: ../libempathy-gtk/empathy-account-widget.c:672
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:640
+#: ../libempathy-gtk/empathy-account-widget.c:673
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Puerto"
-#: ../libempathy-gtk/empathy-account-widget.c:712
-#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1094
+#: ../libempathy-gtk/empathy-account-widget.c:1127
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "La vuenta %s se edita a través de My Web Accounts."
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1133
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "No se puede editar la cuenta %s en Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1120
+#: ../libempathy-gtk/empathy-account-widget.c:1153
msgid "Launch My Web Accounts"
msgstr "Lanzar My Web Accounts"
-#: ../libempathy-gtk/empathy-account-widget.c:1418
+#: ../libempathy-gtk/empathy-account-widget.c:1465
msgid "Username:"
msgstr "Nombre de usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1753
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "A_pply"
msgstr "_Aplicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1783
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "L_og in"
msgstr "Iniciar _sesión"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -804,19 +804,19 @@ msgstr "Iniciar _sesión"
msgid "Account:"
msgstr "Cuenta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1860
+#: ../libempathy-gtk/empathy-account-widget.c:1913
msgid "_Enabled"
msgstr "_Activada"
-#: ../libempathy-gtk/empathy-account-widget.c:1925
+#: ../libempathy-gtk/empathy-account-widget.c:1978
msgid "This account already exists on the server"
msgstr "Esta cuenta ya existe en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1928
+#: ../libempathy-gtk/empathy-account-widget.c:1981
msgid "Create a new account on the server"
msgstr "Crear una cuenta nueva en el servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:2042
+#: ../libempathy-gtk/empathy-account-widget.c:2095
msgid "Ca_ncel"
msgstr "Ca_ncelar"
@@ -825,19 +825,19 @@ msgstr "Ca_ncelar"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2334
+#: ../libempathy-gtk/empathy-account-widget.c:2392
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s en %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2360
+#: ../libempathy-gtk/empathy-account-widget.c:2418
#, c-format
msgid "%s Account"
msgstr "Cuenta %s"
-#: ../libempathy-gtk/empathy-account-widget.c:2364
+#: ../libempathy-gtk/empathy-account-widget.c:2422
msgid "New account"
msgstr "Cuenta nueva"
@@ -1216,28 +1216,28 @@ msgstr "I_D de Yahoo!:"
msgid "_Room List locale:"
msgstr "Configuración de la lista de _salas:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "No se pudo convertir la imagen"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "Su sistema no soporta ninguno de los formatos de imagen aceptados"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Seleccione su imagen de avatar"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "Sin imagen"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Imágenes"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "Todos los archivos"
@@ -1245,51 +1245,51 @@ msgstr "Todos los archivos"
msgid "Click to enlarge"
msgstr "Pulse para agrandar"
-#: ../libempathy-gtk/empathy-chat.c:643
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Falló al abrir el chat privado"
-#: ../libempathy-gtk/empathy-chat.c:683
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "El tema no está soportado en esta conversación"
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "No le está permitido cambiar el tema"
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: limpiar todos los mensajes de la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tema>: establecer el tema para la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <id de sala de chat>: unirse a una sala de chat nueva"
-#: ../libempathy-gtk/empathy-chat.c:832
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <id de sala de chat>: unirse a una sala de chat nueva"
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <apodo>: cambiar su apodo en el servidor actual"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <mensaje>: enviar un mensaje de ACCIÓN a la conversación actual"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:851
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1299,7 +1299,7 @@ msgstr ""
"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa "
"para unirse a una sala de chat nueva»"
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1307,98 +1307,98 @@ msgstr ""
"/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
"definido, muestra su uso."
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Comando desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "contacto no válido"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "permiso denegado"
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "mensaje demasiado largo"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "no implementado"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error al enviar el mensaje «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1234 ../src/empathy-chat-window.c:703
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "Tema:"
-#: ../libempathy-gtk/empathy-chat.c:1246
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "El tema se ha establecido a: %s"
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "No se ha definido el tema"
-#: ../libempathy-gtk/empathy-chat.c:1747
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(Sin sugerencias)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Añadir «%s» al diccionario"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1852
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Añadir «%s» al diccionario de «%s»"
-#: ../libempathy-gtk/empathy-chat.c:1911
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Insertar emoticono"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1929
-#: ../libempathy-gtk/empathy-ui-utils.c:1806
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
msgid "_Send"
msgstr "E_nviar"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "_Sugerencias ortográficas"
-#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Falló al recibir los registros recientes"
-#: ../libempathy-gtk/empathy-chat.c:2158
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s se ha desconectado"
@@ -1406,12 +1406,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:2165
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s expulsó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2168
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s fue expulsado"
@@ -1419,17 +1419,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:2176
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s vetó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s fue vetado"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s ha dejado la sala"
@@ -1439,78 +1439,78 @@ msgstr "%s ha dejado la sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2217
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s ha entrado en la sala"
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "Ahora %s se llama %s"
-#: ../libempathy-gtk/empathy-chat.c:2381 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "Contraseña incorrecta; inténtelo de nuevo:"
-#: ../libempathy-gtk/empathy-chat.c:2995
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Volver a intentarlo"
-#: ../libempathy-gtk/empathy-chat.c:3000
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "Esta sala está protegida por contraseña:"
-#: ../libempathy-gtk/empathy-chat.c:3001
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3141
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3194
+#: ../libempathy-gtk/empathy-chat.c:3216
#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Conversación"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:319
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Copiar la dirección del enlace"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:326
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Abrir enlace"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:419
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Editar información del contacto"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Información personal"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:424
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "Contacto nuevo"
@@ -1531,34 +1531,34 @@ msgstr "Sin grupo"
msgid "Favorite People"
msgstr "Gente favorita"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "¿Realmente quiere quitar el grupo «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2268
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
msgid "Removing group"
msgstr "Quitando grupo"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2322
-#: ../libempathy-gtk/empathy-individual-view.c:2436
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Quitar"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2353
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "¿Realmente quiere quitar el contacto «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
msgid "Removing contact"
msgstr "Quitando el contacto"
@@ -1620,7 +1620,7 @@ msgstr "_Editar"
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:915
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr "Invitándolo a esta sala"
@@ -1873,7 +1873,7 @@ msgid "Select"
msgstr "Seleccionar"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1276
msgid "Group"
msgstr "Grupo"
@@ -2059,6 +2059,20 @@ msgstr "_Llamar"
msgid "New Call"
msgstr "Llamada nueva"
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Introduzca su contraseña para la cuenta\n"
+"<b>%s</b>"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr "Recordar contraseña"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
@@ -2117,43 +2131,43 @@ msgstr "Coincidir con capitalización"
msgid "Phrase not found"
msgstr "No se encontró la frase"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Mensaje instantáneo recibido"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Enviar un mensaje instantáneo"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Solicitud de chat entrante"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Contacto conectado"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Contacto desconectado"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Conectado con el servidor"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Desconectado del servidor"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Llamada de voz entrante"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Llamada de voz saliente"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Finalizó la llamada de voz"
@@ -2263,15 +2277,15 @@ msgstr "Recordar esta opción para futuras conexiones"
msgid "Certificate Details"
msgstr "Detalles del certificado"
-#: ../libempathy-gtk/empathy-ui-utils.c:1703
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
msgid "Unable to open URI"
msgstr "No se pudo abrir el URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1798
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "Select a file"
msgstr "Seleccionar un archivo"
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
#, c-format
msgid "Incoming file from %s"
msgstr "Archivo entrante de %s"
@@ -2459,23 +2473,23 @@ msgstr "Sin mensaje de eeror"
msgid "Instant Message (Empathy)"
msgstr "Mensaje instantáneo (Empathy)"
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "No conectarse automáticamente al inicio"
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "No mostrar la lista de contactos o cualquier otro diálogo al inicio"
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Cliente de mensajería instantánea Empathy"
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Error al contactar con el Gestor de cuentas"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2703,7 +2717,7 @@ msgstr "Existen modificaciones sin guardar en su cuenta %s."
msgid "Your new account has not been saved yet."
msgstr "Aún no se ha guardado su cuenta nueva."
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "Conectando…"
@@ -2790,11 +2804,11 @@ msgstr "_Añadir…"
msgid "_Import…"
msgstr "_Importar…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr ": Cliente de autenticación de Empathy"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Cliente de autenticación de Empathy"
@@ -2810,86 +2824,86 @@ msgstr ": Cliente de sonido/vídeo Empathy"
msgid "Empathy Audio/Video Client"
msgstr "Cliente de sonido/vídeo Empathy"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Contraste"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Brillo"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Volumen"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "Barra _lateral"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Entrada de voz"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Teclado de llamada"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
msgid "Details"
msgstr "Detalles"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1266
+#: ../src/empathy-call-window.c:1270
#, c-format
msgid "Call with %s"
msgstr "Llamada con %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "Llamar"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "La dirección IP como la ve la máquina"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "La dirección IP como la ve el servidor de Internet"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "La dirección IP del par como la ve la otra parte"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "La dirección IP de un servidor de desvío"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr "La dirección IP del grupo multicast"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2898,7 +2912,7 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2907,7 +2921,7 @@ msgstr ""
"El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
"por su equipo"
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2916,25 +2930,25 @@ msgstr ""
"No se puede establecer una conexión con %s. Uno de los dos puede estar en "
"una red que no acepta conexiones directas."
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "Hubo un fallo en la red"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"No están instalados en su equipo los formatos de sonido necesarios para esta "
"llamada"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"No están instalados en su equipo los formatos de vídeo necesarios para esta "
"llamada"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2945,19 +2959,19 @@ msgstr ""
"\">Informe de este error</a> y añada los registros obtenidos de la ventana "
"de «Depuración» en el menú de Ayuda."
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "Hubo un fallo en el motor de llamadas"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "Se llegó al final del flujo"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "No se puede establecer el flujo de voz"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "No se puede establecer el flujo de vídeo"
@@ -3057,35 +3071,35 @@ msgstr "_Llamar"
msgid "_View"
msgstr "_Ver"
-#: ../src/empathy-chat-window.c:468 ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d sin leer)"
msgstr[1] "%s (%d sin leer)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (y otra)"
msgstr[1] "%s (y otras %u)"
-#: ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d sin leer de otros)"
msgstr[1] "%s (%d sin leer de otros)"
-#: ../src/empathy-chat-window.c:505
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d sin leer de todos)"
msgstr[1] "%s (%d sin leer de todos)"
-#: ../src/empathy-chat-window.c:707
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr "Tecleando un mensaje."
@@ -3181,86 +3195,86 @@ msgstr "Autoconectar"
msgid "Manage Favorite Rooms"
msgstr "Gestionar salas favoritas"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:472
msgid "Incoming video call"
msgstr "Llamada de vídeo entrante"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:472
msgid "Incoming call"
msgstr "Llamada entrante"
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s le está llamando con vídeo. ¿Quiere responder?"
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:477
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s le está llamando. ¿Quiere responder?"
-#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming call from %s"
msgstr "Llamada entrante de %s"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:505
msgid "_Reject"
msgstr "_Rechazar"
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:511
msgid "_Answer"
msgstr "Re_spuesta"
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming video call from %s"
msgstr "Llamada de vídeo entrante de %s"
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:702
msgid "Room invitation"
msgstr "Invitación a una sala"
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "Invitation to join %s"
msgstr "Invitación para unirse a %s"
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:711
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s le está invitando a unirse a %s"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:719
msgid "_Decline"
msgstr "_Rechazar"
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:724
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Unirse"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:751
#, c-format
msgid "%s invited you to join %s"
msgstr "%s le ha invitado a unirse a %s"
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:757
#, c-format
msgid "You have been invited to join %s"
msgstr "Le han invitado a unirse a %s"
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:807
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Transferencia de archivo entrante de %s"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1018
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s quiere permiso para ver cuándo está disponible"
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1022
#, c-format
msgid ""
"\n"
@@ -3269,12 +3283,12 @@ msgstr ""
"\n"
"Mensaje: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1066
#, c-format
msgid "%s is now offline."
msgstr "Ahora %s está desconectado."
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1087
#, c-format
msgid "%s is now online."
msgstr "Ahora %s está conectado."
@@ -3417,31 +3431,31 @@ msgstr "Protocolo"
msgid "Source"
msgstr "Origen"
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:385
msgid "No match found"
msgstr "No se encontró ninguna coincidencia"
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:540
msgid "Reconnect"
msgstr "Reconectar"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:546
msgid "Edit Account"
msgstr "Editar cuenta"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:552
msgid "Close"
msgstr "Cerrar"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1258
msgid "Contact"
msgstr "Contacto"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1585
msgid "Contact List"
msgstr "Lista de contactos"
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1695
msgid "Show and edit accounts"
msgstr "Mostrar y editar cuentas"
@@ -3771,26 +3785,6 @@ msgstr "_Publicar mi ubicación a mis contactos"
msgid "_Reduce location accuracy"
msgstr "_Reducir la precisión de la ubicación"
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr "Respuesta"
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "Rechazar"
-
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "Responder"
-
-#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "Rechazar"
-
-#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "Aceptar"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Estado"
@@ -3912,10 +3906,32 @@ msgstr "Cuentas en Empathy"
msgid "Empathy Debugger"
msgstr "Depurador de Empathy"
-#: ../src/empathy-chat.c:91
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr ": Cliente de chat Empathy"
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Respuesta"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Rechazar"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Responder"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Rechazar"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Aceptar"
+
#~ msgid "Add _New Preset"
#~ msgstr "Añadir esta_do guardado"
diff --git a/po/gl.po b/po/gl.po
index 9adc17af9..1a7ca70ba 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-20 01:43+0100\n"
-"PO-Revision-Date: 2010-11-20 01:44+0100\n"
+"POT-Creation-Date: 2010-12-10 18:03+0100\n"
+"PO-Revision-Date: 2010-12-10 18:10+0100\n"
"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
"Language-Team: Galician <gnome-gl-list@gnome.org>\n"
"Language: gl\n"
@@ -526,7 +526,7 @@ msgstr ""
# rever
#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show the contact list in chat rooms."
-msgstr "Indica se mostrar ou non a lista de contactos nas salas de chat."
+msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa."
# rever
#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
@@ -643,9 +643,9 @@ msgstr "Invisíbel"
msgid "Offline"
msgstr "Desconectado"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Descoñecido"
@@ -768,7 +768,7 @@ msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
"O certificado usa un algoritmo de cifrado inseguro ou cripotograficamente "
-"débil."
+"débil"
#: ../libempathy/empathy-utils.c:380
msgid ""
@@ -848,61 +848,61 @@ msgstr "no futuro"
msgid "All"
msgstr "Todas"
-#: ../libempathy-gtk/empathy-account-widget.c:637
+#: ../libempathy-gtk/empathy-account-widget.c:670
#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Conta"
-#: ../libempathy-gtk/empathy-account-widget.c:638
+#: ../libempathy-gtk/empathy-account-widget.c:671
msgid "Password"
msgstr "Contrasinal"
-#: ../libempathy-gtk/empathy-account-widget.c:639
+#: ../libempathy-gtk/empathy-account-widget.c:672
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:640
+#: ../libempathy-gtk/empathy-account-widget.c:673
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Porto"
-#: ../libempathy-gtk/empathy-account-widget.c:712
-#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1094
+#: ../libempathy-gtk/empathy-account-widget.c:1127
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "A conta %s edítase mediante My Web Accounts."
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1133
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Non é posíbel editar a conta %s en Empathy."
# rever
-#: ../libempathy-gtk/empathy-account-widget.c:1120
+#: ../libempathy-gtk/empathy-account-widget.c:1153
msgid "Launch My Web Accounts"
msgstr "Iniciar My Web Accounts"
-#: ../libempathy-gtk/empathy-account-widget.c:1418
+#: ../libempathy-gtk/empathy-account-widget.c:1465
msgid "Username:"
msgstr "Nome de _usuario:"
-#: ../libempathy-gtk/empathy-account-widget.c:1753
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "A_pply"
msgstr "A_plicar"
-#: ../libempathy-gtk/empathy-account-widget.c:1783
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "L_og in"
msgstr "Iniciar sesi_ón"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -911,19 +911,19 @@ msgstr "Iniciar sesi_ón"
msgid "Account:"
msgstr "Conta:"
-#: ../libempathy-gtk/empathy-account-widget.c:1860
+#: ../libempathy-gtk/empathy-account-widget.c:1913
msgid "_Enabled"
msgstr "_Activado"
-#: ../libempathy-gtk/empathy-account-widget.c:1925
+#: ../libempathy-gtk/empathy-account-widget.c:1978
msgid "This account already exists on the server"
msgstr "Esta conta xa existe no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:1928
+#: ../libempathy-gtk/empathy-account-widget.c:1981
msgid "Create a new account on the server"
msgstr "Crear unha nova conta no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:2042
+#: ../libempathy-gtk/empathy-account-widget.c:2095
msgid "Ca_ncel"
msgstr "Ca_ncelar"
@@ -933,20 +933,20 @@ msgstr "Ca_ncelar"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2334
+#: ../libempathy-gtk/empathy-account-widget.c:2392
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s sobre %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2360
+#: ../libempathy-gtk/empathy-account-widget.c:2418
#, c-format
msgid "%s Account"
msgstr "Conta %s"
# rever
-#: ../libempathy-gtk/empathy-account-widget.c:2364
+#: ../libempathy-gtk/empathy-account-widget.c:2422
msgid "New account"
msgstr "Conta nova"
@@ -1322,11 +1322,11 @@ msgstr "I_gnorar os convites para conferencias e salas de conversa"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
-msgstr "Cal é o seu ID para Yahoo!?"
+msgstr "Cal é o seu ID para Yahoo?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
-msgstr "Cal é o seu contrasinal para Yahoo!?"
+msgstr "Cal é o seu contrasinal para Yahoo?"
# rever
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
@@ -1339,30 +1339,30 @@ msgid "_Room List locale:"
msgstr "Configuración da lista de _salas:"
# rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "Non foi posíbel converter a imaxe"
# rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "Ningún dos formatos aceptados de imaxe é compatíbel co seu sistema"
# rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Seleccione a súa imaxe de avatar"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "Sen imaxe"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Imaxes"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "Todos os ficheiros"
@@ -1371,51 +1371,51 @@ msgstr "Todos os ficheiros"
msgid "Click to enlarge"
msgstr "Prema para ampliar"
-#: ../libempathy-gtk/empathy-chat.c:643
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Produciuse un fallo ao abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:683
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "Ese asunto non se admite nesta conversación"
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "Non se lle permite cambiar o asunto"
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear, limpa todas as mensaxes da conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>, estabelece o asunto da conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
-#: ../libempathy-gtk/empathy-chat.c:832
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact id> [<message>], abre unha conversa privada"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact id> <message>, abre unha conversa privada"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:851
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1425,7 +1425,7 @@ msgstr ""
"unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
"unirse a unha nova sala de conversa\""
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1433,103 +1433,103 @@ msgstr ""
"/help [<command>], mostra todas as ordes admitidas. Se <command> está "
"definida, mostra o seu uso."
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Orde descoñecida"
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "contacto incorrecto"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "permiso denegado"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "a mensaxe é demasiado longa"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "non implementado"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "descoñecido"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1234 ../src/empathy-chat-window.c:703
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "Asunto:"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1246
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "Cambiouse o asunto a: %s"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "Non se definiu un asunto"
-#: ../libempathy-gtk/empathy-chat.c:1747
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(Sen suxestións)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Engadir «%s» ao dicionario"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1852
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Engadir «%s» ao dicionario de %s"
-#: ../libempathy-gtk/empathy-chat.c:1911
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Inserir unha emoticona"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1929
-#: ../libempathy-gtk/empathy-ui-utils.c:1806
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
msgid "_Send"
msgstr "_Enviar"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "Suxestións de _ortografía"
-#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Produciuse un fallo ao obter os rexistros recentes"
# rever
-#: ../libempathy-gtk/empathy-chat.c:2158
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s desconectou"
@@ -1537,12 +1537,12 @@ msgstr "%s desconectou"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2165
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s foi expulsado por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2168
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s foi expulsado"
@@ -1550,17 +1550,17 @@ msgstr "%s foi expulsado"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s foi vetado por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s foi excluído"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s deixou a sala"
@@ -1570,79 +1570,79 @@ msgstr "%s deixou a sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
# rever
-#: ../libempathy-gtk/empathy-chat.c:2217
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s uniuse á sala"
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s agora é coñecido como %s"
-#: ../libempathy-gtk/empathy-chat.c:2381 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "O contrasinal é incorrecto, ténteo de novo:"
-#: ../libempathy-gtk/empathy-chat.c:2995
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Reintentar"
-#: ../libempathy-gtk/empathy-chat.c:3000
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "Esta sala está protexida por un contrasinal:"
-#: ../libempathy-gtk/empathy-chat.c:3001
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3141
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3194
+#: ../libempathy-gtk/empathy-chat.c:3216
#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Conversa"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:319
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Copiar o enderezo da ligazón"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:326
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Abrir a ligazón"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:419
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A, %d de %B de %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Editar a información de contacto"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Información persoal"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:424
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "Contacto novo"
@@ -1667,36 +1667,36 @@ msgid "Favorite People"
msgstr "Persoas favoritas"
# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Está seguro de que quere eliminar o grupo '%s'?"
# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2268
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
msgid "Removing group"
msgstr "Eliminando o grupo"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2322
-#: ../libempathy-gtk/empathy-individual-view.c:2436
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Eliminar"
# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2353
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Está seguro de quere eliminar o contacto '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
msgid "Removing contact"
msgstr "Eliminando o contacto"
@@ -1704,7 +1704,7 @@ msgstr "Eliminando o contacto"
#: ../libempathy-gtk/empathy-contact-menu.c:203
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
-msgstr "Eng_adir un contacto..."
+msgstr "Eng_adir un contacto…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
#: ../libempathy-gtk/empathy-individual-menu.c:516
@@ -1762,7 +1762,7 @@ msgstr "_Editar"
# rever
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:915
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr "Invítao a vostede a esta sala"
@@ -1990,7 +1990,7 @@ msgstr "Identificador:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
-msgstr "Información solicitada..."
+msgstr "Información solicitada…"
# rever
#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
@@ -2023,7 +2023,7 @@ msgid "Select"
msgstr "Seleccionar"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1276
msgid "Group"
msgstr "Grupo"
@@ -2031,7 +2031,7 @@ msgstr "Grupo"
#. Translators: the heading at the top of the Information dialogue
#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
-msgstr "contactos ligados"
+msgstr "Contactos ligados"
# rever
#: ../libempathy-gtk/empathy-individual-linker.c:354
@@ -2065,7 +2065,7 @@ msgstr "_Editar"
#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
-msgstr "_Ligar contactos..."
+msgstr "_Ligar contactos…"
#: ../libempathy-gtk/empathy-individual-widget.c:1649
#, c-format
@@ -2115,7 +2115,7 @@ msgstr "Ligar contactos"
#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
-msgstr "_Desligar..."
+msgstr "_Desligar…"
#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
@@ -2215,6 +2215,20 @@ msgstr "Ch_amar"
msgid "New Call"
msgstr "Nova chamada"
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Escriba o contrasinal para a conta\n"
+"<b>%s</b>"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr "Lembrar o contrasinal"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
@@ -2224,12 +2238,12 @@ msgstr "Nova chamada"
#: ../libempathy-gtk/empathy-presence-chooser.c:170
#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
-msgstr "Mensaxe personalizada..."
+msgstr "Mensaxe personalizada…"
#: ../libempathy-gtk/empathy-presence-chooser.c:223
#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
-msgstr "Editar mensaxes personalizadas..."
+msgstr "Editar mensaxes personalizadas…"
#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
@@ -2250,7 +2264,7 @@ msgstr "Estabeleza a súa presenza e estado actual"
#. Custom messages
#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
-msgstr "Mensaxes personalizadas..."
+msgstr "Mensaxes personalizadas…"
# rever
#. Create account
@@ -2275,51 +2289,51 @@ msgid "Phrase not found"
msgstr "Frase non encontrada"
# rever
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Recibir unha mensaxe instantánea"
# rever
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Enviar unha mensaxe instantánea"
# rever
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Solicitude de conversa entrante"
# rever
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Contacto conectado"
# rever
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Contacto desconectado"
# rever
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Conectado co servidor"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Desconectado do servidor"
# rever
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Chamada de voz entrante"
# rever
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Chamada de voz saínte"
# rever
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Chamada de voz finalizada"
@@ -2435,15 +2449,15 @@ msgstr "Lembrar esta elección para futuras conexións"
msgid "Certificate Details"
msgstr "Detalles do certificado"
-#: ../libempathy-gtk/empathy-ui-utils.c:1703
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
msgid "Unable to open URI"
msgstr "Non foi posíbel abrir o URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1798
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "Select a file"
msgstr "Seleccione un ficheiro"
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
#, c-format
msgid "Incoming file from %s"
msgstr "Ficheiro entrante de %s"
@@ -2634,25 +2648,25 @@ msgid "Instant Message (Empathy)"
msgstr "Mensaxe instantáneo (Empathy)"
# rever
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Non conectarse ao inicio"
# rever
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
# rever
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
-msgstr "- Cliente de mensaxaría instantánea Empathy"
+msgstr " - Cliente de mensaxaría instantánea Empathy"
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Produciuse un erro ao contactar co Xestor de contas"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2892,9 +2906,9 @@ msgstr "Hai modificacións sen gardar respecto da súa conta %s."
msgid "Your new account has not been saved yet."
msgstr "A súa nova conta aínda non foi gardada."
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
-msgstr "Conectando..."
+msgstr "Conectando…"
#: ../src/empathy-accounts-dialog.c:321
#, c-format
@@ -2980,18 +2994,18 @@ msgstr ""
# rever
#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
-msgstr "Eng_adir..."
+msgstr "Eng_adir…"
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
-msgstr "_Importar..."
+msgstr "_Importar…"
# rever
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr "- Cliente de autenticación Empathy"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Cliente de autenticación Empathy"
@@ -3009,91 +3023,91 @@ msgstr "- Cliente de son/vídeo Empathy"
msgid "Empathy Audio/Video Client"
msgstr "Cliente de son/vídeo Empathy"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Contraste"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Brillo"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Volume"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "Barra _lateral"
# rever
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Entrada de audio"
# rever
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Entrada de vídeo"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Marcador"
# rever
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
msgid "Details"
msgstr "Detalles do contacto"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1266
+#: ../src/empathy-call-window.c:1270
#, c-format
msgid "Call with %s"
msgstr "Chamar con %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "Chamar"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "O enderezo IP como é visto polo computador"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "O enderezo IP como é visto por un servidor na Internet"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "O enderezo IP do par como é visto pola outra parte"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "O enderezo IP dun servidor de desvío"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr "O enderezo IP do grupo multicast"
# rever
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Conectado — %d:%02dm"
# rever
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Detalles técnicos"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3102,7 +3116,7 @@ msgstr ""
"O software de %s non entende algúns dos formatos de video admitidos polo seu "
"computador"
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3111,7 +3125,7 @@ msgstr ""
"O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
"computador"
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3120,21 +3134,21 @@ msgstr ""
"Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
"que non permite conexións directas."
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "Produciuse un fallo na rede"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "Non ten instalados os formatos de audio necesarios neste computador"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3145,19 +3159,19 @@ msgstr ""
"href=«%s»>Informe de este erro</a> e anexe os rexistros que pode ollar na "
"xanela «Depurar» no menú Axuda."
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "Produciuse un fallo ao chamar ao motor"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "Chegouse ao final do fluxo"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "Non é posíbel estabelecer un fluxo de audio"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "Non é posíbel estabelecer un fluxo de vídeo"
@@ -3261,28 +3275,28 @@ msgstr "_Chamar"
msgid "_View"
msgstr "_Ver"
-#: ../src/empathy-chat-window.c:468 ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d non lido)"
msgstr[1] "%s (%d non lidos)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (e outro %u)"
msgstr[1] "%s (e outros %u)"
-#: ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d non lido de outros)"
msgstr[1] "%s (%d non lidos de outros)"
-#: ../src/empathy-chat-window.c:505
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -3290,7 +3304,7 @@ msgstr[0] "%s (%d non lido de todos)"
msgstr[1] "%s (%d non lidos de todos)"
# rever
-#: ../src/empathy-chat-window.c:707
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr "Escribindo unha mensaxe."
@@ -3312,7 +3326,7 @@ msgstr "Inse_rir unha emoticona"
#: ../src/empathy-chat-window.ui.h:5
msgid "Invite _Participant…"
-msgstr "Invitar _participante..."
+msgstr "Invitar _participante…"
#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
@@ -3393,96 +3407,96 @@ msgid "Manage Favorite Rooms"
msgstr "Xestionar as salas preferidas"
# rever
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:472
msgid "Incoming video call"
msgstr "Chamada de vídeo entrante"
# rever
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:472
msgid "Incoming call"
msgstr "Chamada entrante"
# rever
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s solicítalle unha videochamada. Desexa responderlle?"
# rever
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:477
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s estao chamando. Quérelle responder?"
-#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming call from %s"
msgstr "Chamada entrante de %s"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:505
msgid "_Reject"
msgstr "_Rexeitar"
# rever
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:511
msgid "_Answer"
msgstr "_Responder"
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming video call from %s"
msgstr "Videochamada entrante de %s"
# rever
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:702
msgid "Room invitation"
msgstr "Convite para unha sala"
# rever
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "Invitation to join %s"
msgstr "Invitación a unirse a %s"
# rever
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:711
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s estao convidando a unirse a %s"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:719
msgid "_Decline"
msgstr "_Declinar"
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:724
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Unirse"
# rever
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:751
#, c-format
msgid "%s invited you to join %s"
msgstr "%s convidouno a unirse a %s"
# rever
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:757
#, c-format
msgid "You have been invited to join %s"
msgstr "Vostede foi convidado a unirse a %s"
# rever
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:807
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Transferencia de ficheiro entrante de %s"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1018
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s solicita permiso para ver cando está dispoñíbel"
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1022
#, c-format
msgid ""
"\n"
@@ -3491,12 +3505,12 @@ msgstr ""
"\n"
"Mensaxe: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1066
#, c-format
msgid "%s is now offline."
msgstr "%s está agora desconectado."
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1087
#, c-format
msgid "%s is now online."
msgstr "%s está agora conectado."
@@ -3653,32 +3667,32 @@ msgid "Source"
msgstr "Orixe"
# rever
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:385
msgid "No match found"
msgstr "Non se encontrou ningunha coincidencia."
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:540
msgid "Reconnect"
msgstr "Reconectar"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:546
msgid "Edit Account"
msgstr "Editar a conta"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:552
msgid "Close"
msgstr "Pechar"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1258
msgid "Contact"
msgstr "Contacto"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1585
msgid "Contact List"
msgstr "Lista de contactos"
# rever
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1695
msgid "Show and edit accounts"
msgstr "Mostrar e editar contas"
@@ -3709,7 +3723,7 @@ msgstr "Tamañ_o normal"
#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
-msgstr "Nova _chamada..."
+msgstr "Nova _chamada…"
#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
@@ -3751,11 +3765,11 @@ msgstr "Trans_ferencias de ficheiros"
#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
-msgstr "_Unirse..."
+msgstr "_Unirse…"
#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
-msgstr "_Nova conversa..."
+msgstr "_Nova conversa…"
# rever
#: ../src/empathy-main-window.ui.h:24
@@ -4036,27 +4050,6 @@ msgstr "_Publicar a miña localización aos meus contactos"
msgid "_Reduce location accuracy"
msgstr "_Reducir a precisión de localización"
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr "Responder"
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "Rexeitar"
-
-# rever
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "Responder"
-
-#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "Declinar"
-
-#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "Aceptar"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Estado"
@@ -4181,10 +4174,33 @@ msgid "Empathy Debugger"
msgstr "Depurador de Empathy"
# rever
-#: ../src/empathy-chat.c:91
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr "- Cliente de conversa Empathy"
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Responder"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Rexeitar"
+
+# rever
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Responder"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Declinar"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Aceptar"
+
#~ msgid "The hash of the received file and the sent one do not match"
#~ msgstr "O hash do ficheiro recibido e o do enviado non coinciden"
diff --git a/po/he.po b/po/he.po
index a006bbc39..0d6d07285 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-07 15:36+0200\n"
-"PO-Revision-Date: 2010-12-07 15:37+0200\n"
+"POT-Creation-Date: 2010-12-13 23:44+0200\n"
+"PO-Revision-Date: 2010-12-13 23:46+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -753,7 +753,7 @@ msgstr "_כניסה"
#. Account and Identifier
#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
+#: ../libempathy-gtk/empathy-individual-widget.c:1486
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1340,7 +1340,7 @@ msgstr "הכנס סמיילי"
#. send button
#: ../libempathy-gtk/empathy-chat.c:1932
-#: ../libempathy-gtk/empathy-ui-utils.c:1809
+#: ../libempathy-gtk/empathy-ui-utils.c:1811
msgid "_Send"
msgstr "_שלח"
@@ -1456,16 +1456,16 @@ msgstr "_פתיחת קישור"
msgid "%A %B %d %Y"
msgstr "%A %d ב%B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "עריכת מידע איש קשר"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "מידע אישי"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:424
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "איש קשר חדש"
@@ -1501,19 +1501,19 @@ msgstr "הקבוצה מוסרת"
#: ../libempathy-gtk/empathy-contact-list-view.c:2051
#: ../libempathy-gtk/empathy-contact-list-view.c:2128
#: ../libempathy-gtk/empathy-individual-view.c:2321
-#: ../libempathy-gtk/empathy-individual-view.c:2435
+#: ../libempathy-gtk/empathy-individual-view.c:2468
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "ה_סרה"
#: ../libempathy-gtk/empathy-contact-list-view.c:2081
-#: ../libempathy-gtk/empathy-individual-view.c:2352
+#: ../libempathy-gtk/empathy-individual-view.c:2371
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "להסיר את איש הקשר '%s'?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2083
-#: ../libempathy-gtk/empathy-individual-view.c:2354
+#: ../libempathy-gtk/empathy-individual-view.c:2387
msgid "Removing contact"
msgstr "איש קשר מוסר"
@@ -1559,7 +1559,7 @@ msgstr "שיתוף שולחן העבודה שלי"
#: ../libempathy-gtk/empathy-contact-menu.c:418
#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-individual-widget.c:1377
msgid "Favorite"
msgstr "מועדף"
@@ -1614,152 +1614,152 @@ msgid "Birthday:"
msgstr "יום הולדת:"
#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Country ISO Code:"
msgstr "קוד המדינה בתקן ISO:"
#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Country:"
msgstr "ארץ:"
#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "State:"
msgstr "מדינה:"
#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "City:"
msgstr "עיר:"
#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Area:"
msgstr "אזור:"
#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Postal Code:"
msgstr "מיקוד:"
#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Street:"
msgstr "רחוב:"
#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Building:"
msgstr "מבנה:"
#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Floor:"
msgstr "קומה:"
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Room:"
msgstr "חדר:"
#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Text:"
msgstr "טקסט:"
#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Description:"
msgstr "תיאור:"
#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "URI:"
msgstr "כתובת:"
#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Accuracy Level:"
msgstr "רמת דיוק:"
#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Error:"
msgstr "שגיאה:"
#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Vertical Error (meters):"
msgstr "סטייה אנכית (מטרים):"
#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Horizontal Error (meters):"
msgstr "סטייה אופקית (מטרים):"
#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Speed:"
msgstr "מהירות:"
#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Bearing:"
msgstr "אזימוט:"
#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Climb Speed:"
msgstr "מהירות הטיפוס:"
#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Last Updated on:"
msgstr "עדכון אחרון ב־:"
#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "Longitude:"
msgstr "קו אורך:"
#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Latitude:"
msgstr "קו רוחב:"
#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Altitude:"
msgstr "גובה:"
#: ../libempathy-gtk/empathy-contact-widget.c:779
#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:622
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "מיקום"
#. translators: format is "Location, $date"
#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:624
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr "‏%B %e, %Y ב־‏%R ‏UTC"
#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:922
msgid "Save Avatar"
msgstr "שמירת תמונה אישית"
#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:979
+#: ../libempathy-gtk/empathy-individual-widget.c:980
msgid "Unable to save avatar"
msgstr "לא ניתן לשמור תמונה אישית"
@@ -1769,7 +1769,7 @@ msgstr "<b>מיקום</b> ב(תאריך)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1312
msgid "Alias:"
msgstr "כינוי:"
@@ -1789,7 +1789,7 @@ msgstr "פרטי איש קשר"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1516
msgid "Identifier:"
msgstr "מזהה:"
@@ -1828,7 +1828,7 @@ msgid "Select"
msgstr "בחירה"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1276
+#: ../src/empathy-main-window.c:1277
msgid "Group"
msgstr "קבוצה"
@@ -1869,12 +1869,21 @@ msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_קישור אנשי קשר…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1649
+#: ../libempathy-gtk/empathy-individual-view.c:2379
#, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "משתמש על המכיל איש קשר אחד"
-msgstr[1] "משתמש על המכיל %u אנשי קשר"
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"האם אכן ברצונך להסיר את איש הקשר המקושר '%s'? נא לשים לב שפעולה זו תסיר את "
+"כל אנשי הקשר המתאגדים לאיש קשר מקושר זה."
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1657
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "איש קשר מקושר המכיל איש קשר אחד"
+msgstr[1] "איש קשר מקושר המכיל %u אנשי קשר"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
@@ -1919,8 +1928,8 @@ msgstr "ה_פרדה…"
#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
-msgstr "פיצול משתמש העל המוצג לאנשי הקשר אותם הוא מכיל."
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr "פיצול איש הקשר המקושר המוצג לאנשי הקשר אותם הוא מכיל."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
@@ -1930,18 +1939,18 @@ msgstr "פיצול משתמש העל המוצג לאנשי הקשר אותם ה
msgid "_Link"
msgstr "_קישור"
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
-msgid "Unlink meta-contact '%s'?"
-msgstr "האם לפרק את משתמש העל '%s'?"
+msgid "Unlink linked contacts '%s'?"
+msgstr "האם לפרק את איש הקשר המקושר '%s'?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
msgid ""
-"Are you sure you want to unlink this meta-contact? This will completely "
-"split the meta-contact into the contacts it contains."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
msgstr ""
-"האם באמת ברצונך לפרק משתמש על זה? פעולה זו תפריד את משתמש העל לאנשי הקשר "
-"אותו הוא מכיל."
+"האם באמת ברצונך לפרק איש קשר מקושר זה? פעולה זו תפריד את הקשר המקושר הזה "
+"לאנשי הקשר אותו הוא מכיל."
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
@@ -2225,15 +2234,15 @@ msgstr "יש לזכור בחירה זו עבור חיבורים עתידיים"
msgid "Certificate Details"
msgstr "פרטי התעודה"
-#: ../libempathy-gtk/empathy-ui-utils.c:1706
+#: ../libempathy-gtk/empathy-ui-utils.c:1708
msgid "Unable to open URI"
msgstr "לא ניתן לפתוח את הכתובת"
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1803
msgid "Select a file"
msgstr "בחירת קובץ"
-#: ../libempathy-gtk/empathy-ui-utils.c:1870
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "קובץ נכנס מ־%s"
@@ -3380,15 +3389,15 @@ msgstr "עריכת חשבון"
msgid "Close"
msgstr "סגירה"
-#: ../src/empathy-main-window.c:1258
+#: ../src/empathy-main-window.c:1259
msgid "Contact"
msgstr "איש קשר"
-#: ../src/empathy-main-window.c:1585
+#: ../src/empathy-main-window.c:1586
msgid "Contact List"
msgstr "רשימת אנשי קשר"
-#: ../src/empathy-main-window.c:1695
+#: ../src/empathy-main-window.c:1696
msgid "Show and edit accounts"
msgstr "הצגה ועריכה של חשבונות"
diff --git a/po/nb.po b/po/nb.po
index 7a32a31df..b594b45f4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,9 +5,9 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy 2.92.x\n"
-"Report-Msgid-Bugs-To:\n"
-"POT-Creation-Date: 2010-11-20 11:54+0100\n"
-"PO-Revision-Date: 2010-11-20 11:57+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-12 21:31+0100\n"
+"PO-Revision-Date: 2010-12-12 21:31+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
"Language: no\n"
@@ -510,9 +510,9 @@ msgstr "Usynlig"
msgid "Offline"
msgstr "Frakoblet"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Ukjent"
@@ -695,60 +695,60 @@ msgstr "i fremtiden"
msgid "All"
msgstr "Alle"
-#: ../libempathy-gtk/empathy-account-widget.c:637
+#: ../libempathy-gtk/empathy-account-widget.c:670
#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:638
+#: ../libempathy-gtk/empathy-account-widget.c:671
msgid "Password"
msgstr "Passord"
-#: ../libempathy-gtk/empathy-account-widget.c:639
+#: ../libempathy-gtk/empathy-account-widget.c:672
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Tjener"
-#: ../libempathy-gtk/empathy-account-widget.c:640
+#: ../libempathy-gtk/empathy-account-widget.c:673
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Port"
-#: ../libempathy-gtk/empathy-account-widget.c:712
-#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1094
+#: ../libempathy-gtk/empathy-account-widget.c:1127
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "Konto %s er redigert via Mine nettkontoer."
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1133
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Konto %s kan ikke redigeres i Empathy."
-#: ../libempathy-gtk/empathy-account-widget.c:1120
+#: ../libempathy-gtk/empathy-account-widget.c:1153
msgid "Launch My Web Accounts"
msgstr "Start Mine nettkontoer"
-#: ../libempathy-gtk/empathy-account-widget.c:1418
+#: ../libempathy-gtk/empathy-account-widget.c:1465
msgid "Username:"
msgstr "Brukernavn:"
-#: ../libempathy-gtk/empathy-account-widget.c:1753
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "A_pply"
msgstr "_Bruk"
-#: ../libempathy-gtk/empathy-account-widget.c:1783
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "L_og in"
msgstr "L_ogg inn"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -757,19 +757,19 @@ msgstr "L_ogg inn"
msgid "Account:"
msgstr "Konto:"
-#: ../libempathy-gtk/empathy-account-widget.c:1860
+#: ../libempathy-gtk/empathy-account-widget.c:1913
msgid "_Enabled"
msgstr "Slått _på"
-#: ../libempathy-gtk/empathy-account-widget.c:1925
+#: ../libempathy-gtk/empathy-account-widget.c:1978
msgid "This account already exists on the server"
msgstr "Denne kontoen eksisterer allerede på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:1928
+#: ../libempathy-gtk/empathy-account-widget.c:1981
msgid "Create a new account on the server"
msgstr "Lag en ny konto på tjeneren"
-#: ../libempathy-gtk/empathy-account-widget.c:2042
+#: ../libempathy-gtk/empathy-account-widget.c:2095
msgid "Ca_ncel"
msgstr "A_vbryt"
@@ -778,19 +778,19 @@ msgstr "A_vbryt"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2334
+#: ../libempathy-gtk/empathy-account-widget.c:2392
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s av %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2360
+#: ../libempathy-gtk/empathy-account-widget.c:2418
#, c-format
msgid "%s Account"
msgstr "%s-konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2364
+#: ../libempathy-gtk/empathy-account-widget.c:2422
msgid "New account"
msgstr "Ny konto"
@@ -1169,28 +1169,28 @@ msgstr "Yahoo!-I_D:"
msgid "_Room List locale:"
msgstr "Locale for _romliste:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "Kunne ikke konvertere bilde"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "Ingen av de godkjente bildeformatene støttes av ditt system"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Velg personbilde"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "Ingen bilde"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Bilder"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "Alle filer"
@@ -1198,51 +1198,51 @@ msgstr "Alle filer"
msgid "Click to enlarge"
msgstr "Klikk for å forstørre"
-#: ../libempathy-gtk/empathy-chat.c:643
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Klarte ikke å åpne privat prat"
-#: ../libempathy-gtk/empathy-chat.c:683
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "Emne er ikke støttet for denne samtalen"
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "Du har ikke lov til å bytte emne"
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: tøm alle meldinger fra aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <emne>: sett emne for aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID for praterom>: bli med i et nytt praterom"
-#: ../libempathy-gtk/empathy-chat.c:832
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <prateroms-ID>: bli med i et nytt praterom"
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:851
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1252,7 +1252,7 @@ msgstr ""
"sende en melding som starter med tegnet «/». For eksempel: «/say /join "
"brukes til å bli med i et nytt praterom»"
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1260,98 +1260,98 @@ msgstr ""
"/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> "
"hvis den er definert."
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Bruk: %s"
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Ukjent kommando"
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "frakoblet"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "ugyldig kontakt"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "tilgang nektet"
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "meldingen er for lang"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "ikke implementert"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "ukjent"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Feil ved sending av melding «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1234 ../src/empathy-chat-window.c:703
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "Emne:"
-#: ../libempathy-gtk/empathy-chat.c:1246
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "Emnet er satt til: %s"
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "Emne ikke definert"
-#: ../libempathy-gtk/empathy-chat.c:1747
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(Ingen forslag)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Legg til «%s» i ordboken"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1852
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Legg til «%s» i ordbok for %s"
-#: ../libempathy-gtk/empathy-chat.c:1911
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Sett inn smilefjes"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1929
-#: ../libempathy-gtk/empathy-ui-utils.c:1806
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
msgid "_Send"
msgstr "_Send"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "_Staveforslag"
-#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Klarte ikke å hente siste logger"
-#: ../libempathy-gtk/empathy-chat.c:2158
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s har koblet fra"
@@ -1359,12 +1359,12 @@ msgstr "%s har koblet fra"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2165
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s ble sparket av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2168
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s ble sparket"
@@ -1372,17 +1372,17 @@ msgstr "%s ble sparket"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s ble bannlyst av %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s ble bannlyst"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s har forlatt rommet"
@@ -1392,78 +1392,78 @@ msgstr "%s har forlatt rommet"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2217
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s har blitt med i rommet"
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s er nå kjent som %s"
-#: ../libempathy-gtk/empathy-chat.c:2381 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Koblet fra"
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "Feil passord; vennligst prøv igjen:"
-#: ../libempathy-gtk/empathy-chat.c:2995
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Prøv igjen"
-#: ../libempathy-gtk/empathy-chat.c:3000
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "Dette rommet er beskyttet med et passord:"
-#: ../libempathy-gtk/empathy-chat.c:3001
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Bli med"
-#: ../libempathy-gtk/empathy-chat.c:3141
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Koblet til"
-#: ../libempathy-gtk/empathy-chat.c:3194
+#: ../libempathy-gtk/empathy-chat.c:3216
#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Samtale"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:319
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "_Kopier lenkens adresse"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:326
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Åpne lenke"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:419
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %d %B %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Endre kontaktinformasjon"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Personlig informasjon"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:424
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "Ny kontakt"
@@ -1484,34 +1484,34 @@ msgstr "Ikke gruppert"
msgid "Favorite People"
msgstr "Favorittpersoner"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Vil du virkelig fjerne gruppen «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2268
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
msgid "Removing group"
msgstr "Fjerner gruppe"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2322
-#: ../libempathy-gtk/empathy-individual-view.c:2436
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "Fje_rn"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2353
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Vil du virkelig fjerne kontakten «%s»?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
msgid "Removing contact"
msgstr "Fjerner kontakt"
@@ -1573,7 +1573,7 @@ msgstr "R_ediger"
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:915
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr "Inviterer deg til dette rommet"
@@ -1826,7 +1826,7 @@ msgid "Select"
msgstr "Velg"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1276
msgid "Group"
msgstr "Gruppe"
@@ -2008,6 +2008,20 @@ msgstr "S_amtale"
msgid "New Call"
msgstr "Ny samtale"
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Oppgi ditt passord for konto\n"
+"<b>%s</b>"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr "Husk passord"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
@@ -2066,43 +2080,43 @@ msgstr "Skill mellom små/store bokstaver"
msgid "Phrase not found"
msgstr "Teksten ble ikke funnet"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Mottok en lynmelding"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Send en lynmelding"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Innkommende samtaleforespørsel"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Kontakt koblet til"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Kontakt koblet fra"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Koblet til tjener"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Koblet fra tjener"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Innkommende samtale"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Utgående samtale"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Samtale avsluttet"
@@ -2211,15 +2225,15 @@ msgstr "Husk dette valget for fremtidige tilkoblinger"
msgid "Certificate Details"
msgstr "Sertifikatdetaljer"
-#: ../libempathy-gtk/empathy-ui-utils.c:1703
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
msgid "Unable to open URI"
msgstr "Kan ikke åpne URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1798
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "Select a file"
msgstr "Velg en fil"
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
#, c-format
msgid "Incoming file from %s"
msgstr "Innkommende fil fra %s"
@@ -2407,23 +2421,23 @@ msgstr "Ingen feilmelding"
msgid "Instant Message (Empathy)"
msgstr "Lynmelding (Empathy)"
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Ikke koble til ved oppstart"
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy lynmeldingsprogram"
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Feil ved forsøk på å kontakte kontohåndtering"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2650,7 +2664,7 @@ msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
msgid "Your new account has not been saved yet."
msgstr "Din nye konto er ikke lagret ennå."
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "Kobler til..."
@@ -2737,11 +2751,11 @@ msgstr "_Legg til …"
msgid "_Import…"
msgstr "_Importer …"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr "- Empathy autentiseringsklient"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Empathy autentiseringsklient"
@@ -2757,86 +2771,86 @@ msgstr "- Empathy lyd-/bildeklient"
msgid "Empathy Audio/Video Client"
msgstr "Empathy lyd-/bildeklient"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Lysstyrke"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Volum"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "_Sidelinje"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Lydinngang"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Videoinngang"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Nummertavle"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
msgid "Details"
msgstr "Detaljer"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1266
+#: ../src/empathy-call-window.c:1270
#, c-format
msgid "Call with %s"
msgstr "Samtale med %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "Ring"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "IP-adresse som sett av maskinen"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "IP-adresse som sett av en tjener på internett"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "IP-adresse for peer som sett av andre siden"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "IP-adresse for en relay-tjener"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr "IP-adresse for multicast-gruppe"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Koblet til - %d:%02dm"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Tekniske detaljer"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -2845,7 +2859,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -2854,7 +2868,7 @@ msgstr ""
"Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
"datamaskin"
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2863,25 +2877,25 @@ msgstr ""
"Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
"ikke tillater direkte tilkoblinger."
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "Det oppsto en feil på nettverket"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Lydformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Videoformatene som kreves for denne samtalen er ikke installert på din "
"datamaskin"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2892,19 +2906,19 @@ msgstr ""
"\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
"«Feilsøking»-vinduet i Hjelp-menyen."
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "Det oppsto en feil i samtalemotoren"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "Slutt på strømmen ble nådd"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "Kan ikke etablere lydstrøm"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "Kan ikke etablere videostrøm"
@@ -3004,35 +3018,35 @@ msgstr "_Ring"
msgid "_View"
msgstr "_Vis"
-#: ../src/empathy-chat-window.c:468 ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d ulest)"
msgstr[1] "%s (%d uleste)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (og %u annen)"
msgstr[1] "%s (og %u andre)"
-#: ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d ulest fra andre)"
msgstr[1] "%s (%d uleste fra andre)"
-#: ../src/empathy-chat-window.c:505
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d ulest fra alle)"
msgstr[1] "%s (%d uleste fra alle)"
-#: ../src/empathy-chat-window.c:707
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr "Skriver en melding"
@@ -3128,86 +3142,86 @@ msgstr "Koble til automatisk"
msgid "Manage Favorite Rooms"
msgstr "Håndter favorittrom"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:472
msgid "Incoming video call"
msgstr "Innkommende videosamtale"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:472
msgid "Incoming call"
msgstr "Innkommende samtale"
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s ringer deg med video. Vil du svare?"
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:477
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s ringer deg. Vil du svare?"
-#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming call from %s"
msgstr "Innkommende samtale fra %s"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:505
msgid "_Reject"
msgstr "Av_vis"
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:511
msgid "_Answer"
msgstr "Sv_ar"
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming video call from %s"
msgstr "Innkommende videosamtale fra %s"
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:702
msgid "Room invitation"
msgstr "Invitasjon til rom"
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "Invitation to join %s"
msgstr "Invitasjon til å bli med i %s"
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:711
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s inviterer deg til å bli med i %s"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:719
msgid "_Decline"
msgstr "_Avslå"
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:724
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Bli med"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:751
#, c-format
msgid "%s invited you to join %s"
msgstr "%s inviterte deg til å bli med i %s"
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:757
#, c-format
msgid "You have been invited to join %s"
msgstr "Du har blitt invitert til å bli med i %s"
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:807
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Innkommende filoverføring fra %s"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1018
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s ønsker rettigheter til å se når du er tilgjengelig"
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1022
#, c-format
msgid ""
"\n"
@@ -3216,12 +3230,12 @@ msgstr ""
"\n"
"Melding: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1066
#, c-format
msgid "%s is now offline."
msgstr "%s er nå frakoblet."
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1087
#, c-format
msgid "%s is now online."
msgstr "%s er nå tilkoblet."
@@ -3360,31 +3374,31 @@ msgstr "Protokoll"
msgid "Source"
msgstr "Kilde"
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:385
msgid "No match found"
msgstr "Ingen treff funnet"
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:540
msgid "Reconnect"
msgstr "Koble til på nytt"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:546
msgid "Edit Account"
msgstr "Rediger konto"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:552
msgid "Close"
msgstr "Lukk"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1258
msgid "Contact"
msgstr "Kontakt"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1585
msgid "Contact List"
msgstr "Kontaktliste"
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1695
msgid "Show and edit accounts"
msgstr "Vis og rediger kontoer"
@@ -3712,26 +3726,6 @@ msgstr "_Publiser lokasjon til mine kontakter"
msgid "_Reduce location accuracy"
msgstr "_Reduser nøyaktighet for lokasjon"
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr "Svar"
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "Avvis"
-
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "Svar"
-
-#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "Avslå"
-
-#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "Godta"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Status"
@@ -3827,7 +3821,9 @@ msgstr "Ikke vis noen dialoger. Utfør arbeid (f.eks import) og avslutt"
#: ../src/empathy-accounts.c:187
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-kontoer"
+msgstr ""
+"Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-"
+"kontoer"
#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -3850,6 +3846,28 @@ msgstr "Empathy-kontoer"
msgid "Empathy Debugger"
msgstr "Empathy feilsøking"
-#: ../src/empathy-chat.c:91
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr "- Empathy lynmeldingsprogram"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Svar"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Avvis"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Svar"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Avslå"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Godta"
diff --git a/po/sl.po b/po/sl.po
index c669a3ec7..4eaa3c3e2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-11-13 22:47+0000\n"
-"PO-Revision-Date: 2010-11-14 12:11+0100\n"
+"POT-Creation-Date: 2010-12-11 14:29+0000\n"
+"PO-Revision-Date: 2010-12-11 21:01+0100\n"
"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
"Language-Team: Slovenščina <gnome-si@googlegroups.com>\n"
"Language: \n"
@@ -479,10 +479,10 @@ msgid "Offline"
msgstr "Nepovezano"
#: ../libempathy/empathy-utils.c:257
-#: ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895
-#: ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897
+#: ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901
+#: ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903
#: ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Neznano"
@@ -677,85 +677,85 @@ msgstr[3] "Pred %d meseci"
msgid "in the future"
msgstr "v prihodnosti"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
msgid "All"
msgstr "Vse"
-#: ../libempathy-gtk/empathy-account-widget.c:617
-#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:670
+#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Račun"
-#: ../libempathy-gtk/empathy-account-widget.c:618
+#: ../libempathy-gtk/empathy-account-widget.c:671
msgid "Password"
msgstr "Geslo"
-#: ../libempathy-gtk/empathy-account-widget.c:619
+#: ../libempathy-gtk/empathy-account-widget.c:672
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Strežnik"
-#: ../libempathy-gtk/empathy-account-widget.c:620
+#: ../libempathy-gtk/empathy-account-widget.c:673
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Vrata"
-#: ../libempathy-gtk/empathy-account-widget.c:692
-#: ../libempathy-gtk/empathy-account-widget.c:749
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1074
+#: ../libempathy-gtk/empathy-account-widget.c:1127
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "Račun %s se ureja preko upravljalnika spletnih računov."
-#: ../libempathy-gtk/empathy-account-widget.c:1080
+#: ../libempathy-gtk/empathy-account-widget.c:1133
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "Računa %s s programom Empathy ni mogoče urejati."
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1153
msgid "Launch My Web Accounts"
msgstr "Zaženi spletne račune"
-#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget.c:1465
msgid "Username:"
msgstr "Uporabniško ime:"
-#: ../libempathy-gtk/empathy-account-widget.c:1733
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "A_pply"
msgstr "_Uveljavi"
-#: ../libempathy-gtk/empathy-account-widget.c:1763
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "L_og in"
msgstr "_Prijava"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1829
+#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1400
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Račun:"
-#: ../libempathy-gtk/empathy-account-widget.c:1840
+#: ../libempathy-gtk/empathy-account-widget.c:1913
msgid "_Enabled"
msgstr "_Omogoči"
-#: ../libempathy-gtk/empathy-account-widget.c:1905
+#: ../libempathy-gtk/empathy-account-widget.c:1978
msgid "This account already exists on the server"
msgstr "Ta račun na strežniku že obstaja"
-#: ../libempathy-gtk/empathy-account-widget.c:1908
+#: ../libempathy-gtk/empathy-account-widget.c:1981
msgid "Create a new account on the server"
msgstr "Ustvari nov račun na strežniku"
-#: ../libempathy-gtk/empathy-account-widget.c:2022
+#: ../libempathy-gtk/empathy-account-widget.c:2095
msgid "Ca_ncel"
msgstr "_Prekliči"
@@ -764,19 +764,19 @@ msgstr "_Prekliči"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2314
+#: ../libempathy-gtk/empathy-account-widget.c:2392
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s na %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2340
+#: ../libempathy-gtk/empathy-account-widget.c:2418
#, c-format
msgid "%s Account"
msgstr "%s račun"
-#: ../libempathy-gtk/empathy-account-widget.c:2344
+#: ../libempathy-gtk/empathy-account-widget.c:2422
msgid "New account"
msgstr "Nov račun"
@@ -1153,28 +1153,28 @@ msgstr "Yahoo! I_D:"
msgid "_Room List locale:"
msgstr "_Jezikovne nastavitve seznama klepetalnic:"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "Ni bilo mogoče pretvoriti slike"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "Vaš sistem ne podpira nobene izmed sprejetih vrst slik"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "Izberite sliko za svojo podobo"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "Brez slike"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "Slike"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "Vse datoteke"
@@ -1182,151 +1182,151 @@ msgstr "Vse datoteke"
msgid "Click to enlarge"
msgstr "Kliknite za povečavo"
-#: ../libempathy-gtk/empathy-chat.c:643
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "Napaka med odpiranjem zasebnega klepeta"
-#: ../libempathy-gtk/empathy-chat.c:683
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "Tema ni podprta pri tem pogovoru"
-#: ../libempathy-gtk/empathy-chat.c:689
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "Za spreminjanje teme nimate ustreznih dovoljenj."
-#: ../libempathy-gtk/empathy-chat.c:823
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: počisti vsa sporočila trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tema>: določi temo trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:829
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:832
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:837
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID stika> [<sporočilo>]: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID stika> <sporočilo>: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:844
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <vzdevek>: spremeni vaš vzdevek na trenutnem strežniku"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <sporočilo>: pošlje sporočilo DEJANJA v trenutni pogovor"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:851
msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
msgstr "/say <sporočilo>: pošlje <sporočilo> v trenutni pogovor. Možnost se uporablja za pošiljanje sporočila, ki se začne z '/'. Primer: \"/say /join se uporablja za pridruževanje novi klepetalnici\""
-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:856
msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
msgstr "/help [<ukaz>], pokaže vse podprte ukaze in njihov način uporabe."
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "Uporaba: %s"
-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "Neznan ukaz"
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "Neznan ukaz, za več si vpišite /help"
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "brez povezave"
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "neveljaven stik"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "ni dovoljenja"
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "predolgo sporočilo"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "ni del programa"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "neznano"
-#: ../libempathy-gtk/empathy-chat.c:1173
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Napaka med pošiljanjem sporočila '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1234
-#: ../src/empathy-chat-window.c:705
+#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "Tema:"
-#: ../libempathy-gtk/empathy-chat.c:1246
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "Tema je določena na: %s"
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "Ni določene teme"
-#: ../libempathy-gtk/empathy-chat.c:1747
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(Ni predlogov)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:1818
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Dodaj '%s' v slovar"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1852
+#: ../libempathy-gtk/empathy-chat.c:1855
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Dodaj '%s' v slovar %s"
-#: ../libempathy-gtk/empathy-chat.c:1911
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "Vstavi smeška"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1929
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
msgid "_Send"
msgstr "_Pošlji"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1964
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "Predlogi čr_kovalnika"
-#: ../libempathy-gtk/empathy-chat.c:2052
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
-#: ../libempathy-gtk/empathy-chat.c:2158
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s je prekinil povezavo"
@@ -1334,12 +1334,12 @@ msgstr "%s je prekinil povezavo"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2165
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s je izgnal %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2168
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s je bil izgnan"
@@ -1347,17 +1347,17 @@ msgstr "%s je bil izgnan"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s je izobčil %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s je izobčen"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s je zapustil klepetalnico"
@@ -1367,80 +1367,80 @@ msgstr "%s je zapustil klepetalnico"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2217
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s je vstopil v klepetalnico"
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s je preimenovan v %s"
-#: ../libempathy-gtk/empathy-chat.c:2381
-#: ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385
+#: ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "Prekinjena povezava"
-#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "Napačno geslo; poskusite znova:"
-#: ../libempathy-gtk/empathy-chat.c:2995
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "Poskusi znova"
-#: ../libempathy-gtk/empathy-chat.c:3000
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "Klepetalnica je zaščitena z geslom:"
-#: ../libempathy-gtk/empathy-chat.c:3001
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "Pridruži se"
-#: ../libempathy-gtk/empathy-chat.c:3141
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "Povezano"
-#: ../libempathy-gtk/empathy-chat.c:3194
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "Pogovor"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:797
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "Kopiraj _naslov povezave"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:804
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "_Odpri povezavo"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%A %d. %B. %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Uredi podrobnosti stika"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "Osebni podatki"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:420
-#: ../libempathy-gtk/empathy-individual-dialogs.c:110
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "Nov stik"
@@ -1460,34 +1460,34 @@ msgstr "Brez skupine"
msgid "Favorite People"
msgstr "Priljubljene osebe"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2262
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Ali zares želite odstraniti skupino '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
msgid "Removing group"
msgstr "Odstranjevanje skupine"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2319
-#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Odstrani"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2350
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Ali zares želite odstraniti stik '%s'?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2352
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
msgid "Removing contact"
msgstr "Odstranjevanje stika"
@@ -1533,7 +1533,7 @@ msgstr "Souporaba namizja"
#: ../libempathy-gtk/empathy-contact-menu.c:418
#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1291
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
msgid "Favorite"
msgstr "Priljubljeno"
@@ -1549,7 +1549,7 @@ msgstr "_Uredi"
#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:917
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr "Vabila v klepetalnico"
@@ -1563,177 +1563,177 @@ msgid "Select a contact"
msgstr "Izberi stik"
#: ../libempathy-gtk/empathy-contact-widget.c:252
-#: ../libempathy-gtk/empathy-individual-widget.c:147
+#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Polno ime:"
#: ../libempathy-gtk/empathy-contact-widget.c:253
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Telefonska številka:"
#: ../libempathy-gtk/empathy-contact-widget.c:254
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "Elektronski naslov:"
#: ../libempathy-gtk/empathy-contact-widget.c:255
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Spletišče:"
#: ../libempathy-gtk/empathy-contact-widget.c:256
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Rojstni dan:"
#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Country ISO Code:"
msgstr "ISO oznaka države:"
#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "Country:"
msgstr "Država:"
#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "State:"
msgstr "Okraj:"
#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "City:"
msgstr "Mesto:"
#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Area:"
msgstr "Področje:"
#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Postal Code:"
msgstr "Poštna številka:"
#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Street:"
msgstr "Ulica:"
#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Building:"
msgstr "Stavba:"
#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Floor:"
msgstr "Nadstropje:"
#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Room:"
msgstr "Klepetalnica:"
#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Text:"
msgstr "Besedilo:"
#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Description:"
msgstr "Opis:"
#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "URI:"
msgstr "URI:"
#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Accuracy Level:"
msgstr "Raven natančnosti:"
#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Error:"
msgstr "Napaka:"
#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Vertical Error (meters):"
msgstr "Napaka navpično (v metrih):"
#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Horizontal Error (meters):"
msgstr "Napaka vodoravno (v metrih):"
#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Speed:"
msgstr "Hitrost:"
#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "Bearing:"
msgstr "Smer:"
#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Climb Speed:"
msgstr "Hitrost dviganja:"
#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Last Updated on:"
msgstr "Zadnjič posodobljeno:"
#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Longitude:"
msgstr "Zemljepisna dolžina:"
#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Latitude:"
msgstr "Zemljepisna širina:"
#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Altitude:"
msgstr "Nadmorska višina:"
#: ../libempathy-gtk/empathy-contact-widget.c:779
#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../libempathy-gtk/empathy-individual-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:621
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Mesto"
#. translators: format is "Location, $date"
#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:600
+#: ../libempathy-gtk/empathy-individual-widget.c:623
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:672
msgid "%B %e, %Y at %R UTC"
msgstr "%e.%B.%Y ob %R UTC"
#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:840
+#: ../libempathy-gtk/empathy-individual-widget.c:921
msgid "Save Avatar"
msgstr "Shrani podobo"
#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:979
msgid "Unable to save avatar"
msgstr "Ni mogoče shraniti podobe"
@@ -1743,7 +1743,7 @@ msgstr "<b>Mesto</b> na (datum)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1226
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
msgid "Alias:"
msgstr "Vzdevek:"
@@ -1763,7 +1763,7 @@ msgstr "Podrobnosti stika"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1430
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "Določilo:"
@@ -1798,7 +1798,7 @@ msgid "Select"
msgstr "Izbor"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1276
msgid "Group"
msgstr "Skupina"
@@ -1839,7 +1839,7 @@ msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Poveži stike ..."
-#: ../libempathy-gtk/empathy-individual-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-widget.c:1649
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1852,6 +1852,10 @@ msgstr[3] "Metastik s skupaj %u stiki"
msgid "<b>Location</b> at (date)"
msgstr "<b>Mesto</b> na (datum)"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "Povezava je vzpostavljena preko telefona ali druge mobilne naprave"
+
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
msgstr "Novo omrežje"
@@ -1911,7 +1915,7 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "_Odstrani povezavo"
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgstr "Datum"
@@ -1949,30 +1953,44 @@ msgid "Contact ID:"
msgstr "ID stika:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "Kle_pet"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "Nov pogovor"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "Pošlji _video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "_Kliči"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "Nov klic"
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Treba je vnesti geslo za račun\n"
+"<b>%s</b>"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr "Zapomni si geslo"
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
@@ -2031,43 +2049,43 @@ msgstr "Upoštevaj velikost črk"
msgid "Phrase not found"
msgstr "Rekla ni mogoče najti"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "Prejeto je bilo hipno sporočilo"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "Poslano je bilo hipno sporočilo"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "Prejeta je bila zahteva za klepet"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "Povezava s stikom je bila vzpostavljena"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "Povezava s stikom je bila prekinjena"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "Povezano s strežnikom"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "Povezava s strežnikom je bila prekinjena"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "Dohodni klic"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "Odhodni klic"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "Klic je končan"
@@ -2173,15 +2191,15 @@ msgstr "Zapomni si izbor za prihodnje povezave"
msgid "Certificate Details"
msgstr "Podrobnosti potrdila"
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
msgid "Unable to open URI"
msgstr "Ni mogoče odpreti naslova URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "Select a file"
msgstr "Izbor datoteke"
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
#, c-format
msgid "Incoming file from %s"
msgstr "Prihajajoča datoteka od %s"
@@ -2369,23 +2387,23 @@ msgstr "Ni sporočil o napakah"
msgid "Instant Message (Empathy)"
msgstr "Hipno sporočanje (Empathy)"
-#: ../src/empathy.c:303
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "Brez samodejne povezave ob zagonu"
-#: ../src/empathy.c:307
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "Ne prikaži seznama stikov in drugih pogovornih oken ob zagonu"
-#: ../src/empathy.c:315
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy sporočilnik"
-#: ../src/empathy.c:494
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "Napaka delovanja upravljalnika računov"
-#: ../src/empathy.c:496
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2498,8 +2516,8 @@ msgid "Select the accounts you want to import:"
msgstr "Izbor račune za uvoz:"
#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "Yes"
msgstr "Da"
@@ -2558,7 +2576,7 @@ msgid "Your new account has not been saved yet."
msgstr "Novi račun še ni bil shranjen."
#: ../src/empathy-accounts-dialog.c:280
-#: ../src/empathy-call-window.c:809
+#: ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "Povezovanje ..."
@@ -2641,11 +2659,11 @@ msgstr "_Dodaj ..."
msgid "_Import…"
msgstr "_Uvozi ..."
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr "- Empathy odjemalec overitve"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Empathy odjemalec overitve"
@@ -2661,130 +2679,130 @@ msgstr "- Empathy odjemalec zvoka in slike"
msgid "Empathy Audio/Video Client"
msgstr "Empathy odjemalec zvoka in slike"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "Kontrast"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "Svetlost"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gama"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "Glasnost"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "_Stranska vrstica"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "Zvočni vhod"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "Video vhod"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "Številčnica"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
msgid "Details"
msgstr "Podrobnosti"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1266
+#: ../src/empathy-call-window.c:1270
#, c-format
msgid "Call with %s"
msgstr "Pokliči z %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "Kliči"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "Naslov IP kot ga zazna strojna oprema"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "Naslov IP kot ga zazna strežnik v omrežju"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "Naslov IP kot ga zazna uporabnik na drugi strani"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "Naslov IP posredovalnega strežnika"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr "Naslov IP skupine za večsmerno oddajanje"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Povezan - %d:%02d m"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "Tehnične podrobnosti"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid "%s's software does not understand any of the audio formats supported by your computer"
msgstr "Program stika %s ne prepozna zvočnih zapisov podprtih na vašem sistemu"
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid "%s's software does not understand any of the video formats supported by your computer"
msgstr "Program stika %s ne prepozna video zapisov podprtih na vašem sistemu"
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
msgstr "Ni mogoče vzpostaviti povezave z %s. Morda je eden od odjemalcev je v omrežju, ki ne dovoli neposrednih povezav."
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "Prišlo je do napake na omrežju"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid "The audio formats necessary for this call are not installed on your computer"
msgstr "Zvočni zapisi za ta klic niso nameščeni"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid "The video formats necessary for this call are not installed on your computer"
msgstr "Video zapisi za ta klic niso nameščeni"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
msgstr "Prišlo je do nepričakovane napake v delu programa Telepathy. Pošljite <a href=\"%s\">poročilo o hrošču</a> in pripnite dnevnik razhroščevanja iz menija pomoči."
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "Prišlo je do napake v klicnem programniku"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "Dosežen je konec pretoka"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "Ni mogoče vzpostaviti zvočnega pretoka"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "Ni mogoče vzpostaviti video pretoka"
@@ -2885,8 +2903,8 @@ msgstr "Po_kliči"
msgid "_View"
msgstr "_Pogled"
-#: ../src/empathy-chat-window.c:466
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -2895,7 +2913,7 @@ msgstr[1] "%s (%d neprebrano)"
msgstr[2] "%s (%d neprebrani)"
msgstr[3] "%s (%d neprebrana)"
-#: ../src/empathy-chat-window.c:478
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -2904,7 +2922,7 @@ msgstr[1] "%s (in %u drugo)"
msgstr[2] "%s (in %u drugi)"
msgstr[3] "%s (in %u druga)"
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -2913,7 +2931,7 @@ msgstr[1] "%s (%d neprebrano od drugih)"
msgstr[2] "%s (%d neprebrani od drugih)"
msgstr[3] "%s (%d neprebrana od drugih)"
-#: ../src/empathy-chat-window.c:503
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -2922,7 +2940,7 @@ msgstr[1] "%s (%d neprebrano od vseh)"
msgstr[2] "%s (%d neprebrani od vseh)"
msgstr[3] "%s (%d neprebrana od vseh)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr "Pisanje sporočila."
@@ -3022,87 +3040,87 @@ msgstr "Samodejno povezovanje"
msgid "Manage Favorite Rooms"
msgstr "Upravljanje priljubljenih klepetalnic"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:472
msgid "Incoming video call"
msgstr "Dohodni video klic"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:472
msgid "Incoming call"
msgstr "Dohodni klic"
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s vas kliče preko video kanala. Ali se želite javiti?"
-#: ../src/empathy-event-manager.c:479
+#: ../src/empathy-event-manager.c:477
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s vas kliče. Ali se želite javiti?"
-#: ../src/empathy-event-manager.c:482
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:480
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming call from %s"
msgstr "Dohodni klic od %s"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:505
msgid "_Reject"
msgstr "_Zavrni"
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:511
msgid "_Answer"
msgstr "_Odgovori"
-#: ../src/empathy-event-manager.c:624
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming video call from %s"
msgstr "Dohodni video klic od %s"
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:702
msgid "Room invitation"
msgstr "Vabilo v klepetalnico"
-#: ../src/empathy-event-manager.c:703
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "Invitation to join %s"
msgstr "Povabilo v %s"
-#: ../src/empathy-event-manager.c:710
+#: ../src/empathy-event-manager.c:711
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s vas vabi, da se pridružite v %s"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:719
msgid "_Decline"
msgstr "_Odkloni"
-#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-event-manager.c:724
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Pridruži se"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:751
#, c-format
msgid "%s invited you to join %s"
msgstr "%s vas je povabil v %s"
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:757
#, c-format
msgid "You have been invited to join %s"
msgstr "Povabljeni ste v %s"
-#: ../src/empathy-event-manager.c:803
+#: ../src/empathy-event-manager.c:807
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Prihajajoč prenos datoteke od %s"
-#: ../src/empathy-event-manager.c:1013
+#: ../src/empathy-event-manager.c:1018
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s želi dovoljenje za pregled dosegljivosti"
-#: ../src/empathy-event-manager.c:1017
+#: ../src/empathy-event-manager.c:1022
#, c-format
msgid ""
"\n"
@@ -3111,12 +3129,12 @@ msgstr ""
"\n"
"Sporočilo: %s"
-#: ../src/empathy-event-manager.c:1060
+#: ../src/empathy-event-manager.c:1066
#, c-format
msgid "%s is now offline."
msgstr "%s ni povezan."
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1087
#, c-format
msgid "%s is now online."
msgstr "%s je povezan."
@@ -3256,31 +3274,31 @@ msgstr "Protokol"
msgid "Source"
msgstr "Vir"
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:385
msgid "No match found"
msgstr "Ni najdenih zadetkov."
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:540
msgid "Reconnect"
msgstr "Ponovno se poveži"
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:546
msgid "Edit Account"
msgstr "Uredi račun"
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:552
msgid "Close"
msgstr "Zapri"
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1258
msgid "Contact"
msgstr "Stik"
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1585
msgid "Contact List"
msgstr "Seznam stikov"
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1695
msgid "Show and edit accounts"
msgstr "Pokaži in uredi račune"
@@ -3370,17 +3388,17 @@ msgstr "_Osebni podatki"
msgid "_Room"
msgstr "_Klepetalnica"
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
msgid "Chat Room"
msgstr "Klepetelnica"
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
msgid "Members"
msgstr "Člani"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:634
#, c-format
msgid ""
"%s\n"
@@ -3393,16 +3411,16 @@ msgstr ""
"Zahtevano geslo: %s\n"
"Člani: %s"
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "No"
msgstr "Ne"
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
msgid "Could not start room listing"
msgstr "Seznama klepetalnic ni bilo mogoče začeti"
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
msgid "Could not stop room listing"
msgstr "Seznama klepetalnic ni bilo mogoče dokončati"
@@ -3595,28 +3613,6 @@ msgstr "O_bjavi mesto mojim stikom"
msgid "_Reduce location accuracy"
msgstr "_Zmanjšaj natančnost mesta"
-#: ../src/empathy-status-icon.c:184
-msgid "Respond"
-msgstr "Odgovori"
-
-#: ../src/empathy-status-icon.c:190
-msgid "Reject"
-msgstr "Zavrni"
-
-#: ../src/empathy-status-icon.c:194
-msgid "Answer"
-msgstr "Odgovori"
-
-#: ../src/empathy-status-icon.c:201
-#: ../src/empathy-status-icon.c:211
-msgid "Decline"
-msgstr "Odkloni"
-
-#: ../src/empathy-status-icon.c:205
-#: ../src/empathy-status-icon.c:216
-msgid "Accept"
-msgstr "Sprejmi"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "Stanje"
@@ -3731,10 +3727,32 @@ msgstr "Empathy računi"
msgid "Empathy Debugger"
msgstr "Empathy razhroščevalnik"
-#: ../src/empathy-chat.c:91
+#: ../src/empathy-chat.c:104
msgid "- Empathy Chat Client"
msgstr "- sporočilnik Empathy"
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "Odgovori"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "Zavrni"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "Odgovori"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "Odkloni"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "Sprejmi"
+
#~ msgid "Add _New Preset"
#~ msgstr "Dodaj novo _predlogo"
#~ msgid "Saved Presets"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index f802e5ae4..c50fb5772 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy 2.91.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-13 15:39+0800\n"
-"PO-Revision-Date: 2010-10-13 15:40+0800\n"
+"POT-Creation-Date: 2010-12-09 19:53+0800\n"
+"PO-Revision-Date: 2010-12-09 19:54+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
"Language: zh_TW\n"
@@ -90,7 +90,7 @@ msgstr "在狀態區域顯示收到事件。如果不啟用的話，收到事件
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
-msgstr "Empathy 可以發佈使用者的位置"
+msgstr "Empathy 可以發布使用者的位置"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
@@ -98,7 +98,7 @@ msgstr "Empathy 可以利用 GPS 來推測位置"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 可以利用流動電話網絡基地台來推測位置"
+msgstr "Empathy 可以利用流動電話網絡基地臺來推測位置"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
@@ -262,7 +262,7 @@ msgstr "在聊天室使用佈景主題"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy 是否要將使用者的位置發佈給他的聯絡人。"
+msgstr "Empathy 是否要將使用者的位置發布給他的聯絡人。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
@@ -426,19 +426,19 @@ msgstr "管理訊息與 VoIP 帳號"
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr "已接收檔案的雜湊值與送出的不符"
+#: ../libempathy/empathy-ft-handler.c:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr "檔案傳輸完畢，但是檔案已損毀"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1121
msgid "File transfer not supported by remote contact"
msgstr "遠端聯絡人不支援檔案傳輸"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1177
msgid "The selected file is not a regular file"
msgstr "選取的檔案不是正規的檔案"
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1186
msgid "The selected file is empty"
msgstr "選取的檔案是空白的"
@@ -494,9 +494,9 @@ msgstr "隱藏"
msgid "Offline"
msgstr "離線"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "不明"
@@ -619,7 +619,7 @@ msgstr "Yahoo! 日本"
#: ../libempathy/empathy-utils.c:577
msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
@@ -665,71 +665,85 @@ msgstr[0] "%d 個月以前"
msgid "in the future"
msgstr "未來"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:670
+#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:671
msgid "Password"
msgstr "密碼"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:672
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "伺服器"
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:673
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "連接埠"
-#: ../libempathy-gtk/empathy-account-widget.c:589
-#: ../libempathy-gtk/empathy-account-widget.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
#, c-format
msgid "%s:"
msgstr "%s："
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1127
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "%s 帳號已透過我的網絡帳號修改。"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1133
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "%s 帳號無法於 Empathy 內修改。"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1153
+msgid "Launch My Web Accounts"
+msgstr "啟動我的網絡帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1465
msgid "Username:"
msgstr "使用者名稱："
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "A_pply"
msgstr "套用(_A)"
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "L_og in"
msgstr "登入(_O)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1399
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "帳號："
-#: ../libempathy-gtk/empathy-account-widget.c:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1913
msgid "_Enabled"
msgstr "已啟用(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1978
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1981
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2095
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -738,19 +752,19 @@ msgstr "取消(_N)"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2392
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s 的 %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2418
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2422
msgid "New account"
msgstr "新增帳號"
@@ -1034,7 +1048,7 @@ msgstr "姓(_L)："
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
-msgstr "發佈的名稱(_P)："
+msgstr "發布的名稱(_P)："
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
msgid "<b>Example:</b> user@my.sip.server"
@@ -1126,30 +1140,30 @@ msgstr "Yahoo I_D:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
-msgstr "聊天室清單地區(_R)："
+msgstr "聊天室清單地區資訊(_R)："
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "無法轉換圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "你的系統上沒有支援已接受的圖片格式"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "選擇你的大頭貼圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "沒有圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "所有檔案"
@@ -1157,141 +1171,155 @@ msgstr "所有檔案"
msgid "Click to enlarge"
msgstr "請按這裏放大"
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "開啟私人對話失敗"
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "你不被允許更改這個主題"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: 清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>：設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>：加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>：加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>：開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <網名>：更改在目前伺服器上的你的網名"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:851
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
msgstr "/say <訊息>：送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來說：「/say /join 是用來加入新的聊天室」"
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr "/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "用法：%s"
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令；請參見 /help 以取得可用的指令"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "無效的聯絡人"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤；%s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "主題："
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(沒有建議)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1818
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "加入「%s」至辭典"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1855
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "加入「%s」至 %s 辭典"
+
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
msgid "_Send"
msgstr "傳送(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "無法取得最近的日誌"
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s 已斷線"
@@ -1299,12 +1327,12 @@ msgstr "%s 已斷線"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1312,17 +1340,17 @@ msgstr "%s 被踢出"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
@@ -1332,79 +1360,79 @@ msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經加入此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "已斷線"
-#: ../libempathy-gtk/empathy-chat.c:2910
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "密碼錯誤；請再試一次："
-#: ../libempathy-gtk/empathy-chat.c:2911
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:2916
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護："
-#: ../libempathy-gtk/empathy-chat.c:2917
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3110
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "談話"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "複製連結位址(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "開啟連結(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "編輯聯絡人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "個人資料"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
-#: ../libempathy-gtk/empathy-individual-dialogs.c:111
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "新增聯絡人"
@@ -1424,101 +1452,101 @@ msgstr "未羣組"
msgid "Favorite People"
msgstr "喜好的人"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "是否想要移除羣組「%s」？"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
msgid "Removing group"
msgstr "正在移除羣組"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "移除(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "是否想要移除聯絡人「%s」？"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
msgid "Removing contact"
msgstr "正在移除聯絡人"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "新增聯絡人(_A)…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
#: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-contact-menu.c:261
#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-contact-menu.c:292
#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "視像通話(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-contact-menu.c:333
#: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-contact-menu.c:355
#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "傳送檔案"
-#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-contact-menu.c:378
#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "分享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:414
-#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1290
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
msgid "Favorite"
msgstr "喜好"
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:447
#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "資訊(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:489
+#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:543
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:917
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr "邀請你到這個聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:574
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
@@ -1526,178 +1554,178 @@ msgstr "邀請到聊天室(_I)"
msgid "Select a contact"
msgstr "選擇聯絡人"
-#: ../libempathy-gtk/empathy-contact-widget.c:225
-#: ../libempathy-gtk/empathy-individual-widget.c:147
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "全名："
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "電話號碼："
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "電子信箱位址："
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "網站："
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "生日："
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Country ISO Code:"
msgstr "國家 ISO 碼："
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "Country:"
msgstr "國家："
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "State:"
msgstr "州："
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "City:"
msgstr "市："
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Area:"
msgstr "區域："
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Postal Code:"
msgstr "郵遞區號："
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Street:"
msgstr "街："
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Building:"
msgstr "建築："
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Floor:"
msgstr "樓層："
-#: ../libempathy-gtk/empathy-contact-widget.c:626
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Room:"
msgstr "室："
-#: ../libempathy-gtk/empathy-contact-widget.c:628
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Text:"
msgstr "文字："
-#: ../libempathy-gtk/empathy-contact-widget.c:630
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Description:"
msgstr "描述："
-#: ../libempathy-gtk/empathy-contact-widget.c:632
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "URI:"
msgstr "URI："
-#: ../libempathy-gtk/empathy-contact-widget.c:634
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Accuracy Level:"
msgstr "準確度等級："
-#: ../libempathy-gtk/empathy-contact-widget.c:636
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Error:"
msgstr "錯誤："
-#: ../libempathy-gtk/empathy-contact-widget.c:638
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (米)："
-#: ../libempathy-gtk/empathy-contact-widget.c:640
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (米)："
-#: ../libempathy-gtk/empathy-contact-widget.c:642
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Speed:"
msgstr "速度："
-#: ../libempathy-gtk/empathy-contact-widget.c:644
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "Bearing:"
msgstr "方位："
-#: ../libempathy-gtk/empathy-contact-widget.c:646
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Climb Speed:"
msgstr "爬升速度："
-#: ../libempathy-gtk/empathy-contact-widget.c:648
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Last Updated on:"
msgstr "上次更新於："
-#: ../libempathy-gtk/empathy-contact-widget.c:650
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Longitude:"
msgstr "經度："
-#: ../libempathy-gtk/empathy-contact-widget.c:652
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Latitude:"
msgstr "緯度："
-#: ../libempathy-gtk/empathy-contact-widget.c:654
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Altitude:"
msgstr "緯度："
-#: ../libempathy-gtk/empathy-contact-widget.c:717
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:621
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:623
#, c-format
msgid "%s, %s"
msgstr "%s、%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:672
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-individual-widget.c:840
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:921
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:979
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1707,7 +1735,7 @@ msgstr "<b>位置</b> 於 (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1226
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
msgid "Alias:"
msgstr "別名："
@@ -1727,7 +1755,7 @@ msgstr "聯絡人詳細資料"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1429
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "識別身分："
@@ -1759,14 +1787,12 @@ msgid "_Add Group"
msgstr "加入羣組(_G)"
#: ../libempathy-gtk/empathy-groups-widget.c:398
-#, fuzzy
-#| msgid "Select"
msgctxt "verb in a column header displaying group names"
msgid "Select"
-msgstr "選擇"
+msgstr "選取"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1250
+#: ../src/empathy-main-window.c:1276
msgid "Group"
msgstr "羣組"
@@ -1795,19 +1821,19 @@ msgstr "在所方清單所選的聯絡人將連結在一起。"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:836
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "連結聯絡人(_L)…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1567
+#: ../libempathy-gtk/empathy-individual-widget.c:1649
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1817,6 +1843,10 @@ msgstr[0] "後設聯絡人包含 %u 位聯絡人"
msgid "<b>Location</b> at (date)"
msgstr "<b>位置</b> 於 (日期)"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "從手機或流動通訊器材上線"
+
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
msgstr "新增網絡"
@@ -1826,11 +1856,9 @@ msgid "Choose an IRC network"
msgstr "選擇 IRC 網絡"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
-#, fuzzy
-#| msgid "Select"
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
-msgstr "選擇"
+msgstr "選取"
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
@@ -1881,7 +1909,7 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "取消連結(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgstr "日期"
@@ -1919,64 +1947,76 @@ msgid "Contact ID:"
msgstr "聯絡人 ID："
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "聊天(_C)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "新增談話"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "傳送視像(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "通話(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "新增通話"
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr ""
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
msgstr "自選訊息…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
msgstr "編輯自選訊息…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
msgstr "按這裏將這個狀態從喜好中移除"
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
msgid "Click to make this status a favorite"
msgstr "按這裏將這個狀態設為喜好"
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
msgid "Set status"
msgstr "設定狀態"
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
msgid "Set your presence and current status"
msgstr "設定你的上線與目前的狀態"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
msgstr "自選訊息…"
@@ -2001,43 +2041,43 @@ msgstr "符合條件"
msgid "Phrase not found"
msgstr "找不到詞彙"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "收到即時訊息"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "傳送即時訊息"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "收到聊天要求"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "聯絡人已連線"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "聯絡人已斷線"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "連接到伺服器"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "與伺服器斷線"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "收到語音通話"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "播出語音通話"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "語音通話結束"
@@ -2050,12 +2090,12 @@ msgid "Edit Custom Messages"
msgstr "編輯自選訊息"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "加入新的預先設定(_N)"
+msgid "Save _New Status Message"
+msgstr "儲存新的狀態訊息(_N)"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "已儲存的預先設定"
+msgid "Saved Status Messages"
+msgstr "儲存的狀態訊息"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
@@ -2074,73 +2114,49 @@ msgid "Blue"
msgstr "藍色"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-#, fuzzy
-#| msgid "The identity provided by the chat server cannot be verified.\n"
msgid "The identity provided by the chat server cannot be verified."
-msgstr "對話伺服器所提供的識別身分無法通過驗證。\n"
+msgstr "對話伺服器所提供的識別身分無法通過驗證。"
#: ../libempathy-gtk/empathy-tls-dialog.c:157
-#, fuzzy
-#| msgid "The certificate is not signed by a Certification Authority"
msgid "The certificate is not signed by a Certification Authority."
-msgstr "該證書並非由證書授權中心所簽署"
+msgstr "該證書並非由證書授權中心所簽署。"
#: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
-#| msgid "The certificate has expired"
msgid "The certificate has expired."
-msgstr "證書已逾期"
+msgstr "證書已逾期。"
#: ../libempathy-gtk/empathy-tls-dialog.c:164
-#, fuzzy
-#| msgid "The certificate hasn't yet been activated"
msgid "The certificate hasn't yet been activated."
-msgstr "證書尚未啟用"
+msgstr "證書尚未啟用。"
#: ../libempathy-gtk/empathy-tls-dialog.c:167
-#, fuzzy
-#| msgid "The certificate does not have the expected fingerprint"
msgid "The certificate does not have the expected fingerprint."
-msgstr "證書並未擁有預期的指紋"
+msgstr "證書並未擁有預期的指紋。"
#: ../libempathy-gtk/empathy-tls-dialog.c:170
-#, fuzzy
-#| msgid ""
-#| "The hostname verified by the certificate doesn't match the server name"
msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "證書所驗證的主機名稱與伺服器名稱不符"
+msgstr "證書所驗證的主機名稱與伺服器名稱不符。"
#: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "The certificate is self-signed"
msgid "The certificate is self-signed."
-msgstr "證書為自我簽署"
+msgstr "證書為自我簽署。"
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-#, fuzzy
-#| msgid ""
-#| "The certificate has been revoked by the issuing Certification Authority"
msgid ""
"The certificate has been revoked by the issuing Certification Authority."
-msgstr "證書已被原本發出的證書授權機構撤銷"
+msgstr "證書已被原本發出的證書授權機構撤銷。"
#: ../libempathy-gtk/empathy-tls-dialog.c:181
-#, fuzzy
-#| msgid "The certificate is cryptographically weak"
msgid "The certificate is cryptographically weak."
-msgstr "證書於密碼防護上較弱"
+msgstr "證書於密碼防護上較弱。"
#: ../libempathy-gtk/empathy-tls-dialog.c:184
-#, fuzzy
-#| msgid "The certificate length exceeds verifiable limits"
msgid "The certificate length exceeds verifiable limits."
-msgstr "證書長度超出可驗證的範圍"
+msgstr "證書長度超出可驗證的範圍。"
#: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
-#| msgid "The certificate is malformed"
msgid "The certificate is malformed."
-msgstr "證書格式不良"
+msgstr "證書格式不良。"
#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
@@ -2168,22 +2184,22 @@ msgstr "請記住此選擇以供未來連線使用"
msgid "Certificate Details"
msgstr "證書詳細資料"
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
msgid "Unable to open URI"
msgstr "無法開啓 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "Select a file"
msgstr "選擇一個檔案"
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
#, c-format
msgid "Incoming file from %s"
msgstr "收到來自 %s 的檔案"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
-msgstr "目前的地區設定"
+msgstr "目前的地區資訊設定"
#: ../libempathy-gtk/totem-subtitle-encoding.c:161
#: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -2228,7 +2244,7 @@ msgstr "繁體中文"
#: ../libempathy-gtk/totem-subtitle-encoding.c:208
msgid "Croatian"
-msgstr "克羅地亞語"
+msgstr "克羅地亞文"
#: ../libempathy-gtk/totem-subtitle-encoding.c:211
#: ../libempathy-gtk/totem-subtitle-encoding.c:213
@@ -2246,7 +2262,7 @@ msgstr "斯拉夫語系/俄文"
#: ../libempathy-gtk/totem-subtitle-encoding.c:227
#: ../libempathy-gtk/totem-subtitle-encoding.c:229
msgid "Cyrillic/Ukrainian"
-msgstr "斯拉夫/烏克蘭語系"
+msgstr "斯拉夫文/烏克蘭語系"
#: ../libempathy-gtk/totem-subtitle-encoding.c:232
msgid "Georgian"
@@ -2364,25 +2380,41 @@ msgstr "沒有錯誤訊息"
msgid "Instant Message (Empathy)"
msgstr "即時通訊 (Empathy)"
-#: ../src/empathy.c:414
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "啟動時不要自動連線"
-#: ../src/empathy.c:418
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "啟動時不顯示聯絡人清單或任何其他對話窗"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy 即時通用戶端"
+#: ../src/empathy.c:500
+msgid "Error contacting the Account Manager"
+msgstr "聯絡帳號管理程式時發生錯誤"
+
+#: ../src/empathy.c:502
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"嘗試連接至 Telepathy 帳號管理程式時發生錯誤。錯誤為：\n"
+"\n"
+"%s"
+
#: ../src/empathy-about-dialog.c:81
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
"terms of the GNU General Public License as published by the Free Software "
"Foundation; either version 2 of the License, or (at your option) any later "
"version."
-msgstr "Empathy 是自由軟件，你可以遵照自由軟件基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈這一程式，或者自由選擇使用任何更新的版本。"
+msgstr "Empathy 是自由軟件，你可以遵照自由軟件基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發布這一程式，或者自由選擇使用任何更新的版本。"
#: ../src/empathy-about-dialog.c:85
msgid ""
@@ -2390,7 +2422,7 @@ msgid ""
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
"details."
-msgstr "發佈 Empathy 的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的擔保。更詳細的情況請參閱 GNU 通用公共許可證。"
+msgstr "發布 Empathy 的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的擔保。更詳細的情況請參閱 GNU 通用公共許可證。"
#: ../src/empathy-about-dialog.c:89
msgid ""
@@ -2504,8 +2536,8 @@ msgid "Select the accounts you want to import:"
msgstr "選擇要匯入的帳號："
#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "Yes"
msgstr "是"
@@ -2571,7 +2603,7 @@ msgstr "有與你的 %s 帳號相關的修改尚未儲存。"
msgid "Your new account has not been saved yet."
msgstr "尚未儲存你的新帳號。"
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "連線中…"
@@ -2656,11 +2688,11 @@ msgstr "加入(_A)…"
msgid "_Import…"
msgstr "匯入(_I)…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr "- Empathy 認證用戶端"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Empathy 認證用戶端"
@@ -2668,129 +2700,129 @@ msgstr "Empathy 認證用戶端"
msgid "People nearby"
msgstr "附近的人"
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy 音訊視像用戶端"
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
msgid "Empathy Audio/Video Client"
msgstr "Empathy 音訊視像用戶端"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "對比"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "側邊欄(_S)"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "音效輸入"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "視像輸入"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "播號盤"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
msgid "Details"
msgstr "詳細資料"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1266
+#: ../src/empathy-call-window.c:1270
#, c-format
msgid "Call with %s"
msgstr "與 %s 通話中"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "通話"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "機器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "互聯網上的伺服器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "其他端看見的點的 IP 位址"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "中繼伺服器的 IP 位址"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr "多點廣播羣組的 IP 位址"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已連線 — %d:%02dm"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "技術細節"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 的軟件不瞭解任何你電腦上所支援的音訊格式"
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 的軟件不瞭解任何你電腦上所支援的視像格式"
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr "無法和 %s 建立連線。你們其中之一可能在一個不允許直接連線的網絡之上。"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "這個網絡上有錯誤發生"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的音訊格式尚未在你的電腦上安裝"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的視像格式尚未在你的電腦上安裝"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2798,19 +2830,19 @@ msgid ""
"the Help menu."
msgstr "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助選單內的「除錯」視窗中所收集的紀錄。"
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "通話引擎內有錯誤發生"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "已達串流末端"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "無法建立音訊串流"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "無法建立視像串流"
@@ -2906,35 +2938,35 @@ msgstr "視像預覽"
msgid "_Call"
msgstr "通話(_C)"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "檢視(_V)"
-#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 個未讀)"
-#: ../src/empathy-chat-window.c:478
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (與 %u 其他的)"
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (來自其他人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:503
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (來自所有人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr "正在輸入訊息。"
@@ -2970,7 +3002,7 @@ msgstr "將分頁右移(_R)"
msgid "Notify for All Messages"
msgstr "所有訊息都通知"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "內容(_C)"
@@ -2982,7 +3014,7 @@ msgstr "談話(_C)"
msgid "_Detach Tab"
msgstr "分離分頁(_D)"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
msgid "_Edit"
msgstr "編輯(_E)"
@@ -2990,7 +3022,7 @@ msgstr "編輯(_E)"
msgid "_Favorite Chat Room"
msgstr "喜好的聊天室(_F)"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "求助(_H)"
@@ -3030,86 +3062,86 @@ msgstr "自動連線"
msgid "Manage Favorite Rooms"
msgstr "管理喜好的聊天室"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming video call"
msgstr "傳入的視像通話"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming call"
msgstr "來電"
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s 要與你進行視像通話。你是否要接聽？"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:477
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 要與你進行通話。你是否要接聽？"
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的來電"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:505
msgid "_Reject"
msgstr "拒絕(_R)"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511
msgid "_Answer"
msgstr "接聽(_A)"
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming video call from %s"
msgstr "來自 %s 的視像電話"
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:702
msgid "Room invitation"
msgstr "聊天邀請"
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "Invitation to join %s"
msgstr "邀請加入 %s"
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:711
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正在邀請你加入 %s"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:719
msgid "_Decline"
msgstr "拒絕(_D)"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:724
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:751
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 曾邀請你加入 %s"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:757
#, c-format
msgid "You have been invited to join %s"
msgstr "你被邀請加入 %s"
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:807
#, c-format
msgid "Incoming file transfer from %s"
msgstr "收到來自 %s 的檔案傳輸"
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1018
#, c-format
-msgid "Subscription requested by %s"
-msgstr "來自 %s 的訂閱要求"
+msgid "%s would like permission to see when you are available"
+msgstr "%s 想要在你有空時得到查看的許可"
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1022
#, c-format
msgid ""
"\n"
@@ -3118,12 +3150,12 @@ msgstr ""
"\n"
"訊息：%s"
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1066
#, c-format
msgid "%s is now offline."
msgstr "%s 現在離線。"
-#: ../src/empathy-event-manager.c:1072
+#: ../src/empathy-event-manager.c:1087
#, c-format
msgid "%s is now online."
msgstr "%s 現在上線。"
@@ -3262,31 +3294,31 @@ msgstr "通訊協定"
msgid "Source"
msgstr "來源"
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:385
msgid "No match found"
msgstr "找不到符合項目"
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:540
msgid "Reconnect"
msgstr "重新連接"
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:546
msgid "Edit Account"
msgstr "編輯帳號"
-#: ../src/empathy-main-window.c:550
+#: ../src/empathy-main-window.c:552
msgid "Close"
msgstr "關閉"
-#: ../src/empathy-main-window.c:1232
+#: ../src/empathy-main-window.c:1258
msgid "Contact"
msgstr "聯絡人"
-#: ../src/empathy-main-window.c:1557
+#: ../src/empathy-main-window.c:1585
msgid "Contact List"
msgstr "聯絡人清單"
-#: ../src/empathy-main-window.c:1666
+#: ../src/empathy-main-window.c:1695
msgid "Show and edit accounts"
msgstr "顯示並編輯帳號"
@@ -3299,88 +3331,92 @@ msgid "Context"
msgstr "選項"
#: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "於聯絡人清單內尋找(_L)"
+
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "加入喜好(_F)"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "管理喜好"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "正常大小(_O)"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "新增通話(_C)…"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "正常大小與大頭貼(_A)"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "偏好設定(_R)"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "顯示協定(_R)"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "根據名稱排序(_N)"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "根據狀態排序(_S)"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "帳號(_A)"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "精簡大小(_C)"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "偵錯(_D)"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "檔案傳輸(_F)"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
msgstr "加入(_J)…"
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "新增談話(_N)…"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "離線聯絡人(_O)"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "個人資料(_P)"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "聊天室(_R)"
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
msgid "Chat Room"
msgstr "聊天室"
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
msgid "Members"
msgstr "成員"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:634
#, c-format
msgid ""
"%s\n"
@@ -3393,16 +3429,16 @@ msgstr ""
"需要密碼：%s\n"
"成員：%s"
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
msgid "Could not start room listing"
msgstr "無法開始列出聊天室清單"
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
msgid "Could not stop room listing"
msgstr "無法停止列出聊天室清單"
@@ -3433,39 +3469,39 @@ msgstr "聊天室清單"
msgid "_Room:"
msgstr "聊天室(_R)："
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
msgid "Message received"
msgstr "訊息已收到"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
msgstr "訊息已送出"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr "新增談話"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr "聯絡人上線"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr "聯絡人離線"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr "帳號已連線"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr "帳號已斷線"
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "語言"
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
msgid "Preferences"
msgstr "偏好設定"
@@ -3603,26 +3639,6 @@ msgstr "對我的聯絡人公開位置(_P)"
msgid "_Reduce location accuracy"
msgstr "降低位置準確度(_R)"
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "回應"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "拒絕"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "接聽"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "拒絕"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "接受"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "狀態"
@@ -3710,34 +3726,73 @@ msgstr "選擇想要邀請進入談話的聯絡人："
msgid "Invite"
msgstr "邀請"
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "不要顯示任何對話窗；執行任何作業（例：匯入）並離開"
+msgstr "不要顯示任何對話窗；執行任何作業 (例：匯入) 並離開"
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "如果有任何非 Salut 的帳號，就不要顯示任何對話窗"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "不要顯示任何對話窗，除非只有「附近的人」帳號"
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "初始選取所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Empathy 帳號"
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Empathy 帳號"
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Empathy 除錯程式"
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy 聊天用戶端"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "回應"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "拒絕"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "接聽"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "拒絕"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "接受"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "已接收檔案的雜湊值與送出的不符"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "加入新的預先設定(_N)"
+
+#~ msgid "Saved Presets"
+#~ msgstr "已儲存的預先設定"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "來自 %s 的訂閱要求"
+
#~ msgid "Empathy has asked about importing accounts"
#~ msgstr "Empathy 已詢問匯入帳號"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 41a79de34..eda8a0f5b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy 2.91.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-13 15:39+0800\n"
-"PO-Revision-Date: 2010-09-23 20:50+0800\n"
+"POT-Creation-Date: 2010-12-09 19:53+0800\n"
+"PO-Revision-Date: 2010-12-04 18:14+0800\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
"Language: zh_TW\n"
@@ -90,7 +90,7 @@ msgstr "在狀態區域顯示收到事件。如果不啟用的話，收到事件
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
-msgstr "Empathy 可以發佈使用者的位置"
+msgstr "Empathy 可以發布使用者的位置"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
@@ -98,7 +98,7 @@ msgstr "Empathy 可以利用 GPS 來推測位置"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 可以利用行動電話網路基地台來推測位置"
+msgstr "Empathy 可以利用行動電話網路基地臺來推測位置"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
@@ -262,7 +262,7 @@ msgstr "在聊天室使用佈景主題"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy 是否要將使用者的位置發佈給他的連絡人。"
+msgstr "Empathy 是否要將使用者的位置發布給他的連絡人。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
@@ -428,19 +428,19 @@ msgstr "管理訊息與 VoIP 帳號"
msgid "Messaging and VoIP Accounts"
msgstr "訊息與 VoIP 帳號"
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr "已接收檔案的雜湊值與送出的不符"
+#: ../libempathy/empathy-ft-handler.c:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr "檔案傳輸完畢，但是檔案已損毀"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1121
msgid "File transfer not supported by remote contact"
msgstr "遠端連絡人不支援檔案傳輸"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1177
msgid "The selected file is not a regular file"
msgstr "選取的檔案不是正規的檔案"
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1186
msgid "The selected file is empty"
msgstr "選取的檔案是空白的"
@@ -496,9 +496,9 @@ msgstr "隱藏"
msgid "Offline"
msgstr "離線"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "不明"
@@ -621,7 +621,7 @@ msgstr "Yahoo! 日本"
#: ../libempathy/empathy-utils.c:577
msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
@@ -667,71 +667,85 @@ msgstr[0] "%d 個月以前"
msgid "in the future"
msgstr "未來"
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:670
+#: ../libempathy-gtk/empathy-log-window.c:650
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:671
msgid "Password"
msgstr "密碼"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:672
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "伺服器"
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:673
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "連接埠"
-#: ../libempathy-gtk/empathy-account-widget.c:589
-#: ../libempathy-gtk/empathy-account-widget.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
#, c-format
msgid "%s:"
msgstr "%s："
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1127
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "%s 帳號已透過我的網路帳號修改。"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1133
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "%s 帳號無法於 Empathy 內修改。"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1153
+msgid "Launch My Web Accounts"
+msgstr "啟動我的網路帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1465
msgid "Username:"
msgstr "使用者名稱："
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1806
msgid "A_pply"
msgstr "套用(_A)"
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "L_og in"
msgstr "登入(_O)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1902
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1399
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "帳號："
-#: ../libempathy-gtk/empathy-account-widget.c:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1913
msgid "_Enabled"
msgstr "已啟用(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1978
msgid "This account already exists on the server"
msgstr "此帳號已經存在這個伺服器上"
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1981
msgid "Create a new account on the server"
msgstr "在這個伺服器上建立新的帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2095
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -740,19 +754,19 @@ msgstr "取消(_N)"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2392
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s 的 %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2418
#, c-format
msgid "%s Account"
msgstr "%s 帳號"
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2422
msgid "New account"
msgstr "新增帳號"
@@ -1037,7 +1051,7 @@ msgstr "姓(_L)："
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
-msgstr "發佈的名稱(_P)："
+msgstr "發布的名稱(_P)："
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
msgid "<b>Example:</b> user@my.sip.server"
@@ -1129,30 +1143,30 @@ msgstr "Yahoo I_D:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
-msgstr "聊天室清單地區(_R)："
+msgstr "聊天室清單地區資訊(_R)："
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
msgid "Couldn't convert image"
msgstr "無法轉換圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
msgid "None of the accepted image formats are supported on your system"
msgstr "您的系統上沒有支援已接受的圖片格式"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
msgid "Select Your Avatar Image"
msgstr "選擇您的大頭貼圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
msgid "No Image"
msgstr "沒有圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "圖片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "所有檔案"
@@ -1160,51 +1174,51 @@ msgstr "所有檔案"
msgid "Click to enlarge"
msgstr "請按這裡放大"
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "開啟私人對話失敗"
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "此談話的主題不被支援"
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "您不被允許變更這個主題"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: 清除目前談話的所有訊息"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主題>：設置目前談話的主題"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室 ID>：加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室 ID>：加入新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <聯絡人 ID> <訊息>：開啟私人對話"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <暱稱>：變更在目前伺服器上的您的暱稱"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:851
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1213,7 +1227,7 @@ msgstr ""
"/say <訊息>：送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來"
"說：「/say /join 是用來加入新的聊天室」"
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1221,84 +1235,98 @@ msgstr ""
"/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用"
"法。"
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "用法：%s"
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "未知的命令"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "未知的指令；請參見 /help 以取得可用的指令"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "offline"
msgstr "離線"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "invalid contact"
msgstr "無效的連絡人"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "permission denied"
msgstr "權限被拒絕"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "too long message"
msgstr "太長的訊息"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "not implemented"
msgstr "未實作"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1172
msgid "unknown"
msgstr "不明"
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1176
#, c-format
msgid "Error sending message '%s': %s"
msgstr "傳送訊息「%s」時發生錯誤；%s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
msgid "Topic:"
msgstr "主題："
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1249
#, c-format
msgid "Topic set to: %s"
msgstr "主題設定為: %s"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1251
msgid "No topic defined"
msgstr "尚未定義主題"
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1750
msgid "(No Suggestions)"
msgstr "(沒有建議)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1818
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "加入「%s」至辭典"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1855
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "加入「%s」至 %s 辭典"
+
+#: ../libempathy-gtk/empathy-chat.c:1914
msgid "Insert Smiley"
msgstr "插入表情符號"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
msgid "_Send"
msgstr "傳送(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1967
msgid "_Spelling Suggestions"
msgstr "拼字建議(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2056
msgid "Failed to retrieve recent logs"
msgstr "無法取得最近的日誌"
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2162
#, c-format
msgid "%s has disconnected"
msgstr "%s 已斷線"
@@ -1306,12 +1334,12 @@ msgstr "%s 已斷線"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2169
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出去"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2172
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1319,17 +1347,17 @@ msgstr "%s 被踢出"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2180
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s 被 %2$s 設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s was banned"
msgstr "%s 被設為黑名單"
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2187
#, c-format
msgid "%s has left the room"
msgstr "%s 已經離開此聊天室"
@@ -1339,79 +1367,79 @@ msgstr "%s 已經離開此聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2196
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2221
#, c-format
msgid "%s has joined the room"
msgstr "%s 已經加入此聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2246
#, c-format
msgid "%s is now known as %s"
msgstr "%s 現在被稱為 %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
msgid "Disconnected"
msgstr "已斷線"
-#: ../libempathy-gtk/empathy-chat.c:2910
+#: ../libempathy-gtk/empathy-chat.c:3016
msgid "Wrong password; please try again:"
msgstr "密碼錯誤；請再試一次："
-#: ../libempathy-gtk/empathy-chat.c:2911
+#: ../libempathy-gtk/empathy-chat.c:3017
msgid "Retry"
msgstr "重試"
-#: ../libempathy-gtk/empathy-chat.c:2916
+#: ../libempathy-gtk/empathy-chat.c:3022
msgid "This room is protected by a password:"
msgstr "此聊天室已被密碼保護："
-#: ../libempathy-gtk/empathy-chat.c:2917
+#: ../libempathy-gtk/empathy-chat.c:3023
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3163
msgid "Connected"
msgstr "成功連線"
-#: ../libempathy-gtk/empathy-chat.c:3110
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
msgid "Conversation"
msgstr "談話"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
msgid "_Copy Link Address"
msgstr "複製連結位址(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
msgid "_Open Link"
msgstr "開啟連結(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
msgid "%A %B %d %Y"
msgstr "%Y %B %d %A"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "編輯連絡人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
msgid "Personal Information"
msgstr "個人資訊"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
-#: ../libempathy-gtk/empathy-individual-dialogs.c:111
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
msgid "New Contact"
msgstr "新增連絡人"
@@ -1431,101 +1459,101 @@ msgstr "未群組"
msgid "Favorite People"
msgstr "喜好的人"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "是否想要移除群組「%s」？"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
msgid "Removing group"
msgstr "正在移除群組"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "移除(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "是否想要移除連絡人「%s」？"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
msgid "Removing contact"
msgstr "正在移除連絡人"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "新增聯絡人(_A)…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
#: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-contact-menu.c:261
#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "語音通話(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-contact-menu.c:292
#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "視訊通話(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-contact-menu.c:333
#: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "上一次談話(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-contact-menu.c:355
#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "傳送檔案"
-#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-contact-menu.c:378
#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "分享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:414
-#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1290
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
msgid "Favorite"
msgstr "喜好"
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:447
#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "資訊(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:489
+#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:543
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:917
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:919
msgid "Inviting you to this room"
msgstr "邀請您到這個聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:574
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr "邀請到聊天室(_I)"
@@ -1533,178 +1561,178 @@ msgstr "邀請到聊天室(_I)"
msgid "Select a contact"
msgstr "選擇連絡人"
-#: ../libempathy-gtk/empathy-contact-widget.c:225
-#: ../libempathy-gtk/empathy-individual-widget.c:147
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "全名："
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "電話號碼："
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "電子信箱位址："
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "網站："
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "生日："
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Country ISO Code:"
msgstr "國家 ISO 碼："
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "Country:"
msgstr "國家："
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "State:"
msgstr "州："
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "City:"
msgstr "市："
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Area:"
msgstr "區域："
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Postal Code:"
msgstr "郵遞區號："
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Street:"
msgstr "街："
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Building:"
msgstr "建築："
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Floor:"
msgstr "樓層："
-#: ../libempathy-gtk/empathy-contact-widget.c:626
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Room:"
msgstr "室："
-#: ../libempathy-gtk/empathy-contact-widget.c:628
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Text:"
msgstr "文字："
-#: ../libempathy-gtk/empathy-contact-widget.c:630
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Description:"
msgstr "描述："
-#: ../libempathy-gtk/empathy-contact-widget.c:632
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "URI:"
msgstr "URI："
-#: ../libempathy-gtk/empathy-contact-widget.c:634
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Accuracy Level:"
msgstr "準確度等級："
-#: ../libempathy-gtk/empathy-contact-widget.c:636
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Error:"
msgstr "錯誤："
-#: ../libempathy-gtk/empathy-contact-widget.c:638
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Vertical Error (meters):"
msgstr "垂直誤差 (公尺)："
-#: ../libempathy-gtk/empathy-contact-widget.c:640
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Horizontal Error (meters):"
msgstr "水平誤差 (公尺)："
-#: ../libempathy-gtk/empathy-contact-widget.c:642
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Speed:"
msgstr "速度："
-#: ../libempathy-gtk/empathy-contact-widget.c:644
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "Bearing:"
msgstr "方位："
-#: ../libempathy-gtk/empathy-contact-widget.c:646
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Climb Speed:"
msgstr "爬升速度："
-#: ../libempathy-gtk/empathy-contact-widget.c:648
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Last Updated on:"
msgstr "上次更新於："
-#: ../libempathy-gtk/empathy-contact-widget.c:650
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Longitude:"
msgstr "經度："
-#: ../libempathy-gtk/empathy-contact-widget.c:652
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Latitude:"
msgstr "緯度："
-#: ../libempathy-gtk/empathy-contact-widget.c:654
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Altitude:"
msgstr "緯度："
-#: ../libempathy-gtk/empathy-contact-widget.c:717
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:621
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:623
#, c-format
msgid "%s, %s"
msgstr "%s、%s"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:672
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y 於 %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-individual-widget.c:840
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:921
msgid "Save Avatar"
msgstr "儲存大頭貼"
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:979
msgid "Unable to save avatar"
msgstr "無法儲存大頭貼"
@@ -1714,7 +1742,7 @@ msgstr "<b>位置</b> 於 (date)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1226
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
msgid "Alias:"
msgstr "別名："
@@ -1734,7 +1762,7 @@ msgstr "連絡人詳細資料"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1429
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
msgid "Identifier:"
msgstr "識別身分："
@@ -1767,14 +1795,12 @@ msgid "_Add Group"
msgstr "加入群組(_G)"
#: ../libempathy-gtk/empathy-groups-widget.c:398
-#, fuzzy
-#| msgid "Select"
msgctxt "verb in a column header displaying group names"
msgid "Select"
-msgstr "選擇"
+msgstr "選取"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1250
+#: ../src/empathy-main-window.c:1276
msgid "Group"
msgstr "群組"
@@ -1803,19 +1829,19 @@ msgstr "在所方清單所選的聯絡人將連結在一起。"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:836
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "編輯(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "連結聯絡人(_L)…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1567
+#: ../libempathy-gtk/empathy-individual-widget.c:1649
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1825,6 +1851,10 @@ msgstr[0] "後設聯絡人包含 %u 位聯絡人"
msgid "<b>Location</b> at (date)"
msgstr "<b>位置</b> 於 (日期)"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "從手機或行動裝置上線"
+
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
msgstr "新增網路"
@@ -1834,11 +1864,9 @@ msgid "Choose an IRC network"
msgstr "選擇 IRC 網路"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
-#, fuzzy
-#| msgid "Select"
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
-msgstr "選擇"
+msgstr "選取"
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
@@ -1889,7 +1917,7 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "取消連結(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
msgid "Date"
msgstr "日期"
@@ -1927,64 +1955,76 @@ msgid "Contact ID:"
msgstr "連絡人 ID："
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
msgid "C_hat"
msgstr "聊天(_C)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
msgid "New Conversation"
msgstr "新增談話"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
msgid "Send _Video"
msgstr "傳送視訊(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
msgid "C_all"
msgstr "通話(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
msgid "New Call"
msgstr "新增通話"
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr ""
+
#. COL_STATUS_TEXT
#. COL_STATE_ICON_NAME
#. COL_STATE
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Message…"
msgstr "自訂訊息…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
msgstr "編輯自訂訊息…"
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
msgstr "按這裡將這個狀態從喜好中移除"
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
msgid "Click to make this status a favorite"
msgstr "按這裡將這個狀態設為喜好"
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
msgid "Set status"
msgstr "設定狀態"
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
msgid "Set your presence and current status"
msgstr "設定您的上線與目前的狀態"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messages…"
msgstr "自訂訊息…"
@@ -2009,43 +2049,43 @@ msgstr "符合條件"
msgid "Phrase not found"
msgstr "找不到詞彙"
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
msgstr "收到即時訊息"
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Sent an instant message"
msgstr "傳送即時訊息"
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Incoming chat request"
msgstr "收到聊天要求"
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact connected"
msgstr "連絡人已連線"
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Contact disconnected"
msgstr "連絡人已斷線"
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Connected to server"
msgstr "連接到伺服器"
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
msgstr "與伺服器斷線"
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
msgstr "收到語音通話"
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Outgoing voice call"
msgstr "播出語音通話"
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
msgid "Voice call ended"
msgstr "語音通話結束"
@@ -2058,12 +2098,12 @@ msgid "Edit Custom Messages"
msgstr "編輯自訂訊息"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "加入新的預先設定(_N)"
+msgid "Save _New Status Message"
+msgstr "儲存新的狀態訊息(_N)"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "已儲存的預先設定"
+msgid "Saved Status Messages"
+msgstr "儲存的狀態訊息"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
@@ -2082,73 +2122,49 @@ msgid "Blue"
msgstr "藍色"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-#, fuzzy
-#| msgid "The identity provided by the chat server cannot be verified.\n"
msgid "The identity provided by the chat server cannot be verified."
-msgstr "對話伺服器所提供的識別身分無法通過驗證。\n"
+msgstr "對話伺服器所提供的識別身分無法通過驗證。"
#: ../libempathy-gtk/empathy-tls-dialog.c:157
-#, fuzzy
-#| msgid "The certificate is not signed by a Certification Authority"
msgid "The certificate is not signed by a Certification Authority."
-msgstr "該憑證並非由憑證授權中心所簽署"
+msgstr "該憑證並非由憑證授權中心所簽署。"
#: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
-#| msgid "The certificate has expired"
msgid "The certificate has expired."
-msgstr "憑證已逾期"
+msgstr "憑證已逾期。"
#: ../libempathy-gtk/empathy-tls-dialog.c:164
-#, fuzzy
-#| msgid "The certificate hasn't yet been activated"
msgid "The certificate hasn't yet been activated."
-msgstr "憑證尚未啟用"
+msgstr "憑證尚未啟用。"
#: ../libempathy-gtk/empathy-tls-dialog.c:167
-#, fuzzy
-#| msgid "The certificate does not have the expected fingerprint"
msgid "The certificate does not have the expected fingerprint."
-msgstr "憑證並未擁有預期的指紋"
+msgstr "憑證並未擁有預期的指紋。"
#: ../libempathy-gtk/empathy-tls-dialog.c:170
-#, fuzzy
-#| msgid ""
-#| "The hostname verified by the certificate doesn't match the server name"
msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "憑證所驗證的主機名稱與伺服器名稱不符"
+msgstr "憑證所驗證的主機名稱與伺服器名稱不符。"
#: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "The certificate is self-signed"
msgid "The certificate is self-signed."
-msgstr "憑證為自我簽署"
+msgstr "憑證為自我簽署。"
#: ../libempathy-gtk/empathy-tls-dialog.c:177
-#, fuzzy
-#| msgid ""
-#| "The certificate has been revoked by the issuing Certification Authority"
msgid ""
"The certificate has been revoked by the issuing Certification Authority."
-msgstr "憑證已被原本發出的憑證授權機構撤銷"
+msgstr "憑證已被原本發出的憑證授權機構撤銷。"
#: ../libempathy-gtk/empathy-tls-dialog.c:181
-#, fuzzy
-#| msgid "The certificate is cryptographically weak"
msgid "The certificate is cryptographically weak."
-msgstr "憑證於密碼防護上較弱"
+msgstr "憑證於密碼防護上較弱。"
#: ../libempathy-gtk/empathy-tls-dialog.c:184
-#, fuzzy
-#| msgid "The certificate length exceeds verifiable limits"
msgid "The certificate length exceeds verifiable limits."
-msgstr "憑證長度超出可驗證的範圍"
+msgstr "憑證長度超出可驗證的範圍。"
#: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
-#| msgid "The certificate is malformed"
msgid "The certificate is malformed."
-msgstr "憑證格式不良"
+msgstr "憑證格式不良。"
#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
@@ -2176,22 +2192,22 @@ msgstr "請記住此選擇以供未來連線使用"
msgid "Certificate Details"
msgstr "憑證詳細資料"
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
msgid "Unable to open URI"
msgstr "無法開啓 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "Select a file"
msgstr "選擇一個檔案"
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
#, c-format
msgid "Incoming file from %s"
msgstr "收到來自 %s 的檔案"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
-msgstr "目前的地區設定"
+msgstr "目前的地區資訊設定"
#: ../libempathy-gtk/totem-subtitle-encoding.c:161
#: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -2236,7 +2252,7 @@ msgstr "正體中文"
#: ../libempathy-gtk/totem-subtitle-encoding.c:208
msgid "Croatian"
-msgstr "克羅埃西亞語"
+msgstr "克羅埃西亞文"
#: ../libempathy-gtk/totem-subtitle-encoding.c:211
#: ../libempathy-gtk/totem-subtitle-encoding.c:213
@@ -2254,7 +2270,7 @@ msgstr "斯拉夫語系/俄文"
#: ../libempathy-gtk/totem-subtitle-encoding.c:227
#: ../libempathy-gtk/totem-subtitle-encoding.c:229
msgid "Cyrillic/Ukrainian"
-msgstr "斯拉夫/烏克蘭語系"
+msgstr "斯拉夫文/烏克蘭語系"
#: ../libempathy-gtk/totem-subtitle-encoding.c:232
msgid "Georgian"
@@ -2372,18 +2388,34 @@ msgstr "沒有錯誤訊息"
msgid "Instant Message (Empathy)"
msgstr "即時通訊 (Empathy)"
-#: ../src/empathy.c:414
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "啟動時不要自動連線"
-#: ../src/empathy.c:418
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "啟動時不顯示連絡人清單或任何其他對話窗"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr "- Empathy 即時通用戶端"
+#: ../src/empathy.c:500
+msgid "Error contacting the Account Manager"
+msgstr "聯絡帳號管理程式時發生錯誤"
+
+#: ../src/empathy.c:502
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"嘗試連接至 Telepathy 帳號管理程式時發生錯誤。錯誤為：\n"
+"\n"
+"%s"
+
#: ../src/empathy-about-dialog.c:81
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
@@ -2392,7 +2424,7 @@ msgid ""
"version."
msgstr ""
"Empathy 是自由軟體，您可以遵照自由軟體基金會 (Free Software Foundation) 出版"
-"的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈"
+"的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發布"
"這一程式，或者自由選擇使用任何更新的版本。"
#: ../src/empathy-about-dialog.c:85
@@ -2402,7 +2434,7 @@ msgid ""
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
"details."
msgstr ""
-"發佈 Empathy 的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的"
+"發布 Empathy 的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的"
"擔保。更詳細的情況請參閱 GNU 通用公共許可證。"
#: ../src/empathy-about-dialog.c:89
@@ -2525,8 +2557,8 @@ msgid "Select the accounts you want to import:"
msgstr "選擇要匯入的帳號："
#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "Yes"
msgstr "是"
@@ -2598,7 +2630,7 @@ msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
msgid "Your new account has not been saved yet."
msgstr "尚未儲存您的新帳號。"
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
msgid "Connecting…"
msgstr "連線中…"
@@ -2683,11 +2715,11 @@ msgstr "加入(_A)…"
msgid "_Import…"
msgstr "匯入(_I)…"
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
msgid " - Empathy authentication client"
msgstr "- Empathy 認證用戶端"
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
msgid "Empathy authentication client"
msgstr "Empathy 認證用戶端"
@@ -2695,129 +2727,129 @@ msgstr "Empathy 認證用戶端"
msgid "People nearby"
msgstr "附近的人"
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
msgid "- Empathy Audio/Video Client"
msgstr "- Empathy 音訊視訊用戶端"
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
msgid "Empathy Audio/Video Client"
msgstr "Empathy 音訊視訊用戶端"
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
msgid "Contrast"
msgstr "對比"
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
msgid "Gamma"
msgstr "Gamma"
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
msgid "_Sidebar"
msgstr "側邊欄(_S)"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
msgid "Audio input"
msgstr "音效輸入"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
msgid "Video input"
msgstr "視訊輸入"
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
msgid "Dialpad"
msgstr "播號盤"
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
msgid "Details"
msgstr "詳細資料"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1266
+#: ../src/empathy-call-window.c:1270
#, c-format
msgid "Call with %s"
msgstr "與 %s 通話中"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-call-window.c:1349
msgid "Call"
msgstr "通話"
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
msgid "The IP address as seen by the machine"
msgstr "機器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
msgid "The IP address as seen by a server on the Internet"
msgstr "網際網路上的伺服器看見的 IP 位址"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
msgid "The IP address of the peer as seen by the other side"
msgstr "其他端看見的點的 IP 位址"
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
msgid "The IP address of a relay server"
msgstr "中繼伺服器的 IP 位址"
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
msgid "The IP address of the multicast group"
msgstr "多點廣播群組的 IP 位址"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已連線 — %d:%02dm"
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
msgid "Technical Details"
msgstr "技術細節"
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 的軟體不瞭解任何您電腦上所支援的音訊格式"
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 的軟體不瞭解任何您電腦上所支援的視訊格式"
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr "無法和 %s 建立連線。您們其中之一可能在一個不允許直接連線的網路之上。"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid "There was a failure on the network"
msgstr "這個網路上有錯誤發生"
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝"
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝"
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2827,19 +2859,19 @@ msgstr ""
"在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">回報這個錯誤</a>並附上"
"從求助選單內的「除錯」視窗中所收集的紀錄。"
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
msgid "There was a failure in the call engine"
msgstr "通話引擎內有錯誤發生"
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
msgid "The end of the stream was reached"
msgstr "已達串流末端"
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
msgid "Can't establish audio stream"
msgstr "無法建立音訊串流"
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
msgid "Can't establish video stream"
msgstr "無法建立視訊串流"
@@ -2935,35 +2967,35 @@ msgstr "視訊預覽"
msgid "_Call"
msgstr "通話(_C)"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "檢視(_V)"
-#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 個未讀)"
-#: ../src/empathy-chat-window.c:478
+#: ../src/empathy-chat-window.c:484
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (與 %u 其他的)"
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (來自其他人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:503
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (來自所有人的 %d 個未讀)"
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:711
msgid "Typing a message."
msgstr "正在輸入訊息。"
@@ -2999,7 +3031,7 @@ msgstr "將分頁右移(_R)"
msgid "Notify for All Messages"
msgstr "所有訊息都通知"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "內容(_C)"
@@ -3011,7 +3043,7 @@ msgstr "談話(_C)"
msgid "_Detach Tab"
msgstr "分離分頁(_D)"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
msgid "_Edit"
msgstr "編輯(_E)"
@@ -3019,7 +3051,7 @@ msgstr "編輯(_E)"
msgid "_Favorite Chat Room"
msgstr "喜好的聊天室(_F)"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "求助(_H)"
@@ -3059,86 +3091,86 @@ msgstr "自動連線"
msgid "Manage Favorite Rooms"
msgstr "管理喜好的聊天室"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming video call"
msgstr "傳入的視訊通話"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
msgid "Incoming call"
msgstr "來電"
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:476
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s 要與您進行視訊通話。您是否要接聽？"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:477
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 要與您進行通話。您是否要接聽？"
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的來電"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:505
msgid "_Reject"
msgstr "拒絕(_R)"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511
msgid "_Answer"
msgstr "接聽(_A)"
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:625
#, c-format
msgid "Incoming video call from %s"
msgstr "來自 %s 的視訊電話"
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:702
msgid "Room invitation"
msgstr "聊天邀請"
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "Invitation to join %s"
msgstr "邀請加入 %s"
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:711
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正在邀請您加入 %s"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:719
msgid "_Decline"
msgstr "拒絕(_D)"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:724
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:751
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 曾邀請您加入 %s"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:757
#, c-format
msgid "You have been invited to join %s"
msgstr "您被邀請加入 %s"
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:807
#, c-format
msgid "Incoming file transfer from %s"
msgstr "收到來自 %s 的檔案傳輸"
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1018
#, c-format
-msgid "Subscription requested by %s"
-msgstr "來自 %s 的訂閱要求"
+msgid "%s would like permission to see when you are available"
+msgstr "%s 想要在您有空時得到查看的許可"
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1022
#, c-format
msgid ""
"\n"
@@ -3147,12 +3179,12 @@ msgstr ""
"\n"
"訊息：%s"
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1066
#, c-format
msgid "%s is now offline."
msgstr "%s 現在離線。"
-#: ../src/empathy-event-manager.c:1072
+#: ../src/empathy-event-manager.c:1087
#, c-format
msgid "%s is now online."
msgstr "%s 現在上線。"
@@ -3291,31 +3323,31 @@ msgstr "通訊協定"
msgid "Source"
msgstr "來源"
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:385
msgid "No match found"
msgstr "找不到符合項目"
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:540
msgid "Reconnect"
msgstr "重新連接"
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:546
msgid "Edit Account"
msgstr "編輯帳號"
-#: ../src/empathy-main-window.c:550
+#: ../src/empathy-main-window.c:552
msgid "Close"
msgstr "關閉"
-#: ../src/empathy-main-window.c:1232
+#: ../src/empathy-main-window.c:1258
msgid "Contact"
msgstr "連絡人"
-#: ../src/empathy-main-window.c:1557
+#: ../src/empathy-main-window.c:1585
msgid "Contact List"
msgstr "連絡人清單"
-#: ../src/empathy-main-window.c:1666
+#: ../src/empathy-main-window.c:1695
msgid "Show and edit accounts"
msgstr "顯示並編輯帳號"
@@ -3328,88 +3360,92 @@ msgid "Context"
msgstr "選項"
#: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "於連絡人清單內尋找(_L)"
+
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "加入喜好(_F)"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "管理喜好"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "正常大小(_O)"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "新增通話(_C)…"
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "正常大小與大頭貼(_A)"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "偏好設定(_R)"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "顯示協定(_R)"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "依名稱排序(_N)"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "依狀態排序(_S)"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "帳號(_A)"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "精簡大小(_C)"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "偵錯(_D)"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "檔案傳輸(_F)"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Join…"
msgstr "加入(_J)…"
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "新增談話(_N)…"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "離線連絡人(_O)"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "個人資訊(_P)"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "聊天室(_R)"
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
msgid "Chat Room"
msgstr "聊天室"
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
msgid "Members"
msgstr "成員"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:634
#, c-format
msgid ""
"%s\n"
@@ -3422,16 +3458,16 @@ msgstr ""
"需要密碼：%s\n"
"成員：%s"
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
msgid "Could not start room listing"
msgstr "無法開始列出聊天室清單"
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
msgid "Could not stop room listing"
msgstr "無法停止列出聊天室清單"
@@ -3463,39 +3499,39 @@ msgstr "聊天室清單"
msgid "_Room:"
msgstr "聊天室(_R)："
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
msgid "Message received"
msgstr "訊息已收到"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
msgstr "訊息已送出"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr "新增談話"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr "連絡人上線"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr "連絡人離線"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr "帳號已連線"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr "帳號已斷線"
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "語言"
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
msgid "Preferences"
msgstr "偏好設定"
@@ -3635,26 +3671,6 @@ msgstr "對我的連絡人公開位置(_P)"
msgid "_Reduce location accuracy"
msgstr "降低位置準確度(_R)"
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "回應"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "拒絕"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "接聽"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "拒絕"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "接受"
-
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "狀態"
@@ -3742,34 +3758,73 @@ msgstr "選擇想要邀請進入談話的聯絡人："
msgid "Invite"
msgstr "邀請"
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "不要顯示任何對話窗；執行任何作業（例：匯入）並離開"
+msgstr "不要顯示任何對話窗；執行任何作業 (例：匯入) 並離開"
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "如果有任何非 Salut 的帳號，就不要顯示任何對話窗"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "不要顯示任何對話窗，除非只有「附近的人」帳號"
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "初始選取所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<account-id>"
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Empathy 帳號"
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Empathy 帳號"
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Empathy 除錯程式"
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy 聊天用戶端"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "回應"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "拒絕"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "接聽"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "拒絕"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "接受"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "已接收檔案的雜湊值與送出的不符"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "加入新的預先設定(_N)"
+
+#~ msgid "Saved Presets"
+#~ msgstr "已儲存的預先設定"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "來自 %s 的訂閱要求"
+
#~ msgid "Empathy has asked about importing accounts"
#~ msgstr "Empathy 已詢問匯入帳號"
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index ce2f78042..b1e26f5e5 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -738,6 +738,7 @@ main_window_error_display (EmpathyMainWindow *window,
G_CALLBACK (main_window_error_retry_clicked_cb),
window);
+ gtk_widget_set_tooltip_text (priv->errors_vbox, error_message);
gtk_widget_show (priv->errors_vbox);
g_hash_table_insert (priv->errors, g_object_ref (account), info_bar);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 11:59:20 +0800