...
 
Commits (59)
NEW in 3.0.2 (23/05/2011)
============
Once again, no big changes in this stable release but still worth an update.
Bugs fixed:
- Fixed #648842, Notifications are delayed if contacts send messages too fast (Guillaume Desmottes)
- Fixed #648914, Favourite contacts appear in other contact list groups when offline (Guillaume Desmottes)
- Fixed #649161, Leak in main_window_flash_foreach (Guillaume Desmottes)
- Fixed #649273, empathy-chat exits even if there is disconnected chat (Guillaume Desmottes)
- Fixed #649379, Some files in libempathy-gtk use gi18n.h instead of gi18n-lib.h (Gabor Kelemen)
- Fixed #650015, Chatroom joined but not displayed (Guillaume Desmottes)
- Fixed #650590, cell-renderer-expander: fix rendering with GTK+3 (Cosimo Cecchi)
- Fixed #650854, Fix expand/fill of some account widgets (Guillaume Desmottes)
Translations:
- Updated fr Translation (Bruno Brouard)
NEW in 3.0.1 (25/04/2011)
============
Not big changes in this new 3.0 stable release but enough bugs fixed to do
the update. :)
Bugs fixed:
- Fixed #645586, Contact not selected when opening conversation log from conversation window (Guillaume Desmottes)
- Fixed #645930, Remove unnecessary code in empathy_auth_factory_constructed() (Stef Walter)
- Fixed #646227, Possible overflow in persona-view:drag_data_get (Philip Withnall)
- Fixed #647056, Removing a contact causes a segfault (Philip Withnall)
- Fixed #647641, Does not display the first account when opening empathy-accounts (Guillaume Desmottes)
- Fixed #647793, Empathy doesn't disconnect when the network is disabled in network-manager (Guillaume Desmottes)
- Fixed #648372, the select widget for importing accounts has wrong height (Guillaume Desmottes)
Translations:
- Updated eu Translation (Inaki Larranaga Murgoitio)
- Updated fa Translation (Arash Mousavi)
- Updated pl Translation (Piotr Drąg)
- Updated th Translation (Sira Nokyoongtong)
- Updated ug Translation (Abduxukur Abdurixit)
- Updated vi Translation (Nguyễn Thái Ngọc Duy)
Documentation translations:
- Updated fr Documentation translation (Bruno Brouard)
NEW in 3.0.0 (04/04/2011)
============
......
......@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
m4_define([empathy_major_version], [3])
m4_define([empathy_minor_version], [0])
m4_define([empathy_micro_version], [0])
m4_define([empathy_micro_version], [2])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
......
help/fr/figures/empathy-main-window.png

10.7 KB | W: | H:

help/fr/figures/empathy-main-window.png

43.4 KB | W: | H:

help/fr/figures/empathy-main-window.png
help/fr/figures/empathy-main-window.png
help/fr/figures/empathy-main-window.png
help/fr/figures/empathy-main-window.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -1656,16 +1656,12 @@ msgstr "L'usage de toutes les commandes disponibles est décrit succinctement."
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/introduction.page:41(None)
#, fuzzy
#| msgid ""
#| "@@image: 'figures/empathy-main-window.png'; "
#| "md5=489ba00b0fc377aba4c691210b6e0650"
msgid ""
"@@image: 'figures/empathy-main-window.png'; "
"md5=54908dcb2588beddb15ef0968d2c2582"
msgstr ""
"@@image: 'figures/empathy-main-window.png'; "
"md5=489ba00b0fc377aba4c691210b6e0650"
"md5=54908dcb2588beddb15ef0968d2c2582"
#: C/introduction.page:9(desc)
msgid "Introduction to the <app>Empathy</app> instant messenger."
......
......@@ -3,17 +3,19 @@
# This file is distributed under the same license as the empathy package.
#
# Gabor Kelemen <kelemeng at gnome dot hu>, 2010.
# Balázs Úr <urbalazs at gmail dot com>, 2014.
msgid ""
msgstr ""
"Project-Id-Version: empathy-docs master\n"
"POT-Creation-Date: 2010-09-25 16:27+0000\n"
"PO-Revision-Date: 2010-10-20 12:18+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"POT-Creation-Date: 2014-09-21 03:17+0000\n"
"PO-Revision-Date: 2014-09-21 10:39+0200\n"
"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <gnome at fsf dot hu>\n"
"Language: \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"
"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. When image changes, this message will be marked fuzzy or untranslated for you.
......@@ -21,7 +23,8 @@ msgstr ""
#: C/video-call.page:38(None) C/audio-video.page:70(None)
#: C/audio-call.page:36(None)
msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
msgstr "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
msgstr ""
"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
#: C/video-call.page:10(desc)
msgid "Start a video conversation with one of your contacts."
......@@ -43,7 +46,7 @@ msgstr "Videobeszélgetés kezdése egyik partnerével."
#: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name)
#: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name)
#: C/geolocation.page:17(name) C/favorite-rooms.page:14(name)
#: C/disable-account.page:20(name) C/create-account.page:18(name)
#: C/disable-account.page:20(name) C/create-account.page:19(name)
#: C/audio-video.page:17(name) C/audio-call.page:19(name)
#: C/add-account.page:20(name)
msgid "Milo Casagrande"
......@@ -66,7 +69,7 @@ msgstr "Milo Casagrande"
#: C/geolocation-privacy.page:18(email)
#: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
#: C/create-account.page:19(email) C/audio-video.page:18(email)
#: C/create-account.page:20(email) C/audio-video.page:18(email)
#: C/audio-call.page:20(email) C/add-account.page:21(email)
msgid "milo@ubuntu.com"
msgstr "milo@ubuntu.com"
......@@ -88,7 +91,7 @@ msgstr "milo@ubuntu.com"
#: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p)
#: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p)
#: C/favorite-rooms.page:18(p) C/disable-account.page:28(p)
#: C/create-account.page:22(p) C/change-status.page:23(p)
#: C/create-account.page:23(p) C/change-status.page:23(p)
#: C/audio-video.page:21(p) C/audio-call.page:23(p) C/add-contact.page:22(p)
#: C/add-account.page:28(p) C/accounts-window.page:22(p)
#: C/account-jabber.page:18(p) C/account-irc.page:20(p)
......@@ -153,7 +156,8 @@ msgid "Start a video conversation with a meta-contact"
msgstr "Videobeszélgetés indítása metapartnerrel"
#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
msgid "From the <gui>Contact List</gui> window, right-click on the meta-contact."
msgid ""
"From the <gui>Contact List</gui> window, right-click on the meta-contact."
msgstr ""
"A <gui>Partnerlista</gui> ablakban kattintson a jobb egérgombbal a "
"metapartnerre."
......@@ -180,26 +184,31 @@ msgstr ""
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:39(None)
msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
#| msgid ""
#| "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:45(None)
msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
#| msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:53(None)
msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
#| msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/status-icons.page:62(None) C/status-icons.page:69(None)
msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
msgstr "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
#| msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
#: C/status-icons.page:7(desc)
msgid "Understanding the various statuses and status icons."
......@@ -311,7 +320,8 @@ msgstr "Kilépett"
msgid ""
"Setting your status to <em>Offline</em> disconnects you from all of your "
"accounts."
msgstr "Állapotának <em>Kilépettre</em> állítása megszünteti kapcsolatát fiókjaihoz."
msgstr ""
"Állapotának <em>Kilépettre</em> állítása megszünteti kapcsolatát fiókjaihoz."
#: C/share-desktop.page:7(desc)
msgid "Share the desktop with your contacts."
......@@ -438,7 +448,8 @@ msgstr ""
msgid ""
"From the <gui>Contact List</gui> window, click on the drop-down list at the "
"top."
msgstr "A <gui>Partnerlista</gui> ablakban kattintson a felső legördülő listára."
msgstr ""
"A <gui>Partnerlista</gui> ablakban kattintson a felső legördülő listára."
#: C/set-custom-status.page:52(p)
msgid ""
......@@ -518,8 +529,10 @@ msgid "Click on the <gui>Remove</gui> button."
msgstr "Kattintson az <gui>Eltávolítás</gui> gombra."
#: C/set-custom-status.page:131(p)
msgid "To add a new custom message, from the <gui>Add New Preset</gui> section:"
msgstr "Egyéni üzenet hozzáadásához az <gui>Új érték hozzáadása</gui> szakaszban:"
msgid ""
"To add a new custom message, from the <gui>Add New Preset</gui> section:"
msgstr ""
"Egyéni üzenet hozzáadásához az <gui>Új érték hozzáadása</gui> szakaszban:"
#: C/set-custom-status.page:136(p)
msgid ""
......@@ -650,7 +663,8 @@ msgstr ""
msgid ""
"Once the transfer is finished, it is possible to close the <gui>File "
"Transfers</gui> window."
msgstr "Az átvitel befejeződése után bezárhatja a <gui>Fájlátvitelek</gui> ablakot."
msgstr ""
"Az átvitel befejeződése után bezárhatja a <gui>Fájlátvitelek</gui> ablakot."
#: C/send-file.page:80(p)
msgid ""
......@@ -758,7 +772,8 @@ msgstr ""
msgid ""
"Select the account you wish to remove from the accounts list on the left "
"side of the window."
msgstr "Az ablak bal oldalán válassza ki a fióklistából eltávolítani kívánt fiókot."
msgstr ""
"Az ablak bal oldalán válassza ki a fióklistából eltávolítani kívánt fiókot."
#: C/remove-account.page:50(p)
msgid "Click on <gui style=\"button\">Remove</gui>."
......@@ -837,8 +852,10 @@ msgstr ""
#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
#: C/prob-conn-acctdisabled.page:43(p)
msgid "Make sure that you are connected to the Internet, or to a local area network."
msgstr "Győződjön meg róla, hogy csatlakozik az internethez vagy helyi hálózathoz."
msgid ""
"Make sure that you are connected to the Internet, or to a local area network."
msgstr ""
"Győződjön meg róla, hogy csatlakozik az internethez vagy helyi hálózathoz."
#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
#: C/prob-conn-auth.page:57(p)
......@@ -871,8 +888,10 @@ msgid "Proxy support"
msgstr "Proxytámogatás"
#: C/prob-conn-neterror.page:91(p)
msgid "At the moment <app>Empathy</app> can not be configured to work with a proxy."
msgstr "Jelenleg az <app>Empathy</app> nem állítható be proxyval való használatra."
msgid ""
"At the moment <app>Empathy</app> can not be configured to work with a proxy."
msgstr ""
"Jelenleg az <app>Empathy</app> nem állítható be proxyval való használatra."
#: C/prob-conn-name.page:9(title)
msgid "“Name in use”"
......@@ -924,7 +943,8 @@ msgstr ""
msgid ""
"An error message which says “<gui>Authentication failed</gui>” appears in "
"the main window."
msgstr "A főablakban a „<gui>A hitelesítés meghiúsult</gui>” üzenet jelenik meg."
msgstr ""
"A főablakban a „<gui>A hitelesítés meghiúsult</gui>” üzenet jelenik meg."
#: C/prob-conn-auth.page:36(title)
msgid "I get a message that says “Authentication failed”"
......@@ -951,7 +971,8 @@ msgstr ""
"engedélyezi a csatlakozást."
#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
msgid "Type your username and password again to make sure that they are correct."
msgid ""
"Type your username and password again to make sure that they are correct."
msgstr ""
"Írja be újra felhasználónevét és jelszavát, így ellenőrizve hogy nem gépelte "
"el azokat."
......@@ -960,7 +981,8 @@ msgstr ""
msgid ""
"The instant messaging account that you want to use is not enabled in the "
"list of accounts."
msgstr "A használni kívánt azonnaliüzenő-fiókja nincs engedélyezve a fióklistában."
msgstr ""
"A használni kívánt azonnaliüzenő-fiókja nincs engedélyezve a fióklistában."
#: C/prob-conn-acctdisabled.page:33(title)
msgid "My account is not enabled"
......@@ -1330,7 +1352,6 @@ msgstr ""
"sa/3.0/\">Commons összefoglalót</link>."
#: C/irc-start-conversation.page:8(desc)
#| msgid "Start a conversation witn an IRC contact."
msgid "Start a conversation with an IRC contact."
msgstr "Társalgás kezdése IRC-partnerrel."
......@@ -1379,7 +1400,8 @@ msgstr ""
#: C/irc-send-file.page:9(desc)
msgid "<app>Empathy</app> does not currently support sending files using IRC."
msgstr "Az <app>Empathy</app> jelenleg nem támogatja a fájlküldést IRC használatával."
msgstr ""
"Az <app>Empathy</app> jelenleg nem támogatja a fájlküldést IRC használatával."
#: C/irc-send-file.page:31(title)
msgid "Send files over IRC"
......@@ -1534,7 +1556,8 @@ msgid "Click <gui>Join</gui> to enter the room."
msgstr "Nyomja meg a <gui>Csatlakozás</gui> gombot a szobába való belépéshez."
#: C/irc-join-room.page:64(p)
msgid "To join multiple rooms, you need to repeat the steps above for each room."
msgid ""
"To join multiple rooms, you need to repeat the steps above for each room."
msgstr ""
"Több szobához csatlakozáskor minden szobához meg kell ismételni a fenti "
"lépéseket."
......@@ -1557,7 +1580,8 @@ msgstr ""
#: C/irc-join-pwd.page:33(p)
msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
msgstr "<link xref=\"irc-join-room\">Csatlakozzon a szobához</link> a szokásos módon."
msgstr ""
"<link xref=\"irc-join-room\">Csatlakozzon a szobához</link> a szokásos módon."
#: C/irc-join-pwd.page:38(p)
msgid ""
......@@ -1591,12 +1615,15 @@ msgstr "Minden elérhető parancshoz tartozik egy rövid használati utasítás.
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/introduction.page:41(None)
#| msgid ""
#| "@@image: 'figures/empathy-main-window.png'; "
#| "md5=489ba00b0fc377aba4c691210b6e0650"
msgid ""
"@@image: 'figures/empathy-main-window.png'; "
"md5=489ba00b0fc377aba4c691210b6e0650"
"md5=54908dcb2588beddb15ef0968d2c2582"
msgstr ""
"@@image: 'figures/empathy-main-window.png'; "
"md5=489ba00b0fc377aba4c691210b6e0650"
"md5=54908dcb2588beddb15ef0968d2c2582"
#: C/introduction.page:9(desc)
msgid "Introduction to the <app>Empathy</app> instant messenger."
......@@ -1653,8 +1680,12 @@ msgstr "Az <app>Empathy</app> főablaka."
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/index.page:28(None)
msgid "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
msgstr "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
#| msgid ""
#| "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
msgid ""
"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
msgstr ""
"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
#: C/index.page:7(title) C/index.page:8(title)
msgid "Empathy Internet Messenger"
......@@ -1732,7 +1763,8 @@ msgstr ""
#: C/import-account.page:58(p)
msgid "Select the check box next to each account you wish to import."
msgstr "Válassza ki az egyes importálni kívánt fiókok melletti jelölőnégyzeteket."
msgstr ""
"Válassza ki az egyes importálni kívánt fiókok melletti jelölőnégyzeteket."
#: C/import-account.page:66(p)
msgid ""
......@@ -1969,7 +2001,8 @@ msgid "Select the <gui>Location</gui> tab."
msgstr "Válassza a <gui>Hely</gui> lapot."
#: C/geolocation-turn.page:47(p)
msgid "Select <gui>Publish location to my contacts</gui> to activate geolocation."
msgid ""
"Select <gui>Publish location to my contacts</gui> to activate geolocation."
msgstr ""
"Jelölje be a <gui>Hely közzététele a partnereimnek</gui> négyzetet a "
"helymeghatározás aktiválásához."
......@@ -1987,10 +2020,6 @@ msgstr ""
"csökkentése</gui> négyzetet."
#: C/geolocation-turn.page:61(p)
#| msgid ""
#| "If you have an external device like a GPS or want to send a more accurate "
#| "position, select the appropriate option in the <gui>Geoclue Settings</"
#| "gui> section."
msgid ""
"If you have an external device like a GPS or want to send a more accurate "
"position, select the appropriate option in the <gui>Location sources</gui> "
......@@ -2117,7 +2146,8 @@ msgid "Privacy overview"
msgstr "Adatvédelem áttekintése"
#: C/geolocation-privacy.page:72(p)
msgid "Overview of the various geolocation privacy settings in <app>Empathy</app>."
msgid ""
"Overview of the various geolocation privacy settings in <app>Empathy</app>."
msgstr ""
"Az <app>Empathy</app> helymeghatározással kapcsolatos adatvédelmi "
"beállításainak áttekintése."
......@@ -2131,7 +2161,8 @@ msgid "Privacy mode is enabled by default."
msgstr "Az adatvédelmi mód alapértelmezésben be van kapcsolva."
#: C/geolocation-privacy.page:87(p)
msgid "Privacy mode prevails even when using external and more precise devices."
msgid ""
"Privacy mode prevails even when using external and more precise devices."
msgstr ""
"Az adatvédelmi mód külső és pontosabb eszközök használata esetén is "
"bekapcsolva marad."
......@@ -2322,7 +2353,8 @@ msgstr "Ha befejezte, nyomja meg a <gui>Bezárás</gui> gombot."
#: C/disable-account.page:9(desc)
msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
msgstr "A fiókba való automatikus bejelentkezés megtiltása az <app>Empathynak</app>."
msgstr ""
"A fiókba való automatikus bejelentkezés megtiltása az <app>Empathynak</app>."
#: C/disable-account.page:39(title)
msgid "Disable an account"
......@@ -2345,7 +2377,8 @@ msgstr ""
msgid ""
"Select the account you wish to disable from the accounts list on the left "
"side of the window."
msgstr "Az ablak bal oldalán lévő fióklistában válassza ki a letiltani kívánt fiókot."
msgstr ""
"Az ablak bal oldalán lévő fióklistában válassza ki a letiltani kívánt fiókot."
#: C/disable-account.page:56(p)
msgid ""
......@@ -2367,11 +2400,11 @@ msgstr ""
msgid "Register for an account with one of the supported messaging services."
msgstr "Fiók regisztrálása valamelyik támogatott üzenetküldő szolgáltatással."
#: C/create-account.page:33(title)
#: C/create-account.page:34(title)
msgid "Register for a new account"
msgstr "Új fiók regisztrálása"
#: C/create-account.page:35(p)
#: C/create-account.page:36(p)
msgid ""
"Most account types require you to create an account with a account provider "
"before you can connect using instant messaging applications like "
......@@ -2385,7 +2418,7 @@ msgstr ""
"app> új fiók regisztrálására, a <link xref=\"add-account\">fiók "
"hozzáadásához</link> használt lépéseket követve."
#: C/create-account.page:41(p)
#: C/create-account.page:42(p)
msgid ""
"This page provides information on creating a new account for various types "
"of accounts. Your account provider should give you a login ID and a "
......@@ -2397,11 +2430,11 @@ msgstr ""
"azonosítót és jelszót, valamint az <app>Empathy</app> használatával való "
"csatlakozáshoz esetleg szükséges további információkat."
#: C/create-account.page:46(title)
#: C/create-account.page:47(title)
msgid "Facebook"
msgstr "Facebook"
#: C/create-account.page:47(p)
#: C/create-account.page:48(p)
msgid ""
"Facebook is one of the most-used social networks. It allows users to create "
"their own profile and to communicate with their friends."
......@@ -2409,7 +2442,7 @@ msgstr ""
"A Facebook az egyik legtöbbet használt közösségi hálózat. Segítségével a "
"felhasználók saját profilt hozhatnak létre, és kommunikálhatnak barátaikkal."
#: C/create-account.page:51(p)
#: C/create-account.page:52(p)
msgid ""
"To use Facebook to communicate with your friends, you will need to create a "
"new account from the website: <link href=\"http://www.facebook.com\">www."
......@@ -2419,11 +2452,11 @@ msgstr ""
"\"http://www.facebook.com\">www.facebook.com</link> weboldalon kell "
"létrehoznia egy új fiókot."
#: C/create-account.page:59(title) C/audio-video.page:170(p)
#: C/create-account.page:60(title) C/audio-video.page:170(p)
msgid "Jabber"
msgstr "Jabber"
#: C/create-account.page:61(p)
#: C/create-account.page:62(p)
msgid ""
"Jabber is an open instant messaging system. Like email, Jabber allows you to "
"choose your account provider and communicate with all other Jabber users, "
......@@ -2433,7 +2466,7 @@ msgstr ""
"lehetővé teszi a szolgáltató megválasztását, és az összes Jabber "
"felhasználóval való kommunikációt a szolgáltatótól függetlenül."
#: C/create-account.page:65(p)
#: C/create-account.page:66(p)
msgid ""
"You will need to create a new account with a Jabber provider. There are many "
"free providers; one popular provider is <link href=\"http://register.jabber."
......@@ -2443,7 +2476,7 @@ msgstr ""
"szolgáltató van, az egyik népszerű a <link href=\"http://register.jabber.org/"
"\">Jabber.org</link>."
#: C/create-account.page:70(p)
#: C/create-account.page:71(p)
msgid ""
"If you use Google Mail or Google Talk, you already have a Jabber account. "
"Google Talk is a Jabber service. Simply use your Google Mail address and "
......@@ -2453,11 +2486,11 @@ msgstr ""
"Jabber fiókja. A Google Talk egy Jabber szolgáltatás. Google Mail címét és "
"jelszavát használhatja az <app>Empathyban</app> a kapcsolódáshoz."
#: C/create-account.page:77(title) C/audio-video.page:190(p)
#: C/create-account.page:78(title) C/audio-video.page:190(p)
msgid "People Nearby"
msgstr "Közeli emberek"
#: C/create-account.page:79(p)
#: C/create-account.page:80(p)
msgid ""
"You do not need to create an account with a service provider to use this "
"feature. This service works whenever you are connected to a local network, "
......@@ -2469,15 +2502,15 @@ msgstr ""
"például vezeték nélküli hotspothoz kapcsolódik. Ez képes automatikusan "
"megtalálni a szolgáltatás többi felhasználóját az adott hálózaton."
#: C/create-account.page:84(p)
#: C/create-account.page:85(p)
msgid "For more information, see <link xref=\"salut-protocol\"/>."
msgstr "További információkért lásd a <link xref=\"salut-protocol\"/> oldalt."
#: C/create-account.page:88(title) C/audio-video.page:205(p)
#: C/create-account.page:89(title) C/audio-video.page:205(p)
msgid "SIP"
msgstr "SIP"
#: C/create-account.page:90(p)
#: C/create-account.page:91(p)
msgid ""
"SIP is an open system which allows users to have audio and video "
"conversations over the Internet. You need to create an account with a SIP "
......@@ -2489,17 +2522,7 @@ msgstr ""
"SIP-szolgáltatónál. Az összes SIP-felhasználóval kommunikálhat, függetlenül "
"az általuk használt szolgáltatótól."
#: C/create-account.page:95(p)
msgid ""
"There are a number of popular free SIP account providers; one popular "
"provider is <link href=\"https://signup.sipphone.com/new-users/app?"
"class=NewUser;proc=start\">Sipphone</link>."
msgstr ""
"Számos népszerű ingyenes SIP-szolgáltató van, ezek egyike a <link href="
"\"https://signup.sipphone.com/new-users/app?class=NewUser;proc=start"
"\">Sipphone</link>."
#: C/create-account.page:100(p)
#: C/create-account.page:97(p)
msgid ""
"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
"index.php?page=register\">Ekiga.net</link> service does not currently work "
......@@ -2509,7 +2532,7 @@ msgstr ""
"index.php?page=register\">Ekiga.net</link> szolgáltatás jelenleg nem működik "
"az <app>Empathyval</app>."
#: C/create-account.page:105(p)
#: C/create-account.page:102(p)
msgid ""
"Some SIP providers allow you to call normal phones from your computer. "
"Generally, you will need to subscribe to a paid service for this feature."
......@@ -2518,11 +2541,11 @@ msgstr ""
"számítógépéről. Ehhez a szolgáltatáshoz általában fizetős szolgáltatásra "
"kell előfizetni."
#: C/create-account.page:110(title) C/audio-video.page:165(p)
#: C/create-account.page:107(title) C/audio-video.page:165(p)
msgid "IRC"
msgstr "IRC"
#: C/create-account.page:112(p)
#: C/create-account.page:109(p)
msgid ""
"You do not need to register for an account to use IRC. Although you specify "
"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
......@@ -2534,7 +2557,7 @@ msgstr ""
"csak az egyes csatlakozásokkor jön létre. Ha másik felhasználó használja a "
"becenevet, akkor újat kell választania."
#: C/create-account.page:117(p)
#: C/create-account.page:114(p)
msgid ""
"Some IRC networks use a service called NickServ to allow users to protect "
"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
......@@ -2543,7 +2566,7 @@ msgstr ""
"lehetővé teszi felhasználóiknak beceneveik megvédését. További "
"információkért lásd a <link xref=\"irc-nick-password\"/> oldalt."
#: C/create-account.page:120(p)
#: C/create-account.page:117(p)
msgid ""
"Some IRC servers are password protected. You will need to know the password "
"to connect to these servers. Generally, these are private IRC networks."
......@@ -2551,11 +2574,11 @@ msgstr ""
"Egyes IRC-kiszolgálók jelszóval védettek. Az ilyen kiszolgálókhoz "
"csatlakozáskor ismernie kell a jelszót. Ezek általában privát IRC-hálózatok."
#: C/create-account.page:125(title)
#: C/create-account.page:122(title)
msgid "Proprietary Services"
msgstr "Zárt szolgáltatások"
#: C/create-account.page:127(p)
#: C/create-account.page:124(p)
msgid ""
"There are many proprietary instant messaging services that have been "
"developed by different companies or organizations. <app>Empathy</app> allows "
......@@ -2569,25 +2592,26 @@ msgstr ""
"új fiók létrehozásához fel kell keresnie a szolgáltató weboldalát, és el "
"kell fogadnia a felhasználási feltételeket."
#: C/create-account.page:136(link) C/audio-video.page:135(p)
#: C/create-account.page:133(link) C/audio-video.page:135(p)
msgid "AIM"
msgstr "AIM"
#: C/create-account.page:141(link) C/audio-video.page:160(p)
#: C/create-account.page:138(link) C/audio-video.page:160(p)
msgid "ICQ"
msgstr "ICQ"
#: C/create-account.page:146(link) C/audio-video.page:175(p)
#: C/create-account.page:143(link) C/audio-video.page:175(p)
msgid "MSN"
msgstr "MSN"
#: C/create-account.page:151(link) C/audio-video.page:210(p)
#: C/create-account.page:148(link) C/audio-video.page:210(p)
msgid "Yahoo!"
msgstr "Yahoo!"
#: C/change-status.page:9(desc)
msgid "Change your status to advertise your availability to your contacts."
msgstr "Módosítsa állapotát elérhetőségének közzétételéhez a partnerei számára."
msgstr ""
"Módosítsa állapotát elérhetőségének közzétételéhez a partnerei számára."
#: C/change-status.page:34(title)
msgid "Change your status"
......@@ -2603,8 +2627,10 @@ msgstr ""
"kiválasztását."
#: C/change-status.page:41(p)
msgid "Click on the drop-down list at the top of the <gui>Contact List</gui> window."
msgstr "Kattintson a <gui>Partnerlista</gui> ablak tetején lévő legördülő listára."
msgid ""
"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
msgstr ""
"Kattintson a <gui>Partnerlista</gui> ablak tetején lévő legördülő listára."
#: C/change-status.page:46(p)
msgid "Select a status from the list."
......@@ -2641,7 +2667,8 @@ msgstr ""
"md5=8d89026b66a263a3bc5b1f0665948567"
#: C/audio-video.page:8(desc)
msgid "Information on when it is possible to have an audio or video conversation."
msgid ""
"Information on when it is possible to have an audio or video conversation."
msgstr "Információk arról, hogy mikor kezdhet hang- vagy videohívást."
#: C/audio-video.page:32(title)
......@@ -3149,7 +3176,8 @@ msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
#. It doesn't matter what you translate it to: it's not used at all.
#: C/account-irc.page:112(None)
msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
msgstr "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
msgstr ""
"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
#: C/account-irc.page:8(desc)
msgid "Additional information necessary for connecting to IRC networks."
......@@ -3312,7 +3340,8 @@ msgstr ""
"\" width=\"16\" height=\"16\">Eltávolítás</media> gombot."
#: C/account-irc.page:115(p)
msgid "When adding or modifying a network, you can enter the following information:"
msgid ""
"When adding or modifying a network, you can enter the following information:"
msgstr ""
"Hálózat hozzáadásakor vagy módosításakor a következő információkat adhatja "
"meg:"
......@@ -3321,7 +3350,8 @@ msgstr ""
msgid ""
"This is the name of the network as you want it to appear in the list of "
"networks."
msgstr "Ez a hálózat neve, ahogyan a hálózatok listájában meg szeretné jeleníteni."
msgstr ""
"Ez a hálózat neve, ahogyan a hálózatok listájában meg szeretné jeleníteni."
#: C/account-irc.page:125(gui)
msgid "Charset"
......@@ -3392,7 +3422,15 @@ msgstr ""
"elolvasásában."
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
#: C/index.page:0(None)
#: C/account-irc.page:0(None)
msgid "translator-credits"
msgstr "Kelemen Gábor <kelemeng at gnome dot hu>"
#~ msgid ""
#~ "There are a number of popular free SIP account providers; one popular "
#~ "provider is <link href=\"https://signup.sipphone.com/new-users/app?"
#~ "class=NewUser;proc=start\">Sipphone</link>."
#~ msgstr ""
#~ "Számos népszerű ingyenes SIP-szolgáltató van, ezek egyike a <link href="
#~ "\"https://signup.sipphone.com/new-users/app?class=NewUser;proc=start"
#~ "\">Sipphone</link>."
......@@ -609,7 +609,7 @@ account_chooser_setup (EmpathyAccountChooser *chooser)
gtk_cell_layout_clear (GTK_CELL_LAYOUT (combobox));
store = gtk_list_store_new (COL_ACCOUNT_COUNT,
G_TYPE_STRING, /* Image */
GDK_TYPE_PIXBUF, /* Image */
G_TYPE_STRING, /* Name */
G_TYPE_BOOLEAN, /* Enabled */
G_TYPE_UINT, /* Row type */
......@@ -625,10 +625,9 @@ account_chooser_setup (EmpathyAccountChooser *chooser)
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), renderer, FALSE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
"icon-name", COL_ACCOUNT_IMAGE,
"pixbuf", COL_ACCOUNT_IMAGE,
"sensitive", COL_ACCOUNT_ENABLED,
NULL);
g_object_set (renderer, "stock-size", GTK_ICON_SIZE_BUTTON, NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox), renderer, TRUE);
......@@ -763,6 +762,7 @@ account_chooser_filter_ready_cb (gboolean is_enabled,
GtkListStore *store;
GtkComboBox *combobox;
const gchar *icon_name;
GdkPixbuf *pixbuf;
chooser = fr_data->chooser;
priv = GET_PRIV (chooser);
......@@ -772,13 +772,18 @@ account_chooser_filter_ready_cb (gboolean is_enabled,
store = GTK_LIST_STORE (gtk_combo_box_get_model (combobox));
icon_name = tp_account_get_icon_name (account);
pixbuf = empathy_pixbuf_from_icon_name (icon_name,
GTK_ICON_SIZE_BUTTON);
gtk_list_store_set (store, iter,
COL_ACCOUNT_IMAGE, icon_name,
COL_ACCOUNT_IMAGE, pixbuf,
COL_ACCOUNT_TEXT, tp_account_get_display_name (account),
COL_ACCOUNT_ENABLED, is_enabled,
-1);
if (pixbuf != NULL)
g_object_unref (pixbuf);
/* set first connected account as active account */
if (priv->account_manually_set == FALSE &&
priv->set_active_item == FALSE && is_enabled) {
......
......@@ -88,6 +88,8 @@
<property name="right_attach">2</property>
<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>
......@@ -104,6 +106,8 @@
<property name="right_attach">2</property>
<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>
......
......@@ -72,6 +72,8 @@
<property name="right_attach">2</property>
<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>
......@@ -85,6 +87,8 @@
<property name="right_attach">2</property>
<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>
......@@ -101,6 +105,8 @@
<property name="right_attach">2</property>
<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>
......
......@@ -88,6 +88,8 @@
<property name="right_attach">2</property>
<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>
......@@ -104,6 +106,8 @@
<property name="right_attach">2</property>
<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>
......
......@@ -72,6 +72,8 @@
<property name="right_attach">2</property>
<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>
......@@ -85,6 +87,8 @@
<property name="right_attach">2</property>
<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>
......@@ -101,6 +105,8 @@
<property name="right_attach">2</property>
<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>
......@@ -195,8 +201,8 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
......
......@@ -72,6 +72,8 @@
<property name="right_attach">2</property>
<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>
......@@ -84,6 +86,8 @@
<property name="right_attach">2</property>
<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>
......@@ -100,6 +104,8 @@
<property name="right_attach">2</property>
<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>
......
......@@ -89,6 +89,8 @@
<property name="right_attach">2</property>
<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>
......@@ -105,6 +107,8 @@
<property name="right_attach">2</property>
<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>
......@@ -254,8 +258,8 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
......
......@@ -2229,8 +2229,8 @@ do_constructed (GObject *obj)
/* The password might not have been retrieved from the
* keyring yet. We should update the remember password
* toggle button and the password entry when/if it is. */
g_signal_connect (priv->settings, "password-retrieved",
G_CALLBACK (account_settings_password_retrieved_cb), self);
tp_g_signal_connect_object (priv->settings, "password-retrieved",
G_CALLBACK (account_settings_password_retrieved_cb), self, 0);
}
g_signal_connect (priv->remember_password_widget, "toggled",
......
......@@ -275,6 +275,7 @@ empathy_cell_renderer_expander_render (GtkCellRenderer *cell,
gint x_offset, y_offset;
guint xpad, ypad;
GtkStyleContext *style;
GtkStateFlags state;
expander = (EmpathyCellRendererExpander *) cell;
priv = GET_PRIV (expander);
......@@ -292,11 +293,16 @@ empathy_cell_renderer_expander_render (GtkCellRenderer *cell,
style = gtk_widget_get_style_context (widget);
gtk_style_context_save (style);
gtk_style_context_add_class (style, GTK_STYLE_CLASS_EXPANDER);
state = gtk_cell_renderer_get_state (cell, widget, flags);
if (priv->expander_style == GTK_EXPANDER_COLLAPSED)
gtk_style_context_set_state (style, GTK_STATE_NORMAL);
state |= GTK_STATE_FLAG_NORMAL;
else
gtk_style_context_set_state (style, GTK_STATE_ACTIVE);
state |= GTK_STATE_FLAG_ACTIVE;
gtk_style_context_set_state (style, state);
gtk_render_expander (style,
cr,
......
......@@ -737,7 +737,7 @@ empathy_chat_join_muc (EmpathyChat *chat,
EmpathyChatPriv *priv = GET_PRIV (chat);
empathy_join_muc (priv->account, room,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
}
static void
......@@ -808,7 +808,7 @@ chat_command_msg_internal (EmpathyChat *chat,
NULL);
req = tp_account_channel_request_new (priv->account, request,
tp_user_action_time_from_x11 (gtk_get_current_event_time ()));
empathy_get_current_action_time ());
/* FIXME: We should probably search in members alias. But this
* is enough for IRC */
......
......@@ -21,8 +21,9 @@
*
* Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
#include "config.h"
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <libempathy/empathy-utils.h>
......
......@@ -903,7 +903,7 @@ contact_list_view_row_activated (GtkTreeView *view,
if (contact) {
DEBUG ("Starting a chat");
empathy_chat_with_contact (contact,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
g_object_unref (contact);
}
}
......
......@@ -314,7 +314,7 @@ static void
empathy_contact_chat_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
{
empathy_chat_with_contact (contact, gtk_get_current_event_time ());
empathy_chat_with_contact (contact, empathy_get_current_action_time ());
}
GtkWidget *
......@@ -343,9 +343,8 @@ static void
empathy_contact_audio_call_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
{
empathy_call_new_with_streams (contact, TRUE, FALSE,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
}
GtkWidget *
......@@ -376,7 +375,7 @@ empathy_contact_video_call_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
{
empathy_call_new_with_streams (contact, TRUE, TRUE,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
}
GtkWidget *
......
......@@ -22,8 +22,9 @@
* Danielle Madeley <danielle.madeley@collabora.co.uk>
* Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
*/
#include "config.h"
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <telepathy-glib/telepathy-glib.h>
......
......@@ -22,7 +22,7 @@
#include "config.h"
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <libempathy/empathy-contact.h>
......
......@@ -499,7 +499,7 @@ empathy_individual_chat_menu_item_activated (GtkMenuItem *item,
{
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
empathy_chat_with_contact (contact, gtk_get_current_event_time ());
empathy_chat_with_contact (contact, empathy_get_current_action_time ());
}
GtkWidget *
......@@ -543,7 +543,7 @@ empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item,
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
empathy_call_new_with_streams (contact, TRUE, FALSE,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
}
GtkWidget *
......@@ -585,7 +585,7 @@ empathy_individual_video_call_menu_item_activated (GtkMenuItem *item,
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
empathy_call_new_with_streams (contact, TRUE, TRUE,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
}
GtkWidget *
......
......@@ -1921,7 +1921,7 @@ individual_store_get_individual_status_icon_with_icon_name (
FolksIndividual *individual,
const gchar *status_icon_name)
{
GdkPixbuf *pixbuf_status = NULL;
GdkPixbuf *pixbuf_status;
EmpathyIndividualStorePriv *priv;
const gchar *protocol_name = NULL;
gchar *icon_name = NULL;
......@@ -1953,13 +1953,18 @@ individual_store_get_individual_status_icon_with_icon_name (
{
icon_name = g_strdup_printf ("%s", status_icon_name);
}
pixbuf_status = g_hash_table_lookup (priv->status_icons, icon_name);
if (pixbuf_status == NULL)
{
pixbuf_status =
empathy_pixbuf_contact_status_icon_with_icon_name (contact,
status_icon_name, show_protocols_here);
if (pixbuf_status != NULL)
{
/* pass the reference to the hash table */
g_hash_table_insert (priv->status_icons,
g_strdup (icon_name), pixbuf_status);
}
......
......@@ -1689,7 +1689,9 @@ static gboolean
individual_view_is_visible_individual (EmpathyIndividualView *self,
FolksIndividual *individual,
gboolean is_online,
gboolean is_searching)
gboolean is_searching,
const gchar *group,
gboolean is_fake_group)
{
EmpathyIndividualViewPriv *priv = GET_PRIV (self);
EmpathyLiveSearch *live = EMPATHY_LIVE_SEARCH (priv->search_widget);
......@@ -1721,8 +1723,14 @@ individual_view_is_visible_individual (EmpathyIndividualView *self,
is_favorite = folks_favourite_details_get_is_favourite (
FOLKS_FAVOURITE_DETAILS (individual));
if (is_searching == FALSE)
return (priv->show_offline || is_online || is_favorite);
if (is_searching == FALSE) {
if (is_favorite && is_fake_group &&
!tp_strdiff (group, EMPATHY_INDIVIDUAL_STORE_FAVORITE))
/* Always display favorite contacts in the favorite group */
return TRUE;
return (priv->show_offline || is_online);
}
/* check alias name */
str = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual));
......@@ -1757,6 +1765,28 @@ individual_view_is_visible_individual (EmpathyIndividualView *self,
return FALSE;
}
static gchar *
get_group (GtkTreeModel *model,
GtkTreeIter *iter,
gboolean *is_fake)
{
GtkTreeIter parent_iter;
gchar *name = NULL;
*is_fake = FALSE;
if (!gtk_tree_model_iter_parent (model, &parent_iter, iter))
return NULL;
gtk_tree_model_get (model, &parent_iter,
EMPATHY_INDIVIDUAL_STORE_COL_NAME, &name,
EMPATHY_INDIVIDUAL_STORE_COL_IS_FAKE_GROUP, is_fake,
-1);
return name;
}
static gboolean
individual_view_filter_visible_func (GtkTreeModel *model,
GtkTreeIter *iter,
......@@ -1783,10 +1813,16 @@ individual_view_filter_visible_func (GtkTreeModel *model,
if (individual != NULL)
{
gchar *group;
gboolean is_fake_group;
group = get_group (model, iter, &is_fake_group);
visible = individual_view_is_visible_individual (self, individual,
is_online, is_searching);
is_online, is_searching, group, is_fake_group);
g_object_unref (individual);
g_free (group);
/* FIXME: Work around bgo#626552/bgo#621076 */
if (visible == TRUE)
......@@ -1809,6 +1845,9 @@ individual_view_filter_visible_func (GtkTreeModel *model,
for (valid = gtk_tree_model_iter_children (model, &child_iter, iter);
valid; valid = gtk_tree_model_iter_next (model, &child_iter))
{
gchar *group;
gboolean is_fake_group;
gtk_tree_model_get (model, &child_iter,
EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual,
EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, &is_online,
......@@ -1817,9 +1856,13 @@ individual_view_filter_visible_func (GtkTreeModel *model,
if (individual == NULL)
continue;
group = get_group (model, &child_iter, &is_fake_group);
visible = individual_view_is_visible_individual (self, individual,
is_online, is_searching);
is_online, is_searching, group, is_fake_group);
g_object_unref (individual);
g_free (group);
/* show group if it has at least one visible contact in it */
if (visible == TRUE)
......@@ -2506,7 +2549,6 @@ got_avatar (GObject *source_object,
finally:
g_free (text);
g_object_unref (individual);
g_object_unref (manager);
}
......
......@@ -390,8 +390,8 @@ details_request_cb (TpContact *contact,
tp_clear_object (&priv->details_cancellable);
g_signal_connect (contact, "notify::contact-info",
(GCallback) details_notify_cb, self);
tp_g_signal_connect_object (contact, "notify::contact-info",
(GCallback) details_notify_cb, self, 0);
}
details_data_free (data);
......
......@@ -24,7 +24,7 @@
#include <string.h>
#include <time.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <telepathy-glib/account-manager.h>
#include <telepathy-glib/util.h>
......
......@@ -134,7 +134,8 @@ empathy_new_call_dialog_response (GtkDialog *dialog, int response_id)
* we return from this function. */
video = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->check_video));
call_contact (account, contact_id, video, gtk_get_current_event_time ());
call_contact (account, contact_id, video,
empathy_get_current_action_time ());
out:
gtk_widget_destroy (GTK_WIDGET (dialog));
......
......@@ -76,7 +76,7 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id)
if (EMP_STR_EMPTY (contact_id) || account == NULL) goto out;
empathy_chat_with_contact_id (account, contact_id,
gtk_get_current_event_time ());
empathy_get_current_action_time ());
out:
gtk_widget_destroy (GTK_WIDGET (dialog));
......
......@@ -600,7 +600,10 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
NULL, NULL);
empathy_account_settings_set_string (settings, "server",
extra_certificate_identities[0]);
empathy_account_settings_set_boolean (settings, "require-encryption",
TRUE);
empathy_account_settings_set_strv (settings, "fallback-servers",
fallback_servers);
......@@ -615,7 +618,8 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
{
empathy_account_settings_set_icon_name_async (settings, "im-facebook",
NULL, NULL);
empathy_account_settings_set_boolean (settings, "require-encryption",
TRUE);
empathy_account_settings_set_string (settings, "server",
"chat.facebook.com");
}
......
......@@ -465,6 +465,7 @@ status_preset_dialog_add_preset (GtkWidget *widget,
GTK_TREE_VIEW (priv->presets_treeview),
path, NULL,
FALSE, 0., 0.);
gtk_tree_path_free (path);
break;
}
}
......
......@@ -22,7 +22,7 @@
#include "config.h"
#include <string.h>
#include <glib/gi18n.h>
#include <glib/gi18n-lib.h>
#include <webkit/webkit.h>
#include <telepathy-glib/dbus.h>
......@@ -281,7 +281,7 @@ theme_adium_parse_body (EmpathyThemeAdium *self,
static void
escape_and_append_len (GString *string, const gchar *str, gint len)
{
while (*str != '\0' && len != 0) {
while (str != NULL && *str != '\0' && len != 0) {
switch (*str) {
case '\\':
/* \ becomes \\ */
......
......@@ -1994,3 +1994,9 @@ empathy_context_menu_new (GtkWidget *attach_to)
return menu;
}
gint64
empathy_get_current_action_time (void)
{
return (tp_user_action_time_from_x11 (gtk_get_current_event_time ()));
}
......@@ -150,6 +150,8 @@ void empathy_make_color_whiter (GdkRGBA *color);
GtkWidget * empathy_context_menu_new (GtkWidget *attach_to);
gint64 empathy_get_current_action_time (void);
G_END_DECLS
#endif /* __EMPATHY_UI_UTILS_H__ */
......@@ -111,6 +111,7 @@ connectivity_nm_state_change_cb (NMClient *client,
#if NM_CHECK_VERSION(0,8,992)
|| state == NM_STATE_DISCONNECTING
#endif
|| state == NM_STATE_ASLEEP
|| state == NM_STATE_DISCONNECTED);
DEBUG ("New NetworkManager network state %d (connected: %s)", state,
......
......@@ -653,8 +653,8 @@ empathy_contact_from_tpl_contact (TpAccount *account,
is_user = (TPL_ENTITY_SELF == tpl_entity_get_entity_type (tpl_entity));
retval = g_object_new (EMPATHY_TYPE_CONTACT,
"id", tpl_entity_get_alias (tpl_entity),
"alias", tpl_entity_get_identifier (tpl_entity),
"id", tpl_entity_get_identifier (tpl_entity),
"alias", tpl_entity_get_alias (tpl_entity),
"account", account,
"is-user", is_user,
NULL);
......@@ -1721,6 +1721,13 @@ tp_caps_to_capabilities (TpCapabilities *caps)
TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO))
capabilities |= EMPATHY_CAPABILITIES_VIDEO;
}
if (tp_asv_get_boolean (fixed_prop,
TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO, NULL))
capabilities |= EMPATHY_CAPABILITIES_AUDIO;
if (tp_asv_get_boolean (fixed_prop,
TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, NULL))
capabilities |= EMPATHY_CAPABILITIES_VIDEO;
}
}
......
......@@ -50,6 +50,7 @@ mk
ml
mr
ms
my
nb
ne
nl
......
# Aragonese translation for empathy.
# Copyright (C) 2010 empathy's COPYRIGHT HOLDER
# This file is distributed under the same license as the empathy package.
# Daniel Martinez Cucalon <entaltoaragon@gmail.com>, 2010.
# Daniel Martinez Cucalon <entaltoaragon@gmail.com>, 2010, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&component=general\n"
"POT-Creation-Date: 2010-09-17 20:44+0000\n"
"PO-Revision-Date: 2010-09-18 20:07+0200\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-02 19:40+0200\n"
"PO-Revision-Date: 2011-04-11 18:16+0200\n"
"Last-Translator: Daniel Martinez Cucalon <entaltoaragon@gmail.com>\n"
"Language-Team: Aragonese <softaragones@googlegroups.com>\n"
"Language: an\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: an\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
......@@ -36,7 +35,7 @@ msgstr "Client d'IM"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
msgstr ""
msgstr "Ubrir una finestra direrent ta nuevas charradas."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
msgid ""
......@@ -46,7 +45,7 @@ msgstr ""
#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr ""
msgstr "Tema d'a finestra de chat"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
......@@ -55,7 +54,7 @@ msgstr ""
#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
msgstr ""
msgstr "Lista de contactos preta"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Connection managers should be used"
......@@ -67,7 +66,7 @@ msgst