aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac13
-rw-r--r--help/gl/gl.po278
-rw-r--r--libempathy-gtk/Makefile.am6
-rw-r--r--libempathy-gtk/empathy-log-window.c11
-rw-r--r--libempathy-gtk/empathy-log-window.ui58
-rw-r--r--nautilus-sendto-plugin/Makefile.am3
-rw-r--r--po/fi.po130
-rw-r--r--src/Makefile.am6
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/interactive/Makefile.am2
10 files changed, 313 insertions, 196 deletions
diff --git a/configure.ac b/configure.ac
index 63e88ad3c..b2336892c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,6 +161,10 @@ PKG_CHECK_MODULES(EMPATHY,
telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
telepathy-logger-0.1 >= $TELEPATHY_LOGGER
x11
+ gtk+-3.0 >= $GTK_REQUIRED
+ libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
+ libnotify >= $LIBNOTIFY_REQUIRED
+ gcr-3 >= $KEYRING_REQUIRED
])
# -----------------------------------------------------------
@@ -175,15 +179,6 @@ if test x"$with_eds" = x"yes" ; then
fi
# -----------------------------------------------------------
-# GTK+
-# -----------------------------------------------------------
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
-
-PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
-PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED)
-
-# -----------------------------------------------------------
# Enable debug
# -----------------------------------------------------------
diff --git a/help/gl/gl.po b/help/gl/gl.po
index 2a5d2b913..193b428d3 100644
--- a/help/gl/gl.po
+++ b/help/gl/gl.po
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy.help.master\n"
-"POT-Creation-Date: 2010-09-11 17:27+0000\n"
-"PO-Revision-Date: 2010-10-20 09:08+0200\n"
+"POT-Creation-Date: 2010-11-15 10:00+0000\n"
+"PO-Revision-Date: 2010-11-15 12:52+0100\n"
"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
"Language-Team: Galician <gnome-gl-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr "Comezar unha conversa de vídeo con un dos seus contactos."
#: 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"
@@ -64,7 +64,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"
@@ -86,7 +86,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)
@@ -98,11 +98,6 @@ msgid "Start a video conversation"
msgstr "Comezar unha conversa de vídeo"
#: C/video-call.page:30(p)
-#| msgid ""
-#| "If you have a webcam, you can call your contacts and have an video "
-#| "conversation with them. This features only works with certain types of "
-#| "accounts, and it requires the other person to have an application that "
-#| "supports video calls."
msgid ""
"If you have a webcam, you can call your contacts and have a video "
"conversation with them. This features only works with certain types of "
@@ -115,12 +110,6 @@ msgstr ""
"videochamadas."
#: C/video-call.page:37(p)
-#| msgid ""
-#| "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-#| "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-#| "next to the name of the contact you wish to call and choose <gui style="
-#| "\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
-#| "choose <gui style=\"menuitem\">Video Call</gui>."
msgid ""
"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
@@ -147,12 +136,6 @@ msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
msgstr "Para rematar a conversa, prema sobre <placeholder-1/>"
#: C/video-call.page:54(p)
-#| msgid ""
-#| "To turn a video conversation into an audio conversation, choose "
-#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</"
-#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
-#| "\"figures/camera-web.png\">video call</media> toolbar button to deselect "
-#| "it."
msgid ""
"To turn a video conversation into an audio conversation, choose <guiseq><gui "
"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
@@ -162,14 +145,10 @@ msgstr ""
"vídeo</gui></guiseq>."
#: C/video-call.page:60(title)
-#| msgid "Start a video conversation with one of your contacts."
msgid "Start a video conversation with a meta-contact"
msgstr "Comezar unha conversa de vídeo con un metacontacto."
#: 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, click on the drop-down list at "
-#| "the top."
msgid ""
"From the <gui>Contact List</gui> window, right-click on the meta-contact."
msgstr ""
@@ -177,9 +156,6 @@ msgstr ""
"un metacontacto."
#: C/video-call.page:68(p)
-#| msgid ""
-#| "Right-click on the name of the contact you want to have a conversation "
-#| "with, and choose <gui>Chat</gui>."
msgid ""
"Select the contact you want to have the conversation, and from the menu "
"select <gui style=\"menuitem\">Video Call</gui>."
@@ -605,9 +581,6 @@ msgid "Send a message to someone"
msgstr "Enviar unha mensaxe a alguén"
#: C/send-message.page:36(p)
-#| msgid ""
-#| "Double click the name of the contact that you want to have a conversation "
-#| "with."
msgid ""
"From the <gui>Contact List</gui> window, double-click the name of the "
"contact that you want to have a conversation with."
@@ -624,14 +597,10 @@ msgstr ""
"xanela e prema <placeholder-1/> para enviala."
#: C/send-message.page:50(title)
-#| msgid "Send a message to someone"
msgid "Send a message to a meta-contact"
msgstr "Enviar unha mensaxe a un metacontacto"
#: C/send-message.page:58(p)
-#| msgid ""
-#| "Right-click on the name of the contact you want to have a conversation "
-#| "with, and choose <gui>Chat</gui>."
msgid ""
"Select the contact you want to have the conversation, and from the menu "
"select <gui style=\"menuitem\">Chat</gui>."
@@ -1189,15 +1158,16 @@ msgstr ""
"busca na parte superior. O texto coincidente resaltarase."
#: C/prev-conv.page:121(p)
-#, fuzzy
msgid ""
"You can quickly view the previous conversations with one of your contacts "
"from the <gui>Contact List</gui> window. Simply right click the contact and "
"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
"Conversations</gui> window will open with that contact already selected."
msgstr ""
-"Pode ver de forma rápida as conversas anteriores con un dos seus contactos "
-"desde a lista de "
+"Pode ver rapidamente as conversas anteriores con un dos seus contactos desde "
+"a xanela <gui>Lista de contactos</gui>. Simplemente prema co botón dereito "
+"do rato sobre o contacto e seleccione <gui>Conversas anteriores</gui>. "
+"Abrirase a xanela <gui>Ver conversas previas</gui> co contacto seleccionado."
#: C/link-contacts.page:11(desc)
msgid "Merge and separate different contacts into a single one."
@@ -1212,21 +1182,26 @@ msgid ""
"If one, or more, of your contacts has multiple accounts with different "
"messaging services, you can combine these contacts into a single one."
msgstr ""
+"Se un, ou máis, dos seus contactos ten múltiples contas con diferentes "
+"servizos de mensaxaría, pode combinar estes contactos nun único."
#: C/link-contacts.page:30(p)
msgid ""
"The resulting contact is called a <em>meta-contact</em>: a contact composed "
"from different single contacts."
msgstr ""
+"O contacto resultante chámase un <em>meta-contacto</em>: un contacto "
+"composto por diferentes contactos sinxelos."
#: C/link-contacts.page:34(p)
msgid ""
"If you have a Jane Smith contact that is using three different messaging "
"services like:"
msgstr ""
+"Se ten un contacto Xoán Souto que está usando tres servizos de mensaxaría "
+"como:"
#: C/link-contacts.page:40(p)
-#| msgid "Facebook"
msgid "janes@facebook"
msgstr "xoan@facebook"
@@ -1243,7 +1218,6 @@ msgid "You can combine these contacts into a single Jane Smith one."
msgstr "Pode combinar estes contactos nun só Xoán Souto"
#: C/link-contacts.page:60(title)
-#| msgid "Hide offline contacts"
msgid "Combining contacts"
msgstr "Combinar contactos"
@@ -1253,11 +1227,11 @@ msgid ""
"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
"gui>."
msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui>, prema co botón dereito un dos "
+"contactos que ten diferentes contas, e seleccione <gui style=\"menuitem"
+"\">Ligar contactos...</gui>."
#: C/link-contacts.page:70(p)
-#| msgid ""
-#| "From the <gui>Saved Presets</gui> box, select the status message you want "
-#| "to remove."
msgid ""
"From the left pane in the <gui>Link Contacts</gui> window, select the "
"contacts you want to combine."
@@ -1266,7 +1240,6 @@ msgstr ""
"contactos que quere combinar."
#: C/link-contacts.page:76(p)
-#| msgid "Click on <gui style=\"button\">Remove</gui>."
msgid "Click <gui style=\"button\">Link</gui>."
msgstr "Prema <gui style=\"button\">Ligar</gui>."
@@ -1276,9 +1249,11 @@ msgid ""
"to have a conversation with when you double-click on it, is the contact with "
"the highest presence on-line."
msgstr ""
+"Cando se cree un meta-contacto, o contacto predeterminado usarase para ter "
+"unha conversa con el ao premer dúas veces sobre el, este contacto terá a "
+"presencia en liña máis alta."
#: C/link-contacts.page:91(title)
-#| msgid "Hide offline contacts"
msgid "Separating contacts"
msgstr "Separar contactos"
@@ -1287,9 +1262,11 @@ msgid ""
"From the <gui>Contact List</gui>, right-click the contact to separate, and "
"select <gui style=\"menuitem\">Link Contacts...</gui>."
msgstr ""
+"Desde a <gui>Lista de contactos</gui>, prema co botón dereito para contactar "
+"con el de forma separada, e seleccione <gui style=\"menuitem\">Ligar "
+"contactos...</gui>."
#: C/link-contacts.page:100(p)
-#| msgid "Click on <gui style=\"button\">Remove</gui>."
msgid "Click <gui style=\"button\">Unlink</gui>."
msgstr "Prema <gui style=\"button\">Desligar</gui>."
@@ -1356,6 +1333,8 @@ msgid ""
"If you alter, transform, or build upon this work, you may distribute the "
"resulting work only under the same, similar or a compatible license."
msgstr ""
+"Se modifica, transforma ou constrúe sobre este traballo debe distribuír o "
+"traballo resultando baixo unha licenza igual, similar ou compatíbel."
#: C/license.page:53(p)
msgid ""
@@ -1364,9 +1343,14 @@ msgid ""
"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
"sa/3.0/\">Commons Deed</link>."
msgstr ""
+"Pode encontrar o texto completo da licenza vexa o <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">sitio web de "
+"CreativeCommons</link>, ou lea o <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/\">Escrito de Commons</link> completo."
#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation witn an IRC contact."
+#| msgid "Start a conversation witn an IRC contact."
+msgid "Start a conversation with an IRC contact."
msgstr "Iniciar unha conversa con un contacto do IRC."
#: C/irc-start-conversation.page:30(title)
@@ -1387,6 +1371,9 @@ msgid ""
"you want to chat with. Alternatively, right click the name of the user and "
"choose <gui>Chat</gui>."
msgstr ""
+"Na lista de contactos para a sala de chat do IRC, prema dúas veces no nome "
+"do usuario co que quere falar. De forma alternativa, prema co botón dereito "
+"sobre o nome de usuario e elixa <gui>Conversa</gui>."
#: C/irc-start-conversation.page:45(p)
msgid ""
@@ -1394,6 +1381,9 @@ msgid ""
"list. It contains a list of users in the IRC chat room you joined. Different "
"rooms can have different contacts listed."
msgstr ""
+"A lista de contactos da sala IRC non é igual que a lista de contactos de "
+"<app>Empathy</app>. Contén unha lista de usuarios na sala de chat do IRC á "
+"que se uniu. Salas diferentes poden ter diferentes listados de contactos."
#: C/irc-start-conversation.page:52(p)
msgid ""
@@ -1401,6 +1391,9 @@ msgid ""
"window. If you do not see it, choose <guiseq><gui>Conversation</"
"gui><gui>Show Contact List</gui></guiseq>."
msgstr ""
+"A lista de contactos dunha sala de IRC xeralmente está na parte dereita da "
+"xanela da sala de IRC. Se non a ve elixa <guiseq><gui>Conversa</"
+"gui><gui>Mostrar a lista de contactos</gui></guiseq>."
#: C/irc-send-file.page:9(desc)
msgid "<app>Empathy</app> does not currently support sending files using IRC."
@@ -1442,6 +1435,11 @@ msgid ""
"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
"network is known to have this feature."
msgstr ""
+"Actualmente <app>Empathy</app> non é compatíbel co rexistro de alcumes. "
+"Porén algúns servidores de IRC reenviarán automaticamente un <em>contrasinal "
+"de servidor</em> a NickServ. Nesas redes poderá usar contrasinais de IRC en "
+"<app>Empathy</app> para identificarse contra NickServ. É coñecido que a "
+"popular rede freenode dispón desta característica."
#: C/irc-nick-password.page:46(p)
msgid "To set an IRC server password:"
@@ -1519,6 +1517,9 @@ msgid ""
"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
"account\"/> and <link xref=\"account-irc\"/>."
msgstr ""
+"Pode unirse a salas de chat IRC (tamén coñecidas como canles de IRC) en "
+"calquera rede de IRC á que estea conectado. Para conectarse a unha rede de "
+"IRC consulte a <link xref=\"add-account\"/> e a <link xref=\"account-irc\"/>."
#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
#: C/group-conversations.page:122(p)
@@ -1526,18 +1527,24 @@ msgid ""
"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
"gui><gui>Join</gui></guiseq>."
msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Sala</"
+"gui><gui>Unirse</gui></guiseq>."
#: C/irc-join-room.page:45(p)
msgid ""
"From the <gui>Account</gui> drop-down list, select the IRC account that "
"corresponds to the network you want to use."
msgstr ""
+"Desde a lista despregábel <gui>Conta</gui> elixa a conta IRC que corresponda "
+"coa rede que quere usar."
#: C/irc-join-room.page:51(p)
msgid ""
"In the <gui>Room</gui> text box, type the name of the channel you want to "
"join. IRC channel names start with the hash character (<sys>#</sys>)."
msgstr ""
+"Na caixa de texto <gui>Sala</gui>, escriba o nome da canle de IRC á que "
+"quere unirse. Preceda o nome co carácter almohadilla (<sys>#</sys>)."
#: C/irc-join-room.page:57(p)
msgid "Click <gui>Join</gui> to enter the room."
@@ -1623,12 +1630,19 @@ msgid ""
"transfers, and all the most used messaging systems such as MSN and Google "
"Talk."
msgstr ""
+"<app>Empathy</app> é un aplicativo de mensaxaría instantánea para o "
+"Escritorio GNOME. É compatíbel con mensaxes de texto, chamas de voz e "
+"vídeochamadas, transferencia de ficheiro e os sistemas de mensaxaría máis "
+"populares como MSN e Google Talk."
#: C/introduction.page:28(p)
msgid ""
"<app>Empathy</app> includes features that help you better collaborate while "
"at work, and that let you easily keep in touch with your friends."
msgstr ""
+"<app>Empathy</app> inclúe características que lle axudarán a colaborar "
+"mellor no traballo e permitiranlle manterse en contacto cos seus amigos de "
+"forma sinxela."
#: C/introduction.page:32(p)
msgid ""
@@ -1637,6 +1651,10 @@ msgid ""
"search through your previous conversations, and share your desktop in just "
"two clicks."
msgstr ""
+"Usando <app>Empathy</app> pode agrupar as conversas nunha única xanela ou "
+"ter múltiples xanelas para os diferentes tipos de conversas; busca sinxela "
+"das súas conversas anteriores e compartición do seu escritorio con un só un "
+"par de clics de rato."
#: C/introduction.page:39(title)
msgid "<gui>Contact List</gui> window"
@@ -1659,14 +1677,10 @@ msgstr ""
"@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
#: C/index.page:7(title) C/index.page:8(title)
-#| msgid "Empathy Instant Messenger"
msgid "Empathy Internet Messenger"
msgstr "Mensaxeiro da Internet Empathy"
#: C/index.page:27(title)
-#| msgid ""
-#| "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-#| "\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
msgid ""
"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
@@ -1717,18 +1731,25 @@ msgid ""
"accounts from other instant messaging applications. Currently, the only "
"supported application is <app>Pidgin</app>."
msgstr ""
+"A primeira vez que executa <app>Empathy</app> ofreceráselle importar as súas "
+"contas de outros aplicativos de mensaxaría instantánea. Actualmente a única "
+"aplicación compatíbel é <app>Pidgin</app>."
#: C/import-account.page:50(p)
msgid ""
"Run <app>Empathy</app> for the first time. An assistant will offer you a "
"number of options to create new accounts."
msgstr ""
+"Execute <app>Empathy</app> por primeira vez. Aparecerá un asistente que lle "
+"permitirá crear novas contas de distintos servizos."
#: C/import-account.page:54(p)
msgid ""
"Select <gui>Yes, import my account details from</gui> and click "
"<gui>Forward</gui>."
msgstr ""
+"Seleccione <gui>Si, importar os detalles da miña conta desde </gui>e prema "
+"en <gui>Seguinte</gui>."
#: C/import-account.page:58(p)
msgid "Select the check box next to each account you wish to import."
@@ -1739,6 +1760,8 @@ msgid ""
"It is not currently possible to import accounts after you have completed the "
"first-run assistant."
msgstr ""
+"Actualmente non é posíbel importar contas despois de ter completado o "
+"asistente de primeira execución."
#: C/hide-contacts.page:8(desc)
msgid "Hide the offline contacts from your <gui>Contact List</gui>."
@@ -1754,6 +1777,9 @@ msgid ""
"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
"with which you can have a conversation, and also those that are offline."
msgstr ""
+"Normalmente <app>Empathy</app> mostra todos os contactos: os que están "
+"conectados, cos que pode estabelecer unha conversa, e tamén os que están "
+"desconectados."
#: C/hide-contacts.page:25(p)
msgid "To hide the contacts that are offline:"
@@ -1765,6 +1791,9 @@ msgid ""
"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
"key><key>H</key></keyseq>."
msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Ver</"
+"gui><gui>Contactos desconectados</gui></guiseq> ou prema <keyseq><key>Ctrl</"
+"key><key>H</key></keyseq>."
#: C/hide-contacts.page:36(p)
msgid "To show the offline contacts again, repeat the same procedure above."
@@ -1792,12 +1821,16 @@ msgid ""
"To have a group conversation you need to have a registered account with "
"either Jabber or Google Talk, or a People Nearby account."
msgstr ""
+"Para ter unha conversa en grupo debe ter rexistrado unha conta en Jabber ou "
+"Google Talk, ou en Persoas próximas."
#: C/group-conversations.page:46(p)
msgid ""
"You can have a group conversation only with the contacts that are using the "
"same service as yours."
msgstr ""
+"Pode ter conversas en grupo só cos contactos que usan o mesmo servizo que o "
+"seu."
#: C/group-conversations.page:54(title)
msgid "Start a group conversation"
@@ -1808,12 +1841,16 @@ msgid ""
"From the <gui>Account</gui> drop-down list, select the account you want to "
"use for the group conversation."
msgstr ""
+"Desde a lista despregábel <gui>Conta</gui> seleccione a conta que queira "
+"usar para a conversa en grupo."
#: C/group-conversations.page:69(p)
msgid ""
"In the <gui>Server</gui> text box, type the name of server in which the "
"conversation will be hosted."
msgstr ""
+"Na caixa de texto <gui>Servidor</gui> escriba o nome do servidor no que se "
+"hospedará a conversa."
#: C/group-conversations.page:73(p)
msgid "Leave it empty if it will be on the current server."
@@ -1974,14 +2011,18 @@ msgstr ""
"precisión da localización</gui>."
#: 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>Geoclue Settings</gui> "
+"position, select the appropriate option in the <gui>Location sources</gui> "
"section."
msgstr ""
-"Se ten un dispositivo externo como un GPS ou quere enviar unha posición máis "
-"exacta, seleccione a opción axeitada na sección <gui>Configuracións de "
-"Geoclue</gui>."
+"Se ten un dispositivo externo como un GPS e quere enviar unha posición máis "
+"exacta, seleccione a opción axeitada na sección <gui>Orixes das "
+"localizacións</gui>."
#: C/geolocation-supported.page:7(desc)
msgid "Services that supports geolocation and compatibility."
@@ -2312,18 +2353,26 @@ msgid ""
"enable an account if you only want to be logged in to the account at certain "
"times, but you still want to use <app>Empathy</app> for other accounts."
msgstr ""
+"Pode desactivar unha conta para evitar que <app>Empathy</app> inicie sesión "
+"nela, sen ter que quitar a conta completamente. Pode querer desactivar unha "
+"conta e reactivala se só quere iniciar sesión na conta de vez en cando, pero "
+"segue querendo usar <app>Empathy</app> para outras contas."
#: C/disable-account.page:52(p)
msgid ""
"Select the account you wish to disable from the accounts list on the left "
"side of the window."
msgstr ""
+"Seleccione a conta que quere desactivar desde a lista de contas na parte "
+"esquerda da xanela."
#: C/disable-account.page:56(p)
msgid ""
"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
"window."
msgstr ""
+"Deseleccione <gui style=\"checkbox\">Activada</gui> na parte dereita da "
+"xanela."
#: C/disable-account.page:62(p)
msgid ""
@@ -2335,11 +2384,11 @@ msgstr "Para reactivar a conta simplemente seleccione <placeholder-1/>."
msgid "Register for an account with one of the supported messaging services."
msgstr "Rexistre unha conta con un dos servizos de mensaxería admitidos."
-#: C/create-account.page:33(title)
+#: C/create-account.page:34(title)
msgid "Register for a new account"
msgstr "Rexistrar unha nova conta"
-#: 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 "
@@ -2347,20 +2396,29 @@ msgid ""
"app> to register for a new account, using the same steps as you would to "
"<link xref=\"add-account\">add an account</link>."
msgstr ""
+"Moitos tipos de conta requiren que cree unha conta cun fornecedor de contas "
+"antes de poder conectarse e usar aplicativos de mensaxaría instantánea como "
+"<app>Empathy</app>. Con algúns fornecedores de contas pode usar "
+"<app>Empathy</app> para rexistrar una nova conta, usando os mesmos pasos que "
+"seguiría en <link xref=\"add-account\">engadir unha conta</link>."
-#: 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 "
"password, as well as any additional information you need to connect using "
"<app>Empathy</app>."
msgstr ""
+"Esta páxina fornece información sobre crear unha nova conta para varios "
+"tipos de conta. O seu fornecedor de contas debería fornecerlle un ID de "
+"inicio de sesión e un contrasinal, así como outra información adicional que "
+"pode necesitar para conectarse con <app>Empathy</app>."
-#: 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."
@@ -2368,7 +2426,7 @@ msgstr ""
"Facebook é unha das redes sociais máis usadas. Permite aos usuarios crear o "
"seu propio perfil e comunicarse cos seus amigos."
-#: 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."
@@ -2378,11 +2436,11 @@ msgstr ""
"conta desde o sitio web: <link href=\"http://www.facebook.com\">www.facebook."
"com</link>."
-#: 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, "
@@ -2393,7 +2451,7 @@ msgstr ""
"comunicarse cos ouros usuarios de Jabber, independentemente do fornecedor da "
"conta."
-#: 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."
@@ -2403,7 +2461,7 @@ msgstr ""
"fornecedores libres; un fornecedor popular é <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 "
@@ -2413,11 +2471,11 @@ msgstr ""
"servizo Jabber. Simplemente use o seu enderezo de Google Mail e o seu "
"contrasinal para conectarse."
-#: 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 "Persoas próximas"
-#: 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, "
@@ -2429,72 +2487,85 @@ msgstr ""
"local, tal como un punto sen fíos. Automaticamente encontra outros usuarios "
"na rede que estean usando este servizo."
-#: C/create-account.page:84(p)
+#: C/create-account.page:85(p)
msgid "For more information, see <link xref=\"salut-protocol\"/>."
msgstr ""
"Para obter máis información consulte a <link xref=\"salut-protocol\"/>."
-#: 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 "
"provider. You can communicate with all other SIP users, regardless of which "
"SIP provider they use."
msgstr ""
+"SIP é un sistema aberto que permite aos usuarios realizar conversas de son e "
+"vídeo en Internet. Debe crear unha conta cun fornecedor SIP. Pode "
+"comunicarse con tódolos usuarios SIP, independentemente do fornecedor SIP "
+"que usen."
-#: 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 ""
-
-#: 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 "
"with <app>Empathy</app>."
msgstr ""
+"Debido a algunhas diferencias técnicas, actualmente o servizo libre <link "
+"href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> non "
+"funciona con <app>Empathy</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."
msgstr ""
+"Algúns fornecedores SIP permítenlle chamar a teléfonos normais desde o seu "
+"equipo. Xeralmente deberá subscribirse a un servizo de pago para usar esta "
+"característica."
-#: 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 "
"is only established each time you connect. If another user is using the "
"nickname, you will need to choose a new nickname."
msgstr ""
+"Non necesita rexistrar unha conta para usar o IRC. Aínda que especifique un "
+"alcume ao engadir unha conta IRC en <app>Empathy</app>, este alcume só se "
+"estabelece cada vez que se conecta. Se outro usuario está usando o nome, "
+"deberá elixir un alcume novo."
-#: 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."
msgstr ""
+"Algunhas redes IRC usan un servizo chamado NickServ para permitir aos "
+"usuarios protexer os seus alcumes. Para obter máis información consulte a "
+"<link xref=\"irc-nick-password\"/>."
-#: 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."
msgstr ""
+"Algúns servidores de IRC están protexidos con contrasinal. Necesitará "
+"coñecer o contrasinal para conectarse a eses servidores. Xeralmente son "
+"redes de IRC privadas."
-#: C/create-account.page:125(title)
+#: C/create-account.page:122(title)
msgid "Proprietary Services"
msgstr "Servizos privativos"
-#: 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 "
@@ -2508,19 +2579,19 @@ msgstr ""
"unha nova conta con un destes servizos, debe visitar a páxina web do servizo "
"e aceptar os termos de uso."
-#: 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!"
@@ -2784,12 +2855,6 @@ msgstr ""
"persoa teña un aplicativo que admita chamadas de son."
#: C/audio-call.page:34(p)
-#| msgid ""
-#| "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-#| "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-#| "next to the name of the contact you wish to call and choose <gui style="
-#| "\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
-#| "choose <gui style=\"menuitem\">Video Call</gui>."
msgid ""
"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
@@ -2802,11 +2867,6 @@ msgstr ""
"<gui style=\"menuitem\">Chamada de son</gui>."
#: C/audio-call.page:55(p)
-#| msgid ""
-#| "To turn an audio conversation into a video conversation, choose "
-#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</"
-#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
-#| "\"figures/camera-web.png\">video call</media> toolbar button to select it."
msgid ""
"To turn an audio conversation into a video conversation, choose <guiseq><gui "
"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
@@ -2816,14 +2876,10 @@ msgstr ""
"activado</gui></guiseq>."
#: C/audio-call.page:63(title)
-#| msgid "Start a video conversation with one of your contacts."
msgid "Start an audio conversation with a meta-contact"
msgstr "Comezar unha conversa de son con un metacontacto."
#: C/audio-call.page:71(p)
-#| msgid ""
-#| "Right-click on the name of the contact you want to have a conversation "
-#| "with, and choose <gui>Chat</gui>."
msgid ""
"Select the contact you want to have the conversation, and from the menu "
"select <gui style=\"menuitem\">Audio Call</gui>."
@@ -2868,6 +2924,8 @@ msgid ""
"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
"to appear in your contact list."
msgstr ""
+"No campo <gui>Alcume</gui>escriba o nome do seu contacto tal e como lle "
+"gustaría que aparecese na súa lista de contactos."
#: C/add-contact.page:53(p)
msgid "Click <gui>Add</gui> to add the person to your list of contacts."
@@ -2912,6 +2970,8 @@ msgid ""
"From the <gui>Protocol</gui> drop-down list, select the type of account you "
"wish to add."
msgstr ""
+"Desde a lista despregábel <gui>Protocolo</gui>seleccione o tipo de conta que "
+"quere engadir."
#: C/add-account.page:61(p)
msgid ""
@@ -2920,6 +2980,10 @@ msgid ""
"types, and may not work with some account providers. See <link xref=\"create-"
"account\"/> for more information."
msgstr ""
+"Se aínda non ten unha conta rexistrada seleccione <gui>Crear unha nova conta "
+"no servidor</gui>. Esta característica non está dispoñíbel para todos os "
+"tipos de contas e pode non funcionar con algúns fornecedores de contas. Para "
+"obter máis información consulte a <link xref=\"create-account\"/>."
#: C/add-account.page:66(p)
msgid ""
@@ -3083,6 +3147,10 @@ msgid ""
"custom server settings manually. These settings should be provided for you "
"by your Jabber provider."
msgstr ""
+"<app>Empathy</app> usará a configuración predeterminada para conectarse ao "
+"servidor Jabber en función do seu ID de inicio de sesión. Para algúns "
+"servidores Jabber precisará introducir manualmente os axustes do servidor. O "
+"seu fornecedor de Jabber deberíalle fornecer ditos axustes."
#. 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.
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index def25e357..a28ac9a00 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -8,14 +8,10 @@ AM_CPPFLAGS = \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
-DGCR_API_SUBJECT_TO_CHANGE \
$(EMPATHY_CFLAGS) \
- $(GTK_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- $(CANBERRA_CFLAGS) \
$(ENCHANT_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
$(GEOCLUE_CFLAGS) \
- $(GCR_CFLAGS) \
- $(MEEGO_CFLAGS) \
+ $(MEEGO_CFLAGS) \
$(WEBKIT_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index aa0370b94..9f6006473 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -96,6 +96,8 @@ static void log_window_button_next_clicked_cb (GtkWidget *wi
EmpathyLogWindow *window);
static void log_window_button_previous_clicked_cb (GtkWidget *widget,
EmpathyLogWindow *window);
+static void log_window_button_close_clicked_cb (GtkWidget *widget,
+ EmpathyLogWindow *window);
static void log_window_chats_changed_cb (GtkTreeSelection *selection,
EmpathyLogWindow *window);
static void log_window_chats_populate (EmpathyLogWindow *window);
@@ -263,6 +265,8 @@ empathy_log_window_show (TpAccount *account,
"entry_find", "activate", log_window_entry_find_activate_cb,
"button_previous", "clicked", log_window_button_previous_clicked_cb,
"button_next", "clicked", log_window_button_next_clicked_cb,
+ "button_close", "clicked", log_window_button_close_clicked_cb,
+ "button_close2", "clicked", log_window_button_close_clicked_cb,
"button_find", "clicked", log_window_button_find_clicked_cb,
"entry_chats", "changed", log_window_entry_chats_changed_cb,
"entry_chats", "activate", log_window_entry_chats_activate_cb,
@@ -759,6 +763,13 @@ log_window_button_previous_clicked_cb (GtkWidget *widget,
}
}
+static void
+log_window_button_close_clicked_cb (GtkWidget *widget,
+ EmpathyLogWindow *window)
+{
+ gtk_widget_destroy (window->window);
+}
+
/*
* Chats Code
*/
diff --git a/libempathy-gtk/empathy-log-window.ui b/libempathy-gtk/empathy-log-window.ui
index 5ce930095..1f99cddf0 100644
--- a/libempathy-gtk/empathy-log-window.ui
+++ b/libempathy-gtk/empathy-log-window.ui
@@ -155,6 +155,22 @@
<property name="position">1</property>
</packing>
</child>
+ <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="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <property name="focus_on_click">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -173,6 +189,12 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
@@ -188,7 +210,7 @@
<object class="GtkTable" id="table7">
<property name="visible">True</property>
<property name="border_width">12</property>
- <property name="n_rows">2</property>
+ <property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
@@ -297,6 +319,40 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_close2">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </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>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">1</property>
diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
index 03564fe02..adc9bfb67 100644
--- a/nautilus-sendto-plugin/Makefile.am
+++ b/nautilus-sendto-plugin/Makefile.am
@@ -7,8 +7,7 @@ INCLUDES = \
$(NST_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
- $(EMPATHY_CFLAGS) \
- $(GTK_CFLAGS)
+ $(EMPATHY_CFLAGS)
plugin_LTLIBRARIES = libnstempathy.la
diff --git a/po/fi.po b/po/fi.po
index e309c5ddd..88fc266c7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: "
"http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-09-29 11:53+0000\n"
-"PO-Revision-Date: 2010-11-14 00:37+0200\n"
+"POT-Creation-Date: 2010-11-13 22:40+0000\n"
+"PO-Revision-Date: 2010-11-15 13:51+0200\n"
"Last-Translator: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>\n"
"Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgstr "Käytettävän Adium-teeman sijainti"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Adium-teeman sijainti Adiumia keskustelun teemana käytettäessä"
+msgstr "Adium-teeman sijainti Adiumia keskustelun teemana käytettäessä."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
@@ -197,19 +197,19 @@ msgstr "Soita merkkiääni lähetettäville viesteille"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
-msgstr "Soita merkkiääni tuttavan sisäänkirjautuessa"
+msgstr "Soita merkkiääni tuttavan kirjautuessa sisään"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
-msgstr "Soita merkkiääni tuttavan uloskirjautuessa"
+msgstr "Soita merkkiääni tuttavan kirjautuessa ulos"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
-msgstr "Soita merkkiääni sisäänkirjauduttaessa"
+msgstr "Soita merkkiääni kirjauduttaessa sisään"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
-msgstr "Soita merkkiääni uloskirjauduttaessa"
+msgstr "Soita merkkiääni kirjauduttaessa ulos"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
@@ -301,7 +301,7 @@ msgstr "Onko Empathy tiedustellut tilien tuomisesta."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Josko Empathy olisi muuttanut perhoslogeja."
+msgstr "Onko Empathy siirtänyt butterfly-lokit."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
@@ -313,7 +313,7 @@ msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
"Tulisiko Empathyn merkitä käyttäjä automaattisesti poissaolevaksi, mikäli "
-"konetta ei käytetä?"
+"konetta ei käytetä."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
@@ -450,8 +450,8 @@ msgid ""
"the contact list by state."
msgstr ""
"Kuinka tuttavaluettelo järjestetään. Oletusarvolla \"name\" "
-"järjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo "
-"järjestetään tuttavien tilan perusteella."
+"järjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo järjestetään "
+"tuttavien tilan perusteella."
#: ../data/empathy-accounts.desktop.in.in.h:1
msgid "Manage Messaging and VoIP accounts"
@@ -620,7 +620,7 @@ msgstr "Tämä resurssi on jo yhdistetty palvelimelle"
#: ../libempathy/empathy-utils.c:368
msgid ""
"Connection has been replaced by a new connection using the same resource"
-msgstr "Yhteys on korvattu samaa resurssia käyttävällä uudellä yhteydellä"
+msgstr "Yhteys on korvattu samaa resurssia käyttävällä uudella yhteydellä"
#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
@@ -723,12 +723,12 @@ msgstr "Salasana"
#: ../libempathy-gtk/empathy-account-widget.c:516
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
-msgstr "Palvelin:"
+msgstr "Palvelin"
#: ../libempathy-gtk/empathy-account-widget.c:517
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
-msgstr "Portti:"
+msgstr "Portti"
#: ../libempathy-gtk/empathy-account-widget.c:589
#: ../libempathy-gtk/empathy-account-widget.c:646
@@ -987,7 +987,7 @@ msgstr "Ohita palvelimen asetukset"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
msgid "Priori_ty:"
-msgstr "_Prioriteetti"
+msgstr "_Prioriteetti:"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
@@ -1005,8 +1005,8 @@ msgstr ""
"sähköpostiosoite.\n"
"Jos käyttäjänimesi on esimerkiksi facebook.com/<b>tunnus</b>, kirjoita "
"<b>tunnus</b>.\n"
-"Jos et ole vielä luonut Facebook-käyttäjänimeä, voit luoda sellaisen <a href="
-"\"http://www.facebook.com/username/\">tällä sivulla</a>."
+"Jos et ole vielä luonut Facebook-käyttäjänimeä, voit luoda sellaisen <a "
+"href=\"http://www.facebook.com/username/\">tällä sivulla</a>."
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
@@ -1166,7 +1166,7 @@ msgstr "Mikä on Yahoo! -salasanasi?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
-msgstr "Yahoo!-tunnus:"
+msgstr "Yahoo!-_tunnus:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
@@ -1511,64 +1511,64 @@ msgid "_Add Contact…"
msgstr "_Lisää tuttava…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../libempathy-gtk/empathy-individual-menu.c:516
#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "_Keskustele"
#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Äänipuhelu"
#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videopuhelu"
#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:644
#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "_Aiemmat keskustelut"
#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "Lähetä tiedosto"
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "Jaa työpöytäni"
-#: ../libempathy-gtk/empathy-contact-menu.c:415
+#: ../libempathy-gtk/empathy-contact-menu.c:414
#: ../libempathy-gtk/empathy-contact-widget.c:1570
-#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-menu.c:761
#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Favorite"
msgstr "Suosikki"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "_Tietoja"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:489
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Muokkaa"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "Kutsuu sinut tähän keskusteluhuoneeseen"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
msgid "_Invite to Chat Room"
msgstr "_Kutsu keskusteluhuoneeseen"
@@ -1803,7 +1803,7 @@ msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
msgstr ""
-"Valitse ryhmät, joissa haluat tämän tuttavan näkyvän. Huomaa että Voit "
+"Valitse ryhmät, joissa haluat tämän tuttavan näkyvän. Huomaa että voit "
"valita useita ryhmiä tai olla valitsematta yhtään ryhmää."
#: ../libempathy-gtk/empathy-groups-widget.c:363
@@ -1816,7 +1816,7 @@ msgid "Select"
msgstr "Valitse"
#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1247
+#: ../src/empathy-main-window.c:1250
msgid "Group"
msgstr "Ryhmä"
@@ -1846,14 +1846,14 @@ msgstr ""
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Muokkaa"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Linkitä yhteystiedot…"
@@ -2004,7 +2004,7 @@ msgstr "Oma viesti…"
#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
msgid "Edit Custom Messages…"
-msgstr "Muokkaa omia viestejä..."
+msgstr "Muokkaa omia viestejä…"
#: ../libempathy-gtk/empathy-presence-chooser.c:346
msgid "Click to remove this status as a favorite"
@@ -2025,7 +2025,7 @@ msgstr "Aseta läsnäolosi ja nykyinen tilasi"
#. Custom messages
#: ../libempathy-gtk/empathy-presence-chooser.c:1124
msgid "Custom messages…"
-msgstr "Omat viestit..."
+msgstr "Omat viestit…"
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
@@ -2383,7 +2383,7 @@ msgstr "Älä yhdistä käynnistettäessä"
#: ../src/empathy.c:418
msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "Älä näytä tuttavalistaa tai muita dialogeja käynnistyksessä."
+msgstr "Älä näytä tuttavalistaa tai muita dialogeja käynnistyksessä"
#: ../src/empathy.c:435
msgid "- Empathy IM Client"
@@ -2431,7 +2431,9 @@ msgstr "Gnomen pikaviestiohjelma"
msgid "translator-credits"
msgstr ""
"Samuli Seppänen ja Henna Nykänen, 2006.\n"
-"Ilkka Tuohela, 2006-200999999999.\n"
+"Ilkka Tuohela, 2006-2009.\n"
+"Tommi Vainikainen, 2009.\n"
+"Ville-Pekka Vainio, 2010.\n"
"\n"
"http://www.gnome.fi/\n"
"\n"
@@ -2584,8 +2586,8 @@ msgstr ""
"Empathy voi automaattisesti löytää ja keskustella kanssasi samaan verkkoon "
"yhdistettyjen ihmisten kanssa. Jos haluat käyttää tätä toimintoa, tarkista "
"että alla olevat yksityiskohdat pitävät paikkansa. Voit helposti muuttaa "
-"näitä yksityiskohtia myöhemmin tai estää tämän toiminnonan käyttämäll "
-"'Tilit'-valintaikkunaa."
+"näitä yksityiskohtia myöhemmin tai estää tämän toiminnon käyttämällä "
+"”Tilit”-valintaikkunaa."
#: ../src/empathy-account-assistant.c:1135
#: ../src/empathy-account-assistant.c:1191
@@ -2605,8 +2607,8 @@ msgid ""
msgstr ""
"Et voi keskustella paikalliseen verkkoon liittyneiden ihmisten kanssa sillä "
"telepathy-salut ei ole asennettu. Jos haluat ottaa tämän ominaisuuden "
-"käyttöön, asenna telepathy-salut paketti ja luo läheiset ihmiset -tili Tilit-"
-"ikkunassa."
+"käyttöön, asenna telepathy-salut paketti ja luo läheiset ihmiset -tili "
+"Tilit-ikkunassa."
#: ../src/empathy-account-assistant.c:1193
msgid "telepathy-salut not installed"
@@ -2618,7 +2620,7 @@ msgstr "Viestintä- ja VoIP-käyttäjätilien apulainen"
#: ../src/empathy-account-assistant.c:1273
msgid "Welcome to Empathy"
-msgstr "Tervetuloa empathyyn"
+msgstr "Tervetuloa Empathyyn"
#: ../src/empathy-account-assistant.c:1282
msgid "Import your existing accounts"
@@ -2643,7 +2645,7 @@ msgstr "Uutta tunnustasi ei ole vielä tallennettu."
#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
msgid "Connecting…"
-msgstr "Yhdistetään..."
+msgstr "Yhdistetään…"
#: ../src/empathy-accounts-dialog.c:322
#, c-format
@@ -2876,8 +2878,8 @@ msgid ""
"the Help menu."
msgstr ""
"Telepathy-komponentin kanssa tapahtui jotain odottamatonta. Ole hyvä ja <a "
-"href=\"%s\">raportoi tämä ohjelmavirhe</a> sekä liitä 'Vianjäljitys'-"
-"ikkunasta kerätyt lokit \"Apua\"-valikosta."
+"href=\"%s\">raportoi tämä ohjelmavirhe</a> sekä liitä 'Vianjäljitys'-ikkunasta "
+"kerätyt lokit \"Apua\"-valikosta."
#: ../src/empathy-call-window.c:2404
msgid "There was a failure in the call engine"
@@ -3041,7 +3043,7 @@ msgstr "Lisää _hymiö"
#: ../src/empathy-chat-window.ui.h:5
msgid "Invite _Participant…"
-msgstr "Kutsu _osallistuja"
+msgstr "Kutsu _osallistuja…"
#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
@@ -3330,7 +3332,7 @@ msgid ""
"importing accounts from Pidgin."
msgstr ""
"Tuotavia tilejä ei löytynyt. Empathy osaa tällä hetkellä tuoda tilejä "
-"ainoastaan pidginistä."
+"ainoastaan Pidginistä."
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
@@ -3353,27 +3355,27 @@ msgstr "Lähde"
msgid "No match found"
msgstr "Vastinetta ei löytynyt"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:538
msgid "Reconnect"
msgstr "Yhdistä uudelleen"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:544
msgid "Edit Account"
msgstr "Muokkaa tiliä"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:550
msgid "Close"
msgstr "Sulje"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1232
msgid "Contact"
msgstr "Tuttava"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1557
msgid "Contact List"
msgstr "Tuttavaluettelo"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1666
msgid "Show and edit accounts"
msgstr "Näytä ja muokkaa tilejä"
@@ -3399,7 +3401,7 @@ msgstr "_Normaali koko"
#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
-msgstr "Uusi _puhelu"
+msgstr "Uusi _puhelu…"
#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
@@ -3439,11 +3441,11 @@ msgstr "_Tiedostosiirrot"
#: ../src/empathy-main-window.ui.h:21
msgid "_Join…"
-msgstr "_Liity..."
+msgstr "_Liity…"
#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
-msgstr "_Uusi keskustelu"
+msgstr "_Uusi keskustelu…"
#: ../src/empathy-main-window.ui.h:23
msgid "_Offline Contacts"
@@ -3675,7 +3677,7 @@ msgstr "_Käytä ponnahdusikkunahuomautuksia"
#: ../src/empathy-preferences.ui.h:28
msgid "_Enable sound notifications"
-msgstr "Käytä merkkiääniä"
+msgstr "_Käytä merkkiääniä"
#: ../src/empathy-preferences.ui.h:29
msgid "_GPS"
@@ -3795,7 +3797,7 @@ msgstr "Valittu yhteyshallinta ei tue etävianetsintälaajennusta."
#: ../src/empathy-invite-participant-dialog.c:34
#: ../src/empathy-invite-participant-dialog.c:48
msgid "Invite Participant"
-msgstr "Kutsu osaanottaja"
+msgstr "Kutsu osanottaja"
#: ../src/empathy-invite-participant-dialog.c:35
msgid "Choose a contact to invite into the conversation:"
@@ -3815,7 +3817,7 @@ msgstr ""
msgid "Don't display any dialogs if there are any non-Salut accounts"
msgstr ""
"Älä näytä mitään valintaikkunoita, paitsi jos käytössä on vain ”Lähellä "
-"olevat ihmiset” -tilejä."
+"olevat ihmiset” -tilejä"
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
diff --git a/src/Makefile.am b/src/Makefile.am
index 66c1089e1..eedd6885c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,6 @@ include $(top_srcdir)/tools/flymake.mk
CPPFLAGS_COMMON = \
$(EMPATHY_CFLAGS) \
$(EDS_CFLAGS) \
- $(GTK_CFLAGS) \
$(ERROR_CFLAGS) \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"empathy\" \
@@ -15,7 +14,6 @@ CPPFLAGS_COMMON = \
AM_LDFLAGS = -lm
AM_CPPFLAGS = \
$(CPPFLAGS_COMMON) \
- $(LIBNOTIFY_CFLAGS) \
$(LIBCHAMPLAIN_CFLAGS) \
$(WEBKIT_CFLAGS) \
$(NULL)
@@ -24,9 +22,7 @@ LDADD = \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(top_builddir)/libempathy/libempathy.la \
$(top_builddir)/extensions/libemp-extensions.la \
- $(LIBNOTIFY_LIBS) \
$(EMPATHY_LIBS) \
- $(GTK_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
$(WEBKIT_LIBS)
@@ -46,7 +42,6 @@ libempathy_accounts_common_la_SOURCES = \
libempathy_accounts_common_la_LIBADD = \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(EDS_LIBS) \
- $(LIBNOTIFY_LIBS) \
$(EMPATHY_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
$(WEBKIT_LIBS) \
@@ -151,7 +146,6 @@ empathy_LDADD = \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(top_builddir)/libempathy/libempathy.la \
$(top_builddir)/extensions/libemp-extensions.la \
- $(LIBNOTIFY_LIBS) \
$(EMPATHY_LIBS) \
$(LIBCHAMPLAIN_LIBS) \
$(WEBKIT_LIBS) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 577bb9091..a3bb71c31 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
$(EMPATHY_CFLAGS) \
- $(GTK_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(NULL)
@@ -22,7 +21,6 @@ LDADD = \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(top_builddir)/libempathy/libempathy.la \
$(EMPATHY_LIBS) \
- $(GTK_LIBS) \
$(NULL)
TEST_PROGS = \
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 258b86d45..24e674c6a 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
$(EMPATHY_CFLAGS) \
$(EDS_CFLAGS) \
- $(GTK_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED)
@@ -12,7 +11,6 @@ LDADD = \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(top_builddir)/libempathy/libempathy.la \
$(EMPATHY_LIBS) \
- $(GTK_LIBS) \
$(EDS_LIBS)
noinst_PROGRAMS = \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 16:36:21 +0800