Merge branch 'debug-av-599166'

diff --git a/NEWS b/NEWS
index 1c099c56a03e69dd5012bce0b1319d3536abdeb3..f1b586e25f452959d8c5347209769d60ca157adf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,68 @@
+NEW in 2.31.5.1 (13/07/2010)
+===============
+
+A small release fixing detection of libnm-glib which was accidentally
+broken in 2.31.5.
+
+Bugs fixed:
+ - Fixed #624202, empathy requires libnm_glib instead of libnm-glib (Laurent Bigonville)
+
+Translations:
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+
+NEW in 2.31.5 (12/07/2010)
+=============
+
+The "Please popup chats in my face!" release.
+
+Empathy finally gained an option to automatically present incoming events
+rather than making the status icon blink.
+
+The notifications bubbles now contain more buttons (if your notify server
+supports actions) allowing you to quickly accept or decline incoming events.
+
+The audio/video client now lives in its own process: 'empathy-av'.
+
+Empathy can now build with GTK+ 3. If GTK+ 3 is present during configure it
+will be used and Empathy will requier updated versions of other dependencies:
+  - libcanberra-gtk3 ≥ 0.25
+  - libnotify ≥ 0.5.1
+  - libunique ≥ 2.90.1
+  - WebKitGTK+ ≥ 1.3.2 (optional)
+  - nautilus-sendto ≥ 2.90.0 (optional)
+If GTK+ 3 is not detected or if --enable-gtk3=no is passed to configure, then
+GTK+ 2 is used and the other dependencies are unchanged.
+
+
+Bugs fixed:
+ - Fixed #585914, Notification icon must be clicked before user can see new messages (Guillaume Desmottes)
+ - Fixed #597124, Should make better use of libnotify actions (Guillaume Desmottes)
+ - Fixed #599161, Audio/Video client should be a separated process (Guillaume Desmottes)
+ - Fixed #617405, Empathy's short (menu) description should focus on its use, not the technology (Guillaume Desmottes)
+ - Fixed #621753, Should be able to build with GTK+3 (Guillaume Desmottes)
+ - Fixed #622729, duplicated messages when opening chat (Guillaume Desmottes)
+ - Fixed #623054, Should re-add data/org.gnome.Empathy.gschema.xml.in to POTFILES.in (Danielle Madeley)
+ - Fixed #623112, Bip backlog are not displayed any more (Guillaume Desmottes)
+ - Fixed #623117, Debug window should look for TP clients (Guillaume Desmottes)
+ - Fixed #623358, Use TpSimpleHandler to handle text channels (Guillaume Desmottes)
+ - Fixed #623396, Fixed some leaks (Guillaume Desmottes)
+ - Fixed #623679, /join broken (Guillaume Desmottes)
+ - Fixed #623756, empathy-CRITICAL **: empathy_chatroom_is_always_urgent: assertion `EMPATHY_IS_CHATROOM (chatroom)' failed (Sjoerd Simons)
+ - Fixed #623817, Sync man pages with Debian (Laurent Bigonville, Guillaume Desmottes)
+ - Fixed #623914, since tp-logger history is shown as normal messages in adium themes (Guillaume Desmottes)
+ - Fixed #623937, empathy -h does not start hidden (Guillaume Desmottes)
+ - Fixed #623972, Toggling [ ] Enabled in the accounts dialog with the keyboard doesn't work (Will Thompson)
+ - Fixed #624054, Fix a memory leak in EmpathyAvatar (Philip Withnall)
+
+Translations:
+ - Updated es Translation (Jorge González)
+ - Updated et Translation (Ivar Smolin)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sl Translation (Matej Urbančič)
+
 NEW in 2.31.4 (28/06/2010)
 =============
 

diff --git a/configure.ac b/configure.ac
index 8c781d01ab4e1ae810b46fa6f098c3899a4e8c00..128628f34d4496cb5cf7c1d33e44041904b1e5c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [31])
-m4_define([empathy_micro_version], [4])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_micro_version], [5])
+m4_define([empathy_nano_version], [1])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -254,7 +254,7 @@ else
 
    PKG_CHECK_MODULES(NETWORK_MANAGER,
    [
-      libnm_glib >= $NETWORK_MANAGER_REQUIRED
+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
    ], have_nm="yes", have_nm="no")
 
    if test "x$have_nm" = "xyes"; then

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index c6099d91026714be01b49febb1a60b339c5ddb86..0e7c227d94e75762eed85ed0f8f35c74d875daf1 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -1265,7 +1265,7 @@ contact_list_view_search_activate_cb (GtkWidget *search,
 {
        GtkTreePath *path;
        GtkTreeViewColumn *focus_column;
- 
+
        gtk_tree_view_get_cursor (GTK_TREE_VIEW (view), &path, &focus_column);
        if (path != NULL) {
                gtk_tree_view_row_activated (GTK_TREE_VIEW (view), path,

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index afecd751c3571662d0a371020e143eae2d7233d0..986a3af2cddafec76803da4ba1ea5112cbe1157c 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -524,10 +524,10 @@ log_manager_searched_new_cb (GObject *manager,
                                        continue;
                        }
 
-                       g_date_strftime (date_readable, sizeof(date_readable),
+                       g_date_strftime (date_readable, sizeof (date_readable),
                                EMPATHY_TIME_FORMAT_DISPLAY_LONG, hit->date);
 
-                       g_date_strftime (tmp, sizeof(tmp),
+                       g_date_strftime (tmp, sizeof (tmp),
                                "%Y%m%d", hit->date);
 
                        account_name = tp_account_get_display_name (hit->account);

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e65117912ea58c257c80570cb95905728581448e..b5393727cdd50465a4ecdaa6d8384b5d9e5ca3f2 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -93,3 +93,4 @@ src/cc-empathy-accounts-page.c
 src/cc-empathy-accounts-panel.c
 src/empathy-accounts.c
 src/empathy-debugger.c
+src/empathy-av.c

diff --git a/po/gl.po b/po/gl.po
index a36c4cd9cf06ac3acd9fa10202db0bc074b0ca97..093b2b27e5a455a940b7d3a67781c6746a355f06 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-07 17:41+0200\n"
-"PO-Revision-Date: 2010-07-07 17:44+0200\n"
+"POT-Creation-Date: 2010-07-13 02:49+0200\n"
+"PO-Revision-Date: 2010-07-13 02:51+0200\n"
 "Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
 "Language-Team: Galician <gnome@g11n.net>\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,22 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
+msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
+msgstr ""
+"Converse usando Google Talk, Facebook, MSN e moitos máis servizos de conversa"
+
+#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Mensaxaría na Internet Empathy"
 
-#: ../data/empathy.desktop.in.in.h:3
+#: ../data/empathy.desktop.in.in.h:4
 msgid "IM Client"
 msgstr "Cliente de MI"
 
-# rever
-#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "Envíe e reciba mensaxes"
-
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
@@ -107,6 +107,8 @@ msgid ""
 "Display incoming events in the status area. If false present them right away "
 "to the user."
 msgstr ""
+"Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos "
+"directamente ao usuario."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
@@ -1398,7 +1400,7 @@ msgstr "Inserir unha emoticona"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1842
-#: ../libempathy-gtk/empathy-ui-utils.c:1618
+#: ../libempathy-gtk/empathy-ui-utils.c:1619
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -1468,7 +1470,7 @@ msgstr "%s uniuse á sala"
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2282 ../src/empathy-call-window.c:1653
+#: ../libempathy-gtk/empathy-chat.c:2282 ../src/empathy-call-window.c:1655
 msgid "Disconnected"
 msgstr "Desconectado"
 
@@ -1945,7 +1947,7 @@ msgid "Set your presence and current status"
 msgstr "Estabeleza a súa presenza e estado actual"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
 msgid "Custom messages…"
 msgstr "Mensaxes personalizadas..."
 
@@ -2042,15 +2044,15 @@ msgstr "Limpo"
 msgid "Blue"
 msgstr "Azul"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1515
+#: ../libempathy-gtk/empathy-ui-utils.c:1516
 msgid "Unable to open URI"
 msgstr "Non foi posíbel abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1610
+#: ../libempathy-gtk/empathy-ui-utils.c:1611
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1679
+#: ../libempathy-gtk/empathy-ui-utils.c:1680
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ficheiro entrante de %s"
@@ -2236,7 +2238,8 @@ msgstr "O contacto seleccionado desconectouse."
 msgid "No error message"
 msgstr "Non hai mensaxe de erro"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
 msgid "Instant Message (Empathy)"
 msgstr "Mensaxe instantáneo (Empathy)"
 
@@ -2626,23 +2629,23 @@ msgstr "Chamar con %s"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1309
+#: ../src/empathy-call-window.c:1311
 msgid "Call"
 msgstr "Chamar"
 
 # rever
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1966
+#: ../src/empathy-call-window.c:1968
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
 # rever
-#: ../src/empathy-call-window.c:2027
+#: ../src/empathy-call-window.c:2029
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-call-window.c:2065
+#: ../src/empathy-call-window.c:2067
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -2651,7 +2654,7 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de video admitidos polo seu "
 "computador"
 
-#: ../src/empathy-call-window.c:2070
+#: ../src/empathy-call-window.c:2072
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -2660,7 +2663,7 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
 "computador"
 
-#: ../src/empathy-call-window.c:2076
+#: ../src/empathy-call-window.c:2078
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -2669,21 +2672,21 @@ msgstr ""
 "Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
 "que non permite conexións directas."
 
-#: ../src/empathy-call-window.c:2082
+#: ../src/empathy-call-window.c:2084
 msgid "There was a failure on the network"
 msgstr "Produciuse un fallo na rede"
 
-#: ../src/empathy-call-window.c:2086
+#: ../src/empathy-call-window.c:2088
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de audio necesarios neste computador"
 
-#: ../src/empathy-call-window.c:2089
+#: ../src/empathy-call-window.c:2091
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
 
-#: ../src/empathy-call-window.c:2099
+#: ../src/empathy-call-window.c:2101
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2694,15 +2697,15 @@ msgstr ""
 "\">Informe de este erro</a> e anexe os rexistros que pode ollar na xanela "
 "'Depurar' no menú Axuda."
 
-#: ../src/empathy-call-window.c:2107
+#: ../src/empathy-call-window.c:2109
 msgid "There was a failure in the call engine"
 msgstr "Produciuse un fallo ao chamar ao motor"
 
-#: ../src/empathy-call-window.c:2146
+#: ../src/empathy-call-window.c:2148
 msgid "Can't establish audio stream"
 msgstr "Non é posíbel estabelecer un fluxo de audio"
 
-#: ../src/empathy-call-window.c:2156
+#: ../src/empathy-call-window.c:2158
 msgid "Can't establish video stream"
 msgstr "Non é posíbel estabelecer un fluxo de vídeo"
 
@@ -2989,12 +2992,12 @@ msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
 # rever
-#: ../src/empathy-event-manager.c:985
+#: ../src/empathy-event-manager.c:986
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Subscrición solicitada por %s"
 
-#: ../src/empathy-event-manager.c:989
+#: ../src/empathy-event-manager.c:990
 #, c-format
 msgid ""
 "\n"
@@ -3003,12 +3006,12 @@ msgstr ""
 "\n"
 "Mensaxe: %s"
 
-#: ../src/empathy-event-manager.c:1032
+#: ../src/empathy-event-manager.c:1033
 #, c-format
 msgid "%s is now offline."
 msgstr "%s está agora desconectado."
 
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1053
 #, c-format
 msgid "%s is now online."
 msgstr "%s está agora conectado."
@@ -3567,63 +3570,63 @@ msgstr "_Saír"
 msgid "Contact Map View"
 msgstr "Vista de mapa de contactos"
 
-#: ../src/empathy-debug-window.c:1168
+#: ../src/empathy-debug-window.c:1219
 msgid "Save"
 msgstr "Gardar"
 
-#: ../src/empathy-debug-window.c:1344
+#: ../src/empathy-debug-window.c:1395
 msgid "Debug Window"
 msgstr "Depurar xanela"
 
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1475
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1436
+#: ../src/empathy-debug-window.c:1487
 msgid "Level "
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1456
+#: ../src/empathy-debug-window.c:1507
 msgid "Debug"
 msgstr "Depuración"
 
-#: ../src/empathy-debug-window.c:1462
+#: ../src/empathy-debug-window.c:1513
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:1468 ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../src/empathy-debug-window.c:1474
+#: ../src/empathy-debug-window.c:1525
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:1480
+#: ../src/empathy-debug-window.c:1531
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:1486
+#: ../src/empathy-debug-window.c:1537
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:1505
+#: ../src/empathy-debug-window.c:1556
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1559
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1510
+#: ../src/empathy-debug-window.c:1561
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:1512
+#: ../src/empathy-debug-window.c:1563
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1600
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3676,6 +3679,19 @@ msgstr "Contas de Empathy"
 msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
+# rever
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr "- Cliente de son/vídeo Empathy"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Cliente de son/vídeo Empathy"
+
+# rever
+#~ msgid "Send and receive messages"
+#~ msgstr "Envíe e reciba mensaxes"
+
 #~ msgid "Failed to reconnect this chat"
 #~ msgstr "Produciuse un fallo ao reconectar á conversa"
 
@@ -3701,9 +3717,6 @@ msgstr "Depurador de Empathy"
 #~ msgid "%s account"
 #~ msgstr "Conta %s"
 
-#~ msgid "Empathy IM Client"
-#~ msgstr "Cliente de mensaxería Empathy"
-
 #~ msgid "Hostname of the proxy for outbound requests."
 #~ msgstr "Nome de equipo do proxy para as peticións de saída."
 

diff --git a/po/he.po b/po/he.po
index 497462b965922cc1b5dc9a3730933fa619a6b249..48c12f9e4523060cde6c53f06ebc7bb55d00eac1 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-08 10:21+0300\n"
-"PO-Revision-Date: 2010-07-08 10:24+0200\n"
+"POT-Creation-Date: 2010-07-13 03:29+0300\n"
+"PO-Revision-Date: 2010-07-13 03:31+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,21 +17,21 @@ msgstr ""
 "X-Poedit-Language: Hebrew\n"
 
 #: ../data/empathy.desktop.in.in.h:1
+msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
+msgstr "ניתן לשוחח דרך Google Talk,‏ Facebook,‏ MSN ושירותי שיחה נוספים"
+
+#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "‏Empathy מסרים מידיים"
 
-#: ../data/empathy.desktop.in.in.h:3
+#: ../data/empathy.desktop.in.in.h:4
 msgid "IM Client"
 msgstr "לקוח מסרים מידיים"
 
-#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "שליחה וקבלה של מסרים מידיים"
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Always open a separate chat window for new chats."
@@ -1230,7 +1230,7 @@ msgstr "הכנס סמיילי"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1842
-#: ../libempathy-gtk/empathy-ui-utils.c:1618
+#: ../libempathy-gtk/empathy-ui-utils.c:1619
 msgid "_Send"
 msgstr "_שלח"
 
@@ -1298,7 +1298,7 @@ msgstr "‏%s הצטרף לחדר"
 msgid "%s is now known as %s"
 msgstr "‏%s ידוע כעת כ-%s"
 
-#: ../libempathy-gtk/empathy-chat.c:2282 ../src/empathy-call-window.c:1653
+#: ../libempathy-gtk/empathy-chat.c:2282 ../src/empathy-call-window.c:1655
 msgid "Disconnected"
 msgstr "מנותק"
 
@@ -1753,7 +1753,7 @@ msgid "Set your presence and current status"
 msgstr "הגדרת הנוכחות והמצב הנוכחיים שלך"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
 msgid "Custom messages…"
 msgstr "הודעות מותאמות אישית..."
 
@@ -1841,15 +1841,15 @@ msgstr "נקי"
 msgid "Blue"
 msgstr "כחול"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1515
+#: ../libempathy-gtk/empathy-ui-utils.c:1516
 msgid "Unable to open URI"
 msgstr "לא ניתן לפתוח את הכתובת"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1610
+#: ../libempathy-gtk/empathy-ui-utils.c:1611
 msgid "Select a file"
 msgstr "בחירת קובץ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1679
+#: ../libempathy-gtk/empathy-ui-utils.c:1680
 #, c-format
 msgid "Incoming file from %s"
 msgstr "קובץ נכנס מ־%s"
@@ -2033,7 +2033,8 @@ msgstr "איש קשר הנבחר מנותק."
 msgid "No error message"
 msgstr "אין הודעת שגיאה"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
 msgid "Instant Message (Empathy)"
 msgstr "הודעה מיידית (Empathy)"
 
@@ -2400,35 +2401,35 @@ msgstr "שיחה עם %s"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1309
+#: ../src/empathy-call-window.c:1311
 msgid "Call"
 msgstr "שיחה"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1966
+#: ../src/empathy-call-window.c:1968
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "מחובר — %d:%02d דק'"
 
-#: ../src/empathy-call-window.c:2027
+#: ../src/empathy-call-window.c:2029
 msgid "Technical Details"
 msgstr "פרטים טכניים"
 
-#: ../src/empathy-call-window.c:2065
+#: ../src/empathy-call-window.c:2067
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "התכנה של %s אינה מבינה את מבני השמע הנתמכים על ידי המחשב שלך"
 
-#: ../src/empathy-call-window.c:2070
+#: ../src/empathy-call-window.c:2072
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "התכנה של %s אינה מבינה את מבני הווידאו הנתמכים על ידי המחשב שלך"
 
-#: ../src/empathy-call-window.c:2076
+#: ../src/empathy-call-window.c:2078
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -2437,21 +2438,21 @@ msgstr ""
 "לא ניתן להפעיל את החיבור אל %s. כנראה אחד ממשתתפי השיחה מחובר לרשת שאינה "
 "מאפשרת חיבורים ישירים."
 
-#: ../src/empathy-call-window.c:2082
+#: ../src/empathy-call-window.c:2084
 msgid "There was a failure on the network"
 msgstr "ארעה שגיאה ברשת"
 
-#: ../src/empathy-call-window.c:2086
+#: ../src/empathy-call-window.c:2088
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "מבני השמע הדרושים לקיום שיחה זו אינם מותקנים במחשבך"
 
-#: ../src/empathy-call-window.c:2089
+#: ../src/empathy-call-window.c:2091
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "מבני הווידאו הדרושים לקיום שיחה זו אינם מותקנים במחשבך"
 
-#: ../src/empathy-call-window.c:2099
+#: ../src/empathy-call-window.c:2101
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2461,15 +2462,15 @@ msgstr ""
 "משהו בלתי צפוי ארע ברכיב של Telepathy. נא <a href=\"%s\">לדווח על באג זה</a> "
 "ולהוסיף דוחות שנאספו מחלון 'ניפוי השגיאות' שבתפריט העזרה."
 
-#: ../src/empathy-call-window.c:2107
+#: ../src/empathy-call-window.c:2109
 msgid "There was a failure in the call engine"
 msgstr "ארעה שגיאה במנוע הקריאה"
 
-#: ../src/empathy-call-window.c:2146
+#: ../src/empathy-call-window.c:2148
 msgid "Can't establish audio stream"
 msgstr "לא ניתן לקיים תזרים שמע"
 
-#: ../src/empathy-call-window.c:2156
+#: ../src/empathy-call-window.c:2158
 msgid "Can't establish video stream"
 msgstr "לא ניתן לקיים תזרים וידאו"
 
@@ -2734,12 +2735,12 @@ msgstr "‏%s הזמין אותך להצטרף אל %s"
 msgid "Incoming file transfer from %s"
 msgstr "העברת קבצים נכנסת מ־%s"
 
-#: ../src/empathy-event-manager.c:985
+#: ../src/empathy-event-manager.c:986
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "בקשת ההצטרפות התבקשה על ידי %s"
 
-#: ../src/empathy-event-manager.c:989
+#: ../src/empathy-event-manager.c:990
 #, c-format
 msgid ""
 "\n"
@@ -2748,12 +2749,12 @@ msgstr ""
 "\n"
 "הודעה: %s"
 
-#: ../src/empathy-event-manager.c:1032
+#: ../src/empathy-event-manager.c:1033
 #, c-format
 msgid "%s is now offline."
 msgstr "‏%s מנותק כעת."
 
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1053
 #, c-format
 msgid "%s is now online."
 msgstr "‏%s מחובר כעת."
@@ -3262,63 +3263,63 @@ msgstr "יצי_אה"
 msgid "Contact Map View"
 msgstr "מפת אנשי קשר"
 
-#: ../src/empathy-debug-window.c:1168
+#: ../src/empathy-debug-window.c:1219
 msgid "Save"
 msgstr "שמירה"
 
-#: ../src/empathy-debug-window.c:1344
+#: ../src/empathy-debug-window.c:1395
 msgid "Debug Window"
 msgstr "חלון ניפוי שגיאות"
 
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1475
 msgid "Pause"
 msgstr "השהייה"
 
-#: ../src/empathy-debug-window.c:1436
+#: ../src/empathy-debug-window.c:1487
 msgid "Level "
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:1456
+#: ../src/empathy-debug-window.c:1507
 msgid "Debug"
 msgstr "ניפוי שגיאות"
 
-#: ../src/empathy-debug-window.c:1462
+#: ../src/empathy-debug-window.c:1513
 msgid "Info"
 msgstr "מידע"
 
-#: ../src/empathy-debug-window.c:1468 ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
 msgid "Message"
 msgstr "הודעה"
 
-#: ../src/empathy-debug-window.c:1474
+#: ../src/empathy-debug-window.c:1525
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../src/empathy-debug-window.c:1480
+#: ../src/empathy-debug-window.c:1531
 msgid "Critical"
 msgstr "קריטי"
 
-#: ../src/empathy-debug-window.c:1486
+#: ../src/empathy-debug-window.c:1537
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../src/empathy-debug-window.c:1505
+#: ../src/empathy-debug-window.c:1556
 msgid "Time"
 msgstr "זמן"
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1559
 msgid "Domain"
 msgstr "תחום"
 
-#: ../src/empathy-debug-window.c:1510
+#: ../src/empathy-debug-window.c:1561
 msgid "Category"
 msgstr "קטגוריה"
 
-#: ../src/empathy-debug-window.c:1512
+#: ../src/empathy-debug-window.c:1563
 msgid "Level"
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1600
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3367,6 +3368,17 @@ msgstr "חשבונות Empathy"
 msgid "Empathy Debugger"
 msgstr "מנפה השגיאות של Empathy"
 
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr "- לקוח השמע/הווידאו Empathy"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "לקוח השמע/הווידאו Empathy"
+
+#~ msgid "Send and receive messages"
+#~ msgstr "שליחה וקבלה של מסרים מידיים"
+
 #~ msgid "MC 4 accounts have been imported"
 #~ msgstr "MC 4 accounts have been imported"
 
@@ -3388,9 +3400,6 @@ msgstr "מנפה השגיאות של Empathy"
 #~ msgid "%s account"
 #~ msgstr "חשבון %s"
 
-#~ msgid "Empathy IM Client"
-#~ msgstr "לקוח המסרים המידיים Empathy"
-
 #~ msgid "Salut account is created"
 #~ msgstr "Salut account is created"
 

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index eba94a54fe4e1907e8daf86957cb1cc7946e6350..4a32f8939980195fa70193b5be9dc2dffcbb2365 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -85,7 +85,7 @@
 
 G_DEFINE_TYPE (EmpathyMainWindow, empathy_main_window, GTK_TYPE_WINDOW);
 
-#define GET_PRIV(self) ((EmpathyMainWindowPriv*)((EmpathyMainWindow*)self)->priv)
+#define GET_PRIV(self) ((EmpathyMainWindowPriv *)((EmpathyMainWindow *) self)->priv)
 
 struct _EmpathyMainWindowPriv {
        EmpathyContactListView  *list_view;

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 8714aced07be329d82e3adf7c3088deaf2a556b5..cf8a1748df9303c6e4922c32b3a74cb4d71d6843 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -49,7 +49,7 @@
 
 G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG);
 
-#define GET_PRIV(self) ((EmpathyPreferencesPriv*)((EmpathyPreferences*)self)->priv)
+#define GET_PRIV(self) ((EmpathyPreferencesPriv *)((EmpathyPreferences *) self)->priv)
 
 struct _EmpathyPreferencesPriv {
        GtkWidget *notebook;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index bea652bd3b5626e975df2181b39a667747081dd7..f04882da099a34b7e58cfdebe3211c3ad0ab8bf7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS =                                         \
        -I$(top_srcdir)                                 \
        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
        $(EMPATHY_CFLAGS)                               \
+       $(GTK_CFLAGS)                           \
        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED)