aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libempathy-gtk/empathy-chat.c30
-rw-r--r--libempathy-gtk/empathy-chat.h4
-rw-r--r--libempathy-gtk/empathy-individual-linker.c34
-rw-r--r--libempathy-gtk/empathy-individual-linker.h4
-rw-r--r--libempathy-gtk/empathy-individual-widget.c4
-rw-r--r--libempathy-gtk/empathy-search-bar.c48
-rw-r--r--libempathy-gtk/empathy-search-bar.h4
-rw-r--r--libempathy/empathy-chatroom.c1
-rw-r--r--po/es.po202
-rw-r--r--po/sl.po189
10 files changed, 215 insertions, 305 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index ecf849aaf..bb33130e3 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -180,7 +180,7 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (EmpathyChat, empathy_chat, GTK_TYPE_BIN);
+G_DEFINE_TYPE (EmpathyChat, empathy_chat, GTK_TYPE_BOX);
static gboolean update_misspelled_words (gpointer data);
@@ -2941,34 +2941,11 @@ chat_create_ui (EmpathyChat *chat)
g_list_free (list);
/* Add the main widget in the chat widget */
- gtk_container_add (GTK_CONTAINER (chat), priv->widget);
+ gtk_box_pack_start (GTK_BOX (chat), priv->widget, TRUE, TRUE, 0);
g_object_unref (gui);
}
static void
-chat_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- GtkBin *bin = GTK_BIN (widget);
- GtkAllocation child_allocation;
- GtkWidget *child;
-
- gtk_widget_set_allocation (widget, allocation);
-
- child = gtk_bin_get_child (bin);
-
- if (child && gtk_widget_get_visible (child))
- {
- child_allocation.x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (widget));
- child_allocation.y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (widget));
- child_allocation.width = MAX (allocation->width - gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2, 0);
- child_allocation.height = MAX (allocation->height - gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2, 0);
-
- gtk_widget_size_allocate (child, &child_allocation);
- }
-}
-
-static void
chat_finalize (GObject *object)
{
EmpathyChat *chat;
@@ -3058,7 +3035,6 @@ chat_constructed (GObject *object)
static void
empathy_chat_class_init (EmpathyChatClass *klass)
{
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = chat_finalize;
@@ -3066,8 +3042,6 @@ empathy_chat_class_init (EmpathyChatClass *klass)
object_class->set_property = chat_set_property;
object_class->constructed = chat_constructed;
- widget_class->size_allocate = chat_size_allocate;
-
g_object_class_install_property (object_class,
PROP_TP_CHAT,
g_param_spec_object ("tp-chat",
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index 4b0540b20..0031410d6 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -50,7 +50,7 @@ typedef struct _EmpathyChatClass EmpathyChatClass;
typedef struct _EmpathyChatPriv EmpathyChatPriv;
struct _EmpathyChat {
- GtkBin parent;
+ GtkBox parent;
EmpathyChatPriv *priv;
/* Protected */
@@ -59,7 +59,7 @@ struct _EmpathyChat {
};
struct _EmpathyChatClass {
- GtkBinClass parent;
+ GtkBoxClass parent;
};
GType empathy_chat_get_type (void);
diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c
index 3a1551a70..54663ef26 100644
--- a/libempathy-gtk/empathy-individual-linker.c
+++ b/libempathy-gtk/empathy-individual-linker.c
@@ -85,7 +85,7 @@ enum {
};
G_DEFINE_TYPE (EmpathyIndividualLinker, empathy_individual_linker,
- GTK_TYPE_BIN);
+ GTK_TYPE_BOX);
static void
contact_toggle_cell_data_func (GtkTreeViewColumn *tree_column,
@@ -494,7 +494,7 @@ set_up (EmpathyIndividualLinker *self)
gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, TRUE, 0);
/* Add the main vbox to the bin */
- gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (top_vbox));
+ gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (top_vbox), TRUE, TRUE, 0);
gtk_widget_show (GTK_WIDGET (top_vbox));
}
@@ -578,45 +578,15 @@ finalize (GObject *object)
}
static void
-size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- GtkBin *bin = GTK_BIN (widget);
- GtkAllocation child_allocation;
- GtkWidget *child;
-
- gtk_widget_set_allocation (widget, allocation);
-
- child = gtk_bin_get_child (bin);
-
- if (child && gtk_widget_get_visible (child))
- {
- child_allocation.x = allocation->x +
- gtk_container_get_border_width (GTK_CONTAINER (widget));
- child_allocation.y = allocation->y +
- gtk_container_get_border_width (GTK_CONTAINER (widget));
- child_allocation.width = MAX (allocation->width -
- gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2, 0);
- child_allocation.height = MAX (allocation->height -
- gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2, 0);
-
- gtk_widget_size_allocate (child, &child_allocation);
- }
-}
-
-static void
empathy_individual_linker_class_init (EmpathyIndividualLinkerClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->get_property = get_property;
object_class->set_property = set_property;
object_class->dispose = dispose;
object_class->finalize = finalize;
- widget_class->size_allocate = size_allocate;
-
/**
* EmpathyIndividualLinker:start-individual:
*
diff --git a/libempathy-gtk/empathy-individual-linker.h b/libempathy-gtk/empathy-individual-linker.h
index dcf75189b..3079fa091 100644
--- a/libempathy-gtk/empathy-individual-linker.h
+++ b/libempathy-gtk/empathy-individual-linker.h
@@ -43,14 +43,14 @@ G_BEGIN_DECLS
EmpathyIndividualLinkerClass))
typedef struct {
- GtkBin parent;
+ GtkBox parent;
/*<private>*/
gpointer priv;
} EmpathyIndividualLinker;
typedef struct {
- GtkBinClass parent_class;
+ GtkBoxClass parent_class;
} EmpathyIndividualLinkerClass;
GType empathy_individual_linker_get_type (void) G_GNUC_CONST;
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index e5441748b..628ed5187 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -397,8 +397,8 @@ details_request_cb (TpContact *contact,
tp_clear_object (&priv->details_cancellable);
- g_signal_connect (contact, "notify::contact-info",
- (GCallback) details_notify_cb, self);
+ tp_g_signal_connect_object (contact, "notify::contact-info",
+ (GCallback) details_notify_cb, self, 0);
}
details_data_free (data);
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index fe5f167a0..d23380d4d 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -33,7 +33,7 @@
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathySearchBar)
-G_DEFINE_TYPE (EmpathySearchBar, empathy_search_bar, GTK_TYPE_BIN);
+G_DEFINE_TYPE (EmpathySearchBar, empathy_search_bar, GTK_TYPE_BOX);
typedef struct _EmpathySearchBarPriv EmpathySearchBarPriv;
struct _EmpathySearchBarPriv
@@ -63,45 +63,6 @@ empathy_search_bar_new (EmpathyChatView *view)
}
static void
-empathy_search_bar_get_preferred_height (GtkWidget *widget,
- gint *minimun_height,
- gint *natural_height)
-{
- GtkBin *bin;
- GtkWidget *child;
-
- bin = GTK_BIN (widget);
- child = gtk_bin_get_child (bin);
-
- if (child && gtk_widget_get_visible (child))
- gtk_widget_get_preferred_height (child, minimun_height, natural_height);
-}
-
-static void
-empathy_search_bar_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- GtkBin *bin;
- GtkWidget *child;
- GtkAllocation child_allocation;
-
- bin = GTK_BIN (widget);
- child = gtk_bin_get_child (bin);
-
- gtk_widget_set_allocation (widget, allocation);
-
- if (child && gtk_widget_get_visible (child))
- {
- child_allocation.x = allocation->x;
- child_allocation.y = allocation->y;
- child_allocation.width = MAX (allocation->width, 0);
- child_allocation.height = MAX (allocation->height, 0);
-
- gtk_widget_size_allocate (child, &child_allocation);
- }
-}
-
-static void
empathy_search_bar_update_buttons (EmpathySearchBar *self,
gchar *search,
gboolean match_case)
@@ -332,7 +293,7 @@ empathy_search_bar_init (EmpathySearchBar * self)
g_signal_connect (G_OBJECT (self), "key-press-event",
G_CALLBACK (empathy_search_bar_key_pressed), NULL);
- gtk_container_add (GTK_CONTAINER (self), internal);
+ gtk_box_pack_start (GTK_BOX (self), internal, TRUE, TRUE, 0);
gtk_widget_show_all (internal);
gtk_widget_hide (priv->search_not_found);
g_object_unref (gui);
@@ -342,13 +303,8 @@ static void
empathy_search_bar_class_init (EmpathySearchBarClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
g_type_class_add_private (gobject_class, sizeof (EmpathySearchBarPriv));
-
- /* Neither GtkBin nor GtkContainer seems to do this for us :( */
- widget_class->get_preferred_height = empathy_search_bar_get_preferred_height;
- widget_class->size_allocate = empathy_search_bar_size_allocate;
}
void
diff --git a/libempathy-gtk/empathy-search-bar.h b/libempathy-gtk/empathy-search-bar.h
index 2e4e0d76e..4b07f92c2 100644
--- a/libempathy-gtk/empathy-search-bar.h
+++ b/libempathy-gtk/empathy-search-bar.h
@@ -44,7 +44,7 @@ typedef struct _EmpathySearchBarClass EmpathySearchBarClass;
struct _EmpathySearchBar
{
- GtkBin parent;
+ GtkBox parent;
/*<private>*/
gpointer priv;
@@ -52,7 +52,7 @@ struct _EmpathySearchBar
struct _EmpathySearchBarClass
{
- GtkBinClass parent_class;
+ GtkBoxClass parent_class;
};
GType empathy_search_bar_get_type (void) G_GNUC_CONST;
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 7e060766f..5238af361 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -213,6 +213,7 @@ chatroom_finalize (GObject *object)
g_object_unref (priv->account);
g_free (priv->room);
g_free (priv->name);
+ g_free (priv->subject);
(G_OBJECT_CLASS (empathy_chatroom_parent_class)->finalize) (object);
}
diff --git a/po/es.po b/po/es.po
index 2d07db2e7..c59bde877 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,23 +1,23 @@
# translation of empathy.master.po to Español
# Copyright (C) 2003 Free Software Foundation
# This file is distributed under the same license as the Gossip package.
-# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
+# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-06-15 14:59+0000\n"
-"PO-Revision-Date: 2011-06-19 11:37+0200\n"
-"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"POT-Creation-Date: 2011-06-20 10:08+0000\n"
+"PO-Revision-Date: 2011-06-20 19:41+0200\n"
+"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
+"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -521,18 +521,18 @@ msgstr "El archivo seleccionado no es un archivo regular"
msgid "The selected file is empty"
msgstr "El archivo seleccionado está vacío"
-#: ../libempathy/empathy-message.c:342 ../src/empathy-call-observer.c:130
+#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:130
#, c-format
msgid "Missed call from %s"
msgstr "Llamada perdida de %s"
#. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:346
+#: ../libempathy/empathy-message.c:417
#, c-format
msgid "Called %s"
msgstr "Llamó %s"
-#: ../libempathy/empathy-message.c:349
+#: ../libempathy/empathy-message.c:420
#, c-format
msgid "Call from %s"
msgstr "Llamada de %s"
@@ -1320,40 +1320,40 @@ msgstr "El contacto especificado no es válido"
msgid "Emergency calls are not supported on this protocol"
msgstr "Este protocolo no soporta llamadas de emergencia"
-#: ../libempathy-gtk/empathy-chat.c:695
+#: ../libempathy-gtk/empathy-chat.c:696
msgid "Failed to open private chat"
msgstr "Falló al abrir el chat privado"
-#: ../libempathy-gtk/empathy-chat.c:756
+#: ../libempathy-gtk/empathy-chat.c:757
msgid "Topic not supported on this conversation"
msgstr "El tema no está soportado en esta conversación"
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "You are not allowed to change the topic"
msgstr "No le está permitido cambiar el tema"
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:967
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "%s no es un identificador de contacto válido"
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1024
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:1026
+#: ../libempathy-gtk/empathy-chat.c:1027
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:1029
+#: ../libempathy-gtk/empathy-chat.c:1030
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:1032
+#: ../libempathy-gtk/empathy-chat.c:1033
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:1036
+#: ../libempathy-gtk/empathy-chat.c:1037
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1361,23 +1361,23 @@ msgstr ""
"/part [<ID de la sala de chat>] [<razón>]: abandonar la sala de chat, la "
"actual de manera predeterminada"
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1041
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1044
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:1046
+#: ../libempathy-gtk/empathy-chat.c:1047
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:1049
+#: ../libempathy-gtk/empathy-chat.c:1050
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:1052
+#: ../libempathy-gtk/empathy-chat.c:1053
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 "
@@ -1387,11 +1387,11 @@ 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:1057
+#: ../libempathy-gtk/empathy-chat.c:1058
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <ID del contacto>: mostrar información sobre un contacto"
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1061
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1399,113 +1399,113 @@ msgstr ""
"/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
"definido, muestra su uso."
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1071
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1110
msgid "Unknown command"
msgstr "Comando desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1235
+#: ../libempathy-gtk/empathy-chat.c:1236
msgid "Unknown command; see /help for the available commands"
msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1393
+#: ../libempathy-gtk/empathy-chat.c:1406
msgid "insufficient balance to send message"
msgstr "no tiene balance suficiente para enviar el mensaje"
-#: ../libempathy-gtk/empathy-chat.c:1395
+#: ../libempathy-gtk/empathy-chat.c:1408
msgid "not capable"
msgstr "no es posible"
-#: ../libempathy-gtk/empathy-chat.c:1402
+#: ../libempathy-gtk/empathy-chat.c:1415
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1405
+#: ../libempathy-gtk/empathy-chat.c:1418
msgid "invalid contact"
msgstr "contacto no válido"
-#: ../libempathy-gtk/empathy-chat.c:1408
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "permission denied"
msgstr "permiso denegado"
-#: ../libempathy-gtk/empathy-chat.c:1411
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "too long message"
msgstr "mensaje demasiado largo"
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "not implemented"
msgstr "no implementado"
-#: ../libempathy-gtk/empathy-chat.c:1418
+#: ../libempathy-gtk/empathy-chat.c:1431
msgid "unknown"
msgstr "desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1437
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error al enviar el mensaje «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1441
#, c-format
msgid "Error sending message: %s"
msgstr "Error al enviar el mensaje: %s"
-#: ../libempathy-gtk/empathy-chat.c:1489 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1502 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Tema:"
-#: ../libempathy-gtk/empathy-chat.c:1501
+#: ../libempathy-gtk/empathy-chat.c:1514
#, c-format
msgid "Topic set to: %s"
msgstr "El tema se ha establecido a: %s"
-#: ../libempathy-gtk/empathy-chat.c:1503
+#: ../libempathy-gtk/empathy-chat.c:1516
msgid "No topic defined"
msgstr "No se ha definido el tema"
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2023
msgid "(No Suggestions)"
msgstr "(Sin sugerencias)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2091
#, 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:2115
+#: ../libempathy-gtk/empathy-chat.c:2128
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Añadir «%s» al diccionario de «%s»"
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2185
msgid "Insert Smiley"
msgstr "Insertar emoticono"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2190
+#: ../libempathy-gtk/empathy-chat.c:2203
#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "E_nviar"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2225
+#: ../libempathy-gtk/empathy-chat.c:2238
msgid "_Spelling Suggestions"
msgstr "_Sugerencias ortográficas"
-#: ../libempathy-gtk/empathy-chat.c:2314
+#: ../libempathy-gtk/empathy-chat.c:2327
msgid "Failed to retrieve recent logs"
msgstr "Falló al recibir los registros recientes"
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:2464
#, c-format
msgid "%s has disconnected"
msgstr "%s se ha desconectado"
@@ -1513,12 +1513,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:2432
+#: ../libempathy-gtk/empathy-chat.c:2471
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s expulsó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2435
+#: ../libempathy-gtk/empathy-chat.c:2474
#, c-format
msgid "%s was kicked"
msgstr "%s fue expulsado"
@@ -1526,17 +1526,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:2443
+#: ../libempathy-gtk/empathy-chat.c:2482
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s vetó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2446
+#: ../libempathy-gtk/empathy-chat.c:2485
#, c-format
msgid "%s was banned"
msgstr "%s fue vetado"
-#: ../libempathy-gtk/empathy-chat.c:2450
+#: ../libempathy-gtk/empathy-chat.c:2489
#, c-format
msgid "%s has left the room"
msgstr "%s ha dejado la sala"
@@ -1546,69 +1546,69 @@ 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:2459
+#: ../libempathy-gtk/empathy-chat.c:2498
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2484
+#: ../libempathy-gtk/empathy-chat.c:2523
#, c-format
msgid "%s has joined the room"
msgstr "%s ha entrado en la sala"
-#: ../libempathy-gtk/empathy-chat.c:2509
+#: ../libempathy-gtk/empathy-chat.c:2548
#, c-format
msgid "%s is now known as %s"
msgstr "Ahora %s se llama %s"
-#: ../libempathy-gtk/empathy-chat.c:2648
+#: ../libempathy-gtk/empathy-chat.c:2687
#: ../src/empathy-streamed-media-window.c:1935
#: ../src/empathy-event-manager.c:1261 ../src/empathy-call-window.c:1869
msgid "Disconnected"
msgstr "Desconectado"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3316
+#: ../libempathy-gtk/empathy-chat.c:3355
msgid "Would you like to store this password?"
msgstr "¿Quiere guardar esta contraseña?"
-#: ../libempathy-gtk/empathy-chat.c:3322
+#: ../libempathy-gtk/empathy-chat.c:3361
msgid "Remember"
msgstr "Recordar"
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3371
msgid "Not now"
msgstr "Ahora no"
-#: ../libempathy-gtk/empathy-chat.c:3376
+#: ../libempathy-gtk/empathy-chat.c:3415
msgid "Retry"
msgstr "Volver a intentarlo"
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3419
msgid "Wrong password; please try again:"
msgstr "Contraseña incorrecta; inténtelo de nuevo:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3510
+#: ../libempathy-gtk/empathy-chat.c:3549
msgid "This room is protected by a password:"
msgstr "Esta sala está protegida por contraseña:"
-#: ../libempathy-gtk/empathy-chat.c:3537
+#: ../libempathy-gtk/empathy-chat.c:3576
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3739 ../src/empathy-event-manager.c:1282
+#: ../libempathy-gtk/empathy-chat.c:3778 ../src/empathy-event-manager.c:1282
#: ../src/empathy-call-window.c:2125
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3794
+#: ../libempathy-gtk/empathy-chat.c:3833
msgid "Conversation"
msgstr "Conversación"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3838
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1650,13 +1650,13 @@ msgstr "Cuenta:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1264
+#: ../libempathy-gtk/empathy-theme-adium.c:1410
msgid "_Copy Link Address"
msgstr "_Copiar la dirección del enlace"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1271
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Open Link"
msgstr "_Abrir enlace"
@@ -2278,7 +2278,7 @@ msgid "Search"
msgstr "Buscar"
#: ../libempathy-gtk/empathy-log-window.c:745
-#: ../libempathy-gtk/empathy-log-window.c:859
+#: ../libempathy-gtk/empathy-log-window.c:866
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A, %e de %B de %Y a las %X"
@@ -2289,99 +2289,99 @@ msgid "Chat with %s"
msgstr "Chat con %s"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:814
+#: ../libempathy-gtk/empathy-log-window.c:821
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:822
+#: ../libempathy-gtk/empathy-log-window.c:829
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:878
-#: ../libempathy-gtk/empathy-log-window.c:880 ../src/empathy-ft-manager.c:1026
+#: ../libempathy-gtk/empathy-log-window.c:885
+#: ../libempathy-gtk/empathy-log-window.c:887 ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../libempathy-gtk/empathy-log-window.c:887
+#: ../libempathy-gtk/empathy-log-window.c:894
#, c-format
msgid "Call took %s, ended at %s"
msgstr "La llamada duró %s, finalizó a las %s"
-#: ../libempathy-gtk/empathy-log-window.c:1213
+#: ../libempathy-gtk/empathy-log-window.c:1220
msgid "Today"
msgstr "Hoy"
-#: ../libempathy-gtk/empathy-log-window.c:1217
+#: ../libempathy-gtk/empathy-log-window.c:1224
msgid "Yesterday"
msgstr "Ayer"
-#: ../libempathy-gtk/empathy-log-window.c:1233
+#: ../libempathy-gtk/empathy-log-window.c:1240
msgctxt ""
"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
msgid "%e %B %Y"
msgstr "%e de %B de %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1314
-#: ../libempathy-gtk/empathy-log-window.c:2680
+#: ../libempathy-gtk/empathy-log-window.c:1321
+#: ../libempathy-gtk/empathy-log-window.c:2687
msgid "Anytime"
msgstr "Cualquier hora"
-#: ../libempathy-gtk/empathy-log-window.c:1385
-#: ../libempathy-gtk/empathy-log-window.c:1688
+#: ../libempathy-gtk/empathy-log-window.c:1392
+#: ../libempathy-gtk/empathy-log-window.c:1695
msgid "Anyone"
msgstr "Cualquiera"
-#: ../libempathy-gtk/empathy-log-window.c:1953
+#: ../libempathy-gtk/empathy-log-window.c:1960
msgid "Who"
msgstr "Quién"
-#: ../libempathy-gtk/empathy-log-window.c:2156
+#: ../libempathy-gtk/empathy-log-window.c:2163
msgid "When"
msgstr "Cuándo"
-#: ../libempathy-gtk/empathy-log-window.c:2272
+#: ../libempathy-gtk/empathy-log-window.c:2279
msgid "Anything"
msgstr "Cualquier cosa"
-#: ../libempathy-gtk/empathy-log-window.c:2274
+#: ../libempathy-gtk/empathy-log-window.c:2281
msgid "Text chats"
msgstr "Chats de texto"
-#: ../libempathy-gtk/empathy-log-window.c:2276
+#: ../libempathy-gtk/empathy-log-window.c:2283
msgid "Calls"
msgstr "Llamadas"
-#: ../libempathy-gtk/empathy-log-window.c:2281
+#: ../libempathy-gtk/empathy-log-window.c:2288
msgid "Incoming calls"
msgstr "Llamadas entrantes"
-#: ../libempathy-gtk/empathy-log-window.c:2282
+#: ../libempathy-gtk/empathy-log-window.c:2289
msgid "Outgoing calls"
msgstr "Llamadas salientes"
-#: ../libempathy-gtk/empathy-log-window.c:2283
+#: ../libempathy-gtk/empathy-log-window.c:2290
msgid "Missed calls"
msgstr "Llamadas perdidas"
-#: ../libempathy-gtk/empathy-log-window.c:2304
+#: ../libempathy-gtk/empathy-log-window.c:2311
msgid "What"
msgstr "Qué"
-#: ../libempathy-gtk/empathy-log-window.c:2917
+#: ../libempathy-gtk/empathy-log-window.c:2924
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr ""
"¿Está seguro de que quiere eliminar todos los registros de conversaciones "
"anteriores?"
-#: ../libempathy-gtk/empathy-log-window.c:2921
+#: ../libempathy-gtk/empathy-log-window.c:2928
msgid "Clear All"
msgstr "Limpiar todo"
-#: ../libempathy-gtk/empathy-log-window.c:2928
+#: ../libempathy-gtk/empathy-log-window.c:2935
msgid "Delete from:"
msgstr "Eliminar de:"
@@ -2583,7 +2583,13 @@ msgstr "Guardar mensaje de estado _nuevo"
msgid "Saved Status Messages"
msgstr "Mensajes de estado guardados"
-#: ../libempathy-gtk/empathy-theme-adium.c:1782
+#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "Mensaje editado a las %s"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1937
msgid "Normal"
msgstr "Normal"
@@ -3200,7 +3206,6 @@ msgstr ""
"¿Seguro que quiere continuar?"
#: ../src/empathy-accounts-dialog.ui.h:1
-#| msgid "_Add…"
msgid "Add…"
msgstr "Añadir…"
@@ -3217,7 +3222,6 @@ msgid "Protocol:"
msgstr "Protocolo:"
#: ../src/empathy-accounts-dialog.ui.h:5
-#| msgid "_Remove"
msgid "Remove"
msgstr "Quitar"
diff --git a/po/sl.po b/po/sl.po
index 3ee35f8b4..ceb7d59fb 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&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-06-16 12:55+0000\n"
-"PO-Revision-Date: 2011-06-16 15:14+0100\n"
+"POT-Creation-Date: 2011-06-20 10:08+0000\n"
+"PO-Revision-Date: 2011-06-20 12:30+0100\n"
"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
"Language-Team: Slovenščina <gnome-si@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -441,19 +441,19 @@ msgstr "Izbrana datoteka ni običajna datoteka"
msgid "The selected file is empty"
msgstr "Izbrana datoteka je prazna"
-#: ../libempathy/empathy-message.c:342
+#: ../libempathy/empathy-message.c:413
#: ../src/empathy-call-observer.c:130
#, c-format
msgid "Missed call from %s"
msgstr "Zgrešen klic od %s"
#. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:346
+#: ../libempathy/empathy-message.c:417
#, c-format
msgid "Called %s"
msgstr "Klicanje uporabnika %s"
-#: ../libempathy/empathy-message.c:349
+#: ../libempathy/empathy-message.c:420
#, c-format
msgid "Call from %s"
msgstr "Klic uporabnika %s"
@@ -1252,179 +1252,179 @@ msgstr "Izbrani stik ni veljaven"
msgid "Emergency calls are not supported on this protocol"
msgstr "Klic v sili ni podprt s tem protokolom"
-#: ../libempathy-gtk/empathy-chat.c:695
+#: ../libempathy-gtk/empathy-chat.c:696
msgid "Failed to open private chat"
msgstr "Napaka med odpiranjem zasebnega klepeta"
-#: ../libempathy-gtk/empathy-chat.c:756
+#: ../libempathy-gtk/empathy-chat.c:757
msgid "Topic not supported on this conversation"
msgstr "Tema ni podprta pri tem pogovoru"
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "You are not allowed to change the topic"
msgstr "Za spreminjanje teme nimate ustreznih dovoljenj."
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:967
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "“%s” ni veljaven ID stika"
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1024
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: počisti vsa sporočila trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:1026
+#: ../libempathy-gtk/empathy-chat.c:1027
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tema>: določi temo trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:1029
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1037
msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
msgstr "/part [<ID klepetalnice>] [<razlog>]: zapusti klepetalnico, privzeto je to trenutna klepetalnica"
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1041
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID stika> [<sporočilo>]: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1044
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID stika> <sporočilo>: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:1046
+#: ../libempathy-gtk/empathy-chat.c:1047
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:1049
+#: ../libempathy-gtk/empathy-chat.c:1050
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:1052
+#: ../libempathy-gtk/empathy-chat.c:1053
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:1057
+#: ../libempathy-gtk/empathy-chat.c:1058
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <ID stika>: pokaže podrobnosti stika"
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1061
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:1070
+#: ../libempathy-gtk/empathy-chat.c:1071
#, c-format
msgid "Usage: %s"
msgstr "Uporaba: %s"
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1110
msgid "Unknown command"
msgstr "Neznan ukaz"
-#: ../libempathy-gtk/empathy-chat.c:1235
+#: ../libempathy-gtk/empathy-chat.c:1236
msgid "Unknown command; see /help for the available commands"
msgstr "Neznan ukaz, za več si vpišite /help"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1393
+#: ../libempathy-gtk/empathy-chat.c:1406
msgid "insufficient balance to send message"
msgstr "nezadostno stanje na računu za pošiljanje sporočil"
-#: ../libempathy-gtk/empathy-chat.c:1395
+#: ../libempathy-gtk/empathy-chat.c:1408
msgid "not capable"
msgstr "ni mogoče"
-#: ../libempathy-gtk/empathy-chat.c:1402
+#: ../libempathy-gtk/empathy-chat.c:1415
msgid "offline"
msgstr "brez povezave"
-#: ../libempathy-gtk/empathy-chat.c:1405
+#: ../libempathy-gtk/empathy-chat.c:1418
msgid "invalid contact"
msgstr "neveljaven stik"
-#: ../libempathy-gtk/empathy-chat.c:1408
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "permission denied"
msgstr "ni dovoljenja"
-#: ../libempathy-gtk/empathy-chat.c:1411
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "too long message"
msgstr "predolgo sporočilo"
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "not implemented"
msgstr "ni del programa"
-#: ../libempathy-gtk/empathy-chat.c:1418
+#: ../libempathy-gtk/empathy-chat.c:1431
msgid "unknown"
msgstr "neznano"
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1437
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Napaka med pošiljanjem sporočila '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1441
#, c-format
msgid "Error sending message: %s"
msgstr "Napaka med pošiljanjem sporočila: %s"
-#: ../libempathy-gtk/empathy-chat.c:1489
+#: ../libempathy-gtk/empathy-chat.c:1502
#: ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Tema:"
-#: ../libempathy-gtk/empathy-chat.c:1501
+#: ../libempathy-gtk/empathy-chat.c:1514
#, c-format
msgid "Topic set to: %s"
msgstr "Tema je določena na: %s"
-#: ../libempathy-gtk/empathy-chat.c:1503
+#: ../libempathy-gtk/empathy-chat.c:1516
msgid "No topic defined"
msgstr "Ni določene teme"
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2023
msgid "(No Suggestions)"
msgstr "(Ni predlogov)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2091
#, 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:2115
+#: ../libempathy-gtk/empathy-chat.c:2128
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Dodaj '%s' v slovar %s"
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2185
msgid "Insert Smiley"
msgstr "Vstavi smeška"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2190
+#: ../libempathy-gtk/empathy-chat.c:2203
#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "_Pošlji"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2225
+#: ../libempathy-gtk/empathy-chat.c:2238
msgid "_Spelling Suggestions"
msgstr "Predlogi čr_kovalnika"
-#: ../libempathy-gtk/empathy-chat.c:2314
+#: ../libempathy-gtk/empathy-chat.c:2327
msgid "Failed to retrieve recent logs"
msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:2464
#, c-format
msgid "%s has disconnected"
msgstr "%s je prekinil povezavo"
@@ -1432,12 +1432,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:2432
+#: ../libempathy-gtk/empathy-chat.c:2471
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s je izgnal %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2435
+#: ../libempathy-gtk/empathy-chat.c:2474
#, c-format
msgid "%s was kicked"
msgstr "%s je bil izgnan"
@@ -1445,17 +1445,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:2443
+#: ../libempathy-gtk/empathy-chat.c:2482
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s je izobčil %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2446
+#: ../libempathy-gtk/empathy-chat.c:2485
#, c-format
msgid "%s was banned"
msgstr "%s je izobčen"
-#: ../libempathy-gtk/empathy-chat.c:2450
+#: ../libempathy-gtk/empathy-chat.c:2489
#, c-format
msgid "%s has left the room"
msgstr "%s je zapustil klepetalnico"
@@ -1465,22 +1465,22 @@ 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:2459
+#: ../libempathy-gtk/empathy-chat.c:2498
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2484
+#: ../libempathy-gtk/empathy-chat.c:2523
#, c-format
msgid "%s has joined the room"
msgstr "%s je vstopil v klepetalnico"
-#: ../libempathy-gtk/empathy-chat.c:2509
+#: ../libempathy-gtk/empathy-chat.c:2548
#, c-format
msgid "%s is now known as %s"
msgstr "%s je preimenovan v %s"
-#: ../libempathy-gtk/empathy-chat.c:2648
+#: ../libempathy-gtk/empathy-chat.c:2687
#: ../src/empathy-streamed-media-window.c:1935
#: ../src/empathy-event-manager.c:1261
#: ../src/empathy-call-window.c:1869
@@ -1488,48 +1488,48 @@ msgid "Disconnected"
msgstr "Prekinjena povezava"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3316
+#: ../libempathy-gtk/empathy-chat.c:3355
msgid "Would you like to store this password?"
msgstr "Ali želite shraniti geslo?"
-#: ../libempathy-gtk/empathy-chat.c:3322
+#: ../libempathy-gtk/empathy-chat.c:3361
msgid "Remember"
msgstr "Zapomni si"
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3371
msgid "Not now"
msgstr "Ne zdaj"
-#: ../libempathy-gtk/empathy-chat.c:3376
+#: ../libempathy-gtk/empathy-chat.c:3415
msgid "Retry"
msgstr "Poskusi znova"
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3419
msgid "Wrong password; please try again:"
msgstr "Napačno geslo; poskusite znova:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3510
+#: ../libempathy-gtk/empathy-chat.c:3549
msgid "This room is protected by a password:"
msgstr "Klepetalnica je zaščitena z geslom:"
-#: ../libempathy-gtk/empathy-chat.c:3537
+#: ../libempathy-gtk/empathy-chat.c:3576
msgid "Join"
msgstr "Pridruži se"
-#: ../libempathy-gtk/empathy-chat.c:3739
+#: ../libempathy-gtk/empathy-chat.c:3778
#: ../src/empathy-event-manager.c:1282
#: ../src/empathy-call-window.c:2125
msgid "Connected"
msgstr "Povezano"
-#: ../libempathy-gtk/empathy-chat.c:3794
+#: ../libempathy-gtk/empathy-chat.c:3833
msgid "Conversation"
msgstr "Pogovor"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3838
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1571,13 +1571,13 @@ msgstr "Račun:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1264
+#: ../libempathy-gtk/empathy-theme-adium.c:1410
msgid "_Copy Link Address"
msgstr "Kopiraj _naslov povezave"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1271
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Open Link"
msgstr "_Odpri povezavo"
@@ -2189,7 +2189,7 @@ msgid "Search"
msgstr "Poišči"
#: ../libempathy-gtk/empathy-log-window.c:745
-#: ../libempathy-gtk/empathy-log-window.c:859
+#: ../libempathy-gtk/empathy-log-window.c:866
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%A, %d. %B %Y"
@@ -2200,97 +2200,97 @@ msgid "Chat with %s"
msgstr "Klepet s stikom %s"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:814
+#: ../libempathy-gtk/empathy-log-window.c:821
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:822
+#: ../libempathy-gtk/empathy-log-window.c:829
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../libempathy-gtk/empathy-log-window.c:878
-#: ../libempathy-gtk/empathy-log-window.c:880
+#: ../libempathy-gtk/empathy-log-window.c:885
+#: ../libempathy-gtk/empathy-log-window.c:887
#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../libempathy-gtk/empathy-log-window.c:887
+#: ../libempathy-gtk/empathy-log-window.c:894
#, c-format
msgid "Call took %s, ended at %s"
msgstr "Klic začet %s, končan %s"
-#: ../libempathy-gtk/empathy-log-window.c:1213
+#: ../libempathy-gtk/empathy-log-window.c:1220
msgid "Today"
msgstr "Danes"
-#: ../libempathy-gtk/empathy-log-window.c:1217
+#: ../libempathy-gtk/empathy-log-window.c:1224
msgid "Yesterday"
msgstr "Včeraj"
-#: ../libempathy-gtk/empathy-log-window.c:1233
+#: ../libempathy-gtk/empathy-log-window.c:1240
msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
msgid "%e %B %Y"
msgstr "e. %B %Y"
-#: ../libempathy-gtk/empathy-log-window.c:1314
-#: ../libempathy-gtk/empathy-log-window.c:2680
+#: ../libempathy-gtk/empathy-log-window.c:1321
+#: ../libempathy-gtk/empathy-log-window.c:2687
msgid "Anytime"
msgstr "Kadarkoli"
-#: ../libempathy-gtk/empathy-log-window.c:1385
-#: ../libempathy-gtk/empathy-log-window.c:1688
+#: ../libempathy-gtk/empathy-log-window.c:1392
+#: ../libempathy-gtk/empathy-log-window.c:1695
msgid "Anyone"
msgstr "Kdorkoli"
-#: ../libempathy-gtk/empathy-log-window.c:1953
+#: ../libempathy-gtk/empathy-log-window.c:1960
msgid "Who"
msgstr "Kdo"
-#: ../libempathy-gtk/empathy-log-window.c:2156
+#: ../libempathy-gtk/empathy-log-window.c:2163
msgid "When"
msgstr "Kdaj"
-#: ../libempathy-gtk/empathy-log-window.c:2272
+#: ../libempathy-gtk/empathy-log-window.c:2279
msgid "Anything"
msgstr "Karkoli"
-#: ../libempathy-gtk/empathy-log-window.c:2274
+#: ../libempathy-gtk/empathy-log-window.c:2281
msgid "Text chats"
msgstr "Besedilni klepet"
-#: ../libempathy-gtk/empathy-log-window.c:2276
+#: ../libempathy-gtk/empathy-log-window.c:2283
msgid "Calls"
msgstr "Klici"
-#: ../libempathy-gtk/empathy-log-window.c:2281
+#: ../libempathy-gtk/empathy-log-window.c:2288
msgid "Incoming calls"
msgstr "Dohodni klici"
-#: ../libempathy-gtk/empathy-log-window.c:2282
+#: ../libempathy-gtk/empathy-log-window.c:2289
msgid "Outgoing calls"
msgstr "Odhodni klici"
-#: ../libempathy-gtk/empathy-log-window.c:2283
+#: ../libempathy-gtk/empathy-log-window.c:2290
msgid "Missed calls"
msgstr "Prezrti klici"
-#: ../libempathy-gtk/empathy-log-window.c:2304
+#: ../libempathy-gtk/empathy-log-window.c:2311
msgid "What"
msgstr "Kaj"
-#: ../libempathy-gtk/empathy-log-window.c:2917
+#: ../libempathy-gtk/empathy-log-window.c:2924
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "Ali ste prepričani, da želite izbrisati vse podatke beležanja predhodnih pogovorov?"
-#: ../libempathy-gtk/empathy-log-window.c:2921
+#: ../libempathy-gtk/empathy-log-window.c:2928
msgid "Clear All"
msgstr "Počisti vse"
-#: ../libempathy-gtk/empathy-log-window.c:2928
+#: ../libempathy-gtk/empathy-log-window.c:2935
msgid "Delete from:"
msgstr "Izbriši iz:"
@@ -2493,7 +2493,12 @@ msgstr "Shrani _nova sporočila stanja"
msgid "Saved Status Messages"
msgstr "Shranjena sporočila stanja"
-#: ../libempathy-gtk/empathy-theme-adium.c:1782
+#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#, c-format
+msgid "Message edited at %s"
+msgstr "Sporočilo je bilo nazadnje spremenjeno ob %s"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1937
msgid "Normal"
msgstr "Običajno"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 14:42:14 +0800