diff options
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-irc.c | 1 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-irc.ui | 270 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget.c | 16 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-call-utils.c | 30 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 6 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 6 | ||||
| -rw-r--r-- | po/es.po | 248 | ||||
| -rw-r--r-- | po/sl.po | 407 | ||||
| -rw-r--r-- | po/sv.po | 78 | ||||
| -rw-r--r-- | src/empathy-call-window.c | 114 |
10 files changed, 687 insertions, 489 deletions
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c index c8a401f17..8c47d661c 100644 --- a/libempathy-gtk/empathy-account-widget-irc.c +++ b/libempathy-gtk/empathy-account-widget-irc.c @@ -176,6 +176,7 @@ empathy_account_widget_irc_build (EmpathyAccountWidget *self, "entry_fullname", "fullname", "entry_password", "password", "entry_quit_message", "quit-message", + "entry_username", "username", NULL); empathy_builder_connect (self->ui_details->gui, settings, diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui index 559e0809b..b63001835 100644 --- a/libempathy-gtk/empathy-account-widget-irc.ui +++ b/libempathy-gtk/empathy-account-widget-irc.ui @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> @@ -11,9 +11,38 @@ <property name="skip_taskbar_hint">True</property> <property name="skip_pager_hint">True</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox10"> + <object class="GtkBox" id="dialog-vbox10"> <property name="visible">True</property> <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="button_close"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkFrame" id="frame14"> <property name="visible">True</property> @@ -94,6 +123,8 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -219,33 +250,9 @@ </child> </object> <packing> - <property name="position">2</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area10"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="button_close"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> @@ -254,6 +261,16 @@ <action-widget response="-7">button_close</action-widget> </action-widgets> </object> + <object class="GtkSizeGroup" id="sg_field_labels"> + <widgets> + <widget name="label_network2"/> + <widget name="label_nick"/> + <widget name="label_password"/> + <widget name="label_username"/> + <widget name="label_fullname"/> + <widget name="label_quit_message"/> + </widgets> + </object> <object class="GtkVBox" id="vbox_irc"> <property name="visible">True</property> <child> @@ -264,45 +281,6 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <object class="GtkEntry" id="entry_quit_message"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label_quit_message"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Quit message:</property> - </object> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry_fullname"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> <object class="GtkEntry" id="entry_password"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -330,19 +308,6 @@ </packing> </child> <child> - <object class="GtkLabel" id="label_fullname"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Real name:</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> <object class="GtkEntry" id="entry_nick"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -383,10 +348,155 @@ </packing> </child> <child> + <object class="GtkExpander" id="expander_advanced"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkTable" id="table_irc_settings1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkEntry" id="entry_quit_message"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_quit_message"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Quit message:</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry_fullname"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_fullname"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Real name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">entry_nick</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_username"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Username:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry_username"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label_advanced"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Advanced</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_password_note"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">3</property> + <property name="label" translatable="yes">Most IRC servers don't need a password, so if you're not sure, don't enter a password.</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + <attributes> + <attribute name="scale" value="0.80000000000000004"/> + </attributes> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> <placeholder/> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index fcc5769a0..5bdea6aff 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -172,7 +172,16 @@ static guint signals[LAST_SIGNAL] = { 0 }; /* Based on http://www.ietf.org/rfc/rfc2812.txt (section 2.3.1) */ #define IRC_SPECIAL "_\\[\\]{}\\\\|`^" -#define IRC_USER_NAME "(["ALPHA IRC_SPECIAL"]["ALPHADIGITDASH IRC_SPECIAL"]*)" +#define IRC_NICK_NAME "(["ALPHA IRC_SPECIAL"]["ALPHADIGITDASH IRC_SPECIAL"]*)" +/* user = 1*( %x01-09 / %x0B-0C / %x0E-1F / %x21-3F / %x41-FF ) + * ; any octet except NUL, CR, LF, " " and "@" + * + * so technically, like so many other places in IRC, we should be using arrays + * of bytes here rather than UTF-8 strings. Life: too short. In practice this + * will always be ASCII. + */ +#define IRC_USER_NAME "([^\r\n@ ])+" + /* Based on http://www.ietf.org/rfc/rfc4622.txt (section 2.2) * We just exclude invalid characters to avoid ucschars and other redundant * complexity */ @@ -185,7 +194,8 @@ static guint signals[LAST_SIGNAL] = { 0 }; #define YAHOO_USER_NAME "(["ALPHA"]["ALPHADIGIT"_\\.]{3,31})" #define ACCOUNT_REGEX_ICQ "^"ICQ_USER_NAME"$" -#define ACCOUNT_REGEX_IRC "^"IRC_USER_NAME"$" +#define ACCOUNT_REGEX_IRC "^"IRC_NICK_NAME"$" +#define USERNAME_REGEX_IRC "^"IRC_USER_NAME"$" #define ACCOUNT_REGEX_JABBER "^"JABBER_USER_NAME"@"HOST"$" #define ACCOUNT_REGEX_MSN "^"MSN_USER_NAME"@"HOST"$" #define ACCOUNT_REGEX_YAHOO "^"YAHOO_USER_NAME"$" @@ -1227,6 +1237,8 @@ account_widget_build_irc (EmpathyAccountWidget *self, empathy_account_settings_set_regex (priv->settings, "account", ACCOUNT_REGEX_IRC); + empathy_account_settings_set_regex (priv->settings, "username", + USERNAME_REGEX_IRC); if (priv->simple) { diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 4e8f6d2cd..2991784f1 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -113,7 +113,7 @@ empathy_call_create_streamed_media_request (const gchar *contact, } static void -create_call_channel_cb (GObject *source, +create_streamed_media_channel_cb (GObject *source, GAsyncResult *result, gpointer user_data) { @@ -124,28 +124,28 @@ create_call_channel_cb (GObject *source, result, &error)) { - DEBUG ("Failed to create Call channel: %s", error->message); + DEBUG ("Failed to create StreamedMedia channel: %s", error->message); show_call_error (error); g_error_free (error); } } static void -create_streamed_media_channel_cb (GObject *source, +create_call_channel_cb (GObject *source, GAsyncResult *result, gpointer user_data) { - TpAccountChannelRequest *call_req = user_data; + TpAccountChannelRequest *streamed_media_req = user_data; GError *error = NULL; if (tp_account_channel_request_create_channel_finish ( TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error)) { - g_object_unref (call_req); + g_object_unref (streamed_media_req); return; } - DEBUG ("Failed to create StreamedMedia channel: %s", error->message); + DEBUG ("Failed to create Call channel: %s", error->message); if (error->code != TP_ERROR_NOT_IMPLEMENTED) { @@ -153,11 +153,11 @@ create_streamed_media_channel_cb (GObject *source, return; } - DEBUG ("Let's try with a Call channel"); + DEBUG ("Let's try with an StreamedMedia channel"); g_error_free (error); - tp_account_channel_request_create_channel_async (call_req, - EMPATHY_CALL_BUS_NAME, NULL, - create_call_channel_cb, + tp_account_channel_request_create_channel_async (streamed_media_req, + EMPATHY_AV_BUS_NAME, NULL, + create_streamed_media_channel_cb, NULL); } @@ -183,12 +183,12 @@ empathy_call_new_with_streams (const gchar *contact, streamed_media_request, timestamp); - tp_account_channel_request_create_channel_async (streamed_media_req, - EMPATHY_AV_BUS_NAME, NULL, - create_streamed_media_channel_cb, - call_req); + tp_account_channel_request_create_channel_async (call_req, + EMPATHY_CALL_BUS_NAME, NULL, + create_call_channel_cb, + streamed_media_req); g_hash_table_unref (call_request); g_hash_table_unref (streamed_media_request); - g_object_unref (streamed_media_req); + g_object_unref (call_req); } diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 2b0b51a36..4b2febd30 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -697,14 +697,14 @@ contact_list_view_drag_begin (GtkWidget *widget, priv = GET_PRIV (widget); - GTK_WIDGET_CLASS (empathy_contact_list_view_parent_class)->drag_begin (widget, - context); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); if (!gtk_tree_selection_get_selected (selection, &model, &iter)) { return; } + GTK_WIDGET_CLASS (empathy_contact_list_view_parent_class)->drag_begin (widget, + context); + path = gtk_tree_model_get_path (model, &iter); priv->drag_row = gtk_tree_row_reference_new (model, path); gtk_tree_path_free (path); diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 0fb24430c..db63f0c0d 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -811,13 +811,13 @@ individual_view_drag_begin (GtkWidget *widget, priv = GET_PRIV (widget); - GTK_WIDGET_CLASS (empathy_individual_view_parent_class)->drag_begin (widget, - context); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return; + GTK_WIDGET_CLASS (empathy_individual_view_parent_class)->drag_begin (widget, + context); + path = gtk_tree_model_get_path (model, &iter); priv->drag_row = gtk_tree_row_reference_new (model, path); gtk_tree_path_free (path); @@ -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-07-12 08:51+0000\n" -"PO-Revision-Date: 2011-07-13 10:51+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-07-25 11:44+0000\n" +"PO-Revision-Date: 2011-07-25 21:30+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" "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" @@ -778,66 +778,67 @@ msgstr "en el futuro" msgid "All accounts" msgstr "Todas las cuentas" -#: ../libempathy-gtk/empathy-account-widget.c:681 +#: ../libempathy-gtk/empathy-account-widget.c:691 #: ../src/empathy-import-widget.c:321 msgid "Account" msgstr "Cuenta" -#: ../libempathy-gtk/empathy-account-widget.c:682 +#: ../libempathy-gtk/empathy-account-widget.c:692 msgid "Password" msgstr "Contraseña" -#: ../libempathy-gtk/empathy-account-widget.c:683 +#: ../libempathy-gtk/empathy-account-widget.c:693 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Servidor" -#: ../libempathy-gtk/empathy-account-widget.c:684 +#: ../libempathy-gtk/empathy-account-widget.c:694 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Puerto" -#: ../libempathy-gtk/empathy-account-widget.c:756 -#: ../libempathy-gtk/empathy-account-widget.c:813 +#: ../libempathy-gtk/empathy-account-widget.c:766 +#: ../libempathy-gtk/empathy-account-widget.c:823 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1154 +#: ../libempathy-gtk/empathy-account-widget.c:1164 #, 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:1160 +#: ../libempathy-gtk/empathy-account-widget.c:1170 #, 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:1180 +#: ../libempathy-gtk/empathy-account-widget.c:1190 msgid "Launch My Web Accounts" msgstr "Lanzar My Web Accounts" -#: ../libempathy-gtk/empathy-account-widget.c:1518 +#: ../libempathy-gtk/empathy-account-widget.c:1530 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Username:" msgstr "Nombre de usuario:" -#: ../libempathy-gtk/empathy-account-widget.c:1836 +#: ../libempathy-gtk/empathy-account-widget.c:1848 msgid "A_pply" msgstr "_Aplicar" -#: ../libempathy-gtk/empathy-account-widget.c:1866 +#: ../libempathy-gtk/empathy-account-widget.c:1878 msgid "L_og in" msgstr "Iniciar _sesión" -#: ../libempathy-gtk/empathy-account-widget.c:1940 +#: ../libempathy-gtk/empathy-account-widget.c:1952 msgid "This account already exists on the server" msgstr "Esta cuenta ya existe en el servidor" -#: ../libempathy-gtk/empathy-account-widget.c:1943 +#: ../libempathy-gtk/empathy-account-widget.c:1955 msgid "Create a new account on the server" msgstr "Crear una cuenta nueva en el servidor" -#: ../libempathy-gtk/empathy-account-widget.c:2135 +#: ../libempathy-gtk/empathy-account-widget.c:2147 msgid "Ca_ncel" msgstr "Ca_ncelar" @@ -846,19 +847,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:2413 +#: ../libempathy-gtk/empathy-account-widget.c:2425 #, 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:2439 +#: ../libempathy-gtk/empathy-account-widget.c:2451 #, c-format msgid "%s Account" msgstr "Cuenta %s" -#: ../libempathy-gtk/empathy-account-widget.c:2443 +#: ../libempathy-gtk/empathy-account-widget.c:2455 msgid "New account" msgstr "Cuenta nueva" @@ -870,6 +871,7 @@ msgstr "<b>Ejemplo:</b> MiNombreEnPantalla" #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 @@ -1012,43 +1014,51 @@ msgstr "Opciones" msgid "None" msgstr "Ninguno" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 msgid "Character set:" msgstr "Conjunto de caracteres:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +msgid "" +"Most IRC servers don't need a password, so if you're not sure, don't enter a " +"password." +msgstr "" +"La mayoría de los servidores IRC no necesitan una contraseña, de tal forma " +"que si no está seguro, no introduzca una contraseña." + +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 msgid "Network" msgstr "Red" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 msgid "Network:" msgstr "Red:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 msgid "Nickname:" msgstr "Apodo:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 msgid "Password:" msgstr "Contraseña:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 msgid "Quit message:" msgstr "Mensaje de salida:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 msgid "Real name:" msgstr "Nombre real:" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 msgid "Servers" msgstr "Servidores" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "What is your IRC nickname?" msgstr "¿Cuál es su apodo del IRC?" -#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13 msgid "Which IRC network?" msgstr "¿Qué red de IRC?" @@ -1563,7 +1573,7 @@ msgstr "Ahora %s se llama %s" #: ../libempathy-gtk/empathy-chat.c:2688 #: ../src/empathy-streamed-media-window.c:1939 -#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1848 +#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1845 msgid "Disconnected" msgstr "Desconectado" @@ -1598,7 +1608,7 @@ msgid "Join" msgstr "Unirse" #: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262 -#: ../src/empathy-call-window.c:2095 +#: ../src/empathy-call-window.c:2092 msgid "Connected" msgstr "Conectado" @@ -1769,48 +1779,48 @@ msgid "_Block Contact" msgstr "_Bloquear contacto" #: ../libempathy-gtk/empathy-contact-menu.c:329 -#: ../libempathy-gtk/empathy-individual-menu.c:547 +#: ../libempathy-gtk/empathy-individual-menu.c:548 #: ../src/empathy-main-window.ui.h:16 msgid "_Chat" msgstr "_Chat" #: ../libempathy-gtk/empathy-contact-menu.c:361 -#: ../libempathy-gtk/empathy-individual-menu.c:638 +#: ../libempathy-gtk/empathy-individual-menu.c:639 msgctxt "menu item" msgid "_Audio Call" msgstr "Llamada de vo_z" #: ../libempathy-gtk/empathy-contact-menu.c:394 -#: ../libempathy-gtk/empathy-individual-menu.c:682 +#: ../libempathy-gtk/empathy-individual-menu.c:684 msgctxt "menu item" msgid "_Video Call" msgstr "Llamada de _vídeo" #: ../libempathy-gtk/empathy-contact-menu.c:440 -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:737 #: ../src/empathy-main-window.ui.h:27 msgid "_Previous Conversations" msgstr "Conversaciones an_teriores" #: ../libempathy-gtk/empathy-contact-menu.c:462 -#: ../libempathy-gtk/empathy-individual-menu.c:766 +#: ../libempathy-gtk/empathy-individual-menu.c:778 msgid "Send File" msgstr "Enviar archivo" #: ../libempathy-gtk/empathy-contact-menu.c:485 -#: ../libempathy-gtk/empathy-individual-menu.c:808 +#: ../libempathy-gtk/empathy-individual-menu.c:820 msgid "Share My Desktop" msgstr "Compartir mi escritorio" #: ../libempathy-gtk/empathy-contact-menu.c:525 #: ../libempathy-gtk/empathy-contact-widget.c:1890 -#: ../libempathy-gtk/empathy-individual-menu.c:843 +#: ../libempathy-gtk/empathy-individual-menu.c:855 #: ../libempathy-gtk/empathy-individual-widget.c:1386 msgid "Favorite" msgstr "Favorita" #: ../libempathy-gtk/empathy-contact-menu.c:554 -#: ../libempathy-gtk/empathy-individual-menu.c:871 +#: ../libempathy-gtk/empathy-individual-menu.c:883 msgid "Infor_mation" msgstr "Infor_mación" @@ -1820,13 +1830,13 @@ msgid "_Edit" msgstr "_Editar" #: ../libempathy-gtk/empathy-contact-menu.c:654 -#: ../libempathy-gtk/empathy-individual-menu.c:1058 +#: ../libempathy-gtk/empathy-individual-menu.c:1070 #: ../src/empathy-chat-window.c:1010 msgid "Inviting you to this room" msgstr "Invitándolo a esta sala" #: ../libempathy-gtk/empathy-contact-menu.c:685 -#: ../libempathy-gtk/empathy-individual-menu.c:1104 +#: ../libempathy-gtk/empathy-individual-menu.c:1116 msgid "_Invite to Chat Room" msgstr "_Invitar a sala de chat" @@ -2152,25 +2162,25 @@ msgstr "" #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:137 +#: ../libempathy-gtk/empathy-individual-menu.c:138 #, c-format msgid "%s (%s)" msgstr "%s (%s)" #. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:593 +#: ../libempathy-gtk/empathy-individual-menu.c:594 #: ../libempathy-gtk/empathy-new-message-dialog.c:248 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:919 +#: ../libempathy-gtk/empathy-individual-menu.c:931 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Editar" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:945 +#: ../libempathy-gtk/empathy-individual-menu.c:957 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "_Enlazar contactos…" @@ -2273,129 +2283,129 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "_Desenlazar" -#: ../libempathy-gtk/empathy-log-window.c:451 +#: ../libempathy-gtk/empathy-log-window.c:458 msgid "History" msgstr "Histórico" -#: ../libempathy-gtk/empathy-log-window.c:503 +#: ../libempathy-gtk/empathy-log-window.c:510 msgid "Show" msgstr "Mostrar" -#: ../libempathy-gtk/empathy-log-window.c:525 +#: ../libempathy-gtk/empathy-log-window.c:532 msgid "Search" msgstr "Buscar" -#: ../libempathy-gtk/empathy-log-window.c:939 +#: ../libempathy-gtk/empathy-log-window.c:946 #, c-format msgid "Chat in %s" msgstr "Chatee en %s" -#: ../libempathy-gtk/empathy-log-window.c:941 +#: ../libempathy-gtk/empathy-log-window.c:948 #, c-format msgid "Chat with %s" msgstr "Chat con %s" -#: ../libempathy-gtk/empathy-log-window.c:991 -#: ../libempathy-gtk/empathy-log-window.c:1169 +#: ../libempathy-gtk/empathy-log-window.c:998 +#: ../libempathy-gtk/empathy-log-window.c:1176 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e de %B de %Y a las %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1111 +#: ../libempathy-gtk/empathy-log-window.c:1118 #, 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:1117 +#: ../libempathy-gtk/empathy-log-window.c:1124 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1188 -#: ../libempathy-gtk/empathy-log-window.c:1190 +#: ../libempathy-gtk/empathy-log-window.c:1195 +#: ../libempathy-gtk/empathy-log-window.c:1197 #: ../src/empathy-ft-manager.c:1026 msgid "%" msgstr "%" -#: ../libempathy-gtk/empathy-log-window.c:1197 +#: ../libempathy-gtk/empathy-log-window.c:1204 #, c-format msgid "Call took %s, ended at %s" msgstr "La llamada duró %s, finalizó a las %s" -#: ../libempathy-gtk/empathy-log-window.c:1529 +#: ../libempathy-gtk/empathy-log-window.c:1536 msgid "Today" msgstr "Hoy" -#: ../libempathy-gtk/empathy-log-window.c:1533 +#: ../libempathy-gtk/empathy-log-window.c:1540 msgid "Yesterday" msgstr "Ayer" -#: ../libempathy-gtk/empathy-log-window.c:1549 +#: ../libempathy-gtk/empathy-log-window.c:1556 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:1630 -#: ../libempathy-gtk/empathy-log-window.c:3183 +#: ../libempathy-gtk/empathy-log-window.c:1637 +#: ../libempathy-gtk/empathy-log-window.c:3203 msgid "Anytime" msgstr "Cualquier hora" -#: ../libempathy-gtk/empathy-log-window.c:1710 -#: ../libempathy-gtk/empathy-log-window.c:2137 +#: ../libempathy-gtk/empathy-log-window.c:1717 +#: ../libempathy-gtk/empathy-log-window.c:2154 msgid "Anyone" msgstr "Cualquiera" -#: ../libempathy-gtk/empathy-log-window.c:2434 +#: ../libempathy-gtk/empathy-log-window.c:2451 msgid "Who" msgstr "Quién" -#: ../libempathy-gtk/empathy-log-window.c:2638 +#: ../libempathy-gtk/empathy-log-window.c:2655 msgid "When" msgstr "Cuándo" -#: ../libempathy-gtk/empathy-log-window.c:2754 +#: ../libempathy-gtk/empathy-log-window.c:2771 msgid "Anything" msgstr "Cualquier cosa" -#: ../libempathy-gtk/empathy-log-window.c:2756 +#: ../libempathy-gtk/empathy-log-window.c:2773 msgid "Text chats" msgstr "Chats de texto" -#: ../libempathy-gtk/empathy-log-window.c:2758 +#: ../libempathy-gtk/empathy-log-window.c:2775 msgid "Calls" msgstr "Llamadas" -#: ../libempathy-gtk/empathy-log-window.c:2763 +#: ../libempathy-gtk/empathy-log-window.c:2780 msgid "Incoming calls" msgstr "Llamadas entrantes" -#: ../libempathy-gtk/empathy-log-window.c:2764 +#: ../libempathy-gtk/empathy-log-window.c:2781 msgid "Outgoing calls" msgstr "Llamadas salientes" -#: ../libempathy-gtk/empathy-log-window.c:2765 +#: ../libempathy-gtk/empathy-log-window.c:2782 msgid "Missed calls" msgstr "Llamadas perdidas" -#: ../libempathy-gtk/empathy-log-window.c:2787 +#: ../libempathy-gtk/empathy-log-window.c:2804 msgid "What" msgstr "Qué" -#: ../libempathy-gtk/empathy-log-window.c:3486 +#: ../libempathy-gtk/empathy-log-window.c:3506 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:3490 +#: ../libempathy-gtk/empathy-log-window.c:3510 msgid "Clear All" msgstr "Limpiar todo" -#: ../libempathy-gtk/empathy-log-window.c:3497 +#: ../libempathy-gtk/empathy-log-window.c:3517 msgid "Delete from:" msgstr "Eliminar de:" @@ -2457,17 +2467,17 @@ msgid "New Conversation" msgstr "Conversación nueva" #. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:216 +#: ../libempathy-gtk/empathy-new-call-dialog.c:231 msgid "Send _Video" msgstr "Enviar _vídeo" #. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:224 +#: ../libempathy-gtk/empathy-new-call-dialog.c:242 msgid "C_all" msgstr "_Llamar" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:234 +#: ../libempathy-gtk/empathy-new-call-dialog.c:252 msgid "New Call" msgstr "Llamada nueva" @@ -3149,7 +3159,7 @@ msgid "Your new account has not been saved yet." msgstr "Aún no se ha guardado su cuenta nueva." #: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:801 ../src/empathy-call-window.c:877 +#: ../src/empathy-streamed-media-window.c:801 ../src/empathy-call-window.c:875 msgid "Connecting…" msgstr "Conectando…" @@ -3265,19 +3275,19 @@ msgstr ": Cliente de sonido/vídeo Empathy" msgid "Empathy Audio/Video Client" msgstr "Cliente de sonido/vídeo Empathy" -#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:455 +#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:453 msgid "Contrast" msgstr "Contraste" -#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:458 +#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:456 msgid "Brightness" msgstr "Brillo" -#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:461 +#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:459 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:566 +#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:564 msgid "Volume" msgstr "Volumen" @@ -3287,55 +3297,55 @@ msgid "_Sidebar" msgstr "Barra _lateral" #: ../src/empathy-streamed-media-window.c:1177 -#: ../src/empathy-call-window.c:1140 +#: ../src/empathy-call-window.c:1136 msgid "Audio input" msgstr "Entrada de voz" #: ../src/empathy-streamed-media-window.c:1181 -#: ../src/empathy-call-window.c:1144 +#: ../src/empathy-call-window.c:1140 msgid "Video input" msgstr "Entrada de vídeo" #: ../src/empathy-streamed-media-window.c:1185 -#: ../src/empathy-call-window.c:1148 +#: ../src/empathy-call-window.c:1144 msgid "Dialpad" msgstr "Teclado de llamada" #: ../src/empathy-streamed-media-window.c:1196 -#: ../src/empathy-call-window.c:1158 +#: ../src/empathy-call-window.c:1154 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-streamed-media-window.c:1265 -#: ../src/empathy-call-window.c:1241 +#: ../src/empathy-call-window.c:1237 #, c-format msgid "Call with %s" msgstr "Llamada con %s" #: ../src/empathy-streamed-media-window.c:1498 -#: ../src/empathy-call-window.c:1438 +#: ../src/empathy-call-window.c:1434 msgid "The IP address as seen by the machine" msgstr "La dirección IP como la ve la máquina" #: ../src/empathy-streamed-media-window.c:1500 -#: ../src/empathy-call-window.c:1440 +#: ../src/empathy-call-window.c:1436 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-streamed-media-window.c:1502 -#: ../src/empathy-call-window.c:1442 +#: ../src/empathy-call-window.c:1438 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-streamed-media-window.c:1504 -#: ../src/empathy-call-window.c:1444 +#: ../src/empathy-call-window.c:1440 msgid "The IP address of a relay server" msgstr "La dirección IP de un servidor de desvío" #: ../src/empathy-streamed-media-window.c:1506 -#: ../src/empathy-call-window.c:1446 +#: ../src/empathy-call-window.c:1442 msgid "The IP address of the multicast group" msgstr "La dirección IP del grupo multicast" @@ -3366,12 +3376,12 @@ msgid "Connected — %d:%02dm" msgstr "Conectado — %d:%02dm" #: ../src/empathy-streamed-media-window.c:2250 -#: ../src/empathy-call-window.c:2157 +#: ../src/empathy-call-window.c:2154 msgid "Technical Details" msgstr "Detalles técnicos" #: ../src/empathy-streamed-media-window.c:2288 -#: ../src/empathy-call-window.c:2195 +#: ../src/empathy-call-window.c:2192 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3381,7 +3391,7 @@ msgstr "" "por su equipo" #: ../src/empathy-streamed-media-window.c:2293 -#: ../src/empathy-call-window.c:2200 +#: ../src/empathy-call-window.c:2197 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3391,7 +3401,7 @@ msgstr "" "por su equipo" #: ../src/empathy-streamed-media-window.c:2299 -#: ../src/empathy-call-window.c:2206 +#: ../src/empathy-call-window.c:2203 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3401,12 +3411,12 @@ msgstr "" "una red que no acepta conexiones directas." #: ../src/empathy-streamed-media-window.c:2305 -#: ../src/empathy-call-window.c:2212 +#: ../src/empathy-call-window.c:2209 msgid "There was a failure on the network" msgstr "Hubo un fallo en la red" #: ../src/empathy-streamed-media-window.c:2309 -#: ../src/empathy-call-window.c:2216 +#: ../src/empathy-call-window.c:2213 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" @@ -3414,7 +3424,7 @@ msgstr "" "llamada" #: ../src/empathy-streamed-media-window.c:2312 -#: ../src/empathy-call-window.c:2219 +#: ../src/empathy-call-window.c:2216 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" @@ -3422,7 +3432,7 @@ msgstr "" "llamada" #: ../src/empathy-streamed-media-window.c:2322 -#: ../src/empathy-call-window.c:2231 +#: ../src/empathy-call-window.c:2228 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3434,22 +3444,22 @@ msgstr "" "de «Depuración» en el menú de Ayuda." #: ../src/empathy-streamed-media-window.c:2330 -#: ../src/empathy-call-window.c:2240 +#: ../src/empathy-call-window.c:2237 msgid "There was a failure in the call engine" msgstr "Hubo un fallo en el motor de llamadas" #: ../src/empathy-streamed-media-window.c:2333 -#: ../src/empathy-call-window.c:2243 +#: ../src/empathy-call-window.c:2240 msgid "The end of the stream was reached" msgstr "Se llegó al final del flujo" #: ../src/empathy-streamed-media-window.c:2373 -#: ../src/empathy-call-window.c:2283 +#: ../src/empathy-call-window.c:2280 msgid "Can't establish audio stream" msgstr "No se puede establecer el flujo de voz" #: ../src/empathy-streamed-media-window.c:2383 -#: ../src/empathy-call-window.c:2293 +#: ../src/empathy-call-window.c:2290 msgid "Can't establish video stream" msgstr "No se puede establecer el flujo de vídeo" @@ -3469,7 +3479,6 @@ msgid "Decoding Codec:" msgstr "Códec de decodificación:" #: ../src/empathy-call-window.ui.h:4 -#| msgid "_Disable" msgid "Disable camera" msgstr "Desactivar cámara" @@ -3521,12 +3530,10 @@ msgid "Send Audio" msgstr "Enviar voz" #: ../src/empathy-call-window.ui.h:15 -#| msgid "Send _Video" msgid "Send Video" msgstr "Enviar vídeo" #: ../src/empathy-call-window.ui.h:16 -#| msgid "Dialpad" msgid "Show dialpad" msgstr "Mostrar teclado de llamada" @@ -3536,14 +3543,13 @@ msgid "Toggle audio transmission" msgstr "Conmutar la transmisión de voz" #: ../src/empathy-call-window.ui.h:18 -#| msgid "Toggle audio transmission" msgid "Toggle video transmission" msgstr "Conmutar la transmisión de vídeo" #: ../src/empathy-call-window.ui.h:19 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:1803 ../src/empathy-call-window.c:1804 -#: ../src/empathy-call-window.c:1805 ../src/empathy-call-window.c:1806 +#: ../src/empathy-call-window.c:1800 ../src/empathy-call-window.c:1801 +#: ../src/empathy-call-window.c:1802 ../src/empathy-call-window.c:1803 msgid "Unknown" msgstr "Desconocido" @@ -4548,22 +4554,22 @@ msgstr "%s intentó llamarle, pero estaba en otra llamada." #. Translators: this is an "Info" label. It should be as short #. * as possible. -#: ../src/empathy-call-window.c:784 ../src/empathy-call-window.c:798 +#: ../src/empathy-call-window.c:782 ../src/empathy-call-window.c:796 msgid "i" msgstr "Información" -#: ../src/empathy-call-window.c:1248 +#: ../src/empathy-call-window.c:1244 #, c-format msgid "Call with %d participants" msgstr "Llamada con %d participantes" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2094 +#: ../src/empathy-call-window.c:2091 #, c-format msgid "%s — %d:%02dm" msgstr "%s: %d:%02dm" -#: ../src/empathy-call-window.c:2095 +#: ../src/empathy-call-window.c:2092 msgid "On hold" msgstr "En espera" @@ -10,14 +10,14 @@ 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-07-01 23:37+0000\n" -"PO-Revision-Date: 2011-07-02 12:48+0100\n" +"POT-Creation-Date: 2011-07-19 09:45+0000\n" +"PO-Revision-Date: 2011-07-19 21:53+0100\n" "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n" "Language-Team: Slovenščina <gnome-si@googlegroups.com>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0)\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-Country: SLOVENIA\n" @@ -1481,9 +1481,9 @@ msgid "%s is now known as %s" msgstr "%s je preimenovan v %s" #: ../libempathy-gtk/empathy-chat.c:2688 -#: ../src/empathy-streamed-media-window.c:1935 +#: ../src/empathy-streamed-media-window.c:1939 #: ../src/empathy-event-manager.c:1241 -#: ../src/empathy-call-window.c:1869 +#: ../src/empathy-call-window.c:1858 msgid "Disconnected" msgstr "Prekinjena povezava" @@ -1519,7 +1519,7 @@ msgstr "Pridruži se" #: ../libempathy-gtk/empathy-chat.c:3755 #: ../src/empathy-event-manager.c:1262 -#: ../src/empathy-call-window.c:2125 +#: ../src/empathy-call-window.c:2105 msgid "Connected" msgstr "Povezano" @@ -1575,13 +1575,13 @@ msgstr "Blokirani stiki" #. Copy Link Address menu item #: ../libempathy-gtk/empathy-chat-text-view.c:320 -#: ../libempathy-gtk/empathy-theme-adium.c:1410 +#: ../libempathy-gtk/empathy-theme-adium.c:1417 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:1417 +#: ../libempathy-gtk/empathy-theme-adium.c:1424 msgid "_Open Link" msgstr "_Odpri povezavo" @@ -1691,48 +1691,48 @@ msgid "_Block Contact" msgstr "_Blokiraj stik" #: ../libempathy-gtk/empathy-contact-menu.c:329 -#: ../libempathy-gtk/empathy-individual-menu.c:547 +#: ../libempathy-gtk/empathy-individual-menu.c:548 #: ../src/empathy-main-window.ui.h:16 msgid "_Chat" msgstr "_Klepet" #: ../libempathy-gtk/empathy-contact-menu.c:361 -#: ../libempathy-gtk/empathy-individual-menu.c:638 +#: ../libempathy-gtk/empathy-individual-menu.c:639 msgctxt "menu item" msgid "_Audio Call" msgstr "_Zvočni klic" #: ../libempathy-gtk/empathy-contact-menu.c:394 -#: ../libempathy-gtk/empathy-individual-menu.c:682 +#: ../libempathy-gtk/empathy-individual-menu.c:684 msgctxt "menu item" msgid "_Video Call" msgstr "_Video klic" #: ../libempathy-gtk/empathy-contact-menu.c:440 -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:737 #: ../src/empathy-main-window.ui.h:27 msgid "_Previous Conversations" msgstr "Predhodni po_govori" #: ../libempathy-gtk/empathy-contact-menu.c:462 -#: ../libempathy-gtk/empathy-individual-menu.c:766 +#: ../libempathy-gtk/empathy-individual-menu.c:778 msgid "Send File" msgstr "Pošlji datoteko" #: ../libempathy-gtk/empathy-contact-menu.c:485 -#: ../libempathy-gtk/empathy-individual-menu.c:808 +#: ../libempathy-gtk/empathy-individual-menu.c:820 msgid "Share My Desktop" msgstr "Souporaba namizja" #: ../libempathy-gtk/empathy-contact-menu.c:525 #: ../libempathy-gtk/empathy-contact-widget.c:1890 -#: ../libempathy-gtk/empathy-individual-menu.c:843 +#: ../libempathy-gtk/empathy-individual-menu.c:855 #: ../libempathy-gtk/empathy-individual-widget.c:1386 msgid "Favorite" msgstr "Priljubljeno" #: ../libempathy-gtk/empathy-contact-menu.c:554 -#: ../libempathy-gtk/empathy-individual-menu.c:871 +#: ../libempathy-gtk/empathy-individual-menu.c:883 msgid "Infor_mation" msgstr "_Podrobnosti" @@ -1742,13 +1742,13 @@ msgid "_Edit" msgstr "_Uredi" #: ../libempathy-gtk/empathy-contact-menu.c:654 -#: ../libempathy-gtk/empathy-individual-menu.c:1058 +#: ../libempathy-gtk/empathy-individual-menu.c:1070 #: ../src/empathy-chat-window.c:1010 msgid "Inviting you to this room" msgstr "Vabila v klepetalnico" #: ../libempathy-gtk/empathy-contact-menu.c:685 -#: ../libempathy-gtk/empathy-individual-menu.c:1104 +#: ../libempathy-gtk/empathy-individual-menu.c:1116 msgid "_Invite to Chat Room" msgstr "_Povabi v klepetalnico" @@ -2072,25 +2072,25 @@ msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj." #. Translators: this is used in the context menu for a contact. The first #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one #. * of the user's account IDs (e.g. me@hotmail.com). -#: ../libempathy-gtk/empathy-individual-menu.c:137 +#: ../libempathy-gtk/empathy-individual-menu.c:138 #, c-format msgid "%s (%s)" msgstr "%s (%s)" #. add an SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:593 +#: ../libempathy-gtk/empathy-individual-menu.c:594 #: ../libempathy-gtk/empathy-new-message-dialog.c:248 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:919 +#: ../libempathy-gtk/empathy-individual-menu.c:931 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Uredi" #. Translators: this is a verb meaning "to connect two contacts together #. * to form a meta-contact". -#: ../libempathy-gtk/empathy-individual-menu.c:945 +#: ../libempathy-gtk/empathy-individual-menu.c:957 msgctxt "Link individual (contextual menu)" msgid "_Link Contacts…" msgstr "_Poveži stike ..." @@ -2184,117 +2184,126 @@ msgctxt "Unlink individual (button)" msgid "_Unlink" msgstr "_Odstrani povezavo" -#: ../libempathy-gtk/empathy-log-window.c:419 +#: ../libempathy-gtk/empathy-log-window.c:458 +msgid "History" +msgstr "Zgodovina" + +#: ../libempathy-gtk/empathy-log-window.c:510 msgid "Show" msgstr "Pokaži" -#: ../libempathy-gtk/empathy-log-window.c:441 +#: ../libempathy-gtk/empathy-log-window.c:532 msgid "Search" msgstr "Poišči" -#: ../libempathy-gtk/empathy-log-window.c:676 -#: ../libempathy-gtk/empathy-log-window.c:840 -msgctxt "A date with the time" -msgid "%A, %e %B %Y %X" -msgstr "%A, %d. %B %Y" +#: ../libempathy-gtk/empathy-log-window.c:946 +#, c-format +msgid "Chat in %s" +msgstr "Klepet v %s" -#: ../libempathy-gtk/empathy-log-window.c:678 +#: ../libempathy-gtk/empathy-log-window.c:948 #, c-format msgid "Chat with %s" msgstr "Klepet s stikom %s" +#: ../libempathy-gtk/empathy-log-window.c:998 +#: ../libempathy-gtk/empathy-log-window.c:1176 +msgctxt "A date with the time" +msgid "%A, %e %B %Y %X" +msgstr "%A, %d. %B %Y" + #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:797 +#: ../libempathy-gtk/empathy-log-window.c:1118 #, 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:803 +#: ../libempathy-gtk/empathy-log-window.c:1124 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:859 -#: ../libempathy-gtk/empathy-log-window.c:861 +#: ../libempathy-gtk/empathy-log-window.c:1195 +#: ../libempathy-gtk/empathy-log-window.c:1197 #: ../src/empathy-ft-manager.c:1026 msgid "%" msgstr "%" -#: ../libempathy-gtk/empathy-log-window.c:868 +#: ../libempathy-gtk/empathy-log-window.c:1204 #, c-format msgid "Call took %s, ended at %s" msgstr "Klic začet %s, končan %s" -#: ../libempathy-gtk/empathy-log-window.c:1195 +#: ../libempathy-gtk/empathy-log-window.c:1536 msgid "Today" msgstr "Danes" -#: ../libempathy-gtk/empathy-log-window.c:1199 +#: ../libempathy-gtk/empathy-log-window.c:1540 msgid "Yesterday" msgstr "Včeraj" -#: ../libempathy-gtk/empathy-log-window.c:1215 +#: ../libempathy-gtk/empathy-log-window.c:1556 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:1296 -#: ../libempathy-gtk/empathy-log-window.c:2736 +#: ../libempathy-gtk/empathy-log-window.c:1637 +#: ../libempathy-gtk/empathy-log-window.c:3203 msgid "Anytime" msgstr "Kadarkoli" -#: ../libempathy-gtk/empathy-log-window.c:1368 -#: ../libempathy-gtk/empathy-log-window.c:1712 +#: ../libempathy-gtk/empathy-log-window.c:1717 +#: ../libempathy-gtk/empathy-log-window.c:2154 msgid "Anyone" msgstr "Kdorkoli" -#: ../libempathy-gtk/empathy-log-window.c:1992 +#: ../libempathy-gtk/empathy-log-window.c:2451 msgid "Who" msgstr "Kdo" -#: ../libempathy-gtk/empathy-log-window.c:2196 +#: ../libempathy-gtk/empathy-log-window.c:2655 msgid "When" msgstr "Kdaj" -#: ../libempathy-gtk/empathy-log-window.c:2312 +#: ../libempathy-gtk/empathy-log-window.c:2771 msgid "Anything" msgstr "Karkoli" -#: ../libempathy-gtk/empathy-log-window.c:2314 +#: ../libempathy-gtk/empathy-log-window.c:2773 msgid "Text chats" msgstr "Besedilni klepet" -#: ../libempathy-gtk/empathy-log-window.c:2316 +#: ../libempathy-gtk/empathy-log-window.c:2775 msgid "Calls" msgstr "Klici" -#: ../libempathy-gtk/empathy-log-window.c:2321 +#: ../libempathy-gtk/empathy-log-window.c:2780 msgid "Incoming calls" msgstr "Dohodni klici" -#: ../libempathy-gtk/empathy-log-window.c:2322 +#: ../libempathy-gtk/empathy-log-window.c:2781 msgid "Outgoing calls" msgstr "Odhodni klici" -#: ../libempathy-gtk/empathy-log-window.c:2323 +#: ../libempathy-gtk/empathy-log-window.c:2782 msgid "Missed calls" msgstr "Prezrti klici" -#: ../libempathy-gtk/empathy-log-window.c:2344 +#: ../libempathy-gtk/empathy-log-window.c:2804 msgid "What" msgstr "Kaj" -#: ../libempathy-gtk/empathy-log-window.c:3039 +#: ../libempathy-gtk/empathy-log-window.c:3506 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:3043 +#: ../libempathy-gtk/empathy-log-window.c:3510 msgid "Clear All" msgstr "Počisti vse" -#: ../libempathy-gtk/empathy-log-window.c:3050 +#: ../libempathy-gtk/empathy-log-window.c:3517 msgid "Delete from:" msgstr "Izbriši iz:" @@ -2305,7 +2314,7 @@ msgstr "<span size=\"x-large\">Nalaganje ...</span>" #. translators: Call is a noun. This string is used in the window #. * title #: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-streamed-media-window.c:1340 +#: ../src/empathy-streamed-media-window.c:1344 msgid "Call" msgstr "Kliči" @@ -2319,30 +2328,26 @@ msgid "Delete All History..." msgstr "Izbriši celotno zgodovino ..." #: ../libempathy-gtk/empathy-log-window.ui.h:5 -msgid "History" -msgstr "Zgodovina" - -#: ../libempathy-gtk/empathy-log-window.ui.h:6 msgid "Profile" msgstr "Profil" -#: ../libempathy-gtk/empathy-log-window.ui.h:7 +#: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-call-window.ui.h:20 #: ../src/empathy-streamed-media-window.ui.h:20 msgid "Video" msgstr "Video" -#: ../libempathy-gtk/empathy-log-window.ui.h:8 +#: ../libempathy-gtk/empathy-log-window.ui.h:7 #: ../src/empathy-chat-window.ui.h:12 #: ../src/empathy-main-window.ui.h:20 msgid "_Edit" msgstr "_Uredi" -#: ../libempathy-gtk/empathy-log-window.ui.h:9 +#: ../libempathy-gtk/empathy-log-window.ui.h:8 msgid "_File" msgstr "_Datoteka" -#: ../libempathy-gtk/empathy-log-window.ui.h:10 +#: ../libempathy-gtk/empathy-log-window.ui.h:9 msgid "page 2" msgstr "stran 2" @@ -2361,17 +2366,17 @@ msgid "New Conversation" msgstr "Nov pogovor" #. add video toggle -#: ../libempathy-gtk/empathy-new-call-dialog.c:216 +#: ../libempathy-gtk/empathy-new-call-dialog.c:231 msgid "Send _Video" msgstr "Pošlji _video" #. add chat button -#: ../libempathy-gtk/empathy-new-call-dialog.c:224 +#: ../libempathy-gtk/empathy-new-call-dialog.c:242 msgid "C_all" msgstr "_Kliči" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:234 +#: ../libempathy-gtk/empathy-new-call-dialog.c:252 msgid "New Call" msgstr "Nov klic" @@ -2500,12 +2505,12 @@ msgstr "Urejanje sporočila po meri" msgid "Remove" msgstr "Odstrani" -#: ../libempathy-gtk/empathy-theme-adium.c:1118 +#: ../libempathy-gtk/empathy-theme-adium.c:1121 #, c-format msgid "Message edited at %s" msgstr "Sporočilo je bilo nazadnje spremenjeno ob %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1937 +#: ../libempathy-gtk/empathy-theme-adium.c:1943 msgid "Normal" msgstr "Običajno" @@ -2989,8 +2994,8 @@ msgid "Your new account has not been saved yet." msgstr "Novi račun še ni bil shranjen." #: ../src/empathy-accounts-dialog.c:345 -#: ../src/empathy-streamed-media-window.c:797 -#: ../src/empathy-call-window.c:780 +#: ../src/empathy-streamed-media-window.c:801 +#: ../src/empathy-call-window.c:880 msgid "Connecting…" msgstr "Povezovanje ..." @@ -3095,180 +3100,180 @@ msgid "People nearby" msgstr "Uporabniki v bližini" #: ../src/empathy-av.c:118 -#: ../src/empathy-call.c:120 +#: ../src/empathy-call.c:124 msgid "- Empathy Audio/Video Client" msgstr "- Empathy odjemalec zvoka in slike" #: ../src/empathy-av.c:134 -#: ../src/empathy-call.c:138 +#: ../src/empathy-call.c:145 msgid "Empathy Audio/Video Client" msgstr "Empathy odjemalec zvoka in slike" #: ../src/empathy-streamed-media-window.c:478 -#: ../src/empathy-call-window.c:472 +#: ../src/empathy-call-window.c:458 msgid "Contrast" msgstr "Kontrast" #: ../src/empathy-streamed-media-window.c:481 -#: ../src/empathy-call-window.c:475 +#: ../src/empathy-call-window.c:461 msgid "Brightness" msgstr "Svetlost" #: ../src/empathy-streamed-media-window.c:484 -#: ../src/empathy-call-window.c:478 +#: ../src/empathy-call-window.c:464 msgid "Gamma" msgstr "Gama" #: ../src/empathy-streamed-media-window.c:589 -#: ../src/empathy-call-window.c:583 +#: ../src/empathy-call-window.c:569 msgid "Volume" msgstr "Glasnost" -#: ../src/empathy-streamed-media-window.c:1153 -#: ../src/empathy-call-window.c:1127 +#: ../src/empathy-streamed-media-window.c:1157 +#: ../src/empathy-call-window.ui.h:22 msgid "_Sidebar" msgstr "_Stranska vrstica" -#: ../src/empathy-streamed-media-window.c:1173 +#: ../src/empathy-streamed-media-window.c:1177 #: ../src/empathy-call-window.c:1149 msgid "Audio input" msgstr "Zvočni vhod" -#: ../src/empathy-streamed-media-window.c:1177 +#: ../src/empathy-streamed-media-window.c:1181 #: ../src/empathy-call-window.c:1153 msgid "Video input" msgstr "Video vhod" -#: ../src/empathy-streamed-media-window.c:1181 +#: ../src/empathy-streamed-media-window.c:1185 #: ../src/empathy-call-window.c:1157 msgid "Dialpad" msgstr "Številčnica" -#: ../src/empathy-streamed-media-window.c:1192 +#: ../src/empathy-streamed-media-window.c:1196 #: ../src/empathy-call-window.c:1167 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-streamed-media-window.c:1261 -#: ../src/empathy-call-window.c:1239 +#: ../src/empathy-streamed-media-window.c:1265 +#: ../src/empathy-call-window.c:1250 #, c-format msgid "Call with %s" msgstr "Pokliči z %s" -#: ../src/empathy-streamed-media-window.c:1494 -#: ../src/empathy-call-window.c:1459 +#: ../src/empathy-streamed-media-window.c:1498 +#: ../src/empathy-call-window.c:1447 msgid "The IP address as seen by the machine" msgstr "Naslov IP kot ga zazna strojna oprema" -#: ../src/empathy-streamed-media-window.c:1496 -#: ../src/empathy-call-window.c:1461 +#: ../src/empathy-streamed-media-window.c:1500 +#: ../src/empathy-call-window.c:1449 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-streamed-media-window.c:1498 -#: ../src/empathy-call-window.c:1463 +#: ../src/empathy-streamed-media-window.c:1502 +#: ../src/empathy-call-window.c:1451 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-streamed-media-window.c:1500 -#: ../src/empathy-call-window.c:1465 +#: ../src/empathy-streamed-media-window.c:1504 +#: ../src/empathy-call-window.c:1453 msgid "The IP address of a relay server" msgstr "Naslov IP posredovalnega strežnika" -#: ../src/empathy-streamed-media-window.c:1502 -#: ../src/empathy-call-window.c:1467 +#: ../src/empathy-streamed-media-window.c:1506 +#: ../src/empathy-call-window.c:1455 msgid "The IP address of the multicast group" msgstr "Naslov IP skupine za večsmerno oddajanje" -#: ../src/empathy-streamed-media-window.c:1884 +#: ../src/empathy-streamed-media-window.c:1888 msgctxt "encoding video codec" msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-streamed-media-window.c:1887 +#: ../src/empathy-streamed-media-window.c:1891 msgctxt "encoding audio codec" msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-streamed-media-window.c:1890 +#: ../src/empathy-streamed-media-window.c:1894 msgctxt "decoding video codec" msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-streamed-media-window.c:1893 +#: ../src/empathy-streamed-media-window.c:1897 msgctxt "decoding audio codec" msgid "Unknown" msgstr "Neznano" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-streamed-media-window.c:2185 +#: ../src/empathy-streamed-media-window.c:2189 #, c-format msgid "Connected — %d:%02dm" msgstr "Povezan - %d:%02d m" -#: ../src/empathy-streamed-media-window.c:2246 -#: ../src/empathy-call-window.c:2187 +#: ../src/empathy-streamed-media-window.c:2250 +#: ../src/empathy-call-window.c:2167 msgid "Technical Details" msgstr "Tehnične podrobnosti" -#: ../src/empathy-streamed-media-window.c:2284 -#: ../src/empathy-call-window.c:2225 +#: ../src/empathy-streamed-media-window.c:2288 +#: ../src/empathy-call-window.c:2205 #, 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-streamed-media-window.c:2289 -#: ../src/empathy-call-window.c:2230 +#: ../src/empathy-streamed-media-window.c:2293 +#: ../src/empathy-call-window.c:2210 #, 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-streamed-media-window.c:2295 -#: ../src/empathy-call-window.c:2236 +#: ../src/empathy-streamed-media-window.c:2299 +#: ../src/empathy-call-window.c:2216 #, 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-streamed-media-window.c:2301 -#: ../src/empathy-call-window.c:2242 +#: ../src/empathy-streamed-media-window.c:2305 +#: ../src/empathy-call-window.c:2222 msgid "There was a failure on the network" msgstr "Prišlo je do napake na omrežju" -#: ../src/empathy-streamed-media-window.c:2305 -#: ../src/empathy-call-window.c:2246 +#: ../src/empathy-streamed-media-window.c:2309 +#: ../src/empathy-call-window.c:2226 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-streamed-media-window.c:2308 -#: ../src/empathy-call-window.c:2249 +#: ../src/empathy-streamed-media-window.c:2312 +#: ../src/empathy-call-window.c:2229 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-streamed-media-window.c:2318 -#: ../src/empathy-call-window.c:2261 +#: ../src/empathy-streamed-media-window.c:2322 +#: ../src/empathy-call-window.c:2241 #, 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-streamed-media-window.c:2326 -#: ../src/empathy-call-window.c:2270 +#: ../src/empathy-streamed-media-window.c:2330 +#: ../src/empathy-call-window.c:2250 msgid "There was a failure in the call engine" msgstr "Prišlo je do napake v klicnem programniku" -#: ../src/empathy-streamed-media-window.c:2329 -#: ../src/empathy-call-window.c:2273 +#: ../src/empathy-streamed-media-window.c:2333 +#: ../src/empathy-call-window.c:2253 msgid "The end of the stream was reached" msgstr "Dosežen je konec pretoka" -#: ../src/empathy-streamed-media-window.c:2369 -#: ../src/empathy-call-window.c:2313 +#: ../src/empathy-streamed-media-window.c:2373 +#: ../src/empathy-call-window.c:2293 msgid "Can't establish audio stream" msgstr "Ni mogoče vzpostaviti zvočnega pretoka" -#: ../src/empathy-streamed-media-window.c:2379 -#: ../src/empathy-call-window.c:2323 +#: ../src/empathy-streamed-media-window.c:2383 +#: ../src/empathy-call-window.c:2303 msgid "Can't establish video stream" msgstr "Ni mogoče vzpostaviti video pretoka" @@ -3283,119 +3288,93 @@ msgid "Call the contact again" msgstr "Znova pokliči stik" #: ../src/empathy-call-window.ui.h:3 -#: ../src/empathy-streamed-media-window.ui.h:3 -msgid "Camera Off" -msgstr "Kamera ni omogočena" - -#: ../src/empathy-call-window.ui.h:4 -#: ../src/empathy-streamed-media-window.ui.h:4 -msgid "Camera On" -msgstr "Kamera je omogočena" - -#: ../src/empathy-call-window.ui.h:5 #: ../src/empathy-streamed-media-window.ui.h:5 msgid "Decoding Codec:" msgstr "Kodek odkodiranja:" -#: ../src/empathy-call-window.ui.h:6 -#: ../src/empathy-streamed-media-window.ui.h:6 -msgid "Disable camera and stop sending video" -msgstr "Onemogoči kamero in zaustavi pošiljanje videa" - -#: ../src/empathy-call-window.ui.h:7 -#: ../src/empathy-streamed-media-window.ui.h:7 -msgid "Enable camera and send video" -msgstr "Omogoči kamero in začni pošiljati video" +#: ../src/empathy-call-window.ui.h:4 +msgid "Disable camera" +msgstr "Onemogoči videokamero" -#: ../src/empathy-call-window.ui.h:8 -#: ../src/empathy-streamed-media-window.ui.h:8 -msgid "Enable camera but don't send video" -msgstr "Omogoči kamero, vendar ne pošlji videa" +#: ../src/empathy-call-window.ui.h:5 +msgid "Display the dialpad" +msgstr "Pokaži številčnico na zaslonu" -#: ../src/empathy-call-window.ui.h:9 +#: ../src/empathy-call-window.ui.h:6 #: ../src/empathy-streamed-media-window.ui.h:9 msgid "Encoding Codec:" msgstr "Kodek kodiranja:" -#: ../src/empathy-call-window.ui.h:10 +#: ../src/empathy-call-window.ui.h:7 #: ../src/empathy-streamed-media-window.ui.h:10 msgid "Hang up" msgstr "Odloži" -#: ../src/empathy-call-window.ui.h:11 +#: ../src/empathy-call-window.ui.h:8 #: ../src/empathy-streamed-media-window.ui.h:11 msgid "Hang up current call" msgstr "Odloži trenutni klic" -#: ../src/empathy-call-window.ui.h:12 +#: ../src/empathy-call-window.ui.h:9 #: ../src/empathy-streamed-media-window.ui.h:12 msgid "Local Candidate:" msgstr "Krajevni odjemalec:" -#: ../src/empathy-call-window.ui.h:13 -#: ../src/empathy-streamed-media-window.ui.h:13 -msgid "Preview" -msgstr "Predogled" +#: ../src/empathy-call-window.ui.h:10 +msgid "Maximise me" +msgstr "Razpni" -#: ../src/empathy-call-window.ui.h:14 +#: ../src/empathy-call-window.ui.h:11 +msgid "Minimise me" +msgstr "Skrči" + +#: ../src/empathy-call-window.ui.h:12 #: ../src/empathy-streamed-media-window.ui.h:14 msgid "Redial" msgstr "Ponovno pokliči" -#: ../src/empathy-call-window.ui.h:15 +#: ../src/empathy-call-window.ui.h:13 #: ../src/empathy-streamed-media-window.ui.h:15 msgid "Remote Candidate:" msgstr "Oddaljeni odjemalec:" -#: ../src/empathy-call-window.ui.h:16 +#: ../src/empathy-call-window.ui.h:14 #: ../src/empathy-streamed-media-window.ui.h:16 msgid "Send Audio" msgstr "Pošlji zvočni posnetek" +#: ../src/empathy-call-window.ui.h:15 +msgid "Send Video" +msgstr "Pošlji video" + +#: ../src/empathy-call-window.ui.h:16 +msgid "Show dialpad" +msgstr "Pokaži številčnico" + #: ../src/empathy-call-window.ui.h:17 #: ../src/empathy-streamed-media-window.ui.h:17 msgid "Toggle audio transmission" msgstr "Preklopi prenos zvoka" #: ../src/empathy-call-window.ui.h:18 +msgid "Toggle video transmission" +msgstr "Preklopi prenos videa" + +#: ../src/empathy-call-window.ui.h:19 #: ../src/empathy-streamed-media-window.ui.h:18 -#: ../src/empathy-call-window.c:1824 -#: ../src/empathy-call-window.c:1825 -#: ../src/empathy-call-window.c:1826 -#: ../src/empathy-call-window.c:1827 +#: ../src/empathy-call-window.c:1813 +#: ../src/empathy-call-window.c:1814 +#: ../src/empathy-call-window.c:1815 +#: ../src/empathy-call-window.c:1816 msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-call-window.ui.h:19 -#: ../src/empathy-streamed-media-window.ui.h:19 -msgid "V_ideo" -msgstr "V_ideo" - #: ../src/empathy-call-window.ui.h:21 -#: ../src/empathy-streamed-media-window.ui.h:21 -msgid "Video Off" -msgstr "Video ni omogočen" - -#: ../src/empathy-call-window.ui.h:22 -#: ../src/empathy-streamed-media-window.ui.h:22 -msgid "Video On" -msgstr "Video je omogočen" - -#: ../src/empathy-call-window.ui.h:23 -#: ../src/empathy-streamed-media-window.ui.h:23 -msgid "Video Preview" -msgstr "Predogled videa" - -#: ../src/empathy-call-window.ui.h:24 #: ../src/empathy-streamed-media-window.ui.h:24 msgid "_Call" msgstr "Po_kliči" -#: ../src/empathy-call-window.ui.h:25 -msgid "_Dialpad" -msgstr "Š_tevilčnica" - -#: ../src/empathy-call-window.ui.h:26 +#: ../src/empathy-call-window.ui.h:23 #: ../src/empathy-main-window.ui.h:30 #: ../src/empathy-streamed-media-window.ui.h:25 msgid "_View" @@ -4197,6 +4176,46 @@ msgstr "Stanje" msgid "_Quit" msgstr "_Končaj" +#: ../src/empathy-streamed-media-window.ui.h:3 +msgid "Camera Off" +msgstr "Kamera ni omogočena" + +#: ../src/empathy-streamed-media-window.ui.h:4 +msgid "Camera On" +msgstr "Kamera je omogočena" + +#: ../src/empathy-streamed-media-window.ui.h:6 +msgid "Disable camera and stop sending video" +msgstr "Onemogoči kamero in zaustavi pošiljanje videa" + +#: ../src/empathy-streamed-media-window.ui.h:7 +msgid "Enable camera and send video" +msgstr "Omogoči kamero in začni pošiljati video" + +#: ../src/empathy-streamed-media-window.ui.h:8 +msgid "Enable camera but don't send video" +msgstr "Omogoči kamero, vendar ne pošlji videa" + +#: ../src/empathy-streamed-media-window.ui.h:13 +msgid "Preview" +msgstr "Predogled" + +#: ../src/empathy-streamed-media-window.ui.h:19 +msgid "V_ideo" +msgstr "V_ideo" + +#: ../src/empathy-streamed-media-window.ui.h:21 +msgid "Video Off" +msgstr "Video ni omogočen" + +#: ../src/empathy-streamed-media-window.ui.h:22 +msgid "Video On" +msgstr "Video je omogočen" + +#: ../src/empathy-streamed-media-window.ui.h:23 +msgid "Video Preview" +msgstr "Predogled videa" + #: ../src/empathy-map-view.c:448 msgid "Contact Map View" msgstr "Prikaz zemljevida stikov" @@ -4343,18 +4362,25 @@ msgstr "Zagotovi" msgid "%s just tried to call you, but you were in another call." msgstr "%s je klical med drugim pogovorom." -#: ../src/empathy-call-window.c:1246 +#. Translators: this is an "Info" label. It should be as short +#. * as possible. +#: ../src/empathy-call-window.c:787 +#: ../src/empathy-call-window.c:801 +msgid "i" +msgstr "i" + +#: ../src/empathy-call-window.c:1257 #, c-format msgid "Call with %d participants" msgstr "Klepet večih (%d) uporabnikov" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2124 +#: ../src/empathy-call-window.c:2104 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:2125 +#: ../src/empathy-call-window.c:2105 msgid "On hold" msgstr "Zadržano" @@ -4362,6 +4388,9 @@ msgstr "Zadržano" msgid "_Match case" msgstr "_Upoštevaj velikost črk" +#~ msgid "_Dialpad" +#~ msgstr "Š_tevilčnica" + #~ msgid "Enter Custom Message" #~ msgstr "Vnos sporočila po meri" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-15 13:06+0200\n" -"PO-Revision-Date: 2011-07-15 13:13+0100\n" +"POT-Creation-Date: 2011-07-18 22:57+0200\n" +"PO-Revision-Date: 2011-07-18 23:09+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -49,9 +49,8 @@ msgid "Chat window theme" msgstr "Chattfönstertema" #: ../data/org.gnome.Empathy.gschema.xml.in.h:4 -#, fuzzy msgid "Chat window theme variant" -msgstr "Chattfönstertema" +msgstr "Temavariant för chattfönster" #: ../data/org.gnome.Empathy.gschema.xml.in.h:5 msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." @@ -210,9 +209,8 @@ msgid "Pop up notifications when a contact logs out" msgstr "Visa popupnotifieringar när en kontakt loggar ut" #: ../data/org.gnome.Empathy.gschema.xml.in.h:43 -#, fuzzy msgid "Show Balance in contact list" -msgstr "Visa ko_mpakt kontaktlista" +msgstr "Visa saldo i kontaktlista" #: ../data/org.gnome.Empathy.gschema.xml.in.h:44 msgid "Show avatars" @@ -259,9 +257,8 @@ msgid "The theme that is used to display the conversation in chat windows." msgstr "Det tema som används för att visa samtal i chattfönster." #: ../data/org.gnome.Empathy.gschema.xml.in.h:55 -#, fuzzy msgid "The theme variant that is used to display the conversation in chat windows." -msgstr "Det tema som används för att visa samtal i chattfönster." +msgstr "Den temavariant som används för att visa samtalet i chattfönster." #: ../data/org.gnome.Empathy.gschema.xml.in.h:56 msgid "Use graphical smileys" @@ -380,9 +377,8 @@ msgid "Whether to show a popup notification when receiving a new message." msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot." #: ../data/org.gnome.Empathy.gschema.xml.in.h:85 -#, fuzzy msgid "Whether to show account balances in the contact list." -msgstr "Huruvida protokoll för kontakter ska visas i kontaktlistan." +msgstr "Huruvida kontosaldon ska visas i kontaktlistan." #: ../data/org.gnome.Empathy.gschema.xml.in.h:86 msgid "Whether to show avatars for contacts in the contact list and chat windows." @@ -1231,7 +1227,7 @@ msgstr "Det inträffade ett fel när samtalet startades" #: ../libempathy-gtk/empathy-call-utils.c:49 msgid "The specified contact doesn't support calls" -msgstr "" +msgstr "Den angivna kontakten saknar stöd för röstsamtal" #: ../libempathy-gtk/empathy-call-utils.c:51 msgid "The specified contact is offline" @@ -1242,9 +1238,8 @@ msgid "The specified contact is not valid" msgstr "Den valda kontakten är inte giltig" #: ../libempathy-gtk/empathy-call-utils.c:55 -#, fuzzy msgid "Emergency calls are not supported on this protocol" -msgstr "Ämne stöds inte för detta samtal" +msgstr "Nödsamtal stöds inte med detta protokollet" #: ../libempathy-gtk/empathy-chat.c:697 msgid "Failed to open private chat" @@ -1259,9 +1254,9 @@ msgid "You are not allowed to change the topic" msgstr "Du tillåts inte att ändra ämnet" #: ../libempathy-gtk/empathy-chat.c:968 -#, fuzzy, c-format +#, c-format msgid "“%s” is not a valid contact ID" -msgstr "ogiltig kontakt" +msgstr "\"%s\" är inte ett giltigt kontakt-id" #: ../libempathy-gtk/empathy-chat.c:1025 msgid "/clear: clear all messages from the current conversation" @@ -1305,7 +1300,7 @@ msgstr "/say <meddelande>: skicka <meddelande> till det aktuella samtalet. Detta #: ../libempathy-gtk/empathy-chat.c:1059 msgid "/whois <contact ID>: display information about a contact" -msgstr "" +msgstr "/whois <kontakt-id>: visa information om en kontakt" #: ../libempathy-gtk/empathy-chat.c:1062 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage." @@ -1327,14 +1322,12 @@ msgstr "Okänt kommando; se /help för tillgängliga kommandon" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. #: ../libempathy-gtk/empathy-chat.c:1407 -#, fuzzy msgid "insufficient balance to send message" -msgstr "Otillräckligt med ledigt utrymme för att spara filen" +msgstr "otillräckliga medel på kontot för att skicka meddelande" #: ../libempathy-gtk/empathy-chat.c:1409 -#, fuzzy msgid "not capable" -msgstr "Inte acceptabel" +msgstr "inte kapabel" #: ../libempathy-gtk/empathy-chat.c:1416 msgid "offline" @@ -1366,9 +1359,9 @@ msgid "Error sending message '%s': %s" msgstr "Fel vid sändning av meddelandet \"%s\": %s" #: ../libempathy-gtk/empathy-chat.c:1442 -#, fuzzy, c-format +#, c-format msgid "Error sending message: %s" -msgstr "Fel vid sändning av meddelandet \"%s\": %s" +msgstr "Fel vid sändning av meddelande: %s" #: ../libempathy-gtk/empathy-chat.c:1503 #: ../src/empathy-chat-window.c:760 @@ -1809,9 +1802,8 @@ msgstr "Ansluten från:" #. * and should bin this. #. #: ../libempathy-gtk/empathy-contact-widget.c:353 -#, fuzzy msgid "Away message:" -msgstr "Avslutningsmeddelande:" +msgstr "Frånvaromeddelande:" #: ../libempathy-gtk/empathy-contact-widget.c:606 msgid "Channels:" @@ -2198,10 +2190,9 @@ msgstr "Chatt med %s" #: ../libempathy-gtk/empathy-log-window.c:998 #: ../libempathy-gtk/empathy-log-window.c:1176 -#, fuzzy msgctxt "A date with the time" msgid "%A, %e %B %Y %X" -msgstr "%A %e %B %Y" +msgstr "%A, %e %B %Y %X" #. Translators: this is an emote: '* Danielle waves' #: ../libempathy-gtk/empathy-log-window.c:1118 @@ -2237,10 +2228,9 @@ msgid "Yesterday" msgstr "Igår" #: ../libempathy-gtk/empathy-log-window.c:1556 -#, fuzzy msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year" msgid "%e %B %Y" -msgstr "%A %e %B %Y" +msgstr "%e %B %Y" #: ../libempathy-gtk/empathy-log-window.c:1637 #: ../libempathy-gtk/empathy-log-window.c:3203 @@ -2289,9 +2279,8 @@ msgid "What" msgstr "Vad" #: ../libempathy-gtk/empathy-log-window.c:3506 -#, fuzzy msgid "Are you sure you want to delete all logs of previous conversations?" -msgstr "Är du säker på att du vill blockera \"%s\" från att kontakta dig igen?" +msgstr "Är du säker på att du vill ta bort alla loggar för tidigare samtal?" #: ../libempathy-gtk/empathy-log-window.c:3510 msgid "Clear All" @@ -2500,9 +2489,9 @@ msgid "Remove" msgstr "Ta bort" #: ../libempathy-gtk/empathy-theme-adium.c:1121 -#, fuzzy, c-format +#, c-format msgid "Message edited at %s" -msgstr "Meddelande togs emot" +msgstr "Meddelandet redigerat %s" #: ../libempathy-gtk/empathy-theme-adium.c:1943 msgid "Normal" @@ -3301,7 +3290,7 @@ msgstr "Inaktivera kamera" #: ../src/empathy-call-window.ui.h:5 msgid "Display the dialpad" -msgstr "" +msgstr "Visa knappsatsen" #: ../src/empathy-call-window.ui.h:6 #: ../src/empathy-streamed-media-window.ui.h:9 @@ -3775,17 +3764,16 @@ msgstr "Stäng" #: ../src/empathy-main-window.c:928 #, c-format msgid "Top up %s (%s)..." -msgstr "" +msgstr "Fyll på %s (%s)..." #: ../src/empathy-main-window.c:975 -#, fuzzy msgid "Top up account credit" -msgstr "Salut-konto har skapats" +msgstr "Fyll på kontot" #. top up button #: ../src/empathy-main-window.c:1050 msgid "Top Up..." -msgstr "" +msgstr "Fyll på..." #: ../src/empathy-main-window.c:1817 msgid "Contact" @@ -4000,27 +3988,27 @@ msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview #: ../src/empathy-preferences.c:722 msgid "O Romeo, Romeo, wherefore art thou Romeo?" -msgstr "" +msgstr "Romeo, min Romeo, var är du Romeo?" #. translators: Quote from Romeo & Julier, for chat theme preview #: ../src/empathy-preferences.c:725 msgid "Deny thy father and refuse thy name;" -msgstr "" +msgstr "Förneka din fader och vägra ditt namn;" #. translators: Quote from Romeo & Julier, for chat theme preview #: ../src/empathy-preferences.c:728 msgid "Or if thou wilt not, be but sworn my love" -msgstr "" +msgstr "Eller om du icke, men var svurit min kärlek" #. translators: Quote from Romeo & Julier, for chat theme preview #: ../src/empathy-preferences.c:731 msgid "And I'll no longer be a Capulet." -msgstr "" +msgstr "Och jag kommer inte längre att vara en Capulet." #. translators: Quote from Romeo & Julier, for chat theme preview #: ../src/empathy-preferences.c:734 msgid "Shall I hear more, or shall I speak at this?" -msgstr "" +msgstr "Skall jag höra mer, eller ska jag tala?" #. translators: Quote from Romeo & Julier, for chat theme preview #: ../src/empathy-preferences.c:737 @@ -4350,9 +4338,8 @@ msgid "Accept" msgstr "Acceptera" #: ../src/empathy-notifications-approver.c:260 -#, fuzzy msgid "Provide" -msgstr "Ange lösenord" +msgstr "Tillhandahåll" #: ../src/empathy-call-observer.c:135 #, c-format @@ -4382,9 +4369,8 @@ msgid "On hold" msgstr "Väntar" #: ../libempathy-gtk/empathy-search-bar.c:243 -#, fuzzy msgid "_Match case" -msgstr "Matcha skiftläge" +msgstr "_Matcha skiftläge" #~ msgid "All" #~ msgstr "Alla" diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 85a2f4c51..343c69244 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -144,11 +144,6 @@ struct _EmpathyCallWindowPriv easilly repack everything when toggling fullscreen */ GtkWidget *content_hbox; - /* This vbox is contained in the content_hbox and it contains the - sidebar button. When toggling fullscreen, - it needs to be repacked. We keep a reference on it for easier access. */ - GtkWidget *vbox; - gulong video_output_motion_handler_id; guint bus_message_source_id; @@ -204,6 +199,9 @@ struct _EmpathyCallWindowPriv EmpathyCallWindowFullscreen *fullscreen; gboolean is_fullscreen; + gboolean got_video; + guint got_video_src; + /* Those fields represent the state of the window before it actually was in fullscreen mode. */ gboolean sidebar_was_visible_before_fs; @@ -595,6 +593,16 @@ empathy_call_window_create_audio_input (EmpathyCallWindow *self) } static void +empathy_call_window_show_video_output (EmpathyCallWindow *self, + gboolean show) +{ + if (self->priv->video_output != NULL) + g_object_set (self->priv->video_output, "visible", show, NULL); + + gtk_widget_set_visible (self->priv->remote_user_avatar_widget, !show); +} + +static void create_video_output_widget (EmpathyCallWindow *self) { EmpathyCallWindowPriv *priv = GET_PRIV (self); @@ -853,7 +861,7 @@ display_video_preview (EmpathyCallWindow *self, if (display) { - /* Display the preview and hide the self avatar */ + /* Display the video preview */ DEBUG ("Show video preview"); play_camera (self, TRUE); @@ -861,8 +869,8 @@ display_video_preview (EmpathyCallWindow *self, } else { - /* Display the self avatar and hide the preview */ - DEBUG ("Show self avatar"); + /* Hide the video preview */ + DEBUG ("Hide video preview"); if (priv->video_preview != NULL) { @@ -999,7 +1007,6 @@ empathy_call_window_init (EmpathyCallWindow *self) EmpathyCallWindowPriv *priv; GtkBuilder *gui; GtkWidget *top_vbox; - GtkWidget *h; GtkWidget *page; gchar *filename; GtkWidget *scroll; @@ -1126,15 +1133,8 @@ empathy_call_window_init (EmpathyCallWindow *self) /* The call will be started as soon the pipeline is playing */ priv->start_call_when_playing = TRUE; - priv->vbox = gtk_vbox_new (FALSE, 3); - gtk_box_pack_start (GTK_BOX (priv->content_hbox), priv->vbox, - FALSE, FALSE, CONTENT_HBOX_CHILDREN_PACKING_PADDING); - empathy_call_window_setup_toolbar (self); - h = gtk_hbox_new (FALSE, 3); - gtk_box_pack_end (GTK_BOX (priv->vbox), h, FALSE, FALSE, 3); - priv->sidebar = ev_sidebar_new (); g_signal_connect (G_OBJECT (priv->sidebar), "hide", G_CALLBACK (empathy_call_window_sidebar_hidden_cb), self); @@ -1172,10 +1172,10 @@ empathy_call_window_init (EmpathyCallWindow *self) gtk_widget_hide (priv->sidebar); priv->fullscreen = empathy_call_window_fullscreen_new (self); -#if 0 + empathy_call_window_fullscreen_set_video_widget (priv->fullscreen, - priv->video_output); -#endif + priv->video_container); + g_signal_connect (G_OBJECT (priv->fullscreen->leave_fullscreen_button), "clicked", G_CALLBACK (empathy_call_window_fullscreen_cb), self); @@ -1647,6 +1647,12 @@ empathy_call_window_dispose (GObject *object) priv->bus_message_source_id = 0; } + if (priv->got_video_src > 0) + { + g_source_remove (priv->got_video_src); + priv->got_video_src = 0; + } + tp_clear_object (&priv->pipeline); tp_clear_object (&priv->video_input); tp_clear_object (&priv->audio_input); @@ -1882,6 +1888,11 @@ empathy_call_window_disconnected (EmpathyCallWindow *self, if (priv->video_output != NULL) clutter_actor_destroy (priv->video_output); priv->video_output = NULL; + if (priv->got_video_src > 0) + { + g_source_remove (priv->got_video_src); + priv->got_video_src = 0; + } gtk_widget_show (priv->remote_user_avatar_widget); @@ -2361,16 +2372,59 @@ empathy_call_window_state_changed_cb (EmpathyCallHandler *handler, } static gboolean -emapthy_call_window_show_video_output_cb (gpointer user_data) +empathy_call_window_show_video_output_cb (gpointer user_data) { EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data); - gtk_widget_hide (self->priv->remote_user_avatar_widget); - clutter_actor_show (self->priv->video_output); + if (self->priv->video_output != NULL) + { + gtk_widget_hide (self->priv->remote_user_avatar_widget); + clutter_actor_show (self->priv->video_output); + } return FALSE; } +static gboolean +empathy_call_window_check_video_cb (gpointer data) +{ + EmpathyCallWindow *self = data; + + if (self->priv->got_video) + { + self->priv->got_video = FALSE; + return TRUE; + } + + /* No video in the last N seconds, display the remote avatar */ + empathy_call_window_show_video_output (self, FALSE); + + return TRUE; +} + +/* Called from the streaming thread */ +static gboolean +empathy_call_window_video_probe_cb (GstPad *pad, + GstMiniObject *mini_obj, + EmpathyCallWindow *self) +{ + /* Ignore events */ + if (GST_IS_EVENT (mini_obj)) + return TRUE; + + if (G_UNLIKELY (!self->priv->got_video)) + { + /* show the remote video */ + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, + empathy_call_window_show_video_output_cb, + g_object_ref (self), g_object_unref); + + self->priv->got_video = TRUE; + } + + return TRUE; +} + /* Called from the streaming thread */ static gboolean empathy_call_window_src_added_cb (EmpathyCallHandler *handler, @@ -2390,8 +2444,15 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, pad = empathy_call_window_get_audio_sink_pad (self); break; case TP_MEDIA_STREAM_TYPE_VIDEO: - g_idle_add (emapthy_call_window_show_video_output_cb, self); + g_idle_add (empathy_call_window_show_video_output_cb, self); pad = empathy_call_window_get_video_sink_pad (self); + + gst_pad_add_data_probe (src, + G_CALLBACK (empathy_call_window_video_probe_cb), self); + if (priv->got_video_src > 0) + g_source_remove (priv->got_video_src); + priv->got_video_src = g_timeout_add_seconds (5, + empathy_call_window_check_video_cb, self); break; default: g_assert_not_reached (); @@ -2790,7 +2851,6 @@ show_controls (EmpathyCallWindow *window, gboolean set_fullscreen) { gtk_widget_hide (priv->sidebar); gtk_widget_hide (menu); - gtk_widget_hide (priv->vbox); gtk_widget_hide (priv->statusbar); gtk_widget_hide (priv->toolbar); } @@ -2800,7 +2860,6 @@ show_controls (EmpathyCallWindow *window, gboolean set_fullscreen) gtk_widget_show (priv->sidebar); gtk_widget_show (menu); - gtk_widget_show (priv->vbox); gtk_widget_show (priv->statusbar); gtk_widget_show (priv->toolbar); @@ -2828,11 +2887,6 @@ show_borders (EmpathyCallWindow *window, gboolean set_fullscreen) GTK_PACK_START); #endif } - - gtk_box_set_child_packing (GTK_BOX (priv->content_hbox), - priv->vbox, TRUE, TRUE, - set_fullscreen ? 0 : CONTENT_HBOX_CHILDREN_PACKING_PADDING, - GTK_PACK_START); } static gboolean |