aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac48
-rw-r--r--help/gl/gl.po278
-rw-r--r--libempathy-gtk/Makefile.am6
-rw-r--r--libempathy-gtk/empathy-account-chooser.c107
-rw-r--r--libempathy-gtk/empathy-account-chooser.h26
-rw-r--r--libempathy-gtk/empathy-contact-dialogs.c16
-rw-r--r--libempathy-gtk/empathy-contact-selector-dialog.c12
-rw-r--r--libempathy-gtk/empathy-contact-selector-dialog.h6
-rw-r--r--libempathy-gtk/empathy-individual-dialogs.c11
-rw-r--r--libempathy-gtk/empathy-individual-information-dialog.c2
-rw-r--r--libempathy-gtk/empathy-individual-store.c45
-rw-r--r--libempathy-gtk/empathy-individual-view.c6
-rw-r--r--libempathy-gtk/empathy-linking-dialog.c2
-rw-r--r--libempathy-gtk/empathy-log-window.c11
-rw-r--r--libempathy-gtk/empathy-log-window.ui58
-rw-r--r--libempathy-gtk/empathy-new-call-dialog.c86
-rw-r--r--libempathy-gtk/empathy-new-message-dialog.c62
-rw-r--r--libempathy-gtk/empathy-ui-utils.c3
-rw-r--r--libempathy/empathy-individual-manager.c2
-rw-r--r--libempathy/empathy-tls-verifier.c2
-rw-r--r--nautilus-sendto-plugin/Makefile.am3
-rw-r--r--po/LINGUAS1
-rw-r--r--po/fi.po1044
-rw-r--r--po/gl.po394
-rw-r--r--po/sl.po211
-rw-r--r--po/ug.po3740
-rw-r--r--src/Makefile.am6
-rw-r--r--src/empathy-new-chatroom-dialog.c77
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/interactive/Makefile.am2
-rw-r--r--tests/interactive/test-empathy-account-chooser.c6
31 files changed, 5241 insertions, 1034 deletions
diff --git a/configure.ac b/configure.ac
index 0ac879cc5..d2f09df1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_COPYRIGHT([
# Minimal version required
# Hardp deps
-FOLKS_REQUIRED=0.3.1
+FOLKS_REQUIRED=0.3.2
GCONF_REQUIRED=1.2.0
GLIB_REQUIRED=2.27.2
GNUTLS_REQUIRED=2.8.5
@@ -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
# -----------------------------------------------------------
@@ -206,6 +201,38 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
AM_GLIB_GNU_GETTEXT
# -----------------------------------------------------------
+# Make CA certificates path configurable
+# Stolen from GIO's TLS
+# -----------------------------------------------------------
+AC_MSG_CHECKING([location of system Certificate Authority list])
+AC_ARG_WITH(ca-file,
+ [AC_HELP_STRING([--with-ca-file=@<:@path@:>@],
+ [path to system Certificate Authority list])])
+if test "$with_ca_file" = "no"; then
+ AC_MSG_RESULT([disabled])
+else
+ if test -z "$with_ca_file"; then
+ for f in /etc/pki/tls/certs/ca-bundle.crt \
+ /etc/ssl/certs/ca-certificates.crt; do
+ if test -f "$f"; then
+ with_ca_file="$f"
+ fi
+ done
+ if test -z "$with_ca_file"; then
+ AC_MSG_ERROR([could not find. Use --with-ca-file=path to set, or --without-ca-file to disable])
+ fi
+ fi
+
+ AC_MSG_RESULT($with_ca_file)
+ if ! test -f "$with_ca_file"; then
+ AC_MSG_ERROR([No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable])
+ fi
+ GTLS_SYSTEM_CA_FILE="$with_ca_file"
+
+ AC_DEFINE_UNQUOTED([GTLS_SYSTEM_CA_FILE], ["$GTLS_SYSTEM_CA_FILE"], [path to system Certificate Authority list])
+fi
+
+# -----------------------------------------------------------
# Connectivity integration
# -----------------------------------------------------------
AC_ARG_WITH(connectivity,
@@ -502,6 +529,7 @@ Configure summary:
Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS}
Prefix......................: ${prefix}
Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS}
+ CA Cert Path................: ${GTLS_SYSTEM_CA_FILE}
Features:
Spell checking (enchant)....: ${have_enchant}
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-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 5e261ebdb..f1c0ec6b4 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -74,6 +74,36 @@ typedef struct {
gboolean set;
} SetAccountData;
+typedef struct {
+ EmpathyAccountChooser *chooser;
+ TpAccount *account;
+ GtkTreeIter *iter;
+} FilterResultCallbackData;
+
+static FilterResultCallbackData *
+filter_result_callback_data_new (EmpathyAccountChooser *chooser,
+ TpAccount *account,
+ GtkTreeIter *iter)
+{
+ FilterResultCallbackData *data;
+
+ data = g_slice_new0 (FilterResultCallbackData);
+ data->chooser = g_object_ref (chooser);
+ data->account = g_object_ref (account);
+ data->iter = gtk_tree_iter_copy (iter);
+
+ return data;
+}
+
+static void
+filter_result_callback_data_free (FilterResultCallbackData *data)
+{
+ g_object_unref (data->chooser);
+ g_object_unref (data->account);
+ gtk_tree_iter_free (data->iter);
+ g_slice_free (FilterResultCallbackData, data);
+}
+
/* Distinguishes between store entries which are actually accounts, and special
* items like the "All" entry and the separator below it, so they can be sorted
* correctly. Higher-numbered entries will sort earlier.
@@ -724,33 +754,26 @@ account_chooser_account_remove_foreach (TpAccount *account,
}
static void
-account_chooser_update_iter (EmpathyAccountChooser *chooser,
- GtkTreeIter *iter)
+account_chooser_filter_ready_cb (gboolean is_enabled,
+ gpointer data)
{
+ FilterResultCallbackData *fr_data = data;
+ EmpathyAccountChooser *chooser;
EmpathyAccountChooserPriv *priv;
+ TpAccount *account;
+ GtkTreeIter *iter;
GtkListStore *store;
GtkComboBox *combobox;
- TpAccount *account;
const gchar *icon_name;
- gboolean is_enabled = TRUE;
+ chooser = fr_data->chooser;
priv = GET_PRIV (chooser);
-
+ account = fr_data->account;
+ iter = fr_data->iter;
combobox = GTK_COMBO_BOX (chooser);
store = GTK_LIST_STORE (gtk_combo_box_get_model (combobox));
- gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
- COL_ACCOUNT_POINTER, &account,
- -1);
-
- /* Skip rows without account associated */
- if (account == NULL)
- return;
-
icon_name = tp_account_get_icon_name (account);
- if (priv->filter) {
- is_enabled = priv->filter (account, priv->filter_data);
- }
gtk_list_store_set (store, iter,
COL_ACCOUNT_IMAGE, icon_name,
@@ -766,6 +789,39 @@ account_chooser_update_iter (EmpathyAccountChooser *chooser,
}
g_object_unref (account);
+ filter_result_callback_data_free (fr_data);
+}
+
+static void
+account_chooser_update_iter (EmpathyAccountChooser *chooser,
+ GtkTreeIter *iter)
+{
+ EmpathyAccountChooserPriv *priv;
+ GtkListStore *store;
+ GtkComboBox *combobox;
+ TpAccount *account;
+ FilterResultCallbackData *data;
+
+ priv = GET_PRIV (chooser);
+
+ combobox = GTK_COMBO_BOX (chooser);
+ store = GTK_LIST_STORE (gtk_combo_box_get_model (combobox));
+
+ gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
+ COL_ACCOUNT_POINTER, &account,
+ -1);
+
+ /* Skip rows without account associated */
+ if (account == NULL)
+ return;
+
+ data = filter_result_callback_data_new (chooser, account, iter);
+
+ if (priv->filter)
+ priv->filter (account, account_chooser_filter_ready_cb,
+ (gpointer) data, priv->filter_data);
+ else
+ account_chooser_filter_ready_cb (TRUE, (gpointer) data);
}
static void
@@ -879,19 +935,26 @@ empathy_account_chooser_set_filter (EmpathyAccountChooser *chooser,
/**
* empathy_account_chooser_filter_is_connected:
* @account: a #TpAccount
+ * @callback: an #EmpathyAccountChooserFilterResultCallback accepting the result
+ * @callback_data: data passed to the @callback
* @user_data: user data or %NULL
*
* A useful #EmpathyAccountChooserFilterFunc that one could pass into
* empathy_account_chooser_set_filter() and only show connected accounts.
*
- * Return value: Whether @account is connected
+ * Returns (via the callback) TRUE is @account is connected
*/
-gboolean
-empathy_account_chooser_filter_is_connected (TpAccount *account,
- gpointer user_data)
+void
+empathy_account_chooser_filter_is_connected (
+ TpAccount *account,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
+ gpointer user_data)
{
- return (tp_account_get_connection_status (account, NULL)
- == TP_CONNECTION_STATUS_CONNECTED);
+ gboolean is_connected =
+ tp_account_get_connection_status (account, NULL)
+ == TP_CONNECTION_STATUS_CONNECTED;
+ callback (is_connected, callback_data);
}
gboolean
diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index f80d7003c..dfd372c3e 100644
--- a/libempathy-gtk/empathy-account-chooser.h
+++ b/libempathy-gtk/empathy-account-chooser.h
@@ -38,8 +38,26 @@ G_BEGIN_DECLS
#define EMPATHY_IS_ACCOUNT_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_ACCOUNT_CHOOSER))
#define EMPATHY_ACCOUNT_CHOOSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_ACCOUNT_CHOOSER, EmpathyAccountChooserClass))
-typedef gboolean (* EmpathyAccountChooserFilterFunc) (TpAccount *account,
- gpointer user_data);
+/**
+ * EmpathyAccountChooserFilterResultCallback:
+ * @is_enabled: indicated whether the account should be enabled
+ * @user_data: user data passed to the callback
+ */
+typedef void (* EmpathyAccountChooserFilterResultCallback) (gboolean is_enabled,
+ gpointer user_data);
+
+/**
+ * EmpathyAccountChooserFilterFunc:
+ * @account: a #TpAccount
+ * @callback: an #EmpathyAccountChooserFilterResultCallback accepting the result
+ * @callback_data: data passed to the @callback
+ * @user_data: user data passed to the callback
+ */
+typedef void (* EmpathyAccountChooserFilterFunc) (
+ TpAccount *account,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
+ gpointer user_data);
typedef struct _EmpathyAccountChooser EmpathyAccountChooser;
@@ -69,7 +87,9 @@ void empathy_account_chooser_set_has_all_option (EmpathyAccountChooser
void empathy_account_chooser_set_filter (EmpathyAccountChooser *chooser,
EmpathyAccountChooserFilterFunc filter,
gpointer user_data);
-gboolean empathy_account_chooser_filter_is_connected (TpAccount *account,
+void empathy_account_chooser_filter_is_connected (TpAccount *account,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
gpointer user_data);
gboolean empathy_account_chooser_is_ready (EmpathyAccountChooser *chooser);
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index a5ae51d03..fb57f348b 100644
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -354,24 +354,28 @@ empathy_contact_personal_dialog_show (GtkWindow *parent)
* New contact dialog
*/
-static gboolean
-can_add_contact_to_account (TpAccount *account,
- gpointer user_data)
+static void
+can_add_contact_to_account (TpAccount *account,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
+ gpointer user_data)
{
EmpathyContactManager *contact_manager;
TpConnection *connection;
gboolean result;
connection = tp_account_get_connection (account);
- if (connection == NULL)
- return FALSE;
+ if (connection == NULL) {
+ callback (FALSE, callback_data);
+ return;
+ }
contact_manager = empathy_contact_manager_dup_singleton ();
result = empathy_contact_manager_get_flags_for_connection (
contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
g_object_unref (contact_manager);
- return result;
+ callback (result, callback_data);
}
static void
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c
index 62b902746..3ed7f30e5 100644
--- a/libempathy-gtk/empathy-contact-selector-dialog.c
+++ b/libempathy-gtk/empathy-contact-selector-dialog.c
@@ -243,8 +243,10 @@ entry_activate_cb (GtkEntry *entry,
gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_ACCEPT);
}
-static gboolean
+static void
account_chooser_filter (TpAccount *account,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
gpointer user_data)
{
EmpathyContactSelectorDialog *self = user_data;
@@ -252,9 +254,13 @@ account_chooser_filter (TpAccount *account,
EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (self);
if (class->account_filter == NULL)
- return empathy_account_chooser_filter_is_connected (account, user_data);
+ {
+ empathy_account_chooser_filter_is_connected (
+ account,callback, callback_data, user_data);
+ return;
+ }
- return class->account_filter (self, account);
+ class->account_filter (self, callback, callback_data, account);
}
static gboolean
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.h b/libempathy-gtk/empathy-contact-selector-dialog.h
index 402f1c766..27d689c5a 100644
--- a/libempathy-gtk/empathy-contact-selector-dialog.h
+++ b/libempathy-gtk/empathy-contact-selector-dialog.h
@@ -29,6 +29,8 @@
#include <telepathy-glib/connection.h>
#include <telepathy-glib/account.h>
+#include "empathy-account-chooser.h"
+
G_BEGIN_DECLS
typedef struct _EmpathyContactSelectorDialog EmpathyContactSelectorDialog;
@@ -38,7 +40,9 @@ typedef struct _EmpathyContactSelectorDialogClass \
struct _EmpathyContactSelectorDialogClass {
GtkDialogClass parent_class;
- gboolean (*account_filter) (EmpathyContactSelectorDialog *self,
+ void (*account_filter) (EmpathyContactSelectorDialog *self,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
TpAccount *account);
gboolean (*contact_filter) (EmpathyContactSelectorDialog *self,
const char *id);
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 85ed7d1d4..2c9801059 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -43,8 +43,10 @@ static GtkWidget *new_individual_dialog = NULL;
* New contact dialog
*/
-static gboolean
+static void
can_add_contact_to_account (TpAccount *account,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
gpointer user_data)
{
EmpathyIndividualManager *individual_manager;
@@ -53,13 +55,16 @@ can_add_contact_to_account (TpAccount *account,
connection = tp_account_get_connection (account);
if (connection == NULL)
- return FALSE;
+ {
+ callback (FALSE, callback_data);
+ return;
+ }
individual_manager = empathy_individual_manager_dup_singleton ();
result = empathy_connection_can_add_personas (connection);
g_object_unref (individual_manager);
- return result;
+ callback (result, callback_data);
}
static void
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
index bb52e7d85..7659c8ba6 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -180,7 +180,7 @@ individual_information_dialog_set_individual (
/* Update the UI */
gtk_window_set_title (GTK_WINDOW (dialog),
- folks_individual_get_alias (individual));
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
empathy_individual_widget_set_individual (
EMPATHY_INDIVIDUAL_WIDGET (priv->individual_widget), individual);
set_label_visibility (dialog);
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index d30ce1a87..807afb2a2 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -167,7 +167,7 @@ add_individual_to_store (GtkTreeStore *self,
gtk_tree_store_insert_with_values (self, iter, parent, 0,
EMPATHY_INDIVIDUAL_STORE_COL_NAME,
- folks_individual_get_alias (individual),
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)),
EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, individual,
EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE,
EMPATHY_INDIVIDUAL_STORE_COL_IS_SEPARATOR, FALSE,
@@ -378,12 +378,12 @@ individual_store_add_individual (EmpathyIndividualStore *self,
priv = GET_PRIV (self);
- if (EMP_STR_EMPTY (folks_individual_get_alias (individual)))
+ if (EMP_STR_EMPTY (folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))))
return;
if (priv->show_groups)
{
- group_set = folks_individual_get_groups (individual);
+ group_set = folks_groupable_get_groups (FOLKS_GROUPABLE (individual));
groups = g_hash_table_get_keys (group_set);
}
@@ -432,8 +432,6 @@ individual_store_add_individual (EmpathyIndividualStore *self,
individual);
}
g_list_free (groups);
- if (group_set != NULL)
- g_hash_table_unref (group_set);
if (priv->show_groups &&
folks_favourite_get_is_favourite (FOLKS_FAVOURITE (individual)))
@@ -518,7 +516,8 @@ individual_store_contact_active_new (EmpathyIndividualStore *self,
ShowActiveData *data;
DEBUG ("Individual'%s' now active, and %s be removed",
- folks_individual_get_alias (individual), remove_ ? "WILL" : "WILL NOT");
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)),
+ remove_ ? "WILL" : "WILL NOT");
data = g_slice_new0 (ShowActiveData);
@@ -562,12 +561,12 @@ individual_store_contact_active_cb (ShowActiveData *data)
if (data->remove)
{
DEBUG ("Individual'%s' active timeout, removing item",
- folks_individual_get_alias (data->individual));
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (data->individual)));
individual_store_remove_individual (data->self, data->individual);
}
DEBUG ("Individual'%s' no longer active",
- folks_individual_get_alias (data->individual));
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (data->individual)));
individual_store_contact_set_active (data->self,
data->individual, FALSE, TRUE);
@@ -596,7 +595,7 @@ individual_avatar_pixbuf_received_cb (FolksIndividual *individual,
if (error != NULL)
{
DEBUG ("failed to retrieve pixbuf for individual %s: %s",
- folks_individual_get_alias (individual),
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)),
error->message);
g_clear_error (&error);
}
@@ -662,12 +661,12 @@ individual_store_contact_update (EmpathyIndividualStore *self,
}
/* Get online state now. */
- now_online = folks_individual_is_online (individual);
+ now_online = folks_presence_is_online (FOLKS_PRESENCE (individual));
if (!in_list)
{
DEBUG ("Individual'%s' in list:NO, should be:YES",
- folks_individual_get_alias (individual));
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
individual_store_add_individual (self, individual);
@@ -681,7 +680,7 @@ individual_store_contact_update (EmpathyIndividualStore *self,
else
{
DEBUG ("Individual'%s' in list:YES, should be:YES",
- folks_individual_get_alias (individual));
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
/* Get online state before. */
if (iters && g_list_length (iters) > 0)
@@ -747,11 +746,11 @@ individual_store_contact_update (EmpathyIndividualStore *self,
EMPATHY_INDIVIDUAL_STORE_COL_ICON_STATUS, pixbuf_status,
EMPATHY_INDIVIDUAL_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar,
EMPATHY_INDIVIDUAL_STORE_COL_NAME,
- folks_individual_get_alias (individual),
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)),
EMPATHY_INDIVIDUAL_STORE_COL_PRESENCE_TYPE,
- folks_individual_get_presence_type (individual),
+ folks_presence_get_presence_type (FOLKS_PRESENCE (individual)),
EMPATHY_INDIVIDUAL_STORE_COL_STATUS,
- folks_individual_get_presence_message (individual),
+ folks_presence_get_presence_message (FOLKS_PRESENCE (individual)),
EMPATHY_INDIVIDUAL_STORE_COL_COMPACT, priv->is_compact,
EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE,
EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, now_online,
@@ -791,7 +790,7 @@ individual_store_individual_updated_cb (FolksIndividual *individual,
EmpathyIndividualStore *self)
{
DEBUG ("Individual'%s' updated, checking roster is in sync...",
- folks_individual_get_alias (individual));
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
individual_store_contact_update (self, individual);
}
@@ -1339,8 +1338,9 @@ individual_store_contact_sort (FolksIndividual *individual_a,
g_return_val_if_fail (individual_a != NULL || individual_b != NULL, 0);
/* alias */
- ret_val = g_utf8_collate (folks_individual_get_alias (individual_a),
- folks_individual_get_alias (individual_b));
+ ret_val = g_utf8_collate (
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual_a)),
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual_b)));
if (ret_val != 0)
goto out;
@@ -1350,6 +1350,9 @@ individual_store_contact_sort (FolksIndividual *individual_a,
account_a = empathy_contact_get_account (contact_a);
account_b = empathy_contact_get_account (contact_b);
+ g_assert (account_a != NULL);
+ g_assert (account_b != NULL);
+
/* protocol */
ret_val = g_strcmp0 (tp_account_get_protocol (account_a),
tp_account_get_protocol (account_b));
@@ -1411,8 +1414,10 @@ individual_store_state_sort_func (GtkTreeModel *model,
/* If we managed to get this far, we can start looking at
* the presences.
*/
- folks_presence_type_a = folks_individual_get_presence_type (individual_a);
- folks_presence_type_b = folks_individual_get_presence_type (individual_b);
+ folks_presence_type_a =
+ folks_presence_get_presence_type (FOLKS_PRESENCE (individual_a));
+ folks_presence_type_b =
+ folks_presence_get_presence_type (FOLKS_PRESENCE (individual_b));
tp_presence_a = empathy_folks_presence_type_to_tp (folks_presence_type_a);
tp_presence_b = empathy_folks_presence_type_to_tp (folks_presence_type_b);
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 5f604058a..6eb301d34 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -680,7 +680,7 @@ individual_view_drag_motion (GtkWidget *widget,
}
if (individual != NULL &&
- folks_individual_is_online (individual) &&
+ folks_presence_is_online (FOLKS_PRESENCE (individual)) &&
(caps & EMPATHY_CAPABILITIES_FT))
{
gdk_drag_status (context, GDK_ACTION_COPY, time_);
@@ -1665,7 +1665,7 @@ individual_view_is_visible_individual (EmpathyIndividualView *self,
return (priv->show_offline || is_online);
/* check alias name */
- str = folks_individual_get_alias (individual);
+ str = folks_aliasable_get_alias (FOLKS_ALIASABLE (individual));
if (empathy_live_search_match (live, str))
return TRUE;
@@ -2348,7 +2348,7 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem,
text =
g_strdup_printf (_
("Do you really want to remove the contact '%s'?"),
- folks_individual_get_alias (individual));
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
if (individual_view_remove_dialog_show (parent, _("Removing contact"),
text))
{
diff --git a/libempathy-gtk/empathy-linking-dialog.c b/libempathy-gtk/empathy-linking-dialog.c
index d0a091053..323ec4e03 100644
--- a/libempathy-gtk/empathy-linking-dialog.c
+++ b/libempathy-gtk/empathy-linking-dialog.c
@@ -180,7 +180,7 @@ linking_response_cb (EmpathyLinkingDialog *self,
/* Show a confirmation dialogue first */
dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("Unlink meta-contact '%s'?"),
- folks_individual_get_alias (individual));
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("Are you sure you want to unlink this meta-contact? This will "
"completely split the meta-contact into the contacts it "
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/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 3d51283b1..ab9a86a6f 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -31,7 +31,6 @@
#include <libempathy/empathy-tp-contact-factory.h>
#include <libempathy/empathy-contact-manager.h>
#include <libempathy/empathy-call-factory.h>
-#include <libempathy/empathy-dispatcher.h>
#include <libempathy/empathy-utils.h>
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -50,6 +49,11 @@ G_DEFINE_TYPE(EmpathyNewCallDialog, empathy_new_call_dialog,
typedef struct _EmpathyNewCallDialogPriv EmpathyNewCallDialogPriv;
+typedef struct {
+ EmpathyAccountChooserFilterResultCallback callback;
+ gpointer user_data;
+} FilterCallbackData;
+
struct _EmpathyNewCallDialogPriv {
GtkWidget *check_video;
};
@@ -136,36 +140,80 @@ out:
gtk_widget_destroy (GTK_WIDGET (dialog));
}
-static gboolean
+static void
+conn_prepared_cb (GObject *conn,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ FilterCallbackData *data = user_data;
+ GError *myerr = NULL;
+ TpCapabilities *caps;
+ GPtrArray *classes;
+ guint i;
+
+ if (!tp_proxy_prepare_finish (conn, result, &myerr))
+ goto out;
+
+ caps = tp_connection_get_capabilities (TP_CONNECTION (conn));
+ classes = tp_capabilities_get_channel_classes (caps);
+
+ for (i = 0; i < classes->len; i++)
+ {
+ GHashTable *fixed;
+ GStrv allowed;
+ const gchar *chan_type;
+
+ tp_value_array_unpack (g_ptr_array_index (classes, i), 2,
+ &fixed, &allowed);
+
+ chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE);
+
+ if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
+ continue;
+
+ if (tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) !=
+ TP_HANDLE_TYPE_CONTACT)
+ continue;
+
+ data->callback (TRUE, data->user_data);
+ g_slice_free (FilterCallbackData, data);
+ return;
+ }
+
+out:
+ data->callback (FALSE, data->user_data);
+ g_slice_free (FilterCallbackData, data);
+}
+
+static void
empathy_new_call_dialog_account_filter (EmpathyContactSelectorDialog *dialog,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
TpAccount *account)
{
TpConnection *connection;
- EmpathyDispatcher *dispatcher;
- GList *classes;
+ FilterCallbackData *cb_data;
+ GQuark features[] = { TP_CONNECTION_FEATURE_CAPABILITIES, 0 };
if (tp_account_get_connection_status (account, NULL) !=
TP_CONNECTION_STATUS_CONNECTED)
- return FALSE;
+ {
+ callback (FALSE, callback_data);
+ return;
+ }
/* check if CM supports calls */
connection = tp_account_get_connection (account);
if (connection == NULL)
- return FALSE;
-
- dispatcher = empathy_dispatcher_dup_singleton ();
-
- classes = empathy_dispatcher_find_requestable_channel_classes
- (dispatcher, connection, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
- TP_HANDLE_TYPE_CONTACT, NULL);
-
- g_object_unref (dispatcher);
-
- if (classes == NULL)
- return FALSE;
+ {
+ callback (FALSE, callback_data);
+ return;
+ }
- g_list_free (classes);
- return TRUE;
+ cb_data = g_slice_new0 (FilterCallbackData);
+ cb_data->callback = callback;
+ cb_data->user_data = callback_data;
+ tp_proxy_prepare_async (connection, features, conn_prepared_cb, cb_data);
}
static GObject *
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index a17481437..4747dfbb9 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -42,6 +42,11 @@
#include "empathy-new-message-dialog.h"
#include "empathy-account-chooser.h"
+typedef struct {
+ EmpathyAccountChooserFilterResultCallback callback;
+ gpointer user_data;
+} FilterCallbackData;
+
static EmpathyNewMessageDialog *dialog_singleton = NULL;
G_DEFINE_TYPE(EmpathyNewMessageDialog, empathy_new_message_dialog,
@@ -77,36 +82,57 @@ out:
gtk_widget_destroy (GTK_WIDGET (dialog));
}
-static gboolean
+static void
+conn_prepared_cb (GObject *conn,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ FilterCallbackData *data = user_data;
+ GError *myerr = NULL;
+ TpCapabilities *caps;
+
+ if (!tp_proxy_prepare_finish (conn, result, &myerr))
+ {
+ data->callback (FALSE, data->user_data);
+ g_slice_free (FilterCallbackData, data);
+ }
+
+ caps = tp_connection_get_capabilities (TP_CONNECTION (conn));
+ data->callback (tp_capabilities_supports_text_chats (caps),
+ data->user_data);
+
+ g_slice_free (FilterCallbackData, data);
+}
+
+static void
empathy_new_message_account_filter (EmpathyContactSelectorDialog *dialog,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
TpAccount *account)
{
TpConnection *connection;
- EmpathyDispatcher *dispatcher;
- GList *classes;
+ FilterCallbackData *cb_data;
+ GQuark features[] = { TP_CONNECTION_FEATURE_CAPABILITIES, 0 };
if (tp_account_get_connection_status (account, NULL) !=
TP_CONNECTION_STATUS_CONNECTED)
- return FALSE;
+ {
+ callback (FALSE, callback_data);
+ return;
+ }
/* check if CM supports 1-1 text chat */
connection = tp_account_get_connection (account);
if (connection == NULL)
- return FALSE;
-
- dispatcher = empathy_dispatcher_dup_singleton ();
-
- classes = empathy_dispatcher_find_requestable_channel_classes
- (dispatcher, connection, TP_IFACE_CHANNEL_TYPE_TEXT,
- TP_HANDLE_TYPE_CONTACT, NULL);
-
- g_object_unref (dispatcher);
-
- if (classes == NULL)
- return FALSE;
+ {
+ callback (FALSE, callback_data);
+ return;
+ }
- g_list_free (classes);
- return TRUE;
+ cb_data = g_slice_new0 (FilterCallbackData);
+ cb_data->callback = callback;
+ cb_data->user_data = callback_data;
+ tp_proxy_prepare_async (connection, features, conn_prepared_cb, cb_data);
}
static GObject *
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 667c11090..f33b6ebc0 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -231,7 +231,8 @@ empathy_icon_name_for_individual (FolksIndividual *individual)
FolksPresenceType folks_presence;
TpConnectionPresenceType presence;
- folks_presence = folks_individual_get_presence_type (individual);
+ folks_presence =
+ folks_presence_get_presence_type (FOLKS_PRESENCE (individual));
presence = empathy_folks_presence_type_to_tp (folks_presence);
return empathy_icon_name_for_presence (presence);
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 07295c8bd..82884e4d1 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -448,7 +448,7 @@ empathy_individual_manager_remove (EmpathyIndividualManager *self,
DEBUG ("removing individual %s (%s)",
folks_individual_get_id (individual),
- folks_individual_get_alias (individual));
+ folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
folks_individual_aggregator_remove_individual (priv->aggregator, individual,
aggregator_remove_individual_cb, self);
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index 13727db17..ca1726144 100644
--- a/libempathy/empathy-tls-verifier.c
+++ b/libempathy/empathy-tls-verifier.c
@@ -44,7 +44,7 @@ enum {
};
static const gchar* system_ca_paths[] = {
- "/etc/ssl/certs/ca-certificates.crt",
+ GTLS_SYSTEM_CA_FILE,
NULL,
};
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/LINGUAS b/po/LINGUAS
index 79ea48d82..f7597dd73 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -72,6 +72,7 @@ ta
te
th
tr
+ug
uk
vi
zh_CN
diff --git a/po/fi.po b/po/fi.po
index 0049c8b8d..88fc266c7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,30 +1,28 @@
# This file is distributed under the same license as the empathy package.
# Copyright (C) 2006-2009 Free Software Foundation Inc.
# Copyright (C) 2006 Samuli Seppänen and Henna Nykänen.
-#
# Ilkka Tuohela <hile@iki.fi>, 2006-2009.
# Samuli Seppänen & Henna Nykänen <sjsepp@utu.fi>, 2006.
# Tommi Vainikainen <thv@iki.fi>, 2009.
-#
# Jiri Grönroos https://launchpad.net/~jiri-gronroos
# Jussi Aalto https://launchpad.net/~jtaalto
# Timo Jyrinki https://launchpad.net/~timo-jyrinki
# Tommi Saira https://launchpad.net/~tommisaira
-#
+# Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 22:02+0000\n"
-"PO-Revision-Date: 2010-09-13 15:08+0000\n"
-"Last-Translator: Timo Jyrinki <timo.jyrinki@gmail.com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Launchpad-Export-Date: 2010-09-13 15:12+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -147,8 +145,7 @@ msgstr "Empathyn pitää heikentää sijainnin tarkkuutta"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy yrittää käyttää tuttavan avatarta keskusteluikkunan kuvakkeena"
+msgstr "Empathy yrittää käyttää tuttavan avatarta keskusteluikkunan kuvakkeena"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
@@ -184,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"
@@ -200,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"
@@ -299,17 +296,15 @@ msgid "Whether Empathy can use the network to guess the location."
msgstr "Saako Empathy käyttää verkkoa sijainnin arvaamiseen."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"Whether Empathy has asked about importing accounts from other programs."
+msgid "Whether Empathy has asked about importing accounts from other programs."
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."
+msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr ""
"Kirjautuuko Empathy tileillesi automaattisesti käynnistymisensä yhteydessä."
@@ -318,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 ""
@@ -339,8 +334,8 @@ msgstr "Otetaanko WebKit-kehittäjän työkalut, kuten Web-tutkain, käyttöön.
#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
-"Whether connectivity managers should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
msgstr ""
"Käyttääkö Empathy yhteyksienhallintaa verkkoyhteyksien automaattiseen "
"luomiseen ja katkaisuun."
@@ -355,8 +350,7 @@ msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Näytetäänkö keskusteluiden hymiöt hymiökuvakkeina."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether to play a sound to notify of contacts logging into the network."
+msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "Ilmoitetaanko tuttavien sisäänkirjautumisesta merkkiäänellä."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
@@ -390,8 +384,7 @@ msgstr "Ilmoitetaanko verkosta uloskirjautumisesta merkkiäänellä."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play sound notifications when away or busy."
-msgstr ""
-"Ilmoitetaanko tapahtumista merkkiäänin varattuna tai poissa oltaessa."
+msgstr "Ilmoitetaanko tapahtumista merkkiäänin varattuna tai poissa oltaessa."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes offline."
@@ -457,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"
@@ -466,7 +459,7 @@ msgstr "Hallitse viestimiä ja Internet-puheluiden (VoIP) käyttäjätilejä"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2151
+#: ../src/empathy-accounts-dialog.c:2156
msgid "Messaging and VoIP Accounts"
msgstr "Viestintä ja VoIP-käyttäjätilit"
@@ -514,153 +507,156 @@ msgstr "Virhe yritettäessä siirtää tiedostoa"
msgid "The other participant is unable to transfer the file"
msgstr "Toinen osapuoli ei voi siirtää tiedostoa"
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
msgid "Unknown reason"
msgstr "Tuntematon syy"
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "Tavoitettavissa"
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "Varattu"
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "Poissa"
-#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "Näkymätön"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "Poissa linjoilta"
-#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
-#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
-#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
+#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
+#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "Tuntematon"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "Erittelemätön syy"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "Tila on nyt ”Poissa linjoilta”"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "Verkkovirhe"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "Todennus epäonnistui"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "Salausvirhe"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "Nimi on käytössä"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "Varmennetta ei ole annettu"
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "Varmenne ei ole luotettu"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "Varmenne on vanhentunut"
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "Varmenne ei ole vielä aktivoitu"
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "Varmenteen verkkonimi ei täsmää"
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "Varmenteen sormenjälki ei täsmää"
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "Itseallekirjoitettu varmenne"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "Varmennevirhe"
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:356
msgid "Encryption is not available"
msgstr "Salausta ei ole käytettävissä"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358
msgid "Certificate is invalid"
msgstr "Varmenne ei ole kelvollinen"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:360
msgid "Connection has been refused"
msgstr "Yhteys hylättiin"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:362
msgid "Connection can't be established"
msgstr "Yhteyttä ei voi muodostaa"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:364
msgid "Connection has been lost"
msgstr "Yhteys katkesi"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:366
msgid "This resource is already connected to the server"
msgstr "Tämä resurssi on jo yhdistetty palvelimelle"
-#: ../libempathy/empathy-utils.c:364
+#: ../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:367
+#: ../libempathy/empathy-utils.c:371
msgid "The account already exists on the server"
msgstr "Tunnus on jo olemassa palvelimella"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:373
msgid "Server is currently too busy to handle the connection"
msgstr "Palvelin on liian kiireinen käsitelläkseen tätä yhteyttä"
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:375
msgid "Certificate has been revoked"
-msgstr ""
+msgstr "Varmenne on kumottu"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:377
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
+msgstr "Varmenne käyttää heikkoa salausmenetelmää"
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:380
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
msgstr ""
+"Palvelinsertifikaatin pituus tai palvelinsertifikaattiketjun pituus ovat "
+"suurempia kuin salauskirjasto sallii"
-#: ../libempathy/empathy-utils.c:540
+#: ../libempathy/empathy-utils.c:544
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Lähellä olevat ihmiset"
-#: ../libempathy/empathy-utils.c:545
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Facebook-keskustelu"
@@ -714,68 +710,88 @@ msgstr "tulevaisuudessa"
msgid "All"
msgstr "Kaikki"
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:606
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "Käyttäjätili"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "Salasana"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Palvelin"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Portti"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1145
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "Käyttäjänimi:"
-#: ../libempathy-gtk/empathy-account-widget.c:1475
+#: ../libempathy-gtk/empathy-account-widget.c:1521
msgid "A_pply"
-msgstr ""
+msgstr "_Toteuta"
-#: ../libempathy-gtk/empathy-account-widget.c:1505
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "_Kirjaudu sisään"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1571
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1397
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
msgstr "Käyttäjätili:"
-#: ../libempathy-gtk/empathy-account-widget.c:1582
+#: ../libempathy-gtk/empathy-account-widget.c:1628
msgid "_Enabled"
-msgstr ""
+msgstr "_Käytössä"
-#: ../libempathy-gtk/empathy-account-widget.c:1647
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "Tämä tili on jo olemassa palvelimella"
-#: ../libempathy-gtk/empathy-account-widget.c:1650
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "Luo uusi tili palvelimelle"
-#: ../libempathy-gtk/empathy-account-widget.c:1743
+#: ../libempathy-gtk/empathy-account-widget.c:1789
msgid "Ca_ncel"
-msgstr ""
+msgstr "_Peru"
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2028
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, c-format
msgid "%1$s on %2$s"
msgstr "%s palvelimella %s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2054
+#: ../libempathy-gtk/empathy-account-widget.c:2103
#, c-format
msgid "%s Account"
msgstr "%s-tili"
-#: ../libempathy-gtk/empathy-account-widget.c:2058
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "Uusi tili"
@@ -822,7 +838,7 @@ msgstr "Mikä on AIM-näyttönimesi?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "_Portti:"
@@ -831,7 +847,7 @@ msgstr "_Portti:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "Pal_velin:"
@@ -862,7 +878,7 @@ msgstr "<b>Esimerkki:</b> 123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Ch_aracter set:"
-msgstr ""
+msgstr "_Merkkikartta:"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
@@ -971,7 +987,7 @@ msgstr "Ohita palvelimen asetukset"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
msgid "Priori_ty:"
-msgstr ""
+msgstr "_Prioriteetti:"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
@@ -1138,25 +1154,21 @@ msgstr "_Käyttäjätunnus:"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "I_gnore conference and chat room invitations"
-msgstr ""
+msgstr "_Älä huomioi konferenssi- ja keskusteluhuonekutsuja"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "Use _Yahoo! Japan"
-msgstr "Käytä _Yahoo! Japania"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! ID?"
msgstr "Mikä on Yahoo! -tunnuksesi?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "Mikä on Yahoo! -salasanasi?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "_Huoneluettelon maa-asetusto:"
@@ -1190,51 +1202,51 @@ msgstr "Kaikki tiedostot"
msgid "Click to enlarge"
msgstr "Suurenna napsauttamalla"
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:642
msgid "Failed to open private chat"
msgstr "Yksityiskeskustelun avaaminen epäonnistui"
-#: ../libempathy-gtk/empathy-chat.c:679
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "Aihe ei ole tuettu tässä keskustelussa"
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "Sinulla ei ole oikeutta muuttaa aihetta"
-#: ../libempathy-gtk/empathy-chat.c:819
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: pyyhi kaikki nykyisen keskustelun viestit pois näkyvistä"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <aihe>: aseta nykyisen keskustelun aihe"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <kanavan nimi>: liity kanavalle"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <kanavan nimi>: liity kanavalle"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <tuttavan tunnus> [<viesti>]: avaa yksityiskeskustelu"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <tuttavan tunnus> <viesti>: avaa yksityiskeskustelu"
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nimi>: vaihda nimeä nykyisellä palvelimella"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <viesti>: lähetä TOIMINTO viesti tämänhetkiseen keskusteluun"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:849
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1244,7 +1256,7 @@ msgstr ""
"Tätä toimintoa käytetään kun viestin halutaan alkavan merkillä \"/\", "
"esimerkiksi: \"/say /join komentoa käytetään kanavalle liittymiseen\""
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:854
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1252,116 +1264,115 @@ msgstr ""
"/help [<komento>]: näyttää kaikki tuetut komennot. Jos <komento> on "
"määritetty, näytä sen ohje."
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:864
#, c-format
msgid "Usage: %s"
msgstr "Käyttö: %s"
-#: ../libempathy-gtk/empathy-chat.c:890
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "Tuntematon komento"
-#: ../libempathy-gtk/empathy-chat.c:1011
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
-msgstr ""
-"Tuntematon komento; kirjoita /help nähdäksesi käytössä olevat komennot"
+msgstr "Tuntematon komento; kirjoita /help nähdäksesi käytössä olevat komennot"
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "poissa linjoilta"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "virheellinen tuttava"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "lupa evätty"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "liian pitkä viesti"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "ei toteutettu"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "tuntematon"
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Virhe lähetettäessä viestiä \"%s\": %s"
-#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:703
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
msgid "Topic:"
msgstr "Aihe:"
-#: ../libempathy-gtk/empathy-chat.c:1291
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "Aihe asetettu: %s"
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "Aihetta ei ole annettu"
-#: ../libempathy-gtk/empathy-chat.c:1772
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(Ei ehdotuksia)"
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "Lisää hymiö"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1844
-#: ../libempathy-gtk/empathy-ui-utils.c:1848
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "_Lähetä"
-#: ../libempathy-gtk/empathy-chat.c:1878
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "_Kielentarkistuksen ehdotukset"
-#: ../libempathy-gtk/empathy-chat.c:1955
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "Viimeisimpien lokien nouto epäonnistui"
-#: ../libempathy-gtk/empathy-chat.c:2061
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "%s katkaisi"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
-#.
-#: ../libempathy-gtk/empathy-chat.c:2068
+#.
+#: ../libempathy-gtk/empathy-chat.c:2071
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s potkaisi henkilön %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2074
#, c-format
msgid "%s was kicked"
msgstr "%s potkaistiin"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
-#.
-#: ../libempathy-gtk/empathy-chat.c:2079
+#.
+#: ../libempathy-gtk/empathy-chat.c:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s esti henkilön %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "%s estettiin"
-#: ../libempathy-gtk/empathy-chat.c:2086
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "%s on poistunut huoneesta"
@@ -1370,47 +1381,47 @@ msgstr "%s on poistunut huoneesta"
#. * notifications like "foo has left the room", with the message
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
-#.
-#: ../libempathy-gtk/empathy-chat.c:2095
+#.
+#: ../libempathy-gtk/empathy-chat.c:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2120
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "%s on saapunut huoneeseen"
-#: ../libempathy-gtk/empathy-chat.c:2145
+#: ../libempathy-gtk/empathy-chat.c:2148
#, c-format
msgid "%s is now known as %s"
msgstr "%s vaihtoi nimekseen %s"
-#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
msgid "Disconnected"
msgstr "Ei yhteyttä"
-#: ../libempathy-gtk/empathy-chat.c:2922
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "Väärä salasana, yritä uudelleen:"
-#: ../libempathy-gtk/empathy-chat.c:2923
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "Yritä uudelleen"
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "Huone on salasanasuojattu:"
-#: ../libempathy-gtk/empathy-chat.c:2929
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "Liity"
-#: ../libempathy-gtk/empathy-chat.c:3069
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "Yhdistetty"
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3134
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Keskustelu"
@@ -1433,17 +1444,17 @@ msgstr "_Avaa linkki"
msgid "%A %B %d %Y"
msgstr "%A %d. %Bta %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Muokkaa tuttavan tietoja"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "Henkilökohtaiset tiedot"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
msgid "New Contact"
msgstr "Uusi tuttava"
@@ -1455,281 +1466,288 @@ msgstr "_Päätä myöhemmin"
msgid "Subscription Request"
msgstr "Liittymispyyntö"
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "Ryhmittelemättömät"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "Suosikkihenkilöt"
+
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2254
+#: ../libempathy-gtk/empathy-individual-view.c:2232
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Haluatko varmasti poistaa ryhmän \"%s\"?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2257
+#: ../libempathy-gtk/empathy-individual-view.c:2235
msgid "Removing group"
msgstr "Poistetaan ryhmää"
#. Remove
#: ../libempathy-gtk/empathy-contact-list-view.c:2055
#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2311
-#: ../libempathy-gtk/empathy-individual-view.c:2396
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Poista"
#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2342
+#: ../libempathy-gtk/empathy-individual-view.c:2320
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2344
+#: ../libempathy-gtk/empathy-individual-view.c:2322
msgid "Removing contact"
msgstr "Poistetaan tuttava"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:364
#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "_Lisää tuttava…"
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:489
+#: ../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:530
+#: ../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:572
+#: ../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:630
+#: ../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:671
+#: ../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:713
+#: ../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-widget.c:1541
-#: ../libempathy-gtk/empathy-individual-menu.c:747
-#: ../libempathy-gtk/empathy-individual-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-menu.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1570
+#: ../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:774
+#: ../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:967
-#: ../src/empathy-chat-window.c:915
+#: ../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:1014
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
msgid "_Invite to Chat Room"
-msgstr ""
+msgstr "_Kutsu keskusteluhuoneeseen"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "Valitse tuttava"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-contact-widget.c:226
#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Full name:"
msgstr "Koko nimi:"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-contact-widget.c:227
#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "Phone number:"
msgstr "Puhelinnumero:"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:228
#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "E-mail address:"
msgstr "Sähköpostiosoite:"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:229
#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Website:"
msgstr "Kotisivu:"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:230
#: ../libempathy-gtk/empathy-individual-widget.c:152
msgid "Birthday:"
msgstr "Syntymäpäivä:"
-#: ../libempathy-gtk/empathy-contact-widget.c:579
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-individual-widget.c:454
msgid "Country ISO Code:"
msgstr "Maan ISO-tunnus:"
-#: ../libempathy-gtk/empathy-contact-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-individual-widget.c:456
msgid "Country:"
msgstr "Maa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:583
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "Osavaltio:"
-#: ../libempathy-gtk/empathy-contact-widget.c:585
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "Kaupunki:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "Alue:"
-#: ../libempathy-gtk/empathy-contact-widget.c:589
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "Postinumero:"
-#: ../libempathy-gtk/empathy-contact-widget.c:591
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "Katu:"
-#: ../libempathy-gtk/empathy-contact-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "Rakennus:"
-#: ../libempathy-gtk/empathy-contact-widget.c:595
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "Kerros:"
-#: ../libempathy-gtk/empathy-contact-widget.c:597
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:627
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "Huone:"
-#: ../libempathy-gtk/empathy-contact-widget.c:599
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "Teksti:"
-#: ../libempathy-gtk/empathy-contact-widget.c:601
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:631
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "Kuvaus:"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:633
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:605
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:635
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "Tarkkuustaso:"
-#: ../libempathy-gtk/empathy-contact-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:637
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "Virhe:"
-#: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:639
+#: ../libempathy-gtk/empathy-individual-widget.c:484
msgid "Vertical Error (meters):"
msgstr "Vertikaalinen virhe (metriä):"
-#: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:641
+#: ../libempathy-gtk/empathy-individual-widget.c:486
msgid "Horizontal Error (meters):"
msgstr "Horisontaalinen virhe (metriä):"
-#: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:643
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Speed:"
msgstr "Nopeus:"
-#: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:645
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "Suuntima:"
-#: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:647
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "Kiipeämisvauhti:"
-#: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "Last Updated on:"
msgstr "Viimeksi päivitetty:"
-#: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:651
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Longitude:"
msgstr "Pituuspiiri:"
-#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "Leveyspiiri:"
-#: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:655
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "Korkeus:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
-#: ../libempathy-gtk/empathy-individual-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:718
+#: ../libempathy-gtk/empathy-contact-widget.c:735
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Sijainti"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:707
-#: ../libempathy-gtk/empathy-individual-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:737
+#: ../libempathy-gtk/empathy-individual-widget.c:601
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:650
msgid "%B %e, %Y at %R UTC"
msgstr "%e. %Bta %Y klo %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:842
-#: ../libempathy-gtk/empathy-individual-widget.c:837
+#: ../libempathy-gtk/empathy-contact-widget.c:872
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "Tallenna vastaus"
-#: ../libempathy-gtk/empathy-contact-widget.c:898
-#: ../libempathy-gtk/empathy-individual-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:928
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "Avataria ei voitu tallentaa"
@@ -1739,7 +1757,7 @@ msgstr "<b>Sijainti</b> hetkellä (pvm)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1223
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "Nimimerkki:"
@@ -1759,7 +1777,7 @@ msgstr "Tuttavan tiedot"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1427
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
msgid "Identifier:"
msgstr "Tunniste:"
@@ -1785,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
@@ -1798,62 +1816,58 @@ msgid "Select"
msgstr "Valitse"
#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1273
+#: ../src/empathy-main-window.c:1250
msgid "Group"
msgstr "Ryhmä"
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr ""
-
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
-msgstr ""
+msgstr "Linkitetyt yhteystiedot"
-#: ../libempathy-gtk/empathy-individual-linker.c:353
+#: ../libempathy-gtk/empathy-individual-linker.c:354
msgid "Select contacts to link"
-msgstr ""
+msgstr "Valitse linkitettävät yhteystiedot"
-#: ../libempathy-gtk/empathy-individual-linker.c:426
+#: ../libempathy-gtk/empathy-individual-linker.c:428
msgid "New contact preview"
-msgstr ""
+msgstr "Uuden yhteystiedon esikatselu"
-#: ../libempathy-gtk/empathy-individual-linker.c:470
+#: ../libempathy-gtk/empathy-individual-linker.c:472
msgid "Contacts selected in the list on the left will be linked together."
msgstr ""
+"Vasemmanpuoleisesta luettelosta valitut yhteystiedot linkitetään yhteen."
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:112
+#: ../libempathy-gtk/empathy-individual-menu.c:132
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:825
+#: ../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:857
+#: ../libempathy-gtk/empathy-individual-menu.c:865
msgctxt "Link individual (contextual menu)"
-msgid "_Link…"
-msgstr ""
+msgid "_Link Contacts…"
+msgstr "_Linkitä yhteystiedot…"
-#: ../libempathy-gtk/empathy-individual-widget.c:1565
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Metayhteystieto, joka sisältää %u yhteystiedon"
+msgstr[1] "Metayhteystieto, joka sisältää %u yhteystietoa"
#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
msgid "<b>Location</b> at (date)"
-msgstr ""
+msgstr "<b>Sijainti</b> hetkellä (pvm)"
#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
msgid "New Network"
@@ -1867,14 +1881,6 @@ msgstr "Valitse IRC-verkko"
msgid "new server"
msgstr "uusi palvelin"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "Palvelin:"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "Portti:"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
@@ -1882,22 +1888,45 @@ msgstr "SSL"
#. Translators: this is the title of the linking dialogue (reached by
#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:109
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
msgid "Link Contacts"
-msgstr ""
+msgstr "Linkitä yhteystiedot"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "_Poista linkitys…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr "Jaa näytettävä metayhteystieto sen sisältämiin yhteystietoihin."
#. Add button
#. Translators: this is an action button in the linking dialogue. "Link" is
#. * used here as a verb meaning "to connect two contacts to form a
#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
msgid "_Link"
+msgstr "_Linkitä"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "Poistetaanko metayhteystiedon ”%s” linkitys?"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
msgstr ""
+"Haluatko varmasti poistaa tämän metayhteystiedon linkityksen? "
+"Metayhteystieto jaetaan sen sisältämiin yhteystietoihin."
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "Käyttäjätili"
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "_Poista linkitys"
#: ../libempathy-gtk/empathy-log-window.c:663
msgid "Date"
@@ -1909,10 +1938,12 @@ msgid "Conversations"
msgstr "Keskustelut"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
msgstr "Etsi seuraava"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
msgstr "Etsi edellinen"
@@ -1973,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"
@@ -1994,17 +2025,17 @@ 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:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "Etsi:"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
msgstr "Huomioi kirjainkoko"
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
msgstr "Lausetta ei löydy"
@@ -2085,8 +2116,8 @@ msgid "The identity provided by the chat server cannot be verified.\n"
msgstr "Keskustelupalvelimen antamaa tunnistetta ei voida varmistaa.\n"
#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certrificate is not signed by a Certification Authority"
-msgstr "Varmennetta ei ole virallisesti allekirjoitettu."
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "Varmennetta ei ole virallisesti allekirjoitettu"
#: ../libempathy-gtk/empathy-tls-dialog.c:160
msgid "The certificate has expired"
@@ -2098,11 +2129,10 @@ msgstr "Varmennetta ei ole vielä aktivoitu"
#: ../libempathy-gtk/empathy-tls-dialog.c:166
msgid "The certificate does not have the expected fingerprint"
-msgstr ""
+msgstr "Varmenteessa ei ole odotettua sormenjälkeä"
#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid ""
-"The hostname verified by the certificate doesn't match the server name"
+msgid "The hostname verified by the certificate doesn't match the server name"
msgstr "Varmenteessa ilmoitettu isäntänimi ei täsmää palvelimen nimen kanssa"
#: ../libempathy-gtk/empathy-tls-dialog.c:173
@@ -2110,8 +2140,7 @@ msgid "The certificate is self-signed"
msgstr "Varmenne on itsetehty"
#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority"
+msgid "The certificate has been revoked by the issuing Certification Authority"
msgstr "Varmenne on peruutettu varmenteen myöntäjän toimesta"
#: ../libempathy-gtk/empathy-tls-dialog.c:180
@@ -2146,24 +2175,24 @@ msgstr "Yhteys ei ole luotettava. Haluatko kuitenkin jatkaa?"
#: ../libempathy-gtk/empathy-tls-dialog.c:286
msgid "Remember this choice for future connections"
-msgstr ""
+msgstr "Muista tämä valinta tulevia yhteyksiä varten"
#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Certificate Details"
msgstr "Varmenteen tiedot"
-#: ../libempathy-gtk/empathy-ui-utils.c:1745
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "URI:a ei voi avata"
-#: ../libempathy-gtk/empathy-ui-utils.c:1840
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "Valitse tiedosto"
-#: ../libempathy-gtk/empathy-ui-utils.c:1909
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
msgid "Incoming file from %s"
-msgstr ""
+msgstr "Saapuva tiedosto käyttäjältä %s"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2354,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"
@@ -2402,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"
@@ -2460,7 +2491,7 @@ msgstr ""
"tämän apulaisen ja lisätä tilit myöhemmin Muokkaa-valikosta."
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1310
+#: ../src/empathy-account-assistant.c:1315
msgid "An error occurred"
msgstr "Tapahtui virhe"
@@ -2468,37 +2499,37 @@ msgstr "Tapahtui virhe"
#. Create account
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
-#.
+#.
#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
#, c-format
msgid "New %s account"
msgstr "Uusi %s-tili"
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:514
msgid "What kind of chat account do you have?"
msgstr "Minkä tyyppinen pikaviestintili sinulla on?"
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:520
msgid "Do you have any other chat accounts you want to set up?"
msgstr "Onko sinulla muita tilejä, jotka haluaisit määritellä?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:526
msgid "Enter your account details"
msgstr "Syötä tilisi tiedot"
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:531
msgid "What kind of chat account do you want to create?"
msgstr "Minkä tyyppisen pikaviestintilin haluat luoda?"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:537
msgid "Do you want to create other chat accounts?"
msgstr "Haluatko luoda muita pikaviestintilejä?"
-#: ../src/empathy-account-assistant.c:539
+#: ../src/empathy-account-assistant.c:544
msgid "Enter the details for the new account"
msgstr "Syötä uuden käyttäjätilin tiedot"
-#: ../src/empathy-account-assistant.c:654
+#: ../src/empathy-account-assistant.c:659
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2510,42 +2541,42 @@ msgstr ""
"Mikrofonin ja web-kameran avulla voit myös soittaa puheluita sekä "
"videopuheluita."
-#: ../src/empathy-account-assistant.c:671
+#: ../src/empathy-account-assistant.c:676
msgid "Do you have an account you've been using with another chat program?"
msgstr ""
"Onko sinulla käyttäjätili, jota olet käyttänyt toisessa pikaviestimessä?"
-#: ../src/empathy-account-assistant.c:694
+#: ../src/empathy-account-assistant.c:699
msgid "Yes, import my account details from "
msgstr "Kyllä, tuo tilitiedot ohjelmasta "
-#: ../src/empathy-account-assistant.c:715
+#: ../src/empathy-account-assistant.c:720
msgid "Yes, I'll enter my account details now"
msgstr "Kyllä, syötän tilitietoni nyt"
-#: ../src/empathy-account-assistant.c:737
+#: ../src/empathy-account-assistant.c:742
msgid "No, I want a new account"
msgstr "Ei, haluan uuden käyttäjätilin"
-#: ../src/empathy-account-assistant.c:747
+#: ../src/empathy-account-assistant.c:752
msgid "No, I just want to see people online nearby for now"
msgstr "Ei, haluan vain nähdä samassa lähiverkossa linjoilla olevat henkilöt"
-#: ../src/empathy-account-assistant.c:768
+#: ../src/empathy-account-assistant.c:773
msgid "Select the accounts you want to import:"
msgstr "Valitse tilit, jotka haluat tuoda:"
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:857
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "Kyllä"
-#: ../src/empathy-account-assistant.c:859
+#: ../src/empathy-account-assistant.c:864
msgid "No, that's all for now"
msgstr "Ei, tässä oli kaikki"
-#: ../src/empathy-account-assistant.c:1124
+#: ../src/empathy-account-assistant.c:1129
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -2555,19 +2586,19 @@ 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:1130
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
msgid "Edit->Accounts"
msgstr "Muokkaa->Tilit"
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1151
msgid "I don't want to enable this feature for now"
msgstr "En halua ottaa tätä toimintoa käyttöön nyt"
-#: ../src/empathy-account-assistant.c:1182
+#: ../src/empathy-account-assistant.c:1187
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2576,26 +2607,26 @@ 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:1188
+#: ../src/empathy-account-assistant.c:1193
msgid "telepathy-salut not installed"
msgstr "pakettia telepathy-salut ei ole asennettu"
-#: ../src/empathy-account-assistant.c:1234
+#: ../src/empathy-account-assistant.c:1239
msgid "Messaging and VoIP Accounts Assistant"
msgstr "Viestintä- ja VoIP-käyttäjätilien apulainen"
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1273
msgid "Welcome to Empathy"
-msgstr "Tervetuloa empathyyn"
+msgstr "Tervetuloa Empathyyn"
-#: ../src/empathy-account-assistant.c:1277
+#: ../src/empathy-account-assistant.c:1282
msgid "Import your existing accounts"
msgstr "Tuo olemassa olevat käyttäjätilit"
-#: ../src/empathy-account-assistant.c:1295
+#: ../src/empathy-account-assistant.c:1300
msgid "Please enter personal details"
msgstr "Syötä henkilökohtaiset tiedot"
@@ -2612,9 +2643,9 @@ msgstr "Tilille %s tehtyjä muutoksia ei ole tallennettu."
msgid "Your new account has not been saved yet."
msgstr "Uutta tunnustasi ei ole vielä tallennettu."
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
+#: ../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
@@ -2638,7 +2669,7 @@ msgstr "Tuntematon tila"
msgid "Offline — Account Disabled"
msgstr "Poissa linjoilta — Tili ei ole käytettävissä"
-#: ../src/empathy-accounts-dialog.c:805
+#: ../src/empathy-accounts-dialog.c:810
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2646,16 +2677,16 @@ msgstr ""
"Olet luomassa uutta käyttäjätiliä. Uuden tilin luonti hylkää\n"
"tehdyt muutokset. Haluatko varmasti jatkaa?"
-#: ../src/empathy-accounts-dialog.c:1152
+#: ../src/empathy-accounts-dialog.c:1157
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Haluatko poistaa tilin ”%s” tietokoneeltasi?"
-#: ../src/empathy-accounts-dialog.c:1156
+#: ../src/empathy-accounts-dialog.c:1161
msgid "This will not remove your account on the server."
msgstr "Tämä ei poista tiliäsi palvelimelta."
-#: ../src/empathy-accounts-dialog.c:1394
+#: ../src/empathy-accounts-dialog.c:1399
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2663,7 +2694,7 @@ msgstr ""
"Olet vaihtamassa käyttäjätiliä. Tilin vaihtamineen hylkää\n"
"tehdyt muutokset. Haluatko varmasti jatkaa?"
-#: ../src/empathy-accounts-dialog.c:1997
+#: ../src/empathy-accounts-dialog.c:2002
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2701,11 +2732,11 @@ msgstr "_Tuo…"
#: ../src/empathy-auth-client.c:217
msgid " - Empathy authentication client"
-msgstr ""
+msgstr " - Empathyn tunnistautumisasiakas"
#: ../src/empathy-auth-client.c:233
msgid "Empathy authentication client"
-msgstr ""
+msgstr "Empathyn tunnistautumisasiakas"
#: ../src/empathy-auto-salut-account-helper.c:83
msgid "People nearby"
@@ -2713,11 +2744,11 @@ msgstr "Lähellä olevat ihmiset"
#: ../src/empathy-av.c:133
msgid "- Empathy Audio/Video Client"
-msgstr ""
+msgstr "- Empathyn audio/video-asiakas"
#: ../src/empathy-av.c:149
msgid "Empathy Audio/Video Client"
-msgstr ""
+msgstr "Empathyn audio/video-asiakas"
#: ../src/empathy-call-window.c:479
msgid "Contrast"
@@ -2735,86 +2766,84 @@ msgstr "Gamma"
msgid "Volume"
msgstr "Äänenvoimakkuus"
-#: ../src/empathy-call-window.c:1163
+#: ../src/empathy-call-window.c:1175
msgid "_Sidebar"
msgstr "_Sivupalkki"
-#: ../src/empathy-call-window.c:1182
+#: ../src/empathy-call-window.c:1194
msgid "Audio input"
msgstr "Äänisyöte"
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1198
msgid "Video input"
msgstr "Videosyöte"
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1202
msgid "Dialpad"
msgstr "Valintalevy"
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1207
msgid "Details"
-msgstr ""
+msgstr "Tiedot"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1263
+#: ../src/empathy-call-window.c:1275
#, c-format
msgid "Call with %s"
msgstr "Soita tuttavalle %s"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1342
+#: ../src/empathy-call-window.c:1354
msgid "Call"
msgstr "Soita"
-#: ../src/empathy-call-window.c:1496
+#: ../src/empathy-call-window.c:1508
msgid "The IP address as seen by the machine"
-msgstr ""
+msgstr "Tämän koneen näkemä IP-osoite"
-#: ../src/empathy-call-window.c:1498
+#: ../src/empathy-call-window.c:1510
msgid "The IP address as seen by a server on the Internet"
-msgstr ""
+msgstr "Internetissä olevan palvelimen näkemä IP-osoite"
-#: ../src/empathy-call-window.c:1500
+#: ../src/empathy-call-window.c:1512
msgid "The IP address of the peer as seen by the other side"
msgstr ""
-#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1514
msgid "The IP address of a relay server"
msgstr ""
-#: ../src/empathy-call-window.c:1504
+#: ../src/empathy-call-window.c:1516
msgid "The IP address of the multicast group"
-msgstr ""
+msgstr "Ryhmälähetysryhmän IP-osoite"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2263
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Yhdistetty -- %d:%02d min"
-#: ../src/empathy-call-window.c:2298
+#: ../src/empathy-call-window.c:2324
msgid "Technical Details"
msgstr "Tekniset tiedot"
-#: ../src/empathy-call-window.c:2336
+#: ../src/empathy-call-window.c:2362
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
-msgstr ""
-"%s:n ohjelmisto ei ymmärrä mitään äänimuotoja mitä tietokoneesi tukee"
+msgstr "%s:n ohjelmisto ei ymmärrä mitään äänimuotoja mitä tietokoneesi tukee"
-#: ../src/empathy-call-window.c:2341
+#: ../src/empathy-call-window.c:2367
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
-msgstr ""
-"%s:n ohjelmisto ei ymmärrä mitään videomuotoja mitä tietokoneesi tukee"
+msgstr "%s:n ohjelmisto ei ymmärrä mitään videomuotoja mitä tietokoneesi tukee"
-#: ../src/empathy-call-window.c:2347
+#: ../src/empathy-call-window.c:2373
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -2823,48 +2852,48 @@ msgstr ""
"Yhteyttä ei voi muodostaa kohteeseen %s. Yksi teistä voi ehkä olla verkossa, "
"joka ei salli suoria yhteyksiä."
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2379
msgid "There was a failure on the network"
msgstr "Verkkoyhteydessä tapahtui virhe"
-#: ../src/empathy-call-window.c:2357
+#: ../src/empathy-call-window.c:2383
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
"Tähän puheluun vaadittavia äänitiedostomuotoja ei ole asennettu tälle "
"tietokoneelle"
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:2386
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
"Tähän puheluun vaadittavia videotiedostomuotoja ei ole asennettu tälle "
"tietokoneelle"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2396
#, c-format
msgid ""
-"Something unexpected happened in a Telepathy component. Please <a "
-"href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' "
-"window in the Help menu."
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
msgstr ""
"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:2378
+#: ../src/empathy-call-window.c:2404
msgid "There was a failure in the call engine"
msgstr "Virhe soitettaessa"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:2407
msgid "The end of the stream was reached"
-msgstr ""
+msgstr "Virran loppu saavutettiin"
-#: ../src/empathy-call-window.c:2421
+#: ../src/empathy-call-window.c:2447
msgid "Can't establish audio stream"
msgstr "Ääniyhteyden muodostus ei onnistunut"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2457
msgid "Can't establish video stream"
msgstr "Videoyhteyden muodostus ei onnistunut"
@@ -2886,7 +2915,7 @@ msgstr "Kamera päällä"
#: ../src/empathy-call-window.ui.h:5
msgid "Decoding Codec:"
-msgstr ""
+msgstr "Purkamiskoodekki:"
#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
@@ -2902,7 +2931,7 @@ msgstr "Ota kamera käyttöön, mutta älä lähetä videokuvaa"
#: ../src/empathy-call-window.ui.h:9
msgid "Encoding Codec:"
-msgstr ""
+msgstr "Pakkauskoodekki:"
#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
@@ -2964,35 +2993,35 @@ msgstr "_Soita"
msgid "_View"
msgstr "_Näytä"
-#: ../src/empathy-chat-window.c:464 ../src/empathy-chat-window.c:484
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d lukematon)"
msgstr[1] "%s (%d lukematonta)"
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (ja %u muu)"
msgstr[1] "%s (ja %u muuta)"
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:480
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d lukematon muilta)"
msgstr[1] "%s (%d lukematonta muilta)"
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:489
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d lukematon kaikilta)"
msgstr[1] "%s (%d lukematonta kaikilta)"
-#: ../src/empathy-chat-window.c:707
+#: ../src/empathy-chat-window.c:695
msgid "Typing a message."
msgstr "Kirjoittaa viestiä."
@@ -3014,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"
@@ -3026,7 +3055,7 @@ msgstr "Siirrä välilehti _oikealle"
#: ../src/empathy-chat-window.ui.h:8
msgid "Notify for All Messages"
-msgstr ""
+msgstr "Ilmoita kaikista viesteistä"
#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
@@ -3070,7 +3099,7 @@ msgstr "V_älilehdet"
#: ../src/empathy-chat-window.ui.h:19
msgid "_Undo Close Tab"
-msgstr ""
+msgstr "_Kumoa Sulje välilehti"
#: ../src/empathy-chatrooms-window.c:241
msgid "Name"
@@ -3088,86 +3117,86 @@ msgstr "Yhdistä automaattisesti"
msgid "Manage Favorite Rooms"
msgstr "Hallitse suosikkihuoneita"
-#: ../src/empathy-event-manager.c:469
+#: ../src/empathy-event-manager.c:468
msgid "Incoming video call"
msgstr "Saapuva videopuhelu"
-#: ../src/empathy-event-manager.c:469
+#: ../src/empathy-event-manager.c:468
msgid "Incoming call"
msgstr "Saapuva puhelu"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:472
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s soittaa videopuhelun sinulle. Haluatko vastata?"
-#: ../src/empathy-event-manager.c:474
+#: ../src/empathy-event-manager.c:473
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s soittaa sinulle. Haluatko vastata?"
-#: ../src/empathy-event-manager.c:477 ../src/empathy-event-manager.c:619
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming call from %s"
msgstr "Puhelu käyttäjältä %s"
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:501
msgid "_Reject"
msgstr "_Hylkää"
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:507
msgid "_Answer"
msgstr "_Vastaa"
-#: ../src/empathy-event-manager.c:619
+#: ../src/empathy-event-manager.c:618
#, c-format
msgid "Incoming video call from %s"
msgstr "Saapuva videopuhelu taholta %s"
-#: ../src/empathy-event-manager.c:696
+#: ../src/empathy-event-manager.c:695
msgid "Room invitation"
msgstr "Kutsu huoneeseen"
-#: ../src/empathy-event-manager.c:698
+#: ../src/empathy-event-manager.c:697
#, c-format
msgid "Invitation to join %s"
-msgstr ""
+msgstr "Kutsu liittyä kohteeseen %s"
-#: ../src/empathy-event-manager.c:705
+#: ../src/empathy-event-manager.c:704
#, c-format
msgid "%s is inviting you to join %s"
-msgstr "%s kutsui sinut liittymään %s"
+msgstr "%s kutsui sinut liittymään kohteeseen %s"
-#: ../src/empathy-event-manager.c:713
+#: ../src/empathy-event-manager.c:712
msgid "_Decline"
msgstr "_Kieltäydy"
-#: ../src/empathy-event-manager.c:718
+#: ../src/empathy-event-manager.c:717
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Liity"
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:743
#, c-format
msgid "%s invited you to join %s"
msgstr "%s kutsui sinut liittymään kohteeseen %s"
-#: ../src/empathy-event-manager.c:750
+#: ../src/empathy-event-manager.c:749
#, c-format
msgid "You have been invited to join %s"
-msgstr ""
+msgstr "Sinut on kutsuttu liittymään kohteeseen %s"
-#: ../src/empathy-event-manager.c:798
+#: ../src/empathy-event-manager.c:797
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Saapuva tiedostonsiirto tuttavalta %s"
-#: ../src/empathy-event-manager.c:1006
+#: ../src/empathy-event-manager.c:1005
#, c-format
msgid "Subscription requested by %s"
msgstr "Liittymispyyntö tuttavalta %s"
-#: ../src/empathy-event-manager.c:1010
+#: ../src/empathy-event-manager.c:1009
#, c-format
msgid ""
"\n"
@@ -3176,12 +3205,12 @@ msgstr ""
"\n"
"Viesti: %s"
-#: ../src/empathy-event-manager.c:1053
+#: ../src/empathy-event-manager.c:1052
#, c-format
msgid "%s is now offline."
msgstr "%s on nyt poissa linjoilta."
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1072
#, c-format
msgid "%s is now online."
msgstr "%s on nyt linjoilla."
@@ -3295,8 +3324,7 @@ msgstr "Tiedostosiirrot"
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
-"Poista valmiit, perutut ja epäonnistuneet tiedostonsiirrot luettelosta"
+msgstr "Poista valmiit, perutut ja epäonnistuneet tiedostonsiirrot luettelosta"
#: ../src/empathy-import-dialog.c:84
msgid ""
@@ -3304,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"
@@ -3323,31 +3351,31 @@ msgstr "Protokolla"
msgid "Source"
msgstr "Lähde"
-#: ../src/empathy-main-window.c:405
+#: ../src/empathy-main-window.c:383
msgid "No match found"
-msgstr ""
+msgstr "Vastinetta ei löytynyt"
-#: ../src/empathy-main-window.c:557
+#: ../src/empathy-main-window.c:538
msgid "Reconnect"
msgstr "Yhdistä uudelleen"
-#: ../src/empathy-main-window.c:563
+#: ../src/empathy-main-window.c:544
msgid "Edit Account"
msgstr "Muokkaa tiliä"
-#: ../src/empathy-main-window.c:569
+#: ../src/empathy-main-window.c:550
msgid "Close"
msgstr "Sulje"
-#: ../src/empathy-main-window.c:1255
+#: ../src/empathy-main-window.c:1232
msgid "Contact"
msgstr "Tuttava"
-#: ../src/empathy-main-window.c:1580
+#: ../src/empathy-main-window.c:1557
msgid "Contact List"
msgstr "Tuttavaluettelo"
-#: ../src/empathy-main-window.c:1689
+#: ../src/empathy-main-window.c:1666
msgid "Show and edit accounts"
msgstr "Näytä ja muokkaa tilejä"
@@ -3373,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"
@@ -3413,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"
@@ -3449,6 +3477,10 @@ msgid ""
"Password required: %s\n"
"Members: %s"
msgstr ""
+"%s\n"
+"Vaaditaan kutsu: %s\n"
+"Vaaditaan salasana: %s\n"
+"Jäseniä: %s"
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
@@ -3494,39 +3526,39 @@ msgstr "Huoneluettelo"
msgid "_Room:"
msgstr "_Keskusteluhuone:"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:138
msgid "Message received"
msgstr "Viesti vastaanotettu"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:139
msgid "Message sent"
msgstr "Viesti lähetetty"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:140
msgid "New conversation"
msgstr "Uusi keskustelu"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:141
msgid "Contact goes online"
msgstr "Tuttava saapui linjoille"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:142
msgid "Contact goes offline"
msgstr "Tuttava poistui linjoilta"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:143
msgid "Account connected"
msgstr "Tili yhdistetty"
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:144
msgid "Account disconnected"
msgstr "Tilin yhteys katkaistu"
-#: ../src/empathy-preferences.c:456
+#: ../src/empathy-preferences.c:445
msgid "Language"
msgstr "Kieli"
-#: ../src/empathy-preferences.c:893
+#: ../src/empathy-preferences.c:882
msgid "Preferences"
msgstr "Asetukset"
@@ -3552,7 +3584,7 @@ msgstr "Poista äänet käytöstä oltaessa _poissa tai kiireinen"
#: ../src/empathy-preferences.ui.h:6
msgid "Display incoming events in the notification area"
-msgstr ""
+msgstr "Näytä tulevat tapahtumat tilarivillä"
#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
@@ -3612,18 +3644,14 @@ msgid "Show contact _list in rooms"
msgstr "Näytä tuttava_luettelo huoneissa"
#: ../src/empathy-preferences.ui.h:21
-msgid "Show incoming messages in the messaging menu"
-msgstr "Näytä saapuvat viestit viestivalikossa"
-
-#: ../src/empathy-preferences.ui.h:22
msgid "Sounds"
msgstr "Äänet"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:22
msgid "Spell Checking"
msgstr "Kielentarkastus"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:23
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
@@ -3631,64 +3659,64 @@ msgstr ""
"Luettelo kielistä sisältää ainoastaan ne kielet, joille tietokoneessasi on "
"asennettu sanakirja."
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:24
msgid "Themes"
msgstr "Teemat"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:25
msgid "_Automatically connect on startup"
msgstr "_Yhdistä automaattisesti käynnistyksen yhteydessä"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:26
msgid "_Cellphone"
msgstr "_Matkapuhelin"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:27
msgid "_Enable bubble notifications"
msgstr "_Käytä ponnahdusikkunahuomautuksia"
-#: ../src/empathy-preferences.ui.h:29
+#: ../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:30
+#: ../src/empathy-preferences.ui.h:29
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:30
msgid "_Network (IP, Wi-Fi)"
msgstr "_Verkko (IP, Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:31
msgid "_Open new chats in separate windows"
msgstr "_Avaa uusi ikkuna uusille keskusteluille"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:32
msgid "_Publish location to my contacts"
msgstr "_Julkaise sijainti tuttavilleni"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:34
msgid "_Reduce location accuracy"
msgstr "_Heikennä sijaintitiedon tarkkuutta"
-#: ../src/empathy-status-icon.c:152
+#: ../src/empathy-status-icon.c:141
msgid "Respond"
msgstr "Vastaa"
-#: ../src/empathy-status-icon.c:158
+#: ../src/empathy-status-icon.c:147
msgid "Reject"
msgstr "Hylkää"
-#: ../src/empathy-status-icon.c:162
+#: ../src/empathy-status-icon.c:151
msgid "Answer"
msgstr "Vastaa"
-#: ../src/empathy-status-icon.c:169
+#: ../src/empathy-status-icon.c:158
msgid "Decline"
msgstr "Kieltäydy"
-#: ../src/empathy-status-icon.c:173
+#: ../src/empathy-status-icon.c:162
msgid "Accept"
msgstr "Hyväksy"
@@ -3769,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:"
@@ -3788,10 +3816,11 @@ msgstr ""
#: ../src/empathy-accounts.c:186
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ä"
#: ../src/empathy-accounts.c:190
-msgid ""
-"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "Valitse tili alussa (esim. gabble/jabber/foo_40example_2eorg0)"
#: ../src/empathy-accounts.c:192
@@ -3810,6 +3839,12 @@ msgstr "Empathy-tilit"
msgid "Empathy Debugger"
msgstr "Empathyn virheenjäljitin"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "Käytä _Yahoo! Japania"
+
+#~ msgid "Show incoming messages in the messaging menu"
+#~ msgstr "Näytä saapuvat viestit viestivalikossa"
+
#~ msgid "Pri_ority:"
#~ msgstr "_Tärkeys:"
@@ -3855,7 +3890,6 @@ msgstr "Empathyn virheenjäljitin"
#~ msgid "MC 4 accounts have been imported."
#~ msgstr "MC 4 -tilit on tuotu."
-#, c-format
#~ msgid "%s account"
#~ msgstr "%s-tili"
@@ -3874,7 +3908,6 @@ msgstr "Empathyn virheenjäljitin"
#~ msgid "_Character set:"
#~ msgstr "_Merkkikartta:"
-#, c-format
#~ msgid ""
#~ "<b>%s</b>\n"
#~ "Invite required: %s\n"
@@ -3888,3 +3921,56 @@ msgstr "Empathyn virheenjäljitin"
#~ msgid "_E-mail address:"
#~ msgstr "_Sähköpostiosoite:"
+
+#~ msgid "File transfer completed, but the file was corrupted"
+#~ msgstr "Tiedostonsiirto valmistui, mutta tiedosto oli viallinen"
+
+#~ msgid "Google Talk"
+#~ msgstr "Google Talk"
+
+#~ msgid "The account %s is edited via My Web Accounts."
+#~ msgstr "Tiliä %s muokataan Web-tilien kautta."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Käyttäjätiliä %s ei voi muokata Empathyssä."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Käynnistä Web-tilit"
+
+#~ msgid "Add '%s' to Dictionary"
+#~ msgstr "Lisää ”%s” sanakirjaan"
+
+#~ msgid "Add '%s' to %s Dictionary"
+#~ msgstr "Lisää ”%s” kielen %s sanakirjaan"
+
+#~ msgctxt "verb displayed on a button to select an IRC network"
+#~ msgid "Select"
+#~ msgstr "Valitse"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Tallenna _uusi tilaviesti"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Tallennetut tilaviestit"
+
+#~ msgid "Error contacting the Account Manager"
+#~ msgstr "Virhe yhdistettäessä tilienhallintaan"
+
+#~ msgid ""
+#~ "There was an error while trying to connect to the Telepathy Account "
+#~ "Manager. The error was:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Yhdistettäessä Empathyn tilienhallintaan tapahtui virhe:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "%s would like permission to see when you are available"
+#~ msgstr "%s haluaisi oikeuden nähdä, milloin olet tavoitettavissa"
+
+#~ msgid "Find in Contact _List"
+#~ msgstr "Etsi _tuttavaluettelosta"
+
+#~ msgid "- Empathy Chat Client"
+#~ msgstr "- Empathy-keskusteluasiakas"
diff --git a/po/gl.po b/po/gl.po
index 3abe18681..b999b54a4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-20 08:42+0200\n"
-"PO-Revision-Date: 2010-10-20 08:44+0200\n"
+"POT-Creation-Date: 2010-11-13 01:07+0100\n"
+"PO-Revision-Date: 2010-11-13 01:10+0100\n"
"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
"Language-Team: Galician <gnome-gl-list@gnome.org>\n"
"Language: gl\n"
@@ -568,19 +568,20 @@ msgstr "Xestionar as contas de mensaxaría e VoIP"
msgid "Messaging and VoIP Accounts"
msgstr "Contas de mensaxaría e VoIP"
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr "O hash do ficheiro recibido e o do enviado non coinciden"
+#: ../libempathy/empathy-ft-handler.c:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr ""
+"Completouse a transferencia de ficheiro pero o ficheiro está corrompido"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1121
msgid "File transfer not supported by remote contact"
msgstr "A transferencia de ficheiro non é permitida polo contacto remoto"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1177
msgid "The selected file is not a regular file"
msgstr "O ficheiro seleccionado non é un ficheiro regular"
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1186
msgid "The selected file is empty"
msgstr "O ficheiro seleccionado está baleiro"
@@ -922,7 +923,7 @@ msgstr "Esta conta xa existe no servidor"
msgid "Create a new account on the server"
msgstr "Crear unha nova conta no servidor"
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:2022
msgid "Ca_ncel"
msgstr "Ca_ncelar"
@@ -932,20 +933,20 @@ msgstr "Ca_ncelar"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2310
+#: ../libempathy-gtk/empathy-account-widget.c:2314
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s sobre %2$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2336
+#: ../libempathy-gtk/empathy-account-widget.c:2340
#, c-format
msgid "%s Account"
msgstr "Conta %s"
# rever
-#: ../libempathy-gtk/empathy-account-widget.c:2340
+#: ../libempathy-gtk/empathy-account-widget.c:2344
msgid "New account"
msgstr "Conta nova"
@@ -1370,51 +1371,51 @@ msgstr "Todos os ficheiros"
msgid "Click to enlarge"
msgstr "Prema para ampliar"
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:643
msgid "Failed to open private chat"
msgstr "Produciuse un fallo ao abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:683
msgid "Topic not supported on this conversation"
msgstr "Ese asunto non se admite nesta conversación"
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:689
msgid "You are not allowed to change the topic"
msgstr "Non se lle permite cambiar o asunto"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:823
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear, limpa todas as mensaxes da conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:826
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <topic>, estabelece o asunto da conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:829
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:832
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:837
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <contact id> [<message>], abre unha conversa privada"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:840
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <contact id> <message>, abre unha conversa privada"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:844
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:850
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1424,7 +1425,7 @@ msgstr ""
"unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
"unirse a unha nova sala de conversa\""
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:855
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1432,89 +1433,103 @@ msgstr ""
"/help [<command>], mostra todas as ordes admitidas. Se <command> está "
"definida, mostra o seu uso."
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:865
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:894
msgid "Unknown command"
msgstr "Orde descoñecida"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1015
msgid "Unknown command; see /help for the available commands"
msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1153
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "invalid contact"
msgstr "contacto incorrecto"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "permission denied"
msgstr "permiso denegado"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "too long message"
msgstr "a mensaxe é demasiado longa"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "not implemented"
msgstr "non implementado"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1169
msgid "unknown"
msgstr "descoñecido"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1173
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
+#: ../libempathy-gtk/empathy-chat.c:1234 ../src/empathy-chat-window.c:705
msgid "Topic:"
msgstr "Asunto:"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1246
#, c-format
msgid "Topic set to: %s"
msgstr "Cambiouse o asunto a: %s"
# rever
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1248
msgid "No topic defined"
msgstr "Non se definiu un asunto"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1747
msgid "(No Suggestions)"
msgstr "(Sen suxestións)"
-#: ../libempathy-gtk/empathy-chat.c:1875
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1815
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Engadir «%s» ao dicionario"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1852
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Engadir «%s» ao dicionario de %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1911
msgid "Insert Smiley"
msgstr "Inserir unha emoticona"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1893
+#: ../libempathy-gtk/empathy-chat.c:1929
#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "_Enviar"
-#: ../libempathy-gtk/empathy-chat.c:1927
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1964
msgid "_Spelling Suggestions"
msgstr "Suxestións de _ortografía"
-#: ../libempathy-gtk/empathy-chat.c:2004
+#: ../libempathy-gtk/empathy-chat.c:2052
msgid "Failed to retrieve recent logs"
msgstr "Produciuse un fallo ao obter os rexistros recentes"
# rever
-#: ../libempathy-gtk/empathy-chat.c:2110
+#: ../libempathy-gtk/empathy-chat.c:2158
#, c-format
msgid "%s has disconnected"
msgstr "%s desconectou"
@@ -1522,12 +1537,12 @@ msgstr "%s desconectou"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2117
+#: ../libempathy-gtk/empathy-chat.c:2165
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s foi expulsado por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2120
+#: ../libempathy-gtk/empathy-chat.c:2168
#, c-format
msgid "%s was kicked"
msgstr "%s foi expulsado"
@@ -1535,17 +1550,17 @@ msgstr "%s foi expulsado"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2128
+#: ../libempathy-gtk/empathy-chat.c:2176
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s foi vetado por %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2131
+#: ../libempathy-gtk/empathy-chat.c:2179
#, c-format
msgid "%s was banned"
msgstr "%s foi excluído"
-#: ../libempathy-gtk/empathy-chat.c:2135
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s has left the room"
msgstr "%s deixou a sala"
@@ -1555,60 +1570,60 @@ msgstr "%s deixou a sala"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2144
+#: ../libempathy-gtk/empathy-chat.c:2192
#, c-format
msgid " (%s)"
msgstr " (%s)"
# rever
-#: ../libempathy-gtk/empathy-chat.c:2169
+#: ../libempathy-gtk/empathy-chat.c:2217
#, c-format
msgid "%s has joined the room"
msgstr "%s uniuse á sala"
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2242
#, c-format
msgid "%s is now known as %s"
msgstr "%s agora é coñecido como %s"
-#: ../libempathy-gtk/empathy-chat.c:2333 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2381 ../src/empathy-call-window.c:1938
msgid "Disconnected"
msgstr "Desconectado"
-#: ../libempathy-gtk/empathy-chat.c:2956
+#: ../libempathy-gtk/empathy-chat.c:2994
msgid "Wrong password; please try again:"
msgstr "O contrasinal é incorrecto, ténteo de novo:"
-#: ../libempathy-gtk/empathy-chat.c:2957
+#: ../libempathy-gtk/empathy-chat.c:2995
msgid "Retry"
msgstr "Reintentar"
-#: ../libempathy-gtk/empathy-chat.c:2962
+#: ../libempathy-gtk/empathy-chat.c:3000
msgid "This room is protected by a password:"
msgstr "Esta sala está protexida por un contrasinal:"
-#: ../libempathy-gtk/empathy-chat.c:2963
+#: ../libempathy-gtk/empathy-chat.c:3001
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3103
+#: ../libempathy-gtk/empathy-chat.c:3141
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3156
+#: ../libempathy-gtk/empathy-chat.c:3194
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Conversa"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-theme-adium.c:797
msgid "_Copy Link Address"
msgstr "_Copiar o enderezo da ligazón"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-theme-adium.c:804
msgid "_Open Link"
msgstr "_Abrir a ligazón"
@@ -1618,16 +1633,16 @@ msgstr "_Abrir a ligazón"
msgid "%A %B %d %Y"
msgstr "%A, %d de %B de %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:264
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Editar a información de contacto"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:315
msgid "Personal Information"
msgstr "Información persoal"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-contact-dialogs.c:420
#: ../libempathy-gtk/empathy-individual-dialogs.c:110
msgid "New Contact"
msgstr "Contacto novo"
@@ -1653,35 +1668,35 @@ msgstr "Persoas favoritas"
# rever
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2206
+#: ../libempathy-gtk/empathy-individual-view.c:2262
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Está seguro de que quere eliminar o grupo '%s'?"
# rever
#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2209
+#: ../libempathy-gtk/empathy-individual-view.c:2265
msgid "Removing group"
msgstr "Eliminando o grupo"
#. Remove
#: ../libempathy-gtk/empathy-contact-list-view.c:2055
#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2263
-#: ../libempathy-gtk/empathy-individual-view.c:2377
+#: ../libempathy-gtk/empathy-individual-view.c:2319
+#: ../libempathy-gtk/empathy-individual-view.c:2433
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Eliminar"
# rever
#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2294
+#: ../libempathy-gtk/empathy-individual-view.c:2350
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Está seguro de quere eliminar o contacto '%s'?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2296
+#: ../libempathy-gtk/empathy-individual-view.c:2352
msgid "Removing contact"
msgstr "Eliminando o contacto"
@@ -1697,62 +1712,62 @@ msgstr "Eng_adir un contacto..."
msgid "_Chat"
msgstr "_Conversa"
-#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-contact-menu.c:261
#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Audiochamada"
-#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-contact-menu.c:292
#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videochamada"
# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-contact-menu.c:333
#: ../libempathy-gtk/empathy-individual-menu.c:644
#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "Conversas _previas"
-#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-contact-menu.c:355
#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "Enviar ficheiro"
-#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-contact-menu.c:378
#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "Compartir o meu escritorio"
# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:414
-#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
#: ../libempathy-gtk/empathy-individual-menu.c:761
#: ../libempathy-gtk/empathy-individual-widget.c:1291
msgid "Favorite"
msgstr "Favorito"
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:447
#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "Infor_mación"
-#: ../libempathy-gtk/empathy-contact-menu.c:489
+#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-contact-menu.c:547
#: ../libempathy-gtk/empathy-individual-menu.c:969
#: ../src/empathy-chat-window.c:917
msgid "Inviting you to this room"
msgstr "Invítao a vostede a esta sala"
# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-contact-menu.c:578
#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr "Conv_idar a sala de conversa"
@@ -1762,154 +1777,154 @@ msgstr "Conv_idar a sala de conversa"
msgid "Select a contact"
msgstr "Seleccione un contacto"
-#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-contact-widget.c:252
#: ../libempathy-gtk/empathy-individual-widget.c:147
msgid "Full name:"
msgstr "Nome completo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-contact-widget.c:253
#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Phone number:"
msgstr "Número de teléfono:"
-#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-contact-widget.c:254
#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "E-mail address:"
msgstr "Enderezo de correo electrónico:"
-#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-contact-widget.c:255
#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "Website:"
msgstr "Sitio web:"
-#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-contact-widget.c:256
#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Birthday:"
msgstr "Aniversario:"
-#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-contact-widget.c:670
#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Country ISO Code:"
msgstr "Código ISO de país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-contact-widget.c:672
#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-contact-widget.c:674
#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "State:"
msgstr "Rexión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-contact-widget.c:676
#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "City:"
msgstr "Cidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-contact-widget.c:678
#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Area:"
msgstr "Área:"
-#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-contact-widget.c:680
#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Postal Code:"
msgstr "Código postal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-contact-widget.c:682
#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Street:"
msgstr "Rúa:"
-#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-contact-widget.c:684
#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Building:"
msgstr "Edificio:"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:686
#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Floor:"
msgstr "_Andar:"
-#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-contact-widget.c:688
#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Room:"
msgstr "Sala:"
-#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-contact-widget.c:690
#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-contact-widget.c:692
#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Description:"
msgstr "Descrición:"
-#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-contact-widget.c:694
#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-contact-widget.c:696
#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Accuracy Level:"
msgstr "Nivel de precisión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-contact-widget.c:698
#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Error:"
msgstr "Erro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-contact-widget.c:700
#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Vertical Error (meters):"
msgstr "Erro vertical (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:640
+#: ../libempathy-gtk/empathy-contact-widget.c:702
#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Horizontal Error (meters):"
msgstr "Erro horizontal (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:642
+#: ../libempathy-gtk/empathy-contact-widget.c:704
#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Speed:"
msgstr "Velocidade:"
-#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-contact-widget.c:706
#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Bearing:"
msgstr "Orientación:"
-#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:708
#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Climb Speed:"
msgstr "Velocidade de incremento:"
-#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-contact-widget.c:710
#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Last Updated on:"
msgstr "Última actualización:"
-#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:712
#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Longitude:"
msgstr "Lonxitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-contact-widget.c:714
#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Latitude:"
msgstr "Latitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-contact-widget.c:716
#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Altitude:"
msgstr "Altitude:"
-#: ../libempathy-gtk/empathy-contact-widget.c:717
-#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
#: ../libempathy-gtk/empathy-individual-widget.c:581
#: ../libempathy-gtk/empathy-individual-widget.c:598
#: ../src/empathy-preferences.ui.h:12
@@ -1917,25 +1932,25 @@ msgid "Location"
msgstr "Localización"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:798
#: ../libempathy-gtk/empathy-individual-widget.c:600
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-contact-widget.c:850
#: ../libempathy-gtk/empathy-individual-widget.c:649
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e, %Y de %R UTC"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:933
#: ../libempathy-gtk/empathy-individual-widget.c:840
msgid "Save Avatar"
msgstr "Gardar o avatar"
# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-contact-widget.c:989
#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Unable to save avatar"
msgstr "Non foi posíbel gardar o avatar"
@@ -2313,12 +2328,12 @@ msgid "Edit Custom Messages"
msgstr "Editar mensaxes personalizadas"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "Engada a _nova configuración preestabelecida"
+msgid "Save _New Status Message"
+msgstr "Gardar a mensaxe de estado _novo"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "Configuración personalizada gardada"
+msgid "Saved Status Messages"
+msgstr "Mensaxes de estado gardados"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
@@ -2614,11 +2629,26 @@ msgstr "Non hai mensaxe de erro"
msgid "Instant Message (Empathy)"
msgstr "Mensaxe instantáneo (Empathy)"
-#: ../src/empathy.c:428
+# rever
+#: ../src/empathy.c:303
+msgid "Don't connect on startup"
+msgstr "Non conectarse ao inicio"
+
+# rever
+#: ../src/empathy.c:307
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
+
+# rever
+#: ../src/empathy.c:315
+msgid "- Empathy IM Client"
+msgstr "- Cliente de mensaxaría instantánea Empathy"
+
+#: ../src/empathy.c:494
msgid "Error contacting the Account Manager"
msgstr "Produciuse un erro ao contactar co Xestor de contas"
-#: ../src/empathy.c:430
+#: ../src/empathy.c:496
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2632,21 +2662,6 @@ msgstr ""
"%s"
# rever
-#: ../src/empathy.c:660
-msgid "Don't connect on startup"
-msgstr "Non conectarse ao inicio"
-
-# rever
-#: ../src/empathy.c:664
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
-
-# rever
-#: ../src/empathy.c:681
-msgid "- Empathy IM Client"
-msgstr "- Cliente de mensaxaría instantánea Empathy"
-
-# rever
#: ../src/empathy-about-dialog.c:81
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
@@ -2767,9 +2782,9 @@ msgid ""
"programs. With a microphone or a webcam you can also have audio or video "
"calls."
msgstr ""
-"Con Empathy pode falar en liña con xente próxima e con amigos e colegas que "
-"usen Google Talk, AIM, Windows Live e calquera outro programa de chat. Cun "
-"micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo."
+"Con Empathy pode falar en liña con persoas próximas e con amigos e colegas "
+"que usen Google Talk, AIM, Windows Live e calquera outro programa de chat. "
+"Cun micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo."
#: ../src/empathy-account-assistant.c:629
msgid "Do you have an account you've been using with another chat program?"
@@ -2837,7 +2852,7 @@ msgstr ""
"Vostede non poderá conversar con xente conectada á súa rede local xa que "
"telepathy-salut non está instalado.\n"
"Se quere activar esta característica, instale o paquete telepathy-salut e "
-"cree unha conta de Xente próxima desde o diálogo Contas"
+"cree unha conta de Persoas próximas desde o diálogo Contas"
#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
@@ -2982,11 +2997,11 @@ msgid "People nearby"
msgstr "Persoas próximas"
# rever
-#: ../src/empathy-av.c:136
+#: ../src/empathy-av.c:118
msgid "- Empathy Audio/Video Client"
msgstr "- Cliente de son/vídeo Empathy"
-#: ../src/empathy-av.c:152
+#: ../src/empathy-av.c:134
msgid "Empathy Audio/Video Client"
msgstr "Cliente de son/vídeo Empathy"
@@ -3374,97 +3389,96 @@ msgid "Manage Favorite Rooms"
msgstr "Xestionar as salas preferidas"
# rever
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:474
msgid "Incoming video call"
msgstr "Chamada de vídeo entrante"
# rever
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:474
msgid "Incoming call"
msgstr "Chamada entrante"
# rever
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:478
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s solicítalle unha videochamada. Desexa responderlle?"
# rever
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:479
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s estao chamando. Quérelle responder?"
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
#, c-format
msgid "Incoming call from %s"
msgstr "Chamada entrante de %s"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:507
msgid "_Reject"
msgstr "_Rexeitar"
# rever
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:513
msgid "_Answer"
msgstr "_Responder"
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:624
#, c-format
msgid "Incoming video call from %s"
msgstr "Videochamada entrante de %s"
# rever
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:701
msgid "Room invitation"
msgstr "Convite para unha sala"
# rever
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:703
#, c-format
msgid "Invitation to join %s"
msgstr "Invitación a unirse a %s"
# rever
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:710
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s estao convidando a unirse a %s"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:718
msgid "_Decline"
msgstr "_Declinar"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:723
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Unirse"
# rever
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:749
#, c-format
msgid "%s invited you to join %s"
msgstr "%s convidouno a unirse a %s"
# rever
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:755
#, c-format
msgid "You have been invited to join %s"
msgstr "Vostede foi convidado a unirse a %s"
# rever
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:803
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Transferencia de ficheiro entrante de %s"
-# rever
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1013
#, c-format
-msgid "Subscription requested by %s"
-msgstr "Subscrición solicitada por %s"
+msgid "%s would like permission to see when you are available"
+msgstr "%s solicita permiso para ver cando está dispoñíbel"
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1017
#, c-format
msgid ""
"\n"
@@ -3473,12 +3487,12 @@ msgstr ""
"\n"
"Mensaxe: %s"
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1060
#, c-format
msgid "%s is now offline."
msgstr "%s está agora desconectado."
-#: ../src/empathy-event-manager.c:1072
+#: ../src/empathy-event-manager.c:1080
#, c-format
msgid "%s is now online."
msgstr "%s está agora conectado."
@@ -4018,24 +4032,24 @@ msgstr "_Publicar a miña localización aos meus contactos"
msgid "_Reduce location accuracy"
msgstr "_Reducir a precisión de localización"
-#: ../src/empathy-status-icon.c:141
+#: ../src/empathy-status-icon.c:184
msgid "Respond"
msgstr "Responder"
-#: ../src/empathy-status-icon.c:147
+#: ../src/empathy-status-icon.c:190
msgid "Reject"
msgstr "Rexeitar"
# rever
-#: ../src/empathy-status-icon.c:151
+#: ../src/empathy-status-icon.c:194
msgid "Answer"
msgstr "Responder"
-#: ../src/empathy-status-icon.c:158
+#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
msgid "Decline"
msgstr "Declinar"
-#: ../src/empathy-status-icon.c:162
+#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
msgid "Accept"
msgstr "Aceptar"
@@ -4128,39 +4142,59 @@ msgstr "Seleccione o contacto que quere invitar á conversa:"
msgid "Invite"
msgstr "Invitar"
-#: ../src/empathy-accounts.c:163
+#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "Non mostra ningún diálogo, fai algún traballo (p.ex. importar) e sae"
-#: ../src/empathy-accounts.c:167
-msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "Non mostrar ningún diálogo se hai algunha conta non-Salut"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Non mostrar ningún diálogo a non ser que só existan contas «Persoas próximas»"
-#: ../src/empathy-accounts.c:171
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
"Conta fornecida seleccionada inicialmente (p.ex. gabble/jabber/"
"foo_40exemplo_2eorg0)"
-#: ../src/empathy-accounts.c:173
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<account-id>"
# rever
-#: ../src/empathy-accounts.c:181
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Contas de Empathy"
# rever
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Contas de Empathy"
-#: ../src/empathy-debugger.c:44
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Depurador de Empathy"
# rever
+#: ../src/empathy-chat.c:91
+msgid "- Empathy Chat Client"
+msgstr "- Cliente de conversa Empathy"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "O hash do ficheiro recibido e o do enviado non coinciden"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "Engada a _nova configuración preestabelecida"
+
+#~ msgid "Saved Presets"
+#~ msgstr "Configuración personalizada gardada"
+
+# rever
+#~ msgid "Subscription requested by %s"
+#~ msgstr "Subscrición solicitada por %s"
+
+# rever
#~ msgid "Empathy has asked about importing accounts"
#~ msgstr "O Empathy preguntou sobre a importación de contas"
diff --git a/po/sl.po b/po/sl.po
index 17c215665..c669a3ec7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-11-04 08:17+0000\n"
-"PO-Revision-Date: 2010-11-05 12:47+0100\n"
+"POT-Creation-Date: 2010-11-13 22:47+0000\n"
+"PO-Revision-Date: 2010-11-14 12:11+0100\n"
"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
"Language-Team: Slovenščina <gnome-si@googlegroups.com>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0)\n"
"X-Poedit-Language: Slovenian\n"
"X-Poedit-Country: SLOVENIA\n"
@@ -1182,151 +1182,151 @@ msgstr "Vse datoteke"
msgid "Click to enlarge"
msgstr "Kliknite za povečavo"
-#: ../libempathy-gtk/empathy-chat.c:644
+#: ../libempathy-gtk/empathy-chat.c:643
msgid "Failed to open private chat"
msgstr "Napaka med odpiranjem zasebnega klepeta"
-#: ../libempathy-gtk/empathy-chat.c:684
+#: ../libempathy-gtk/empathy-chat.c:683
msgid "Topic not supported on this conversation"
msgstr "Tema ni podprta pri tem pogovoru"
-#: ../libempathy-gtk/empathy-chat.c:690
+#: ../libempathy-gtk/empathy-chat.c:689
msgid "You are not allowed to change the topic"
msgstr "Za spreminjanje teme nimate ustreznih dovoljenj."
-#: ../libempathy-gtk/empathy-chat.c:824
+#: ../libempathy-gtk/empathy-chat.c:823
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: počisti vsa sporočila trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:827
+#: ../libempathy-gtk/empathy-chat.c:826
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tema>: določi temo trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:830
+#: ../libempathy-gtk/empathy-chat.c:829
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:832
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:838
+#: ../libempathy-gtk/empathy-chat.c:837
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID stika> [<sporočilo>]: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:841
+#: ../libempathy-gtk/empathy-chat.c:840
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID stika> <sporočilo>: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:845
+#: ../libempathy-gtk/empathy-chat.c:844
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <vzdevek>: spremeni vaš vzdevek na trenutnem strežniku"
-#: ../libempathy-gtk/empathy-chat.c:848
+#: ../libempathy-gtk/empathy-chat.c:847
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <sporočilo>: pošlje sporočilo DEJANJA v trenutni pogovor"
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:850
msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
msgstr "/say <sporočilo>: pošlje <sporočilo> v trenutni pogovor. Možnost se uporablja za pošiljanje sporočila, ki se začne z '/'. Primer: \"/say /join se uporablja za pridruževanje novi klepetalnici\""
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:855
msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
msgstr "/help [<ukaz>], pokaže vse podprte ukaze in njihov način uporabe."
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:865
#, c-format
msgid "Usage: %s"
msgstr "Uporaba: %s"
-#: ../libempathy-gtk/empathy-chat.c:895
+#: ../libempathy-gtk/empathy-chat.c:894
msgid "Unknown command"
msgstr "Neznan ukaz"
-#: ../libempathy-gtk/empathy-chat.c:1016
+#: ../libempathy-gtk/empathy-chat.c:1015
msgid "Unknown command; see /help for the available commands"
msgstr "Neznan ukaz, za več si vpišite /help"
-#: ../libempathy-gtk/empathy-chat.c:1154
+#: ../libempathy-gtk/empathy-chat.c:1153
msgid "offline"
msgstr "brez povezave"
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1156
msgid "invalid contact"
msgstr "neveljaven stik"
-#: ../libempathy-gtk/empathy-chat.c:1160
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "permission denied"
msgstr "ni dovoljenja"
-#: ../libempathy-gtk/empathy-chat.c:1163
+#: ../libempathy-gtk/empathy-chat.c:1162
msgid "too long message"
msgstr "predolgo sporočilo"
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1165
msgid "not implemented"
msgstr "ni del programa"
-#: ../libempathy-gtk/empathy-chat.c:1170
+#: ../libempathy-gtk/empathy-chat.c:1169
msgid "unknown"
msgstr "neznano"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1173
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Napaka med pošiljanjem sporočila '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1284
+#: ../libempathy-gtk/empathy-chat.c:1234
#: ../src/empathy-chat-window.c:705
msgid "Topic:"
msgstr "Tema:"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1246
#, c-format
msgid "Topic set to: %s"
msgstr "Tema je določena na: %s"
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1248
msgid "No topic defined"
msgstr "Ni določene teme"
-#: ../libempathy-gtk/empathy-chat.c:1831
+#: ../libempathy-gtk/empathy-chat.c:1747
msgid "(No Suggestions)"
msgstr "(Ni predlogov)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1899
+#: ../libempathy-gtk/empathy-chat.c:1815
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Dodaj '%s' v slovar"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1936
+#: ../libempathy-gtk/empathy-chat.c:1852
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Dodaj '%s' v slovar %s"
-#: ../libempathy-gtk/empathy-chat.c:1995
+#: ../libempathy-gtk/empathy-chat.c:1911
msgid "Insert Smiley"
msgstr "Vstavi smeška"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2013
+#: ../libempathy-gtk/empathy-chat.c:1929
#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "_Pošlji"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2048
+#: ../libempathy-gtk/empathy-chat.c:1964
msgid "_Spelling Suggestions"
msgstr "Predlogi čr_kovalnika"
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2052
msgid "Failed to retrieve recent logs"
msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2158
#, c-format
msgid "%s has disconnected"
msgstr "%s je prekinil povezavo"
@@ -1334,12 +1334,12 @@ msgstr "%s je prekinil povezavo"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2165
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s je izgnal %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2252
+#: ../libempathy-gtk/empathy-chat.c:2168
#, c-format
msgid "%s was kicked"
msgstr "%s je bil izgnan"
@@ -1347,17 +1347,17 @@ msgstr "%s je bil izgnan"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2260
+#: ../libempathy-gtk/empathy-chat.c:2176
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s je izobčil %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2179
#, c-format
msgid "%s was banned"
msgstr "%s je izobčen"
-#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-chat.c:2183
#, c-format
msgid "%s has left the room"
msgstr "%s je zapustil klepetalnico"
@@ -1367,60 +1367,60 @@ msgstr "%s je zapustil klepetalnico"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2276
+#: ../libempathy-gtk/empathy-chat.c:2192
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2217
#, c-format
msgid "%s has joined the room"
msgstr "%s je vstopil v klepetalnico"
-#: ../libempathy-gtk/empathy-chat.c:2326
+#: ../libempathy-gtk/empathy-chat.c:2242
#, c-format
msgid "%s is now known as %s"
msgstr "%s je preimenovan v %s"
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2381
#: ../src/empathy-call-window.c:1938
msgid "Disconnected"
msgstr "Prekinjena povezava"
-#: ../libempathy-gtk/empathy-chat.c:3088
+#: ../libempathy-gtk/empathy-chat.c:2994
msgid "Wrong password; please try again:"
msgstr "Napačno geslo; poskusite znova:"
-#: ../libempathy-gtk/empathy-chat.c:3089
+#: ../libempathy-gtk/empathy-chat.c:2995
msgid "Retry"
msgstr "Poskusi znova"
-#: ../libempathy-gtk/empathy-chat.c:3094
+#: ../libempathy-gtk/empathy-chat.c:3000
msgid "This room is protected by a password:"
msgstr "Klepetalnica je zaščitena z geslom:"
-#: ../libempathy-gtk/empathy-chat.c:3095
+#: ../libempathy-gtk/empathy-chat.c:3001
msgid "Join"
msgstr "Pridruži se"
-#: ../libempathy-gtk/empathy-chat.c:3235
+#: ../libempathy-gtk/empathy-chat.c:3141
msgid "Connected"
msgstr "Povezano"
-#: ../libempathy-gtk/empathy-chat.c:3288
+#: ../libempathy-gtk/empathy-chat.c:3194
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "Pogovor"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-theme-adium.c:797
msgid "_Copy Link Address"
msgstr "Kopiraj _naslov povezave"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-theme-adium.c:804
msgid "_Open Link"
msgstr "_Odpri povezavo"
@@ -1430,16 +1430,16 @@ msgstr "_Odpri povezavo"
msgid "%A %B %d %Y"
msgstr "%A %d. %B. %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:264
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Uredi podrobnosti stika"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:315
msgid "Personal Information"
msgstr "Osebni podatki"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-contact-dialogs.c:420
#: ../libempathy-gtk/empathy-individual-dialogs.c:110
msgid "New Contact"
msgstr "Nov stik"
@@ -2080,12 +2080,12 @@ msgid "Edit Custom Messages"
msgstr "Urejanje sporočila po meri"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "Dodaj novo _predlogo"
+msgid "Save _New Status Message"
+msgstr "Shrani _nova sporočila stanja"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "Shranjene predloge"
+msgid "Saved Status Messages"
+msgstr "Shranjena sporočila stanja"
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
@@ -3022,87 +3022,87 @@ msgstr "Samodejno povezovanje"
msgid "Manage Favorite Rooms"
msgstr "Upravljanje priljubljenih klepetalnic"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:474
msgid "Incoming video call"
msgstr "Dohodni video klic"
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:474
msgid "Incoming call"
msgstr "Dohodni klic"
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:478
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s vas kliče preko video kanala. Ali se želite javiti?"
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:479
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s vas kliče. Ali se želite javiti?"
-#: ../src/empathy-event-manager.c:476
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:482
+#: ../src/empathy-event-manager.c:624
#, c-format
msgid "Incoming call from %s"
msgstr "Dohodni klic od %s"
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:507
msgid "_Reject"
msgstr "_Zavrni"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:513
msgid "_Answer"
msgstr "_Odgovori"
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:624
#, c-format
msgid "Incoming video call from %s"
msgstr "Dohodni video klic od %s"
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:701
msgid "Room invitation"
msgstr "Vabilo v klepetalnico"
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:703
#, c-format
msgid "Invitation to join %s"
msgstr "Povabilo v %s"
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:710
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s vas vabi, da se pridružite v %s"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:718
msgid "_Decline"
msgstr "_Odkloni"
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:723
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Pridruži se"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:749
#, c-format
msgid "%s invited you to join %s"
msgstr "%s vas je povabil v %s"
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:755
#, c-format
msgid "You have been invited to join %s"
msgstr "Povabljeni ste v %s"
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:803
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Prihajajoč prenos datoteke od %s"
-#: ../src/empathy-event-manager.c:1006
+#: ../src/empathy-event-manager.c:1013
#, c-format
msgid "%s would like permission to see when you are available"
msgstr "%s želi dovoljenje za pregled dosegljivosti"
-#: ../src/empathy-event-manager.c:1010
+#: ../src/empathy-event-manager.c:1017
#, c-format
msgid ""
"\n"
@@ -3111,12 +3111,12 @@ msgstr ""
"\n"
"Sporočilo: %s"
-#: ../src/empathy-event-manager.c:1053
+#: ../src/empathy-event-manager.c:1060
#, c-format
msgid "%s is now offline."
msgstr "%s ni povezan."
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1080
#, c-format
msgid "%s is now online."
msgstr "%s je povezan."
@@ -3595,23 +3595,25 @@ msgstr "O_bjavi mesto mojim stikom"
msgid "_Reduce location accuracy"
msgstr "_Zmanjšaj natančnost mesta"
-#: ../src/empathy-status-icon.c:141
+#: ../src/empathy-status-icon.c:184
msgid "Respond"
msgstr "Odgovori"
-#: ../src/empathy-status-icon.c:147
+#: ../src/empathy-status-icon.c:190
msgid "Reject"
msgstr "Zavrni"
-#: ../src/empathy-status-icon.c:151
+#: ../src/empathy-status-icon.c:194
msgid "Answer"
msgstr "Odgovori"
-#: ../src/empathy-status-icon.c:158
+#: ../src/empathy-status-icon.c:201
+#: ../src/empathy-status-icon.c:211
msgid "Decline"
msgstr "Odkloni"
-#: ../src/empathy-status-icon.c:162
+#: ../src/empathy-status-icon.c:205
+#: ../src/empathy-status-icon.c:216
msgid "Accept"
msgstr "Sprejmi"
@@ -3725,99 +3727,84 @@ msgstr "- Empathy računi"
msgid "Empathy Accounts"
msgstr "Empathy računi"
-#: ../src/empathy-debugger.c:65
+#: ../src/empathy-debugger.c:66
msgid "Empathy Debugger"
msgstr "Empathy razhroščevalnik"
+#: ../src/empathy-chat.c:91
+msgid "- Empathy Chat Client"
+msgstr "- sporočilnik Empathy"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "Dodaj novo _predlogo"
+#~ msgid "Saved Presets"
+#~ msgstr "Shranjene predloge"
#~ msgid "The hash of the received file and the sent one do not match"
#~ msgstr "Razpršili prejete in poslane datoteke se ne skladata"
-
#~ msgid "Subscription requested by %s"
#~ msgstr "%s zahteva naročilo"
-
#~ msgid "Empathy has asked about importing accounts"
#~ msgstr "Program Empathy zahteva podrobnosti o uvozu računov"
-
#~ msgid ""
#~ "Whether Empathy has asked about importing accounts from other programs."
#~ msgstr ""
#~ "Ali naj program Empathy zahteva podrobnosti o uvozu računov iz drugih "
#~ "programov."
-
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "Uporabi _Yahoo! Japan"
#~ msgctxt "Link individual (contextual menu)"
-
#~ msgid "_Link…"
#~ msgstr "_Poveži ..."
-
#~ msgid "_Character set:"
#~ msgstr "_Znakovni nabor:"
-
#~ msgid "_E-mail address:"
#~ msgstr "_Elektronski naslov:"
-
#~ msgid "_Nickname:"
#~ msgstr "_Vzdevek:"
-
#~ msgid "<b>Location</b>, "
#~ msgstr "<b>Mesto</b>, "
-
#~ msgid "Your contact list is empty"
#~ msgstr "Seznam stikov je prazen"
-
#~ msgid "Send and receive messages"
#~ msgstr "Pošiljanje in prejemanje hipnih sporočil"
-
#~ msgid "Failed to reconnect this chat"
#~ msgstr "Ponovna povezava s tem klepetom ni bila uspešna"
-
#~ msgid "Failed to join chat room"
#~ msgstr "Napaka med pridruževanjem klepetalnici"
-
#~ msgid "Select a destination"
#~ msgstr "Izbor cilja"
-
#~ msgid "Important Room"
#~ msgstr "Pomembna klepetalnica"
-
#~ msgid "MC 4 accounts have been imported"
#~ msgstr "MC 4 računi so boli uvoženi"
-
#~ msgid "MC 4 accounts have been imported."
#~ msgstr "MC 4 računi so bili uvoženi."
-
#~ msgid "Hostname of the proxy for outbound requests."
#~ msgstr "Ime gostitelja posredniškega strežnika odhodnih zahtev."
-
#~ msgid ""
#~ "Look up the DNS SRV record at the service's domain for the host name of a "
#~ "STUN server."
#~ msgstr ""
#~ "Preglej vpis DNS SRV domene storitve za ime gostitelja strežnika STUN."
-
#~ msgid "Port of the proxy for outbound requests."
#~ msgstr "Ime gostitelja posredniškega strežnika odhodnih zahtev."
-
#~ msgid ""
#~ "The username for SIP authentication, if different from the SIP URI\n"
#~ "username."
#~ msgstr ""
#~ "Uporabniško ime za SIP overitev v kolikor, da je drugačno od SIP URI\n"
#~ "uporabniškega imena."
-
#~ msgid ""
#~ "Update the registration binding if the external address for the client is "
#~ "discovered to be different from the local binding."
#~ msgstr ""
#~ "Posodobi povezavo vpisnika v primeru, da je zunanji naslov odjemalca "
#~ "drugačen od krajevne povezave."
-
#~ msgid ""
#~ "Use the loose routing behavior and the Route header as recommended in RFC "
#~ "3261."
#~ msgstr ""
#~ "Uporabi ohlapno usmerjanje in glavo usmerjevalnika kot priporoča RFC 3261."
-
#~ msgid "%s account"
#~ msgstr "%s račun"
+
diff --git a/po/ug.po b/po/ug.po
new file mode 100644
index 000000000..403d513c6
--- /dev/null
+++ b/po/ug.po
@@ -0,0 +1,3740 @@
+# Uyghur translation for empathy.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Gheyret Kenji<gheyret@yahoo.com>,2010.
+# Sahran <sahran.ug@gmail.com>, 2010.
+# Zeper <zeper@msn.com>, 2010.
+#
+msgid ""
+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-11-09 08:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Gheyret Kenji<gheyret@yahoo.com>\n"
+"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../data/empathy.desktop.in.in.h:1
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+
+#: ../data/empathy.desktop.in.in.h:2
+msgid "Empathy"
+msgstr "تۇتاش كۆڭۈللەر"
+
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
+msgstr ""
+
+#: ../data/empathy.desktop.in.in.h:4
+msgid "IM Client"
+msgstr "ئالاقە كېلىشىمى"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
+msgid "Always open a separate chat window for new chats."
+msgstr "يېڭى سۆھبەت ئۈچۈن داۋاملىق يېڭى كۆزنەك ئىچىش"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Chat window theme"
+msgstr "سۆھبەت كۆزنەك ئۆرنىكى"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Compact contact list"
+msgstr "قىسىلغان دوستلار تىزىملىكى"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid "Connection managers should be used"
+msgstr "ئۇلىنىش باشقۇرغۇچىسى ئىشلىتىلىشى كېرەك"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Contact list sort criterion"
+msgstr "تونۇشلار تىزىملىكىنى تەرتىپلەش ئۆلچىمى"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Default directory to select an avatar image from"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid "Disable popup notifications when away"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+msgid "Disable sounds when away"
+msgstr "ئايرىلغاندا ئاۋازنى ئېتىش"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Empathy can publish the user's location"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+msgid "Empathy can use the GPS to guess the location"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+msgid "Empathy can use the network to guess the location"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+msgid "Empathy default download folder"
+msgstr "تۇتاش كۆڭۈللەرنىڭ ئەسلىدىكى چۈشۈرۈش مۇندەرىجىسى"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Empathy has migrated butterfly logs"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Empathy should auto-away when idle"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-connect on startup"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+msgid "Empathy should reduce the location's accuracy"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+msgid "Enable popup notifications for new messages"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+msgid "Enable spell checker"
+msgstr "ئىملا تەكشۈرگۈچنى قوزغات"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+msgid "Hide main window"
+msgstr "ئاساسى كۆزنەكنى يوشۇر"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+msgid "Hide the main window."
+msgstr "بۇ ئاساسى كۆزنەكنى يوشۇر"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+msgid "Nick completed character"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+msgid "Open new chats in separate windows"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+msgid "Path of the Adium theme to use"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Play a sound for incoming messages"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Play a sound for new conversations"
+msgstr "يېڭى سۆھبەت ئۈچۈن ئاۋاز قوي"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Play a sound for outgoing messages"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Play a sound when a contact logs in"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+msgid "Play a sound when a contact logs out"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+msgid "Play a sound when we log in"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Play a sound when we log out"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+msgid "Pop up notifications if the chat isn't focused"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Pop up notifications when a contact logs in"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+msgid "Pop up notifications when a contact logs out"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Show avatars"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+msgid "Show contact list in rooms"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+msgid "Show hint about closing the main window"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+msgid "Show offline contacts"
+msgstr "توردا يوق ئالاقەداشلارنىمۇ كۆرسەت"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+msgid "Show protocols"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+msgid "Spell checking languages"
+msgstr "ئىملا تەكشۈرۈش تىلى"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+msgid "The default folder to save file transfers in."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "The last directory that an avatar image was chosen from."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "The position for the chat window side pane"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+msgid "Use graphical smileys"
+msgstr "رەسىملىك چىراي ئىپادىلىرىنى ئىشلەت"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+msgid "Use notification sounds"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+msgid "Use theme for chat rooms"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+msgid "Whether Empathy can use the network to guess the location."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Whether to play a sound to notify of events."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Whether to play a sound to notify of new conversations."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Whether to play a sound when logging into a network."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+msgid "Whether to play a sound when logging out of a network."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to play sound notifications when away or busy."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid "Whether to show the contact list in chat rooms."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Whether to show the contact list in compact mode."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to use the theme for chat rooms."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
+msgstr ""
+
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr ""
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2105
+msgid "Messaging and VoIP Accounts"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1121
+msgid "File transfer not supported by remote contact"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1177
+msgid "The selected file is not a regular file"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1186
+msgid "The selected file is empty"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:283
+msgid "Socket type not supported"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:402
+msgid "No reason was specified"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:405
+msgid "The change in state was requested"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:408
+msgid "You canceled the file transfer"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:411
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:414
+msgid "Error while trying to transfer the file"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:417
+msgid "The other participant is unable to transfer the file"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
+msgid "Unknown reason"
+msgstr "نامەلۇم سەۋەب"
+
+#: ../libempathy/empathy-utils.c:246
+msgid "Available"
+msgstr "ئىشلىتىلىشچان"
+
+#: ../libempathy/empathy-utils.c:248
+msgid "Busy"
+msgstr "ئالدىراش"
+
+#: ../libempathy/empathy-utils.c:251
+msgid "Away"
+msgstr "يوق"
+
+#: ../libempathy/empathy-utils.c:253
+msgid "Invisible"
+msgstr "يوشۇرۇن"
+
+#: ../libempathy/empathy-utils.c:255
+msgid "Offline"
+msgstr "تورسىز"
+
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "نامەلۇم"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "No reason specified"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
+msgid "Status is set to offline"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+msgid "Network error"
+msgstr "تور خاتالىقى"
+
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
+msgid "Authentication failed"
+msgstr "دەلىللەش مەغلۇپ بولدى"
+
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
+msgid "Encryption error"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Name in use"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+msgid "Certificate not provided"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+msgid "Certificate untrusted"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+msgid "Certificate expired"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+msgid "Certificate not activated"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+msgid "Certificate hostname mismatch"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
+msgid "Certificate fingerprint mismatch"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
+msgid "Certificate self-signed"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:322
+msgid "Certificate error"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:377
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:543
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
+msgid "People Nearby"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:548
+msgid "Yahoo! Japan"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:578
+msgid "Facebook Chat"
+msgstr ""
+
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d سېكۇنت بۇرۇن"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d مىنۇت ئىلگىرى"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d سائەت ئىلگىرى"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d كۈن ئىلگىرى"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d ھەپتە ئىلگىرى"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d ئاي بۇرۇن"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "كەلگۈسىدە"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:463
+msgid "All"
+msgstr "ھەممىسى"
+
+#: ../libempathy-gtk/empathy-account-widget.c:617
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:321
+msgid "Account"
+msgstr "ھېسابات"
+
+#: ../libempathy-gtk/empathy-account-widget.c:618
+msgid "Password"
+msgstr "ئىم"
+
+#: ../libempathy-gtk/empathy-account-widget.c:619
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "مۇلازىمېتىر"
+
+#: ../libempathy-gtk/empathy-account-widget.c:620
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "ئېغىز"
+
+#: ../libempathy-gtk/empathy-account-widget.c:692
+#: ../libempathy-gtk/empathy-account-widget.c:749
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1074
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1080
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1100
+msgid "Launch My Web Accounts"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+msgid "Username:"
+msgstr "ئىشلەتكۈچى ئاتى:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1733
+msgid "A_pply"
+msgstr "قوللان(_P)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1763
+msgid "L_og in"
+msgstr ""
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1829
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1400
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "ھېسابات:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1840
+msgid "_Enabled"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1905
+msgid "This account already exists on the server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1908
+msgid "Create a new account on the server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:2022
+msgid "Ca_ncel"
+msgstr ""
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:2314
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%2$s ئۈستىدىكى %1$s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2340
+#, c-format
+msgid "%s Account"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:2344
+msgid "New account"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "<b>Example:</b> MyScreenName"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Advanced"
+msgstr "ئالىي"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "Pass_word:"
+msgstr "ئىم(_W):"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+msgid "Screen _Name:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "_Port:"
+msgstr "ئېغىز(_P):"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
+msgid "_Server:"
+msgstr "مۇلازىمېتىر(_S):"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "<b>Example:</b> username"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+msgid "Login I_D:"
+msgstr "تىزىمغا كىرىش ID: (_D)"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "GroupWise ئىشلەتكۈچى كىملىكىڭىز نېمە؟"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "<b>Example:</b> 123456789"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+msgid "ICQ _UIN:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ UIN?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+msgid "What is your ICQ password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "Auto"
+msgstr "ئاپتوماتىك"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+msgid "UDP"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+msgid "TLS"
+msgstr ""
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+msgid "Register"
+msgstr "خەتلەت"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+msgid "Options"
+msgstr "تاللانما"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+msgid "None"
+msgstr "يوق"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Character set:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network"
+msgstr "تور"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Network:"
+msgstr "تور:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Nickname:"
+msgstr "تەخەللۇس:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid "Password:"
+msgstr "ئىم:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Quit message:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+msgid "Real name:"
+msgstr "تولۇق ئىسىم:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "مۇلازىمېتىر"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<b>Example:</b> user@gmail.com"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+msgid "<b>Example:</b> user@jabber.org"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+msgid "Override server settings"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "Reso_urce:"
+msgstr ""
+
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "Use old SS_L"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "What is your Facebook password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "What is your Facebook username?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "What is your Google ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "What is your Google password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+msgid "What is your Jabber ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+msgid "What is your Jabber password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "What is your desired Jabber ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+msgid "What is your desired Jabber password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "E-_mail address:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "لەقىمى(_K):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_First Name:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+msgid "_Jabber ID:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
+msgid "_Last Name:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+msgid "_Published Name:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "Authentication username:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+msgid "Discover Binding"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Interval (seconds)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Keep-Alive Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Loose Routing"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Mechanism:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Miscellaneous Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "NAT Traversal Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Port:"
+msgstr "ئېغىز:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Proxy Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "STUN Server:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Server:"
+msgstr "مۇلازىمېتىر:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "What is your SIP account password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "What is your SIP login ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid "_Username:"
+msgstr "ئىشلەتكۈچى ئاتى(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+msgid "I_gnore conference and chat room invitations"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "What is your Yahoo! ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "What is your Yahoo! password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "Yahoo! I_D:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "_Room List locale:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+msgid "Couldn't convert image"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+msgid "None of the accepted image formats are supported on your system"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+msgid "Select Your Avatar Image"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+msgid "No Image"
+msgstr "سۈرەت يوق"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+msgid "Images"
+msgstr "سۈرەتلەر"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+msgid "All Files"
+msgstr "ھەممە ھۆججەتلەر"
+
+#: ../libempathy-gtk/empathy-avatar-image.c:323
+msgid "Click to enlarge"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:644
+msgid "Failed to open private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:684
+msgid "Topic not supported on this conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:690
+msgid "You are not allowed to change the topic"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:824
+msgid "/clear: clear all messages from the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:827
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:830
+msgid "/join <chat room ID>: join a new chat room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:833
+msgid "/j <chat room ID>: join a new chat room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:838
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:841
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:845
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:848
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:851
+msgid ""
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:856
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:866
+#, c-format
+msgid "Usage: %s"
+msgstr "ئىشلىتىش ئۇسۇلى:%s"
+
+#: ../libempathy-gtk/empathy-chat.c:895
+msgid "Unknown command"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1016
+msgid "Unknown command; see /help for the available commands"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1154
+msgid "offline"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1157
+msgid "invalid contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1160
+msgid "permission denied"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1163
+msgid "too long message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1166
+msgid "not implemented"
+msgstr "تېخى ئىشلەتكىلى بولمايدۇ"
+
+#: ../libempathy-gtk/empathy-chat.c:1170
+msgid "unknown"
+msgstr "نامەلۇم"
+
+#: ../libempathy-gtk/empathy-chat.c:1174
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1284 ../src/empathy-chat-window.c:705
+msgid "Topic:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1296
+#, c-format
+msgid "Topic set to: %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1298
+msgid "No topic defined"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1831
+msgid "(No Suggestions)"
+msgstr ""
+
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1899
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr ""
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1936
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1995
+msgid "Insert Smiley"
+msgstr ""
+
+#. send button
+#: ../libempathy-gtk/empathy-chat.c:2013
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
+msgid "_Send"
+msgstr "يوللا(_S)"
+
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2048
+msgid "_Spelling Suggestions"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2136
+msgid "Failed to retrieve recent logs"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2242
+#, c-format
+msgid "%s has disconnected"
+msgstr ""
+
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2249
+#, c-format
+msgid "%1$s was kicked by %2$s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2252
+#, c-format
+msgid "%s was kicked"
+msgstr ""
+
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2260
+#, c-format
+msgid "%1$s was banned by %2$s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2263
+#, c-format
+msgid "%s was banned"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2267
+#, c-format
+msgid "%s has left the room"
+msgstr ""
+
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:2276
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:2301
+#, c-format
+msgid "%s has joined the room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2326
+#, c-format
+msgid "%s is now known as %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2465 ../src/empathy-call-window.c:1938
+msgid "Disconnected"
+msgstr "ئۈزۈلدى"
+
+#: ../libempathy-gtk/empathy-chat.c:3088
+msgid "Wrong password; please try again:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:3089
+msgid "Retry"
+msgstr "قايتا سىنا"
+
+#: ../libempathy-gtk/empathy-chat.c:3094
+msgid "This room is protected by a password:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:3095
+msgid "Join"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:3235
+msgid "Connected"
+msgstr "باغلاندى"
+
+#: ../libempathy-gtk/empathy-chat.c:3288
+#: ../libempathy-gtk/empathy-log-window.c:653
+msgid "Conversation"
+msgstr ""
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
+msgid "_Copy Link Address"
+msgstr "ئۇلانما ئادرېس كۆچۈر(_C)"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
+msgid "_Open Link"
+msgstr "ئۇلانما ئاچ(_O)"
+
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
+msgid "%A %B %d %Y"
+msgstr "%A %B %d %Y"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:315
+msgid "Personal Information"
+msgstr "شەخسىي ئۇچۇرلارنى"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:420
+#: ../libempathy-gtk/empathy-individual-dialogs.c:110
+msgid "New Contact"
+msgstr "يېڭى دوست"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Decide _Later"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "Subscription Request"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2262
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2265
+msgid "Removing group"
+msgstr ""
+
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2319
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "_Remove"
+msgstr "ئۆچۈر(_R)"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2350
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2352
+msgid "Removing contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Add Contact…"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:516
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Chat"
+msgstr "پاراڭ(_C)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:261
+#: ../libempathy-gtk/empathy-individual-menu.c:559
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:292
+#: ../libempathy-gtk/empathy-individual-menu.c:601
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:333
+#: ../libempathy-gtk/empathy-individual-menu.c:644
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:355
+#: ../libempathy-gtk/empathy-individual-menu.c:685
+msgid "Send File"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+msgid "Share My Desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1291
+msgid "Favorite"
+msgstr "يىغقۇچ"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:447
+#: ../libempathy-gtk/empathy-individual-menu.c:788
+msgid "Infor_mation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:493
+msgctxt "Edit contact (contextual menu)"
+msgid "_Edit"
+msgstr "تەھرىر(_E)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:917
+msgid "Inviting you to this room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
+msgid "_Invite to Chat Room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-selector.c:129
+msgid "Select a contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:147
+msgid "Full name:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:148
+msgid "Phone number:"
+msgstr "تېلېفون نومۇرى:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "E-mail address:"
+msgstr "ئېلخەت ئادرېس"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "Website:"
+msgstr "تور بېكەت:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+msgid "Birthday:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:453
+msgid "Country ISO Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "Country:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "State:"
+msgstr "ھالەت:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "City:"
+msgstr "شەھەر :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "Area:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Postal Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Street:"
+msgstr "كوچا:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Building:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Floor:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Room:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Text:"
+msgstr "تېكىست:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Description:"
+msgstr "چۈشەندۈرۈش:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "Accuracy Level:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Error:"
+msgstr "خاتالىق:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Horizontal Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Speed:"
+msgstr "سۈرئەت:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Bearing:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Climb Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Last Updated on:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Longitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Latitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Altitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "ئورنى"
+
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:600
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e، %Y at %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:840
+msgid "Save Avatar"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:898
+msgid "Unable to save avatar"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>ئورۇن</b> ۋاقتى (چېسلا)\t"
+
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
+msgid "Alias:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+msgid "Client Information"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr ""
+
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1430
+msgid "Identifier:"
+msgstr "بەلگە:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Information requested…"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "OS:"
+msgstr "OS:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "نەشرى:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "گۇرۇپپا"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
+msgid ""
+"Select the groups you want this contact to appear in. Note that you can "
+"select more than one group or no groups."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-groups-widget.c:363
+msgid "_Add Group"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "تاللا"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1261
+msgid "Group"
+msgstr "گۇرۇپپا"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+msgid "Linked Contacts"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr ""
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:836
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "تەھرىر(_E)"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:862
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1568
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] ""
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>ئورۇن</b> ۋاقتى (چېسلا)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "تاللا"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+msgid "new server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
+msgid "SSL"
+msgstr "SSL"
+
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
+msgid "Link Contacts"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr ""
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
+msgid "_Link"
+msgstr "ئۇلانما(_L)"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:663
+msgid "Date"
+msgstr "چېسلا"
+
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+msgid "Conversations"
+msgstr "سۆھبەتلەر"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "كېيىنكىنى ئىزدە"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "كېيىنكىنى ئىزدە"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+msgid "Previous Conversations"
+msgstr ""
+
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+msgid "Search"
+msgstr "ئىزدە"
+
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "_For:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr ""
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+msgid "C_hat"
+msgstr ""
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+msgid "New Conversation"
+msgstr ""
+
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+msgid "Send _Video"
+msgstr ""
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
+msgstr ""
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "New Call"
+msgstr ""
+
+#. COL_STATUS_TEXT
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
+msgid "Custom Message…"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+msgid "Edit Custom Messages…"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
+msgid "Click to remove this status as a favorite"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
+msgid "Click to make this status a favorite"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
+msgid "Set status"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
+msgid "Set your presence and current status"
+msgstr ""
+
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+msgid "Custom messages…"
+msgstr ""
+
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Find:"
+msgstr "ئىزدە:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Match case"
+msgstr "دەل ماسلاش"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "Phrase not found"
+msgstr "ئاتالغۇنى تاپالمىدى"
+
+#: ../libempathy-gtk/empathy-sound.c:50
+msgid "Received an instant message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:52
+msgid "Sent an instant message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:54
+msgid "Incoming chat request"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:56
+msgid "Contact connected"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:58
+msgid "Contact disconnected"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:60
+msgid "Connected to server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:62
+msgid "Disconnected from server"
+msgstr "مۇلازىمېتىر بىلەن بولغان باغلىنىش ئۈزۈلدى"
+
+#: ../libempathy-gtk/empathy-sound.c:64
+msgid "Incoming voice call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:66
+msgid "Outgoing voice call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:68
+msgid "Voice call ended"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
+msgid "Enter Custom Message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+msgid "Edit Custom Messages"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Save _New Status Message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Status Messages"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "كلاسسىك"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "ئاددىي"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "كۆك"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
+msgid "Continue"
+msgstr "داۋاملاشتۇر"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Remember this choice for future connections"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
+msgid "Certificate Details"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
+msgid "Unable to open URI"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
+msgid "Select a file"
+msgstr "ھۆججەت تاللاش"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#, c-format
+msgid "Incoming file from %s"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr "نۆۋەتتىكى يەرلىك تىل"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr "ئەرەبچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr "ئەرمەنچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:173
+#: ../libempathy-gtk/totem-subtitle-encoding.c:175
+#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+msgid "Baltic"
+msgstr "بالتىق"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+msgid "Celtic"
+msgstr "كېلتىك"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:183
+#: ../libempathy-gtk/totem-subtitle-encoding.c:185
+#: ../libempathy-gtk/totem-subtitle-encoding.c:187
+#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+msgid "Central European"
+msgstr "ئوتتۇرا ياۋروپا"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:192
+#: ../libempathy-gtk/totem-subtitle-encoding.c:194
+#: ../libempathy-gtk/totem-subtitle-encoding.c:196
+#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+msgid "Chinese Simplified"
+msgstr "ئاددىي خەنزۇچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:201
+#: ../libempathy-gtk/totem-subtitle-encoding.c:203
+#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+msgid "Chinese Traditional"
+msgstr "مۇرەككەپ خەنزۇچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+msgid "Croatian"
+msgstr "خورۋاتچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:211
+#: ../libempathy-gtk/totem-subtitle-encoding.c:213
+#: ../libempathy-gtk/totem-subtitle-encoding.c:215
+#: ../libempathy-gtk/totem-subtitle-encoding.c:217
+#: ../libempathy-gtk/totem-subtitle-encoding.c:219
+#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+msgid "Cyrillic"
+msgstr "سلاۋيانچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+msgid "Cyrillic/Russian"
+msgstr "رۇسچە/سلاۋىيان"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:227
+#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+msgid "Cyrillic/Ukrainian"
+msgstr "سلاۋيانچە/ئۇكرائىنچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+msgid "Georgian"
+msgstr "گرۇزىنچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:235
+#: ../libempathy-gtk/totem-subtitle-encoding.c:237
+#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+msgid "Greek"
+msgstr "گرېكچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+msgid "Gujarati"
+msgstr "گۇجاراتى"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+msgid "Gurmukhi"
+msgstr "گۇرمۇكىچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:248
+#: ../libempathy-gtk/totem-subtitle-encoding.c:250
+#: ../libempathy-gtk/totem-subtitle-encoding.c:252
+#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+msgid "Hebrew"
+msgstr "ئىبرانىچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+msgid "Hebrew Visual"
+msgstr "ئىبرانىچە كۆرۈنۈشچان"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+msgid "Hindi"
+msgstr "ھىندىچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+msgid "Icelandic"
+msgstr "ئىسلاندچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:266
+#: ../libempathy-gtk/totem-subtitle-encoding.c:268
+#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+msgid "Japanese"
+msgstr "ياپونچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:273
+#: ../libempathy-gtk/totem-subtitle-encoding.c:275
+#: ../libempathy-gtk/totem-subtitle-encoding.c:277
+#: ../libempathy-gtk/totem-subtitle-encoding.c:279
+msgid "Korean"
+msgstr "كورېيەچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+msgid "Nordic"
+msgstr "شىمالىي ياۋروپا"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+msgid "Persian"
+msgstr "پارسچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:288
+#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+msgid "Romanian"
+msgstr "رۇمىنچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+msgid "South European"
+msgstr "جەنۇبى ياۋروپا"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+msgid "Thai"
+msgstr "تايلاندچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:299
+#: ../libempathy-gtk/totem-subtitle-encoding.c:301
+#: ../libempathy-gtk/totem-subtitle-encoding.c:303
+#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+msgid "Turkish"
+msgstr "تۈركچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:308
+#: ../libempathy-gtk/totem-subtitle-encoding.c:310
+#: ../libempathy-gtk/totem-subtitle-encoding.c:312
+#: ../libempathy-gtk/totem-subtitle-encoding.c:314
+#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+msgid "Unicode"
+msgstr "يۇنىكود"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:319
+#: ../libempathy-gtk/totem-subtitle-encoding.c:321
+#: ../libempathy-gtk/totem-subtitle-encoding.c:323
+#: ../libempathy-gtk/totem-subtitle-encoding.c:325
+#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+msgid "Western"
+msgstr "غەربچە"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:330
+#: ../libempathy-gtk/totem-subtitle-encoding.c:332
+#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+msgid "Vietnamese"
+msgstr "ۋىيېتنامچە"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr ""
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr ""
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "خاتالىق ئۇچۇرى يوق"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "مۇڭداشقۇ ئۇچۇرى(Empathy)"
+
+#: ../src/empathy.c:303
+msgid "Don't connect on startup"
+msgstr ""
+
+#: ../src/empathy.c:307
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr ""
+
+#: ../src/empathy.c:315
+msgid "- Empathy IM Client"
+msgstr ""
+
+#: ../src/empathy.c:494
+msgid "Error contacting the Account Manager"
+msgstr ""
+
+#: ../src/empathy.c:496
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/empathy-about-dialog.c:81
+msgid ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+
+#: ../src/empathy-about-dialog.c:85
+msgid ""
+"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
+"details."
+msgstr ""
+
+#: ../src/empathy-about-dialog.c:89
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+
+#: ../src/empathy-about-dialog.c:107
+msgid "An Instant Messaging client for GNOME"
+msgstr ""
+
+#: ../src/empathy-about-dialog.c:113
+msgid "translator-credits"
+msgstr "Sahran <sahran@live.com>\n"
+"Gheyret T.Kenji <gheyret@yahoo.com>\n"
+"Zeper <zeper@msn.com>\n"
+"Abduxukur Abdurixit <abduxukur.abdurixit@t-systems.ch>"
+
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:179
+#, c-format
+msgid "The error message was: %s"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:183
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1268
+msgid "An error occurred"
+msgstr "خاتالىق كۆرۈلدى"
+
+#: ../src/empathy-account-assistant.c:467
+msgid "What kind of chat account do you have?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:473
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:479
+msgid "Enter your account details"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:484
+msgid "What kind of chat account do you want to create?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:490
+msgid "Do you want to create other chat accounts?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:497
+msgid "Enter the details for the new account"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:612
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:629
+msgid "Do you have an account you've been using with another chat program?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:652
+msgid "Yes, import my account details from "
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:673
+msgid "Yes, I'll enter my account details now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:695
+msgid "No, I want a new account"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:705
+msgid "No, I just want to see people online nearby for now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:726
+msgid "Select the accounts you want to import:"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:810
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
+msgid "Yes"
+msgstr "ھەئە"
+
+#: ../src/empathy-account-assistant.c:817
+msgid "No, that's all for now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1082
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1088
+#: ../src/empathy-account-assistant.c:1144
+msgid "Edit->Accounts"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1104
+msgid "I don't want to enable this feature for now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1140
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1146
+msgid "telepathy-salut not installed"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1192
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1226
+msgid "Welcome to Empathy"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1235
+msgid "Import your existing accounts"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1253
+msgid "Please enter personal details"
+msgstr ""
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:64
+#, c-format
+msgid "There are unsaved modifications to your %s account."
+msgstr ""
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:68
+msgid "Your new account has not been saved yet."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+msgid "Connecting…"
+msgstr "ئۇلىنىۋاتىدۇ…"
+
+#: ../src/empathy-accounts-dialog.c:321
+#, c-format
+msgid "Offline — %s"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:333
+#, c-format
+msgid "Disconnected — %s"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:344
+msgid "Offline — No Network Connection"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:351
+msgid "Unknown Status"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:363
+msgid "Offline — Account Disabled"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:759
+msgid ""
+"You are about to create a new account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1106
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1110
+msgid "This will not remove your account on the server."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1348
+msgid ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1951
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "No protocol installed"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "Protocol:"
+msgstr "كېلىشىم:"
+
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Add…"
+msgstr "[fuzzy]قوش(_A)"
+
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "_Import…"
+msgstr ""
+
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr ""
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr ""
+
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr ""
+
+#: ../src/empathy-av.c:118
+msgid "- Empathy Audio/Video Client"
+msgstr ""
+
+#: ../src/empathy-av.c:134
+msgid "Empathy Audio/Video Client"
+msgstr ""
+
+#: ../src/empathy-call-window.c:479
+msgid "Contrast"
+msgstr "ئاق-قارىلىقى"
+
+#: ../src/empathy-call-window.c:482
+msgid "Brightness"
+msgstr "يورۇقلۇق"
+
+#: ../src/empathy-call-window.c:485
+msgid "Gamma"
+msgstr "گامما"
+
+#: ../src/empathy-call-window.c:590
+msgid "Volume"
+msgstr "قىممەت"
+
+#: ../src/empathy-call-window.c:1166
+msgid "_Sidebar"
+msgstr "يان بالداق(_S)"
+
+#: ../src/empathy-call-window.c:1186
+msgid "Audio input"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1190
+msgid "Video input"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1194
+msgid "Dialpad"
+msgstr "نومۇر تاختىسى"
+
+#: ../src/empathy-call-window.c:1199
+msgid "Details"
+msgstr "تەپسىلاتى"
+
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1266
+#, c-format
+msgid "Call with %s"
+msgstr ""
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1345
+msgid "Call"
+msgstr "چاقىر"
+
+#: ../src/empathy-call-window.c:1499
+msgid "The IP address as seen by the machine"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1501
+msgid "The IP address as seen by a server on the Internet"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1503
+msgid "The IP address of the peer as seen by the other side"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1505
+msgid "The IP address of a relay server"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1507
+msgid "The IP address of the multicast group"
+msgstr ""
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:2254
+#, c-format
+msgid "Connected — %d:%02dm"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2315
+msgid "Technical Details"
+msgstr "تېخنىكىلىق تەپسىلات"
+
+#: ../src/empathy-call-window.c:2353
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2358
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2364
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+
+#: ../src/empathy-call-window.c:2370
+msgid "There was a failure on the network"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2374
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2377
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2387
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+
+#: ../src/empathy-call-window.c:2395
+msgid "There was a failure in the call engine"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2398
+msgid "The end of the stream was reached"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2438
+msgid "Can't establish audio stream"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2448
+msgid "Can't establish video stream"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "ئاۋاز"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call the contact again"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera Off"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Camera On"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:10
+msgid "Hang up"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "Hang up current call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:13
+msgid "Preview"
+msgstr "ئالدىن كۆزەت"
+
+#: ../src/empathy-call-window.ui.h:14
+msgid "Redial"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Send Audio"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:19
+msgid "V_ideo"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "سىن"
+
+#: ../src/empathy-call-window.ui.h:21
+msgid "Video Off"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Video On"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:23
+msgid "Video Preview"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
+msgid "_View"
+msgstr "كۆرۈنۈش(_V)"
+
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d ئوقۇلمىدى)"
+
+#: ../src/empathy-chat-window.c:478
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] ""
+
+#: ../src/empathy-chat-window.c:494
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (باشقىلاردىن %d ئوقۇلمىدى)"
+
+#: ../src/empathy-chat-window.c:503
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (ھەممىسىدىن %d ئوقۇلمىدى)"
+
+#: ../src/empathy-chat-window.c:709
+msgid "Typing a message."
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "تازىلا(_L)"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "پاراڭ"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Insert _Smiley"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "Move Tab _Left"
+msgstr "بەتكۈچنى سولغا يۆتكە(_L)"
+
+#: ../src/empathy-chat-window.ui.h:7
+msgid "Move Tab _Right"
+msgstr "بەتكۈچنى ئوڭغا يۆتكە(_R)"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
+msgid "_Contents"
+msgstr "مەزمۇنلار(_C)"
+
+#: ../src/empathy-chat-window.ui.h:10
+msgid "_Conversation"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Detach Tab"
+msgstr "بەتكۈچنى ئايرىۋەت(_D)"
+
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "تەھرىر(_E)"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Favorite Chat Room"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
+msgid "_Help"
+msgstr "ياردەم(_H)"
+
+#: ../src/empathy-chat-window.ui.h:15
+msgid "_Next Tab"
+msgstr "كېيىنكى بەتكۈچ(_N)"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Previous Tab"
+msgstr "ئالدىنقى بەتكۈچ(_P)"
+
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
+msgid "_Show Contact List"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:18
+msgid "_Tabs"
+msgstr "بەتكۈچ(_T)"
+
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr ""
+
+#: ../src/empathy-chatrooms-window.c:241
+msgid "Name"
+msgstr "ئاتى"
+
+#: ../src/empathy-chatrooms-window.c:259
+msgid "Room"
+msgstr ""
+
+#: ../src/empathy-chatrooms-window.c:267
+msgid "Auto-Connect"
+msgstr "ئاپتوماتىك باغلىنىش"
+
+#: ../src/empathy-chatrooms-window.ui.h:2
+msgid "Manage Favorite Rooms"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:474
+msgid "Incoming video call"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:474
+msgid "Incoming call"
+msgstr "سۆزلىشىۋاتىدۇ"
+
+#: ../src/empathy-event-manager.c:478
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:479
+#, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:482 ../src/empathy-event-manager.c:624
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s دىن كەلگەن تېلېفون"
+
+#: ../src/empathy-event-manager.c:507
+msgid "_Reject"
+msgstr "رەت قىل(_R)"
+
+#: ../src/empathy-event-manager.c:513
+msgid "_Answer"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:624
+#, c-format
+msgid "Incoming video call from %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:701
+msgid "Room invitation"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:703
+#, c-format
+msgid "Invitation to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:710
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:718
+msgid "_Decline"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:723
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "_Join"
+msgstr "قاتناش(_J)"
+
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "%s invited you to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:755
+#, c-format
+msgid "You have been invited to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:803
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:1013
+#, c-format
+msgid "%s would like permission to see when you are available"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:1017
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:1060
+#, c-format
+msgid "%s is now offline."
+msgstr ""
+
+#: ../src/empathy-event-manager.c:1080
+#, c-format
+msgid "%s is now online."
+msgstr ""
+
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:99
+#, c-format
+msgid "%u:%02u.%02u"
+msgstr "%u:%02u.%02u"
+
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:102
+#, c-format
+msgid "%02u.%02u"
+msgstr "%02u.%02u"
+
+#: ../src/empathy-ft-manager.c:178
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "نامەلۇم"
+
+#: ../src/empathy-ft-manager.c:273
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:274
+#, c-format
+msgid "%s of %s"
+msgstr "%s / %s"
+
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:305
+#, c-format
+msgid "Receiving \"%s\" from %s"
+msgstr ""
+
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:308
+#, c-format
+msgid "Sending \"%s\" to %s"
+msgstr ""
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:338
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:341
+msgid "Error receiving a file"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:346
+#, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:349
+msgid "Error sending a file"
+msgstr ""
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:488
+#, c-format
+msgid "\"%s\" received from %s"
+msgstr "\"%s\" نى %s دىن تاپشۇرۇۋالغان"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:493
+#, c-format
+msgid "\"%s\" sent to %s"
+msgstr "\"%s\" نى %s غا يوللايدۇ"
+
+#: ../src/empathy-ft-manager.c:496
+msgid "File transfer completed"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+msgid "Waiting for the other participant's response"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#, c-format
+msgid "Hashing \"%s\""
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:996
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1008
+msgid "File"
+msgstr "ھۆججەت"
+
+#: ../src/empathy-ft-manager.c:1030
+msgid "Remaining"
+msgstr "قالدى"
+
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr ""
+
+#: ../src/empathy-ft-manager.ui.h:2
+msgid "Remove completed, canceled and failed file transfers from the list"
+msgstr ""
+
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr ""
+
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:301
+msgid "Import"
+msgstr "ئەكىر"
+
+#: ../src/empathy-import-widget.c:310
+msgid "Protocol"
+msgstr "كېلىشىم"
+
+#: ../src/empathy-import-widget.c:334
+msgid "Source"
+msgstr "مەنبە"
+
+#: ../src/empathy-main-window.c:384
+msgid "No match found"
+msgstr ""
+
+#: ../src/empathy-main-window.c:539
+msgid "Reconnect"
+msgstr ""
+
+#: ../src/empathy-main-window.c:545
+msgid "Edit Account"
+msgstr ""
+
+#: ../src/empathy-main-window.c:551
+msgid "Close"
+msgstr "ياپ"
+
+#: ../src/empathy-main-window.c:1243
+msgid "Contact"
+msgstr "ئالاقىلەشكۈچى"
+
+#: ../src/empathy-main-window.c:1567
+msgid "Contact List"
+msgstr "ئالاقەداشلار تىزىملىكى"
+
+#: ../src/empathy-main-window.c:1677
+msgid "Show and edit accounts"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:1
+msgid "Contacts on a _Map"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:2
+msgid "Context"
+msgstr "تىل مۇھىتى"
+
+#: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:4
+msgid "Join _Favorites"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:5
+msgid "Manage Favorites"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "P_references"
+msgstr "تەڭشەك(_R)"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "Show P_rotocols"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:11
+msgid "Sort by _Name"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:12
+msgid "Sort by _Status"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Accounts"
+msgstr "ھېسابات (_A)"
+
+#: ../src/empathy-main-window.ui.h:16
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Debug"
+msgstr "سازلا(_D)"
+
+#: ../src/empathy-main-window.ui.h:20
+msgid "_File Transfers"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Join…"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Offline Contacts"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:25
+msgid "_Personal Information"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:27
+msgid "_Room"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:379
+msgid "Chat Room"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:395
+msgid "Members"
+msgstr "ئەزالار"
+
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:607
+#, c-format
+msgid ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
+msgid "No"
+msgstr "ياق"
+
+#: ../src/empathy-new-chatroom-dialog.c:638
+msgid "Could not start room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:648
+msgid "Could not stop room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr ""
+
+#: ../src/empathy-preferences.c:139
+msgid "Message received"
+msgstr ""
+
+#: ../src/empathy-preferences.c:140
+msgid "Message sent"
+msgstr ""
+
+#: ../src/empathy-preferences.c:141
+msgid "New conversation"
+msgstr ""
+
+#: ../src/empathy-preferences.c:142
+msgid "Contact goes online"
+msgstr ""
+
+#: ../src/empathy-preferences.c:143
+msgid "Contact goes offline"
+msgstr ""
+
+#: ../src/empathy-preferences.c:144
+msgid "Account connected"
+msgstr ""
+
+#: ../src/empathy-preferences.c:145
+msgid "Account disconnected"
+msgstr ""
+
+#: ../src/empathy-preferences.c:446
+msgid "Language"
+msgstr "تىل"
+
+#: ../src/empathy-preferences.c:875
+msgid "Preferences"
+msgstr "مايىللىق"
+
+#: ../src/empathy-preferences.ui.h:1
+msgid "Appearance"
+msgstr "قىياپەت"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Behavior"
+msgstr "ھەرىكەت"
+
+#: ../src/empathy-preferences.ui.h:3
+msgid "Chat Th_eme:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:4
+msgid "Disable notifications when _away or busy"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:5
+msgid "Disable sounds when _away or busy"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:7
+msgid "Enable notifications when a contact comes online"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:8
+msgid "Enable notifications when a contact goes offline"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:9
+msgid "Enable notifications when the _chat is not focused"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable spell checking for languages:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "General"
+msgstr "ئادەتتە"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Notifications"
+msgstr "ئۇقتۇرۇشلار"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Play sound for events"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Privacy"
+msgstr "شەخسىي سىر"
+
+#: ../src/empathy-preferences.ui.h:18
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published. GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:19
+msgid "Show _smileys as images"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:20
+msgid "Show contact _list in rooms"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "ئۈن"
+
+#: ../src/empathy-preferences.ui.h:22
+msgid "Spell Checking"
+msgstr "ئىملا تەكشۈرۈش"
+
+#: ../src/empathy-preferences.ui.h:23
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:24
+msgid "Themes"
+msgstr "ئۇسلۇب"
+
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Cellphone"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:27
+msgid "_Enable bubble notifications"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:28
+msgid "_Enable sound notifications"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_GPS"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Network (IP, Wi-Fi)"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Open new chats in separate windows"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Publish location to my contacts"
+msgstr ""
+
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
+msgid "_Reduce location accuracy"
+msgstr ""
+
+#: ../src/empathy-status-icon.c:184
+msgid "Respond"
+msgstr ""
+
+#: ../src/empathy-status-icon.c:190
+msgid "Reject"
+msgstr "رەت قىل"
+
+#: ../src/empathy-status-icon.c:194
+msgid "Answer"
+msgstr ""
+
+#: ../src/empathy-status-icon.c:201 ../src/empathy-status-icon.c:211
+msgid "Decline"
+msgstr "قوشۇلما"
+
+#: ../src/empathy-status-icon.c:205 ../src/empathy-status-icon.c:216
+msgid "Accept"
+msgstr "قوشۇل"
+
+#: ../src/empathy-status-icon.ui.h:2
+msgid "Status"
+msgstr "ھالىتى"
+
+#: ../src/empathy-status-icon.ui.h:4
+msgid "_Quit"
+msgstr "چېكىن(_Q)"
+
+#: ../src/empathy-map-view.c:452
+msgid "Contact Map View"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1219
+msgid "Save"
+msgstr "ساقلا"
+
+#: ../src/empathy-debug-window.c:1395
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1475
+msgid "Pause"
+msgstr "Pause"
+
+#: ../src/empathy-debug-window.c:1487
+msgid "Level "
+msgstr "دەرىجە "
+
+#: ../src/empathy-debug-window.c:1507
+msgid "Debug"
+msgstr "سازلا"
+
+#: ../src/empathy-debug-window.c:1513
+msgid "Info"
+msgstr "ئۇچۇر"
+
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+msgid "Message"
+msgstr "ئۇچۇر"
+
+#: ../src/empathy-debug-window.c:1525
+msgid "Warning"
+msgstr "ئاگاھلاندۇرۇش"
+
+#: ../src/empathy-debug-window.c:1531
+msgid "Critical"
+msgstr "ئاچقۇچلۇق"
+
+#: ../src/empathy-debug-window.c:1537
+msgid "Error"
+msgstr "خاتالىق"
+
+#: ../src/empathy-debug-window.c:1556
+msgid "Time"
+msgstr "ۋاقىت"
+
+#: ../src/empathy-debug-window.c:1559
+msgid "Domain"
+msgstr "دائىرە"
+
+#: ../src/empathy-debug-window.c:1561
+msgid "Category"
+msgstr "كاتېگورىيە"
+
+#: ../src/empathy-debug-window.c:1563
+msgid "Level"
+msgstr "دەرىجە"
+
+#: ../src/empathy-debug-window.c:1600
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr ""
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr ""
+
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "تەكلىپ"
+
+#: ../src/empathy-accounts.c:183
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+
+#: ../src/empathy-accounts.c:191
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+
+#: ../src/empathy-accounts.c:193
+msgid "<account-id>"
+msgstr ""
+
+#: ../src/empathy-accounts.c:198
+msgid "- Empathy Accounts"
+msgstr ""
+
+#: ../src/empathy-accounts.c:237
+msgid "Empathy Accounts"
+msgstr ""
+
+#: ../src/empathy-debugger.c:66
+msgid "Empathy Debugger"
+msgstr "Empathy سازلىغۇچ"
+
+#: ../src/empathy-chat.c:91
+msgid "- Empathy Chat Client"
+msgstr ""
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/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 3808daacc..58690d139 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -25,7 +25,6 @@
#include <config.h>
#include <string.h>
-#include <stdio.h>
#include <gtk/gtk.h>
#include <glib.h>
@@ -74,6 +73,11 @@ typedef struct {
GtkWidget *viewport_error;
} EmpathyNewChatroomDialog;
+typedef struct {
+ EmpathyAccountChooserFilterResultCallback callback;
+ gpointer user_data;
+} FilterCallbackData;
+
enum {
COL_NEED_PASSWORD,
COL_INVITE_ONLY,
@@ -133,46 +137,69 @@ static void new_chatroom_dialog_button_close_error_clicked_cb (GtkButton
static EmpathyNewChatroomDialog *dialog_p = NULL;
+
+static void
+conn_prepared_cb (GObject *conn,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ FilterCallbackData *data = user_data;
+ GError *myerr = NULL;
+ TpCapabilities *caps;
+
+ if (!tp_proxy_prepare_finish (conn, result, &myerr)) {
+ data->callback (FALSE, data->user_data);
+ g_slice_free (FilterCallbackData, data);
+ }
+
+ caps = tp_connection_get_capabilities (TP_CONNECTION (conn));
+ data->callback (tp_capabilities_supports_text_chatrooms (caps),
+ data->user_data);
+
+ g_slice_free (FilterCallbackData, data);
+}
+
/**
* empathy_account_chooser_filter_supports_multichat:
* @account: a #TpAccount
+ * @callback: an #EmpathyAccountChooserFilterResultCallback accepting the result
+ * @callback_data: data passed to the @callback
* @user_data: user data or %NULL
*
* An #EmpathyAccountChooserFilterFunc that returns accounts that both
* support multiuser text chat and are connected.
*
- * Return value: TRUE if @account both supports muc and is connected
+ * Returns (via the callback) TRUE if @account both supports muc and is connected
*/
-static gboolean
-empathy_account_chooser_filter_supports_multichat (TpAccount *account,
- gpointer user_data)
+static void
+empathy_account_chooser_filter_supports_multichat (
+ TpAccount *account,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
+ gpointer user_data)
{
- TpConnection *connection;
- EmpathyDispatcher *dispatcher;
- GList *classes;
+ TpConnection *connection;
+ FilterCallbackData *cb_data;
+ GQuark features[] = { TP_CONNECTION_FEATURE_CAPABILITIES, 0 };
if (tp_account_get_connection_status (account, NULL) !=
- TP_CONNECTION_STATUS_CONNECTED)
- return FALSE;
+ TP_CONNECTION_STATUS_CONNECTED) {
+ callback (FALSE, callback_data);
+ return;
+ }
/* check if CM supports multiuser text chat */
connection = tp_account_get_connection (account);
- if (connection == NULL)
- return FALSE;
-
- dispatcher = empathy_dispatcher_dup_singleton ();
-
- classes = empathy_dispatcher_find_requestable_channel_classes
- (dispatcher, connection, TP_IFACE_CHANNEL_TYPE_TEXT,
- TP_HANDLE_TYPE_ROOM, NULL);
-
- g_object_unref (dispatcher);
-
- if (classes == NULL)
- return FALSE;
+ if (connection == NULL) {
+ callback (FALSE, callback_data);
+ return;
+ }
- g_list_free (classes);
- return TRUE;
+ cb_data = g_slice_new0 (FilterCallbackData);
+ cb_data->callback = callback;
+ cb_data->user_data = callback_data;
+ tp_proxy_prepare_async (connection, features, conn_prepared_cb,
+ cb_data);
}
void
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 = \
diff --git a/tests/interactive/test-empathy-account-chooser.c b/tests/interactive/test-empathy-account-chooser.c
index d2ce7ccbc..7622a6248 100644
--- a/tests/interactive/test-empathy-account-chooser.c
+++ b/tests/interactive/test-empathy-account-chooser.c
@@ -5,12 +5,14 @@
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-account-chooser.h>
-static gboolean
+static void
filter_func (TpAccount *account,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
gpointer user_data)
{
g_assert (TP_IS_ACCOUNT (account));
- return TRUE;
+ callback (TRUE, callback_data);
}
int