diff options
326 files changed, 13665 insertions, 12956 deletions
@@ -1,15 +1,54 @@ -NEW in 3.8.3 (24/05/2013) +NEW in 3.9.3 (17/06/2013) +============ +Bugs fixed: + - Fixed #680778, Stop using empathy-accounts + - Fixed #698742, Crash when joining an IRC channel (Xavier Claessens) + - Fixed #701281, empathy-sanity-checker: Include empathy-keyring.h when HAVE_UOA is defined. (Iain Lane) + - Fixed #701891, New account dialog title is incorrect (Sindhu S) + - Fixed #701914, Return value of tp_debug_client_get_messages_finish() is leaked (Guillaume Desmottes) + +Translations: + - Updated gl Translation (Fran Diéguez) + +NEW in 3.9.2 (29/05/2013) ============ Bugs fixed: - Fixed #692746, history uses wrong encoding to show utf8 logs (Guillaume Desmottes) - Fixed #696151, empathy crashed with SIGSEGV in listing_failed_cb() (Guillaume Desmottes) + - Fixed #699333, online-accounts-preferences crashes when accounts need access granted (Xavier Claessens) + - Fixed #700084, new *.page added not recognized by git due to commit eb8eb761 (Sindhu S) + +Translations: + - Updated cs Translation (Marek ÄŒernocký) + - Updated es Translation (Daniel Mustieles) + - Updated he Translation (Yaron Shahrabani) + - Updated nb Translation (Kjartan Maraas) + - Updated sk Translation (Pavol KlaÄanský) + - Updated sl Translation (Matej UrbanÄiÄ) + +Documentation translations: + - Updated ca Documentation translation (Gil Forcada, Manel Vidal) + - Updated es Documentation translation (Daniel Mustieles) -NEW in 3.8.2 (20/05/2013) +NEW in 3.9.1 (03/05/2013) ============ Bugs fixed: + - Fixed #692160, Updated Icon Names (B.Prathibha) - Fixed #697214, call-window: Remember that the audio output has been added (Olivier Crête) + - Fixed #697302, Spelling mistake: "You need to setup an account..." (SandipTiwari) - Fixed #699017, libempathy: Fix build by adding missing math.h header (Stef Walter) - - Fixed #699333, online-accounts-preferences crashes when accounts need access granted + - Fixed #673775, The icon for audio call in the help is wrong. (Ekaterina Gerasimova) + - Fixed #677549, "Link Contacts" user documentation is wrong (Shobha Tyagi) + +Translations: + - Updated crh Translation (ReÅŸat SABIQ) + - Updated it Translation (Milo Casagrande) + +Documentation translations: + - Updated de Documentation translation (Christian Kirbach) + - Updated el Documentation translation (Dimitris Spingos) + - Updated es Documentation translation (Daniel Mustieles) + - Updated zh_CN Documentation translation (Wylmer Wang) NEW in 3.8.1 (15/04/2013) ============ diff --git a/configure.ac b/configure.ac index 3ce63fe45..4d8e8a9ff 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl If not 1, append datestamp to the version number m4_define(empathy_released, 0) m4_define([empathy_major_version], [3]) -m4_define([empathy_minor_version], [8]) +m4_define([empathy_minor_version], [9]) m4_define([empathy_micro_version], [3]) m4_define([empathy_nano_version], [0]) diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in index c5dea6f7e..2e9b9fc91 100644 --- a/data/empathy.desktop.in.in +++ b/data/empathy.desktop.in.in @@ -7,7 +7,7 @@ _Comment=Chat on Google Talk, Facebook, MSN and many other chat services _Keywords=chat;talk;im;message;irc;voip;gtalk;facebook;jabber; Exec=empathy Icon=empathy -StartupNotify=false +StartupNotify=true Terminal=false Type=Application Categories=GNOME;GTK;Network;InstantMessaging; diff --git a/extensions/extensions.h b/extensions/extensions.h index 2dbd79cc6..c1c421643 100644 --- a/extensions/extensions.h +++ b/extensions/extensions.h @@ -1,7 +1,6 @@ #ifndef __EMP_EXTENSIONS_H__ #define __EMP_EXTENSIONS_H__ -#include <glib-object.h> #include <telepathy-glib/telepathy-glib.h> #include "extensions/_gen/enums.h" diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c index 41eb8f6eb..dc9e036ee 100644 --- a/goa-mc-plugin/mcp-account-manager-goa.c +++ b/goa-mc-plugin/mcp-account-manager-goa.c @@ -24,14 +24,11 @@ */ #include "config.h" - -#include <telepathy-glib/telepathy-glib.h> +#include "mcp-account-manager-goa.h" #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */ #include <goa/goa.h> -#include "mcp-account-manager-goa.h" - #define DEBUG g_debug #define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv) #define DECLARE_GASYNC_CALLBACK(name) \ diff --git a/goa-mc-plugin/mission-control-plugin.c b/goa-mc-plugin/mission-control-plugin.c index 406530560..d4e8ae297 100644 --- a/goa-mc-plugin/mission-control-plugin.c +++ b/goa-mc-plugin/mission-control-plugin.c @@ -23,7 +23,7 @@ * Danielle Madeley <danielle.madeley@collabora.co.uk> */ -#include <mission-control-plugins/mission-control-plugins.h> +#include "config.h" #include "mcp-account-manager-goa.h" diff --git a/help/.gitignore b/help/.gitignore index 90a9e908f..89cbe39ab 100644 --- a/help/.gitignore +++ b/help/.gitignore @@ -3,3 +3,4 @@ */*.stamp */*.page */*.xml +!/C diff --git a/help/C/account-irc.page b/help/C/account-irc.page index 213247c8d..4b4b92776 100644 --- a/help/C/account-irc.page +++ b/help/C/account-irc.page @@ -1,4 +1,5 @@ <page xmlns="http://projectmallard.org/1.0/" + xmlns:its="http://www.w3.org/2005/11/its" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="screen" id="account-irc"> @@ -14,7 +15,7 @@ <revision pkgversion="2.30" version="0.2" date="2010-04-19" status="review"/> <credit type="author"> <name>Shaun McCance</name> - <email>shaunm@gnome.org</email> + <email its:translate="no">shaunm@gnome.org</email> </credit> <license> <p>Creative Commons Share Alike 3.0</p> @@ -103,13 +104,16 @@ telepathy-idle note <list> <item><p>To add a network to the list, click <media type="image" mime="image/png" src="figures/gtk-add.png" width="16" - height="16">Add</media>.</p></item> + height="16" its:translate="no"><span + its:translate="yes">Add</span></media>.</p></item> <item><p>To modify a network in the list, select the network and click <media type="image" mime="image/png" src="figures/gtk-edit.png" width="16" - height="16">Edit</media>.</p></item> + height="16" its:translate="no"><span + its:translate="yes">Edit</span></media>.</p></item> <item><p>To remove a network from the list, select the network and click <media type="image" mime="image/png" src="figures/gtk-remove.png" - width="16" height="16">Remove</media>.</p></item> + width="16" height="16" its:translate="no"><span + its:translate="yes">Remove</span></media>.</p></item> </list> <p>When adding or modifying a network, you can enter the following diff --git a/help/C/accounts-window.page b/help/C/accounts-window.page index 8e25b80a2..c8839babf 100644 --- a/help/C/accounts-window.page +++ b/help/C/accounts-window.page @@ -5,7 +5,6 @@ <info> <link type="topic" xref="add-account"/> - <link type="topic" xref="create-account"/> <link type="topic" xref="disable-account"/> <link type="topic" xref="remove-account"/> <desc>Add, modify, and delete accounts.</desc> diff --git a/help/C/add-account.page b/help/C/add-account.page index b727eddfa..cdeb4b8d9 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -1,6 +1,6 @@ <page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" - type="topic" style="task" + type="guide" style="task" id="add-account"> <info> diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 0bf6a0b54..3426cd6fc 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -5,7 +5,7 @@ <info> <link type="guide" xref="index#contacts"/> - <link type="seealso" xref="offline-contacts"/> + <link type="seealso" xref="hide-contacts"/> <desc>Add someone to the contact list.</desc> <revision pkgversion="2.28" version="0.1" date="2009-06-15" status="draft"/> <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"> diff --git a/help/C/audio-call.page b/help/C/audio-call.page index 024b46377..4d9707f38 100644 --- a/help/C/audio-call.page +++ b/help/C/audio-call.page @@ -1,5 +1,6 @@ <page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" + xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="task" id="audio-call"> @@ -15,10 +16,17 @@ </revision> <revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/> <revision pkgversion="2.32" version="0.4" date="2010-09-09" status="review"/> + <revision pkgversion="3.8" version="0.4" date="2013-04-15" status="review"/> + <credit type="author"> <name>Milo Casagrande</name> - <email>milo@ubuntu.com</email> + <email its:translate="no">milo@ubuntu.com</email> + </credit> + <credit type="author"> + <name>Ekaterina Gerasimova</name> + <email its:translate="no">kittykat3756@gmail.com</email> </credit> + <license> <p>Creative Commons Share Alike 3.0</p> </license> @@ -26,27 +34,27 @@ <title>Start an audio conversation</title> - <p>You can call your contacts and have an audio conversation with them. - This features only works with certain types of accounts, and it requires - the other person to have an application that supports audio calls.</p> + <p>You can call your contacts and have an audio conversation with them. This + features only works with certain types of accounts and it requires the other + person to have an application that supports audio calls.</p> + <steps> <item> <p> - 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">Audio Call</gui>. + Right-click on the contact that you want to call and select + <gui style="menuitem">Audio Call</gui>. </p> </item> <item> <p> A new window will open. When the connection is established, you will - see <gui>Connected</gui> at the bottom of the window, along with the - total conversation time.</p> + see the total conversation time at the bottom of the window. + </p> </item> <item> <p> - To end the conversation, click on <gui style="button">Hang up</gui>. + To end the conversation, click the <gui style="button">hand up</gui> + button. </p> </item> </steps> diff --git a/help/C/create-account.page b/help/C/create-account.page index e87e117e1..3535a37b1 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -1,152 +1,145 @@ <page xmlns="http://projectmallard.org/1.0/" + xmlns:its="http://www.w3.org/2005/11/its" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="create-account"> <info> - <link type="guide" xref="index#accounts"/> - <link type="seealso" xref="add-account"/> - <desc>Register for an account with one of the supported messaging services.</desc> + <link type="guide" xref="add-account"/> <revision pkgversion="2.28" version="0.1" date="2009-06-21" status="draft"/> <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review"> - <!-- - <e:review by="shaunm@gnome.org" date="2009-09-02" status="done"/> - --> + <!-- + <e:review by="shaunm@gnome.org" date="2009-09-02" status="done"/> + --> </revision> <revision pkgversion="2.30" version="0.3" date="2010-04-19" status="review"/> <revision pkgversion="2.30" version="0.4" date="2010-10-01" status="review"/> + <revision pkgversion="3.10" date="2013-06-23" status="review"/> + <credit type="author"> <name>Milo Casagrande</name> - <email>milo@ubuntu.com</email> + <email its:translate="no">milo@ubuntu.com</email> + </credit> + <credit type="editor"> + <name>Ekaterina Gerasimova</name> + <email its:translate="no">kittykat3756@gmail.com</email> </credit> + <license> <p>Creative Commons Share Alike 3.0</p> </license> -<!-- - <copyright> - <year>2009</year> - <name>GNOME Documentation Project</name> - </copyright> - <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> ---> + + <desc>Create an account for one of the supported messaging services.</desc> + </info> - <title>Register for a new account</title> + <title>Register a new account</title> + + <p>Most account types require you to create an account with a service + provider before you can use that account with instant messaging applications. + You can use <app>Empathy</app> to register for a new account with some + account providers using the same steps as you would to + <link xref="add-account">add an account</link>.</p> + + <p>Once you create a new account, your account provider should give you a + login or a username and a password, as well as any additional information you + need to connect using <app>Empathy</app>.</p> - <p>Most account types require you to create an account with a account provider - before you can connect using instant messaging applications like <app>Empathy</app>. - With some account providers, you can use <app>Empathy</app> to register for a new - account, using the same steps as you would to <link xref="add-account">add an - account</link>.</p> + <section id="irc"> + <title>IRC</title> + + <p>IRC networks require that you specify a nick (nickname) when you connect + to the server. Some IRC networks use a service, such as NickServ, to allow + users to <link xref="irc-nick-password">protect their nick</link>. If you + did not register your nick or are unable to do so and another user is using + it, then you will need to choose a different one.</p> + + <p>Some IRC servers are password protected. You will need to know the + password to connect to these servers. Generally, these are private IRC + networks.</p> + + <note> + <p>Many GNOME projects use <code>irc.gnome.org</code> for project-related + discussion.</p> + </note> + </section> - <p>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>.</p> - <section id="facebook"> <title>Facebook</title> - <p> - Facebook is one of the most-used social networks. It allows users to - create their own profile and to communicate with their friends. - </p> - <p> - 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.facebook.com</link>. - </p> + + <p>Facebook is one of the more popular social networks. It allows users to + create their own profile and to communicate with their friends.</p> + + <p>To use Facebook to communicate with your friends, you will need to + create a new account from the website: + <link href="https://www.facebook.com">www.facebook.com</link>.</p> </section> <section id="jabber"> <title>Jabber</title> - <p>Jabber is an open instant messaging system. Like email, Jabber allows + <p>Jabber is an open instant messaging system. Like email, Jabber allows you to choose your account provider and communicate with all other Jabber users, regardless of their account provider.</p> - <p>You will need to create a new account with a Jabber provider. There are + <p>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.org/">Jabber.org</link>.</p> + <link href="http://register.jabber.org/">jabber.org</link>.</p> <note> - <p>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 - password in <app>Empathy</app> to connect.</p> + <p>If you use Gmail or Google+ Hangouts, you already have a Jabber + account. Use your Gmail address and password in <app>Empathy</app> to + connect.</p> </note> </section> <section id="salut"> <title>People Nearby</title> - <p>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, - such as a wireless hotspot. It automatically finds all other users on the - network who are also using this service.</p> + <p>This service works whenever you are connected to a local network, such + as a wireless hotspot, you do not need to create an account with service + providor, just set up your account through <app>Empathy</app>. It + automatically finds all other users on the network who are also using this + service.</p> - <p>For more information, see <link xref="salut-protocol" />.</p> + <p>For more information, see the <link xref="salut-protocol">salut + protocol</link>.</p> </section> <section id ="sip-services"> <title>SIP</title> <p>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, + 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.</p> - <note style="warning"> - <p>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>.</p> - </note> - <p>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.</p> - </section> - - <section id="irc"> - <title>IRC</title> - - <p>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.</p> - - <p>Some IRC networks use a service called NickServ to allow users to protect - their nicknames. See <link xref="irc-nick-password"/> for more information.</p> - - <p>Some IRC servers are password protected. You will need to know the password - to connect to these servers. Generally, these are private IRC networks.</p> + Generally, you will need to subscribe to a paid service for this + feature.</p> </section> <section id="proprietary-services"> <title>Proprietary Services</title> <p>There are many proprietary instant messaging services that have been - developed by different companies or organizations. <app>Empathy</app> - allows you to connect to an existing account for most popular services. + developed by different companies or organizations. <app>Empathy</app> + allows you to connect to an existing account for some of these services. To create a new account with one of these services, you will need to - visit the service’s web site and agree to its terms of use.</p> + visit the website for the service.</p> <list> <item> - <p> - <link href="http://dashboard.aim.com/aim">AIM</link> - </p> + <p><link href="http://dashboard.aim.com/aim">AIM</link></p> </item> <item> - <p> - <link href="https://www.icq.com/register/">ICQ</link> - </p> + <p><link href="https://www.icq.com/register/">ICQ</link></p> </item> <item> - <p> - <link href="https://accountservices.passport.net">MSN</link> - </p> + <p><link href="https://accountservices.passport.net">MSN</link></p> </item> <item> - <p> - <link href="https://login.yahoo.com/config/login">Yahoo!</link> - </p> + <p><link href="https://login.yahoo.com/config/login">Yahoo!</link></p> </item> </list> </section> diff --git a/help/C/figures/audio-input-microphone.png b/help/C/figures/audio-input-microphone.png Binary files differdeleted file mode 100644 index f45d15d56..000000000 --- a/help/C/figures/audio-input-microphone.png +++ /dev/null diff --git a/help/C/figures/camera-web.png b/help/C/figures/camera-web.png Binary files differdeleted file mode 100644 index e5406c5b9..000000000 --- a/help/C/figures/camera-web.png +++ /dev/null diff --git a/help/C/index.page b/help/C/index.page index 5b700188d..778115e51 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -1,11 +1,10 @@ <page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" + xmlns:its="http://www.w3.org/2005/11/its" type="guide" id="index"> <info> - <title type="link">Empathy Internet Messenger</title> - <title type="text">Empathy Internet Messenger</title> <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="incomplete"/> <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/> <revision pkgversion="2.28" version="0.2" date="2009-09-05" status="review"> @@ -15,20 +14,26 @@ </revision> <revision pkgversion="2.30" version="0.3" date="2010-02-03" status="review"/> <revision pkgversion="2.32" version="0.4" date="2010-09-11" status="review"/> + <revision pkgversion="3.10" date="2013-06-23" status="review"/> + <credit type="author"> <name>Milo Casagrande</name> - <email>milo@ubuntu.com</email> + <email its:translate="no">milo@ubuntu.com</email> </credit> + <license> <p>Creative Commons Share Alike 3.0</p> </license> + + <desc>Empathy is the instant messenging application for GNOME. It supports text, voice and video chat over many protocols.</desc> + + <title type="link">Empathy</title> + <title type="text">Empathy</title> </info> <title> - <media type="image" mime="image/png" src="figures/empathy-logo.png"> - Empathy Internet Messenger logo - </media> - Empathy Internet Messenger + <media type="image" mime="image/png" src="figures/empathy-logo.png" its:translate="no" /> + Empathy </title> <section id="accounts" style="2column"> diff --git a/help/C/link-contacts.page b/help/C/link-contacts.page index 06184ac66..6a23cd142 100644 --- a/help/C/link-contacts.page +++ b/help/C/link-contacts.page @@ -15,6 +15,10 @@ <name>Milo Casagrande</name> <email>milo@ubuntu.com</email> </credit> + <credit type="editor"> + <name>Shobha Tyagi</name> + <email>tyagishobha@gmail.com</email> + </credit> <license> <p> Creative Commons Share Alike 3.0 @@ -22,18 +26,18 @@ </license> </info> - <title>Combine and separate contacts</title> + <title>Link and unlink contacts</title> <p> - If one, or more, of your contacts has multiple accounts with different - messaging services, you can combine these contacts into a single one. + If one or more of your contacts has multiple accounts with different + messaging services, you can combine these accounts into a single contact. </p> <p> The resulting contact is called a <em>meta-contact</em>: a contact composed from different single contacts. </p> <p> - If you have a Jane Smith contact that is using three different messaging - services like: + Suppose you have a contact called Jane Smith who is using three different + messaging services like: </p> <list> <item> @@ -55,52 +59,71 @@ <p> You can combine these contacts into a single Jane Smith one. </p> - <section id="linking"> - <title>Combining contacts</title> + <title>Link contacts</title> + <p> + The way you can link your contacts is as follows: + </p> <steps> <item> <p> - From the <gui>Contact List</gui> window, right-click one of the contact - that has different accounts, and select - <gui style="menuitem">Link Contacts...</gui>. + Press the tick button to select entries you want to link. This will enable + <em>selection mode</em> and you can see a checkbox for each entry. </p> </item> <item> <p> - From the left pane in the <gui>Link Contacts</gui> window, - select the contacts you want to combine. + Tick the checkboxes that correspond to the <app>Contacts</app> entries which + belong to the same contact. </p> </item> <item> <p> - Click <gui style="button">Link</gui>. + Press <gui style="button">Link</gui>. </p> </item> </steps> - <note> - <p> - When a meta-contact has been created, the default contact that will be used - to have a conversation with when you double-click on it, is the contact with - the highest presence on-line. - </p> - </note> + <p> + Repeat steps 3 and 4 in order to link other contacts. + </p> </section> - <section id="unlinkg"> - <title>Separating contacts</title> + <section id="unlinking"> + <title>Unlink contacts</title> + <p> + To unlink a linked contact: + </p> <steps> <item> <p> - From the <gui>Contact List</gui>, right-click the contact - to separate, and select <gui style="menuitem">Link Contacts...</gui>. + Select the contact from your list. + </p> + </item> + <item> + <p> + Press <gui style="button">Edit</gui> in the top-right corner of <app>Contacts</app>. + </p> + </item> + <item> + <p> + Press <gui style="button">Linked Contacts</gui>. + </p> + </item> + <item> + <p> + Press <gui style="button">Remove</gui> to unlink an entry from the linked contact. </p> </item> <item> <p> - Click <gui style="button">Unlink</gui>. + Press <gui style="button">Close</gui> if you do not want to unlink any more contacts. </p> </item> + <item> + <p> + Finally, press <gui style="button">Done</gui> to finish editing. + </p> + </item> </steps> </section> </page> diff --git a/help/C/overview.page b/help/C/overview.page index daa67b844..2ce72a9d0 100644 --- a/help/C/overview.page +++ b/help/C/overview.page @@ -1,4 +1,5 @@ -<page xmlns="http://projectmallard.org/1.0/" +<page xmlns="http://projectmallard.org/1.0/" + xmlns:its="http://www.w3.org/2005/11/its" type="topic" id="overview"> @@ -10,11 +11,11 @@ </desc> <credit type="author"> <name>Aruna S</name> - <email>aruna.evam@gmail.com</email> + <email its:translate="no">aruna.evam@gmail.com</email> </credit> <credit type="editor"> <name>Ekaterina Gerasimova</name> - <email>kittykat3756@gmail.com</email> + <email its:translate="no">kittykat3756@gmail.com</email> </credit> <license> <p>Creative Commons Share Alike 3.0</p> @@ -34,9 +35,9 @@ <table frame="all" shade="cols"> <tr> - <td><p><media type="image" src="figures/video_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td> - <td><p><media type="image" src="figures/conf_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td> - <td><p><media type="image" src="figures/croom_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td> + <td><p><media type="image" src="figures/video_overview.png" mime="image/png" style="right" width="150" height="150" its:translate="no" /></p></td> + <td><p><media type="image" src="figures/conf_overview.png" mime="image/png" style="right" width="150" height="150" its:translate="no" /></p></td> + <td><p><media type="image" src="figures/croom_overview.png" mime="image/png" style="right" width="150" height="150" its:translate="no" /></p></td> </tr> <tr> <td><p>Video Conference</p></td> diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index 38ca57c43..0ce4a506a 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -1,6 +1,7 @@ <page xmlns="http://projectmallard.org/1.0/" - type="topic" - id="prob-conn-auth"> + xmlns:its="http://www.w3.org/2005/11/its" + type="topic" + id="prob-conn-auth"> <info> <link type="guide" xref="prob-conn"/> @@ -15,11 +16,11 @@ <revision pkgversion="2.30" version="0.4" date="2010-02-16" status="review"/> <credit type="author"> <name>Phil Bull</name> - <email>philbull@gmail.com</email> + <email its:translate="no">philbull@gmail.com</email> </credit> <credit type="author"> <name>Milo Casagrande</name> - <email>milo@ubuntu.com</email> + <email its:translate="no">milo@ubuntu.com</email> </credit> <license> <p>Creative Commons Share Alike 3.0</p> @@ -54,10 +55,8 @@ </p> </item> <item> - <p> - Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media> - icon in the error message. - </p> + <p>Click the <media type="image" mime="image/png" src="figures/gtk-edit.png" its:translate="no"><span its:translate="yes">edit</span></media> + icon in the error message.</p> </item> <item> <p> diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page index 00407a665..f3bdefd35 100644 --- a/help/C/prob-conn-name.page +++ b/help/C/prob-conn-name.page @@ -1,6 +1,7 @@ <page xmlns="http://projectmallard.org/1.0/" - type="topic" - id="prob-conn-name"> + xmlns:its="http://www.w3.org/2005/11/its" + type="topic" + id="prob-conn-name"> <info> <link type="guide" xref="prob-conn"/> @@ -16,7 +17,7 @@ <revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/> <credit type="author"> <name>Milo Casagrande</name> - <email>milo@ubuntu.com</email> + <email its:translate="no">milo@ubuntu.com</email> </credit> <license> <p>Creative Commons Share Alike 3.0</p> @@ -40,10 +41,8 @@ <steps> <item> - <p> - Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media> - icon in the error message. - </p> + <p>Click the <media type="image" mime="image/png" src="figures/gtk-edit.png" its:translate="no"><span its:translate="yes">edit</span></media> + icon in the error message.</p> </item> <item> <list> diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page index 91d482222..146c0eb7d 100644 --- a/help/C/prob-conn-neterror.page +++ b/help/C/prob-conn-neterror.page @@ -1,6 +1,7 @@ <page xmlns="http://projectmallard.org/1.0/" - type="topic" - id="prob-conn-neterror"> + xmlns:its="http://www.w3.org/2005/11/its" + type="topic" + id="prob-conn-neterror"> <info> <link type="guide" xref="prob-conn"/> @@ -13,11 +14,11 @@ <revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/> <credit type="author"> <name>Phil Bull</name> - <email>philbull@gmail.com</email> + <email its:translate="no">philbull@gmail.com</email> </credit> <credit type="author"> <name>Milo Casagrande</name> - <email>milo@ubuntu.com</email> + <email its:translate="no">milo@ubuntu.com</email> </credit> <license> <p>Creative Commons Share Alike 3.0</p> @@ -55,10 +56,8 @@ </p> </item> <item> - <p> - Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media> - icon in the error message. - </p> + <p>Click the <media type="image" mime="image/png" src="figures/gtk-edit.png" its:translate="no"><span its:translate="yes">edit</span></media> + icon in the error message.</p> </item> <item> <p> diff --git a/help/C/status-icons.page b/help/C/status-icons.page index be63f994d..1212fdb7c 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -1,4 +1,5 @@ <page xmlns="http://projectmallard.org/1.0/" + xmlns:its="http://www.w3.org/2005/11/its" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="concept" id="status-icons"> @@ -14,11 +15,11 @@ </revision> <credit type="author"> <name>Milo Casagrande</name> - <email>milo@ubuntu.com</email> + <email its:translate="no">milo@ubuntu.com</email> </credit> <credit type="author"> <name>Shaun McCance</name> - <email>shaunm@gnome.org</email> + <email its:translate="no">shaunm@gnome.org</email> </credit> <license> <p>Creative Commons Share Alike 3.0</p> @@ -36,13 +37,13 @@ <terms> <item> - <title><media type="image" mime="image/png" src="figures/available.png">Available icon</media> + <title><media type="image" mime="image/png" src="figures/available.png" its:translate="no"><span its:translate="yes">Available icon</span></media> <gui>Available</gui></title> <p>Use the <em>Available</em> status when you are at your computer and able to chat with your contacts. You can set a custom message for this status.</p> </item> <item> - <title><media type="image" mime="image/png" src="figures/busy.png">Busy icon</media> + <title><media type="image" mime="image/png" src="figures/busy.png" its:translate="no"><span its:translate="yes">Busy icon</span></media> <gui>Busy</gui></title> <p>Use the <em>Busy</em> status to let your contacts know that you don’t want to chat right now. They can still contact you, for instance if they have something @@ -50,7 +51,7 @@ bubbles and sounds when you are busy. You can set a custom message for this status.</p> </item> <item> - <title><media type="image" mime="image/png" src="figures/away.png">Away icon</media> + <title><media type="image" mime="image/png" src="figures/away.png" its:translate="no"><span its:translate="yes">Away icon</span></media> <gui>Away</gui></title> <p>Use the <em>Away</em> status when you are going away from your computer. <app>Empathy</app> automatically sets your status to Away if you do not use @@ -59,14 +60,14 @@ away. You can set a custom message for this status.</p> </item> <item> - <title><media type="image" mime="image/png" src="figures/offline.png">Offline icon</media> + <title><media type="image" mime="image/png" src="figures/offline.png" its:translate="no"><span its:translate="yes">Offline icon</span></media> <gui>Invisible</gui></title> <p>When you set your status to <em>Invisible</em>, you will appear as offline to your contacts. You will still be connected to your accounts, and you still see your contacts’ statuses and start conversations with them.</p> </item> <item> - <title><media type="image" mime="image/png" src="figures/offline.png">Offline icon</media> + <title><media type="image" mime="image/png" src="figures/offline.png" its:translate="no"><span its:translate="yes">Offline icon</span></media> <gui>Offline</gui></title> <p>Setting your status to <em>Offline</em> disconnects you from all of your accounts.</p> diff --git a/help/C/video-call.page b/help/C/video-call.page index bbd4c6812..0cdd63c1a 100644 --- a/help/C/video-call.page +++ b/help/C/video-call.page @@ -1,5 +1,6 @@ <page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" + xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="task" id="video-call"> @@ -18,10 +19,17 @@ </revision> <revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/> <revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/> + <revision pkgversion="3.8" version="0.4" date="2013-04-15" status="review"/> + <credit type="author"> <name>Milo Casagrande</name> - <email>milo@ubuntu.com</email> + <email its:translate="no">milo@ubuntu.com</email> + </credit> + <credit type="author"> + <name>Ekaterina Gerasimova</name> + <email its:translate="no">kittykat3756@gmail.com</email> </credit> + <license> <p>Creative Commons Share Alike 3.0</p> </license> @@ -35,28 +43,24 @@ <steps> <item> - <p>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>. - </p> + <p>Right-click on the contact that you want to call and select + <gui style="menuitem">Video Call</gui>.</p> </item> <item> <p>A new window will open. When the connection is established, you will - see <gui>Connected</gui> at the bottom of the window, along with the - total conversation time.</p> + see the total conversation time at the bottom of the window.</p> </item> <item> - <p> - To end the conversation, click on <gui style="button">Hang up</gui>. - </p> + <p>To end the conversation, click on the <gui style="button">hang + up</gui> button.</p> </item> </steps> + <note style="tip"> - <p> - To turn a video conversation into an audio conversation, choose - <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video Off</gui></guiseq>. - </p> + <p>To turn a video conversation into an audio conversation, choose + <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video Off</gui></guiseq>.</p> </note> + <section id="video-meta-contact"> <title>Start a video conversation with a meta-contact</title> <steps> diff --git a/help/Makefile.am b/help/Makefile.am index 60b9facab..6253e2a0b 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -2,11 +2,9 @@ HELP_ID = empathy HELP_MEDIA = \ - figures/audio-input-microphone.png \ figures/available.png \ figures/away.png \ figures/busy.png \ - figures/camera-web.png \ figures/empathy-main-window.png \ figures/empathy-logo.png \ figures/gtk-add.png \ diff --git a/help/ca/ca.po b/help/ca/ca.po index 3193c282a..d1fdd8f16 100644 --- a/help/ca/ca.po +++ b/help/ca/ca.po @@ -2,1837 +2,1735 @@ # Copyright © 2009 Free Software Foundation, Inc. # Joan Duran <jodufi@gmail.com>, 2008, 2009. # Carles Ferrando Garcia <carles.ferrando@gmail.com>, 2010. +# Manel Vidal <verduler@gmail.com>, 2013. +# Gil Forcada <gilforcada@guifi.net>, 2013. # msgid "" msgstr "" "Project-Id-Version: emphaty\n" -"POT-Creation-Date: 2011-04-01 02:16+0000\n" -"PO-Revision-Date: 2010-05-28 22:37+0200\n" -"Last-Translator: Carles Ferrando Garcia <carles.ferrando@gmail.com>\n" +"POT-Creation-Date: 2013-05-07 13:30+0000\n" +"PO-Revision-Date: 2013-05-08 23:43+0200\n" +"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n" "Language-Team: Catalan <tradgnome@softcatala.org>\n" +"Language: ca\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" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/video-call.page:38(None) C/audio-video.page:70(None) -#: C/audio-call.page:36(None) -msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" +#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" msgstr "" -"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" +"Joan Duran <jodufi@gmail.com>, 2008, 2009\n" +"Carles Ferrando <carles.ferrando@gmail.com>, 2010\n" +"Gil Forcada <gilforcada@guifi.net>, 2011\n" +"Manel Vidal <verduler@gmail.com>, 2013" -#: C/video-call.page:10(desc) -msgid "Start a video conversation with one of your contacts." -msgstr "Inicieu una conversa de vÃdeo amb un dels contactes." +#: C/index.page:8(info/title) +msgctxt "link" +msgid "Empathy Internet Messenger" +msgstr "Missatgeria d'Internet Empathy" + +#: C/index.page:9(info/title) +msgctxt "text" +msgid "Empathy Internet Messenger" +msgstr "Missatgeria d'Internet Empathy" -#: C/video-call.page:21(name) C/status-icons.page:16(name) -#: C/share-desktop.page:13(name) C/set-custom-status.page:19(name) -#: C/send-file.page:21(name) C/salut-protocol.page:18(name) -#: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name) -#: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name) -#: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name) -#: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name) -#: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name) -#: C/irc-manage.page:19(name) C/irc-join-room.page:16(name) -#: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name) -#: C/introduction.page:13(name) C/index.page:19(name) -#: C/import-account.page:23(name) C/hide-contacts.page:11(name) -#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name) -#: 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:19(name) -#: C/audio-video.page:17(name) C/audio-call.page:19(name) -#: C/add-account.page:20(name) +#: C/index.page:20(credit/name) C/add-account.page:21(credit/name) +#: C/audio-call.page:22(credit/name) C/audio-video.page:17(credit/name) +#: C/create-account.page:19(credit/name) +#: C/disable-account.page:21(credit/name) +#: C/favorite-rooms.page:14(credit/name) C/geolocation.page:17(credit/name) +#: C/geolocation-not-showing.page:17(credit/name) +#: C/geolocation-privacy.page:17(credit/name) +#: C/geolocation-supported.page:16(credit/name) +#: C/geolocation-turn.page:18(credit/name) +#: C/geolocation-what-is.page:18(credit/name) +#: C/group-conversations.page:19(credit/name) +#: C/hide-contacts.page:11(credit/name) C/import-account.page:23(credit/name) +#: C/introduction.page:13(credit/name) C/irc-commands.page:10(credit/name) +#: C/irc-join-pwd.page:17(credit/name) C/irc-join-room.page:16(credit/name) +#: C/irc-manage.page:19(credit/name) C/irc-nick-password.page:18(credit/name) +#: C/irc-send-file.page:16(credit/name) +#: C/irc-start-conversation.page:15(credit/name) +#: C/link-contacts.page:15(credit/name) C/prev-conv.page:17(credit/name) +#: C/prob-conn-acctdisabled.page:19(credit/name) +#: C/prob-conn-auth.page:21(credit/name) C/prob-conn-name.page:18(credit/name) +#: C/prob-conn-neterror.page:19(credit/name) +#: C/remove-account.page:19(credit/name) C/salut-protocol.page:18(credit/name) +#: C/send-file.page:21(credit/name) C/set-custom-status.page:19(credit/name) +#: C/share-desktop.page:14(credit/name) C/status-icons.page:16(credit/name) +#: C/video-call.page:25(credit/name) msgid "Milo Casagrande" msgstr "Milo Casagrande" -#: C/video-call.page:22(email) C/status-icons.page:17(email) -#: C/share-desktop.page:14(email) C/set-custom-status.page:20(email) -#: C/send-file.page:22(email) C/salut-protocol.page:19(email) -#: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email) -#: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email) -#: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email) -#: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email) -#: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email) -#: C/irc-manage.page:20(email) C/irc-join-room.page:17(email) -#: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email) -#: C/introduction.page:14(email) C/index.page:20(email) -#: C/import-account.page:24(email) C/hide-contacts.page:12(email) -#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email) -#: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email) -#: 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: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" - -#: C/video-call.page:25(p) C/status-icons.page:24(p) -#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p) -#: C/send-message.page:21(p) C/send-file.page:25(p) -#: C/salut-protocol.page:22(p) C/remove-account.page:22(p) -#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p) -#: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p) -#: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p) -#: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p) -#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p) -#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p) -#: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p) -#: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p) -#: C/hide-contacts.page:15(p) C/group-conversations.page:23(p) -#: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p) -#: 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: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) +#: C/index.page:24(license/p) C/account-irc.page:20(license/p) +#: C/account-jabber.page:18(license/p) C/accounts-window.page:22(license/p) +#: C/add-account.page:29(license/p) C/add-contact.page:22(license/p) +#: C/audio-call.page:31(license/p) C/audio-video.page:21(license/p) +#: C/change-status.page:28(license/p) C/create-account.page:23(license/p) +#: C/disable-account.page:29(license/p) C/favorite-rooms.page:18(license/p) +#: C/geolocation.page:21(license/p) +#: C/geolocation-not-showing.page:21(license/p) +#: C/geolocation-privacy.page:21(license/p) +#: C/geolocation-supported.page:20(license/p) +#: C/geolocation-turn.page:22(license/p) +#: C/geolocation-what-is.page:22(license/p) +#: C/group-conversations.page:23(license/p) C/hide-contacts.page:15(license/p) +#: C/import-account.page:31(license/p) C/introduction.page:17(license/p) +#: C/irc-commands.page:14(license/p) C/irc-join-pwd.page:21(license/p) +#: C/irc-join-room.page:20(license/p) C/irc-manage.page:28(license/p) +#: C/irc-nick-password.page:22(license/p) C/irc-send-file.page:20(license/p) +#: C/irc-start-conversation.page:19(license/p) +#: C/link-contacts.page:23(license/p) C/overview.page:20(license/p) +#: C/prev-conv.page:25(license/p) C/prob-conn-acctdisabled.page:23(license/p) +#: C/prob-conn-auth.page:25(license/p) C/prob-conn-name.page:22(license/p) +#: C/prob-conn-neterror.page:23(license/p) C/prob-conn.page:18(license/p) +#: C/remove-account.page:23(license/p) C/salut-protocol.page:22(license/p) +#: C/send-file.page:25(license/p) C/send-message.page:21(license/p) +#: C/set-custom-status.page:23(license/p) C/share-desktop.page:22(license/p) +#: C/status-icons.page:24(license/p) C/video-call.page:34(license/p) msgid "Creative Commons Share Alike 3.0" msgstr "Creative Commons Reconeixement-Compartir Igual 3.0" -#: C/video-call.page:28(title) -msgid "Start a video conversation" -msgstr "Inicieu una conversa de vÃdeo" - -#: C/video-call.page:30(p) -#, fuzzy -#| 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 " -"accounts, and it requires the other person to have an application that " -"supports video calls." -msgstr "" -"Si teniu una cà mera web, podeu trucar els contactes i tindre una " -"vÃdeo conferencia amb ells. Aquesta caracterÃstica sols funciona amb certs " -"tipus de comptes, i requereix que l'altra persona tingui una aplicació que " -"suporti vÃdeo trucades." - -#: C/video-call.page:37(p) -#, fuzzy -#| 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 " -"next to the name of the contact you wish to call and choose <gui style=" -"\"menuitem\">Video Call</gui>." -msgstr "" -"Des de la finestra de la <gui>Llista de contactes</gui> , feu clic a la " -"icona<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png" -"\">vÃdeo trucada</media> a la vora del nom del contacte que vols trucar i " -"escull <gui style=\"menuitem\">VÃdeo trucada</gui>. També podeu fer clic al " -"botó dret sobre el contacte i escull <gui style=\"menuitem\">VÃdeo trucada</" -"gui>." - -#: C/video-call.page:43(p) C/audio-call.page:42(p) -msgid "" -"A new window will open. When the connection is established, you will see " -"<gui>Connected</gui> at the bottom of the window, along with the total " -"conversation time." -msgstr "" -"S'obrirà una finestra nova. Quan s'estableixi la connexió veureu que a la " -"part inferior de la finestra posa <gui>Connectat</gui> juntament amb la durada " -"de la conversa." - -#: C/video-call.page:48(p) C/audio-call.page:48(p) -msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>." -msgstr "" -"Per acabar la conversa feu clic a <gui style=\"button\">Penja</gui>." - -#: 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>." -msgstr "" -"Per canviar d'una conversa de vÃdeo a una conversa d'à udio, escolliu " -"<guiseq><gui style=\"menu\">VÃdeo</gui><gui style=\"menuitem\">Apaga el vÃdeo</" -"gui></guiseq>." +#: C/index.page:30(media/span) +msgid "Empathy Internet Messenger logo" +msgstr "Logotip del programa de missatgeria d'Internet Empathy" -#: C/video-call.page:60(title) -msgid "Start a video conversation with a meta-contact" -msgstr "Inicia una conversa de vÃdeo amb un metacontacte" +#: C/index.page:28(page/title) +msgid "<_:media-1/> Empathy Internet Messenger" +msgstr "<_:media-1/> Missatgeria d'Internet Empathy" -#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p) -msgid "" -"From the <gui>Contact List</gui> window, right-click on the meta-contact." -msgstr "" -"Des de la finestra <gui>Llista de contactes</gui>, feu clic amb el botó " -"secundari al metacontacte." - -#: C/video-call.page:68(p) -msgid "" -"Select the contact you want to have the conversation, and from the menu " -"select <gui style=\"menuitem\">Video Call</gui>." -msgstr "" -"Seleccioneu el contacte amb el que voleu realitzar la conversa i des del menú " -"seleccioneu <gui style=\"menuitem\">Trucada de vÃdeo</gui>." +#: C/index.page:36(section/title) +msgid "Account Management" +msgstr "Gestió de comptes" -#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p) -msgid "" -"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a " -"contact in the <gui>Contact List</gui> window, and stop over it for a " -"second: a small pop-up message will appear showing the number of the " -"contacts that form the meta-contact." -msgstr "" +#: C/index.page:40(section/title) +msgid "Contact Management" +msgstr "Gestió de contactes" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/status-icons.page:39(None) -msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947" -msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71" +#: C/index.page:44(section/title) +msgid "Text Conversations" +msgstr "Converses de text" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/status-icons.page:45(None) -msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a" -msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207" +#: C/index.page:48(section/title) +msgid "Audio and Video Conversations" +msgstr "Converses de veu i de vÃdeo" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/status-icons.page:53(None) -msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33" -msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0" +#: C/index.page:52(section/title) +msgid "Advanced Actions" +msgstr "Opcions avançades" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/status-icons.page:62(None) C/status-icons.page:69(None) -msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964" -msgstr "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527" +#: C/index.page:56(section/title) C/irc-manage.page:64(section/title) +msgid "Common Problems" +msgstr "Problemes comuns" -#: C/status-icons.page:7(desc) -msgid "Understanding the various statuses and status icons." -msgstr "Explicació dels diversos estats i icones d'estat." +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/account-irc.page:106(media) +msgctxt "_" +msgid "" +"external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'" +msgstr "" +"external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/account-irc.page:109(media) C/prob-conn-auth.page:58(media) +#: C/prob-conn-name.page:44(media) C/prob-conn-neterror.page:59(media) +msgctxt "_" +msgid "" +"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'" +msgstr "" +"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/account-irc.page:112(media) +msgctxt "_" +msgid "" +"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'" +msgstr "" +"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'" + +#: C/account-irc.page:8(info/desc) +msgid "Additional information necessary for connecting to IRC networks." +msgstr "Informació addicional per connectar-se a xarxes d'IRC." -#: C/status-icons.page:20(name) C/salut-protocol.page:36(cite) -#: C/prev-conv.page:20(name) C/prev-conv.page:38(cite) -#: C/import-account.page:27(name) C/disable-account.page:24(name) -#: C/audio-video.page:109(cite) C/audio-video.page:117(cite) -#: C/add-account.page:24(name) C/accounts-window.page:18(name) -#: C/account-jabber.page:14(name) C/account-irc.page:16(name) +#: C/account-irc.page:16(credit/name) C/account-jabber.page:14(credit/name) +#: C/accounts-window.page:18(credit/name) C/add-account.page:25(credit/name) +#: C/disable-account.page:25(credit/name) +#: C/import-account.page:27(credit/name) C/prev-conv.page:21(credit/name) +#: C/status-icons.page:20(credit/name) msgid "Shaun McCance" msgstr "Shaun McCance" -#: C/status-icons.page:21(email) C/prev-conv.page:21(email) -#: C/import-account.page:28(email) C/disable-account.page:25(email) -#: C/add-account.page:25(email) C/accounts-window.page:19(email) -#: C/account-jabber.page:15(email) C/account-irc.page:17(email) -msgid "shaunm@gnome.org" -msgstr "shaunm@gnome.org" - -#: C/status-icons.page:35(title) -msgid "Status Types and Icons" -msgstr "Icones i tipus d'estats" - -#: C/status-icons.page:39(media) -msgid "Available icon" -msgstr "Icona de disponibilitat" - -#: C/status-icons.page:40(gui) -msgid "Available" -msgstr "Disponible" +#: C/account-irc.page:31(page/title) +msgid "IRC account details" +msgstr "Dades del compte d'IRC" -#: C/status-icons.page:41(p) +#: C/account-irc.page:33(page/p) msgid "" -"Use the <em>Available</em> status when you are at your computer and able to " -"chat with your contacts. You can set a custom message for this status." +"IRC accounts require different information than many other types of " +"accounts. To create an IRC account, you must specify at least an IRC network " +"and a nickname. This page details the information you can provide for an IRC " +"account." msgstr "" -"Utilitzeu l'estat <em>Disponible</em> quan esteu a l'ordinador i esteu " -"disponibles per xatejar. Podeu configurar un missatge personalitzat per " -"aquest estat." +"Els comptes d'IRC requereixen una informació diferent que els altres tipus " +"de comptes. Per crear un compte d'IRC heu d'especificar com a mÃnim una " +"xarxa d'IRC i un sobrenom. Aquesta pà gina descriu la informació que podeu " +"proporcionar pel compte d'IRC." -#: C/status-icons.page:45(media) -msgid "Busy icon" -msgstr "Icona d'ocupat" +#: C/account-irc.page:39(note/p) C/irc-manage.page:42(note/p) +msgid "" +"You must have the <sys>telepathy-idle</sys> package installed to use IRC in " +"<app>Empathy</app>." +msgstr "" +"Heu de tenir instal·lat el paquet <sys>telepathy-idle</sys> per utilitzar " +"l'IRC amb l'<app>Empathy</app>." -#: C/status-icons.page:46(gui) -msgid "Busy" -msgstr "Ocupat" +#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title) +msgid "<gui>Network</gui>" +msgstr "<gui>Xarxa</gui>" -#: C/status-icons.page:47(p) +#: C/account-irc.page:46(item/p) msgid "" -"Use the <em>Busy</em> status to let your contacts know that you don’t want " -"to chat right now. They can still contact you, for instance if they have " -"something urgent they need to discuss. By default, <app>Empathy</app> will " -"not use notification bubbles and sounds when you are busy. You can set a " -"custom message for this status." +"IRC is an open system that allows people to run separate IRC networks. Each " +"network is distinct and has its own users and chat rooms. <app>Empathy</app> " +"lists the most popular networks in the <gui>Network</gui> drop-down list. " +"You can add additional networks. See <link xref=\"#networks\"/> below." msgstr "" -"Utilitzeu l'estat <em>Ocupat</em> per mostrar als contactes que no voleu " -"xatejar ara. Encara podran xatejar si volen, per exemple si tenen alguna cosa " -"urgent a comentar-vos. Per defecte, l'<app>Empathy</app> no utilitzarà " -"finestres emergents ni sons quan esteu ocupats. Podeu configurar un missatge " -"personalitzat per aquest estat." - -#: C/status-icons.page:53(media) -msgid "Away icon" -msgstr "Icona d'absent" +"L'IRC és un sistema obert que permet que puguin haver-hi tantes xarxes d'IRC " +"com es vulgui. Cada xarxa és diferent de les altres i té els seus propis " +"usuaris i sales de xat. L'<app>Empathy</app> us mostra les xarxes més " +"populars a la llista desplegable <gui>Xarxa</gui>. Podeu afegir més xarxes " +"si voleu. Vegeu <link xref=\"#networks\"/> més avall." -#: C/status-icons.page:54(gui) -msgid "Away" -msgstr "Absent" +#: C/account-irc.page:53(item/title) +msgid "<gui>Nickname</gui>" +msgstr "<gui>Sobrenom</gui>" -#: C/status-icons.page:55(p) +#: C/account-irc.page:54(item/p) msgid "" -"Use the <em>Away</em> status when you are going away from your computer. " -"<app>Empathy</app> automatically sets your status to Away if you do not use " -"your computer for a while, or if your screensaver is on. By default, " -"<app>Empathy</app> will not use notification bubbles and sounds when you are " -"away. You can set a custom message for this status." +"Your nickname is your unique name on the IRC network. Only one person on a " +"network may use a given nickname. If you get an error message that says " +"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change " +"your nickname." msgstr "" -"Utilitzeu l'estat <em>Absent</em> quan sou lluny de l'ordinador. " -"L'<app>Empathy</app> us posa automà ticament l'estat «Absent» si esteu un temps " -"sense utilitzar l'ordinador o si s'activa l'estalvi de pantalla. Per defecte, " -"l'<app>Empathy</app> no utilitzarà finestres emergents ni sons quan esteu " -"absents. Podeu configurar un missatge personalitzat per aquest estat." - -#: C/status-icons.page:62(media) C/status-icons.page:69(media) -msgid "Offline icon" -msgstr "Icona de desconnectat" +"El vostre sobrenom és el nom únic que us identifica a la xarxa d'IRC. Només " +"una persona pot utilitzar un sobrenom especÃfic a cada xarxa. Si rebeu un " +"error que diu <link xref=\"prob-conn-name\" role=\"error-msg\"/> haureu de " +"canviar el sobrenom." -#: C/status-icons.page:63(gui) -msgid "Invisible" -msgstr "Invisible" +#: C/account-irc.page:60(item/title) +msgid "<gui>Password</gui>" +msgstr "<gui>Contrasenya</gui>" -#: C/status-icons.page:64(p) +#: C/account-irc.page:61(item/p) msgid "" -"When you set your status to <em>Invisible</em>, you will appear as offline " -"to your contacts. You will still be connected to your accounts, and you " -"still see your contacts’ statuses and start conversations with them." +"Some servers, particularly those on private networks, require a password to " +"connect. If you are authorized to use the network, the network " +"administrators should provide you with a password." msgstr "" -"Quan poseu l'estat com a <em>Invisible</em>, apareixereu com a desconnectat " -"per als contactes. Encara estareu connectat als comptes i podreu " -"veure l'estat dels contactes i xatejar-hi." +"Per connectar-se a alguns servidors, en especial els de les xarxes privades, " +"us farà falta una contrasenya. Si esteu autoritzat a utilitzar la xarxa, els " +"seus administradors us en proporcionaran la contrasenya." -#: C/status-icons.page:70(gui) -msgid "Offline" -msgstr "Desconnectat" +#: C/account-irc.page:65(note/title) +msgid "NickServ Passwords" +msgstr "Contrasenyes de NickServ" -#: C/status-icons.page:71(p) +#: C/account-irc.page:66(note/p) msgid "" -"Setting your status to <em>Offline</em> disconnects you from all of your " -"accounts." +"On some networks, nicknames can be registered using a service known as " +"NickServ. <app>Empathy</app> does not directly support nickname passwords. " +"On some networks, including the popular freenode network, server passwords " +"are automatically forwarded to NickServ, allowing you to set this field to " +"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for " +"more details." msgstr "" -"Si establiu l'estat com a <em>Desconnectat</em> us desconnectarà de tots " -"els contactes." - -#: C/share-desktop.page:7(desc) -msgid "Share the desktop with your contacts." -msgstr "Compartiu l'escriptori amb els contactes." +"En algunes xarxes es poden registrar els sobrenoms amb un servei conegut com " +"a NickServ. L'<app>Empathy</app> encara no permet utilitzar sobrenoms amb " +"contrasenyes. En algunes xarxes, entre elles la popular xarxa freenode, els " +"servidors de contrasenyes es reenvien automà ticament al NickServ, de manera " +"que podeu establir aquest camp per identificar-vos amb el NickServ. Vegeu " +"<link xref=\"irc-nick-password\"/> per més informació." -#: C/share-desktop.page:28(title) -msgid "Share your desktop" -msgstr "Compartiu l'escriptori" +#: C/account-irc.page:76(item/title) +msgid "<gui>Real name</gui>" +msgstr "<gui>Nom real</gui>" -#: C/share-desktop.page:30(p) +#: C/account-irc.page:77(item/p) msgid "" -"It is possible, with some of your contacts, to share your desktop with them, " -"or to start using your contacts desktop. You can use this functionality to " -"show your desktop to your contacts, to ask for help or to help your contacts " -"resolve a problem." +"You can provide your real name in addition to your nickname. Other users " +"will be able to see this when they view your information." msgstr "" -"Podeu compartir l'escriptori amb algun contacte o que algun contacte us " -"comparteixi el seu escriptori. Podeu utilitzar-ho per mostrar l'escriptori " -"als contactes, per demanar-los ajuda o ajudar-los a resoldre un problema." +"Podeu proporcionar el vostre nom real conjuntament amb el sobrenom. Els " +"altres usuaris el podran veure quan vegin la vostra informació." + +#: C/account-irc.page:81(item/title) +msgid "<gui>Quit message</gui>" +msgstr "<gui>Missatge de desconnexió</gui>" -#: C/share-desktop.page:38(p) +#: C/account-irc.page:82(item/p) msgid "" -"In order to be able to share your desktop or to remotely use your contacts " -"desktop, it is necessary to have a remote desktop viewer application " -"installed in your system." +"When you go offline, a quit message is sent to all the chat rooms you’re in " +"and to all the users you’re having a private conversation with. Use this " +"field to provide a custom quit message." msgstr "" -"Per tal d'habilitar la compartició d'escriptori o utilitzar de forma remota " -"l'escriptori d'un contacte, us cal tenir una aplicació de visualització " -"d'escriptoris remots instal·lat al sistema." +"Quan sortiu, s'enviarà un missatge a totes les sales de xat que estigueu i " +"tots els usuaris amb els que tingueu xats privats. Utilitzeu aquest camp per " +"proporcionar un missatge de sortida personalitzat." -#: C/share-desktop.page:46(p) C/send-file.page:40(p) -#: C/favorite-rooms.page:66(p) -msgid "From the <gui>Contact List</gui> window, perform one of the following:" -msgstr "" -"Des de la finestra <gui>Llista de contactes</gui> executeu una de les " -"següents accions:" +#: C/account-irc.page:94(info/title) +msgctxt "link" +msgid "IRC Networks" +msgstr "Xarxes d'IRC" -#: C/share-desktop.page:51(p) +#: C/account-irc.page:97(section/title) +msgid "Networks" +msgstr "Xarxes" + +#: C/account-irc.page:99(section/p) msgid "" -"Select the contact you want to share your desktop with, and choose " -"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></" -"guiseq>." +"<app>Empathy</app> includes a list of popular IRC networks. If you wish to " +"another IRC network, you can add it to the list. You can also modify " +"networks and remove them from the list." msgstr "" -"Seleccioneu el contacte amb el que voleu compartir l'escriptori i escolliu " -"<guiseq><gui>Edita</gui><gui>Contacte</gui><gui>Comparteix el meu " -"escriptori</gui></guiseq>." +"L'<app>Empathy</app> inclou una llista de les xarxes d'IRC més populars. Si " +"voleu una altra xarxa, podeu afegir-la a la llista. També podeu modificar " +"xarxes existents i esborrar-ne de la llista." -#: C/share-desktop.page:57(p) +#: C/account-irc.page:104(item/p) msgid "" -"Right-click on the name of the contact you want to share your desktop with, " -"and select <gui>Share my desktop</gui>." +"To add a network to the list, click <media type=\"image\" mime=\"image/png\" " +"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>." msgstr "" -"Feu clic amb el botó secundari sobre el contacte amb el qual voleu compartir " -"l'escriptori i seleccioneu <gui>Comparteix el meu escriptori</gui>." +"Feu clic a <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-add.png" +"\" width=\"16\" height=\"16\">Afegeix</media> per afegir una xarxa a la " +"llista." -#: C/share-desktop.page:65(p) +#: C/account-irc.page:107(item/p) msgid "" -"A request will be sent to the contact you want to share your desktop with. " -"If they accept, the default remote desktop viewer application will be " -"launched in order to permit you to disconnect the user that is controlling " -"your desktop." +"To modify a network in the list, select the network and click <media type=" +"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" " +"height=\"16\">Edit</media>." msgstr "" -"S'enviarà una sol·licitud al contacte amb el qual voleu compartir " -"l'escriptori. Si l'accepta s'iniciarà l'aplicació de visualització " -"d'escriptoris remots per permetre-us desconnectar l'usuari que controla " -"el vostre escriptori." +"Seleccioneu una xarxa de la llista i feu clic a <media type=\"image\" mime=" +"\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">Edita</" +"media> per modificar una xarxa de la llista." -#: C/share-desktop.page:70(p) +#: C/account-irc.page:110(item/p) msgid "" -"For more information about how to use the remote desktop viewer application, " -"refer to its help." +"To remove a network from the list, select the network and click <media type=" +"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" " +"height=\"16\">Remove</media>." msgstr "" -"Per més informació sobre com utilitzar l'aplicació de visualització " -"d'escriptoris remots mireu la seva ajuda." +"Seleccioneu una xarxa de la llista i feu clic a <media type=\"image\" mime=" +"\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=" +"\"16\">Suprimeix</media> per suprimir una xarxa de la llista." -#: C/share-desktop.page:77(p) +#: C/account-irc.page:115(section/p) msgid "" -"When you share your desktop with someone else, it is possible to experience " -"system performance slowdown and low Internet speed." +"When adding or modifying a network, you can enter the following information:" msgstr "" -"Quan compartiu l'escriptori amb algú altre, podeu notar un alentiment del " -"sistema i una disminució de la velocitat d'Internet." +"Quan afegiu o modifiqueu una xarxa podeu introduir la informació següent:" -#: C/share-desktop.page:83(p) +#: C/account-irc.page:121(item/p) msgid "" -"Not all your contacts might be able to support this functionality. It is " -"necessary for them to have at least the 2.28 version of <app>Empathy</app> " -"and a remote desktop viewer application installed in their system." +"This is the name of the network as you want it to appear in the list of " +"networks." msgstr "" -"Potser no tots els contactes podran utilitzar aquesta funció. Cal que tinguin " -"com a mÃnim la versió 2.28 de l'<app>Empathy</app> i una aplicació " -"de visualització d'escriptoris remots instal·lada al sistema." - -#: C/set-custom-status.page:9(desc) -msgid "Add, edit or delete personal messages for your status." -msgstr "Afegiu, editeu o suprimiu missatges personals dels vostres estats." - -#: C/set-custom-status.page:15(name) -msgid "Jim Campbell" -msgstr "Jim Campbell" - -#: C/set-custom-status.page:16(email) -msgid "jwcampbell@gmail.com" -msgstr "jwcampbell@gmail.com" +"Aquest és el nom de la xarxa que voleu que aparegui a la llista de xarxes." -#: C/set-custom-status.page:34(title) -msgid "Set a custom message" -msgstr "Establiu un missatge personalitzat" +#: C/account-irc.page:125(item/title) +msgid "<gui>Charset</gui>" +msgstr "<gui>Joc de carà cters</gui>" -#: C/set-custom-status.page:36(p) +#: C/account-irc.page:126(item/p) msgid "" -"Sometimes you may want to set a custom message for your status, for example " -"to let people know that you will be unavailable for a certain period of time." +"This specifies the character encoding that is typically used on this " +"network. A character encoding is a specific way of recording characters " +"internally in a computer. There are many character encodings, and you need " +"to use the same character encoding as other users to see their messages " +"correctly." msgstr "" -"A vegades voleu deixar un missatge personalitzat pel vostre estat, per exemple " -"per fer saber als contactes que no estareu disponible durant una estona." +"Això especifica la codificació de carà cters que s'utilitza en aquesta xarxa. " +"Una codificació de carà cters és un format especÃfic per enregistrar " +"carà cters internament a l'ordinador. Hi ha moltes codificacions de carà cters " +"i heu d'utilitzar la mateixa que els altres usuaris per veure els missatges " +"de forma correcta." -#: C/set-custom-status.page:40(p) +#: C/account-irc.page:135(item/p) msgid "" -"It is possible to set a custom message based on the different statuses " -"available." +"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that " +"can handle text from most of the world's languages. Another common encoding " +"for English and some other Western languages is ISO-8859-1." msgstr "" -"Podeu deixar un missatge personalitzat per a cada estat disponible." +"Per defecte l'<app>Empathy</app> utilitza l'UTF-8 , una codificació de " +"carà cters moderna que pot gestionar text escrit en la immensa majoria de les " +"llengües del món. Una altra codificació de carà cters per l'anglès i algunes " +"llengües occidentals és l'ISO-8859-1." -#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p) +#: C/account-irc.page:141(item/title) +msgid "<gui>Servers</gui>" +msgstr "<gui>Servidors</gui>" + +#: C/account-irc.page:142(item/p) msgid "" -"From the <gui>Contact List</gui> window, click on the drop-down list at the " -"top." +"An IRC network may have many servers you can connect to. When you are " +"connected to a server on a particular network, you can communicate with all " +"users on all other servers on that network. You can add and remove servers " +"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons." msgstr "" -"Des de la finestra <gui>Llista de contactes</gui> feu clic a la llista " -"desplegable de la part superior." +"Una xarxa d'IRC pot tenir molts servidors als que us podeu connectar. Quan " +"esteu connectat a un servidor d'una xarxa en particular, us podeu comunicar " +"amb tots els usuaris de tots els servidors d'aquella xarxa. Podeu afegir o " +"suprimir servidors per a aquesta xarxa utilitzant els botons <gui>Afegeix</" +"gui> i <gui>Suprimeix</gui>." -#: C/set-custom-status.page:52(p) +#: C/account-irc.page:147(item/p) msgid "" -"Select the status you want to add a custom message to. You have to select " -"the one identified with the label <gui>Custom Message</gui>." +"When a server is selected, click the field under <gui>Server</gui> or " +"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys " +"to focus the field, and press the space bar to begin editing." msgstr "" -"Seleccioneu l'estat al que voleu afegir-li el missatge personalitzat. Heu de " -"seleccionar el que està identificat amb l'etiqueta <gui>Missatge personalitzat</" -"gui>." +"Quan seleccioneu un servidor feu clic al camp de <gui>Servidor</gui> o " +"<gui>Port</gui> per editar-lo. També ho podeu fer amb les tecles de " +"navegació de cap a la dreta i de cap a l'esquerra per donar el focus al camp " +"i si feu clic a la barra espaiadora editareu el camp." -#: C/set-custom-status.page:58(p) +#: C/account-irc.page:151(item/p) msgid "" -"Enter your custom message in the text box at the top of the window, and " -"press <key>Enter</key> to set the message." +"Select the check box in the <gui>SSL</gui> column to encrypt all " +"communication with a server. Note that this does not prevent other users on " +"the network from seeing what you write on public chat rooms." msgstr "" -"Introduïu el missatge personalitzat a la caixa de text de dalt de la finestra " -"i premeu <key>Retorn</key> per establir el missatge." +"Seleccioneu la casella de selecció de la columna <gui>SSL</gui> per xifrar " +"totes les comunicacions amb el servidor. Adoneu-vos que això no impedirà que " +"altres usuaris de la xarxa puguin veure el que escriviu en un xat públic." + +#: C/account-jabber.page:7(info/desc) +msgid "Advanced options for Jabber and Google Talk accounts." +msgstr "Opcions avançades per als comptes de Jabber i de Google Talk." -#: C/set-custom-status.page:64(p) +#: C/account-jabber.page:29(page/title) +msgid "Jabber account details" +msgstr "Dades dels comptes de Jabber" + +#: C/account-jabber.page:31(page/p) msgid "" -"If you want to set the custom message as a favorite, saving it in order to " -"use it again, click on the little star on the right of the text box where " -"you wrote your custom message." +"Most Jabber accounts will require only a login ID and a password to connect. " +"For some accounts or on certain types of networks, you may need to enter " +"additional information in the <gui>Advanced</gui> section. Normally, you " +"will not need to use the advanced options below. For general instructions on " +"adding an account, see <link xref=\"add-account\"/>." msgstr "" -"Si voleu establir el missatge personalitzat com a preferit, per poder-lo " -"utilitzar en un altre moment, feu clic a l'estrela petita a la dreta de la " -"caixa de text on heu escrit el missatge personalitzat." +"Per connectar-se a la majoria de comptes de Jabber només fa falta el nom " +"d'usuari i la contrasenya. Tot i aixÃ, per alguns comptes o tipus de xarxes " +"haureu d'introduir informació addicional al secció <gui>Avançada</gui>. " +"Normalment, no us farà falta utilitzar les opcions avançades. Vegeu <link " +"xref=\"add-account\"/> per les instruccions generals de com afegir comptes." -#: C/set-custom-status.page:69(p) +#: C/account-jabber.page:39(note/p) msgid "" -"If you do not do it, the custom message will not be available the next time " -"you use <app>Empathy</app>. It will be saved only for the current session." +"Google Talk is a type of Jabber account. These instructions hold for Google " +"Talk accounts as well." msgstr "" -"So no el deseu com a preferit quan torneu a iniciar l'<app>Empathy</app> no " -"estarà disponible com a missatge personalitzat. Només es desarà per la sessió " -"actual." +"Com que el Google Talk també és un tipus de compte de Jabber, les " +"instruccions següents també serveixen." -#: C/set-custom-status.page:78(title) -msgid "Edit, remove and add a custom message" -msgstr "Editeu , suprimiu i afegiu un missatge personalitzat" +#: C/account-jabber.page:45(item/title) +msgid "<gui>Encryption required (TLS/SSL)</gui>" +msgstr "<gui>Es requereix encriptació (TLS/SSL)</gui>" -#: C/set-custom-status.page:88(p) -msgid "Select <gui>Edit Custom Message</gui>." -msgstr "Seleccioneu <gui>Edita el missatge personalitzat</gui>." +#: C/account-jabber.page:46(item/title) +msgid "<gui>Ignore SSL certificate errors</gui>" +msgstr "<gui>Ignora els errors del certificat SSL</gui>" -#: C/set-custom-status.page:95(p) -msgid "To edit a custom message:" -msgstr "Per editar un missatge personalitzat:" - -#: C/set-custom-status.page:100(p) +#: C/account-jabber.page:47(item/p) msgid "" -"From the <gui>Saved Presets</gui> box, select the status message you want to " -"edit and double-click on it." -msgstr "" -"Des de la caixa <guilabel>Parà metres desats</guilabel>, seleccioneu el " -"missatge d'estat que voleu editar i feu-hi doble clic." - -#: C/set-custom-status.page:106(p) -msgid "Type the new custom message and press <key>Enter</key> to modify it." +"Whenever possible, communication between <app>Empathy</app> and the Jabber " +"server is encrypted. If encrypted communication is not possible, messages " +"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent " +"<app>Empathy</app> from communicating with the Jabber server when encryption " +"is not possible." msgstr "" -"Teclegeu el missatge personalitzat nou i premeu <key>Retorn</key> per " -"modificar-lo." - -#: C/set-custom-status.page:113(p) -msgid "To remove a custom message:" -msgstr "Per suprimir un missatge personalitzat:" +"Sempre que sigui possible, es xifren les comunicacions entre l'<app>Empathy</" +"app> i el servidor de Jabber. Si no és possible, s'envien els missatges " +"sense xifrar. Seleccioneu <gui>Es requereix encriptació</gui> per impedir " +"que l'<app>Empathy</app> es comuniqui amb el servidor de Jabber si no es pot " +"establir una comunicació xifrada." -#: C/set-custom-status.page:118(p) +#: C/account-jabber.page:52(item/p) msgid "" -"From the <gui>Saved Presets</gui> box, select the status message you want to " -"remove." +"Some Jabber servers may encrypt data using invalid certificates, or using " +"certificates from unknown authorities. If you trust the server you are " +"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to " +"allow encrypted communication with invalid certificates." msgstr "" -"Des de la caixa <guilabel>Parà metres desats</guilabel>, seleccioneu el " -"missatge d'estat que voleu suprimir." +"Alguns servidors de Jabber xifren les dades amb certificats no và lids o " +"d'autoritats no reconegudes. Si confieu en el servidor al que us connecteu, " +"podeu seleccionar <gui>Ignora els errors del certificat SSL</gui> per " +"permetre la comunicació xifrada amb certificats no và lids." -#: C/set-custom-status.page:124(p) -msgid "Click on the <gui>Remove</gui> button." -msgstr "Feu clic al botó <gui>Suprimeix</gui>." +#: C/account-jabber.page:59(item/title) +msgid "<gui>Resource</gui>" +msgstr "<gui>Recurs</gui>" -#: C/set-custom-status.page:131(p) +#: C/account-jabber.page:60(item/title) +msgid "<gui>Priority</gui>" +msgstr "<gui>Prioritat</gui>" + +#: C/account-jabber.page:61(item/p) msgid "" -"To add a new custom message, from the <gui>Add New Preset</gui> section:" +"If you have multiple applications (for instance, on separate computers) " +"connected to your account at the same time, you can set a resource to " +"uniquely identify each one. By default, <app>Empathy</app> will use " +"<input>Telepathy</input> as the resource." msgstr "" -"Per afegir un missatge personalitzat nou des de la secció <gui>Afegeix un " -"parà metre nou</gui>:" +"Si teniu més d'una aplicació (en ordinadors diferents) connectats al mateix " +"temps al mateix compte, podeu configurar un recurs per identificar de forma " +"inequÃvoca cadascun d'ells. Per defecte l'<app>Empathy</app> utilitzarà " +"<input>Telepathy</input> com a recurs." -#: C/set-custom-status.page:136(p) +#: C/account-jabber.page:65(item/p) msgid "" -"Click on the drop-down list to select the status you want to set a custom " -"message to." +"You can set the priority to specify which application should receive " +"incoming messages from your contacts. New messages will be sent to the " +"application with the highest priority." msgstr "" -"Feu clic a la llista desplegable per seleccionar l'estat al que voleu " -"afegir-hi el missatge personalitzat." +"Podeu establir la prioritat per especificar quina aplicació rebrà els " +"missatges entrants dels contactes. Els missatges nous s'enviaran a " +"l'aplicació que tingui la mà xima prioritat." -#: C/set-custom-status.page:142(p) -msgid "Click on the text box, and type the new custom message." -msgstr "Feu clic a la caixa de text i escriu el missatge personalitzat nou." +#: C/account-jabber.page:70(item/title) +msgid "<gui>Override server settings</gui>" +msgstr "<gui>Sobreescriu els parà metres del servidor</gui>" -#: C/set-custom-status.page:147(p) -msgid "Click on <gui>Add</gui> to add the new message to the presets ones." +#: C/account-jabber.page:71(item/p) +msgid "" +"<app>Empathy</app> will use default settings to connect to the Jabber server " +"based on your login ID. For some Jabber servers, you will need to enter " +"custom server settings manually. These settings should be provided for you " +"by your Jabber provider." msgstr "" -"Feu clic a <gui>Afegeix</gui> per afegir el missatge nou als per defecte." +"L'<app>Empathy</app> utilitza els parà metres per defecte, basant-se en el " +"nom d'usuari, per connectar-se al servidor de Jabber. Per alguns servidors " +"de Jabber us caldrà introduir els parà metres del servidor manualment. " +"Aquests parà metres els hauria de proporcionar el proveïdor de Jabber." -#: C/set-custom-status.page:156(p) -msgid "When finished, click on <gui>Close</gui>." -msgstr "Feu clic a <gui>Tanca</gui> quan hà giu acabat." +#: C/accounts-window.page:11(info/desc) +msgid "Add, modify, and delete accounts." +msgstr "Afegiu, modifiqueu i suprimiu comptes." -#: C/set-custom-status.page:163(p) +#: C/accounts-window.page:33(page/title) +msgid "Accounts Window" +msgstr "Finestra dels comptes" + +#: C/accounts-window.page:35(page/p) msgid "" -"When you edit or add a new custom message, it will not be set as the current " -"status message. You will need to select it from the <gui>Contact List</gui> " -"window." +"The <gui>Accounts</gui> window allows you to add, modify, and delete " +"accounts." msgstr "" -"Quan editeu o afegiu un missatge personalitzat nou, no s'establirà com " -"el missatge actual. L'haureu de seleccionar a la finestra <gui>Llista de " -"contactes</gui>." +"La finestra dels <gui>Comptes</gui> us permet afegir, modificar i suprimir " +"comptes." -#: C/send-message.page:8(desc) -msgid "Send a message to one of your contacts." -msgstr "Envieu un missatge a un dels contactes." +#: C/accounts-window.page:43(section/title) +msgid "Account Details" +msgstr "Dades dels comptes" -#: C/send-message.page:17(name) C/send-file.page:17(name) -#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name) -#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name) -#: C/change-status.page:19(name) C/add-contact.page:18(name) -msgid "Phil Bull" -msgstr "Phil Bull" +#: C/accounts-window.page:44(section/p) +msgid "" +"For most types of accounts, you can simply enter a login ID and a password. " +"Certain accounts or account types, however, may require additional " +"information." +msgstr "" +"Per a majoria de tipus de comptes només us caldrà entrar el nom d'usuari i " +"la contrasenya. Tanmateix alguns comptes o tipus de comptes requereixen " +"informació addicional." -#: C/send-message.page:18(email) C/send-file.page:18(email) -#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email) -#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email) -#: C/change-status.page:20(email) C/add-contact.page:19(email) -msgid "philbull@gmail.com" -msgstr "philbull@gmail.com" +#: C/add-account.page:9(info/desc) +msgid "Add a new account to <app>Empathy</app>." +msgstr "Afegiu un compte nou a l'<app>Empathy</app>." -#: C/send-message.page:32(title) -msgid "Send a message to someone" -msgstr "Envieu una missatge a algú" +#: C/add-account.page:40(page/title) +msgid "Add a new account" +msgstr "Afegiu un compte nou" -#: C/send-message.page:36(p) -#, fuzzy -#| msgid "" -#| "Double click the name of the contact that you want to have a conversation " -#| "with." +#: C/add-account.page:42(page/p) msgid "" -"From the <gui>Contact List</gui> window, double-click the name of the " -"contact that you want to have a conversation with." +"You can add instant messaging accounts from any supported service to " +"communicate with all of your contacts in <app>Empathy</app>. For some " +"account providers, these steps will also allow you to register for a new " +"account. For more details, see <link xref=\"create-account\"/>." msgstr "" -"Feu doble clic sobre el nom del contacte amb el qual voleu tindre la " -"conversació." +"Podeu afegir comptes de missatgeria instantà nia per a qualsevol servei " +"habilitat per comunicar-vos amb el contactes a través de l'<app>Empathy</" +"app>. Per a alguns proveïdors de comptes aquests passos us permeten " +"registrar-hi un compte nou. Vegeu <link xref=\"create-account\"/> per a més " +"informació." -#: C/send-message.page:42(p) +#: C/add-account.page:49(item/p) C/disable-account.page:49(item/p) +#: C/irc-nick-password.page:50(item/p) C/remove-account.page:43(item/p) msgid "" -"A new window will open. Type a message into the box at the bottom of the " -"window and press <key>Enter</key> to send it." +"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui> " +"<gui>Accounts</gui></guiseq>, or press <key>F4</key>." msgstr "" -"S'obrirà una finestra nova. Teclegeu el missatge a la caixa a la part " -"inferior de la finestra i premeu <key>Retorn</key> per enviar-lo." +"Des de la finestra <gui>Llista de contactes</gui> seleccioneu " +"<guiseq><gui>Edita</gui><gui>Comptes</gui></guiseq> o premeu la tecla " +"<key>F4</key>." -#: C/send-message.page:50(title) -#, fuzzy -#| msgid "Send a message to someone" -msgid "Send a message to a meta-contact" -msgstr "Com enviar una missatge a algú" +#: C/add-account.page:53(item/p) +msgid "Click <gui style=\"button\">+</gui>." +msgstr "Feu clic a <gui style=\"button\">+</gui>." -#: C/send-message.page:58(p) +#: C/add-account.page:58(item/p) msgid "" -"Select the contact you want to have the conversation, and from the menu " -"select <gui style=\"menuitem\">Chat</gui>." +"From the <gui>Protocol</gui> drop-down list, select the type of account you " +"wish to add." msgstr "" -"Seleccioneu el contacte amb el que voleu conversar i des del menú seleccioneu " -"<gui style=\"menuitem\">Xat</gui>." - -#: C/send-file.page:8(desc) -msgid "Send a file from your computer to one of your contacts." -msgstr "Envieu un fitxer des del vostre ordinador a un dels contactes." +"Des de la llista desplegable de <gui>Protocol</gui>, seleccioneu el tipus de " +"compte que vulgueu afegir." -#: C/send-file.page:36(title) -msgid "Send files" -msgstr "Envia fitxers" +#: C/add-account.page:62(item/p) +msgid "" +"If you do not already have a registered account, select <gui>Create a new " +"account on the server</gui>. This feature is not available for all account " +"types, and may not work with some account providers. See <link xref=\"create-" +"account\"/> for more information." +msgstr "" +"Si no teniu un compte registrat, seleccioneu <gui>Crea un compte nou al " +"servidor</gui>. Aquesta caracterÃstica no està disponible per tots els tipus " +"de comptes i pot no funcionar amb alguns proveïdors. Vegeu <link xref=" +"\"create-account\"/> per a més informació." -#: C/send-file.page:45(p) +#: C/add-account.page:69(item/p) msgid "" -"Right click on the contact you want to send a file to, and choose <gui>Send " -"file</gui>." +"Enter the required information. For most accounts, you will only need a " +"login ID and a password. Some accounts may require additional information. " +"See <link xref=\"accounts-window#details\"/>for more information." msgstr "" -"Feu clic amb el botó secundari al contacte que li voleu enviar el fitxer i " -"seleccioneu <gui>Envia un fitxer</gui>." +"Introduïu la informació requerida. Per la majoria de comptes només us caldrà " +"un nom d'usuari i una contrasenya. En alguns comptes cal més informació. " +"Vegeu <link xref=\"accounts-window#details\"/> per a més informació." -#: C/send-file.page:50(p) +#: C/add-account.page:74(item/p) C/import-account.page:61(item/p) +#: C/irc-nick-password.page:63(item/p) +msgid "Click <gui style=\"button\">Apply</gui>." +msgstr "Feu clic a <gui style=\"button\">Aplica</gui>." + +#: C/add-account.page:81(note/p) msgid "" -"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</" -"gui><gui>Contact</gui><gui>Send file</gui></guiseq>." +"To change the name that identifies the account in the <gui>Accounts</gui> " +"window, select the account from the list on the left and either click on the " +"name or press the space bar. Edit the account name and press <key>Enter</" +"key> when you’re finished." msgstr "" -"Feu clic al contacte que li voleu enviar un fitxer i seleccioneu" -"<guiseq><gui>Edita</gui><gui>Contacte</gui><gui>Envia un fitxer</gui></guiseq>." +"Per canviar el nom que identifica el compte a la finestra <gui>Comptes</" +"gui>, seleccioneu el compte des de la llista de l'esquerra i feu clic sobre " +"el nom o premeu la barra espaiadora. Editeu el nom del compte i feu clic a " +"<key>Retorn</key> quan hageu acabat." -#: C/send-file.page:58(p) -msgid "Select the file to send, and click on <gui>Send</gui>." -msgstr "Seleccioneu el fitxer a enviar i feu clic a <gui>Envia</gui>." +#: C/add-contact.page:9(info/desc) +msgid "Add someone to the contact list." +msgstr "Afegiu algú a la llista de contactes." -#: C/send-file.page:63(p) -msgid "The <gui>File Transfers</gui> window will appear." -msgstr "Apareixerà la finestra <gui>Transferències de fitxers</gui>." +#: C/add-contact.page:18(credit/name) C/change-status.page:24(credit/name) +#: C/prob-conn-acctdisabled.page:15(credit/name) +#: C/prob-conn-auth.page:17(credit/name) +#: C/prob-conn-neterror.page:15(credit/name) C/prob-conn.page:14(credit/name) +#: C/send-file.page:17(credit/name) C/send-message.page:17(credit/name) +msgid "Phil Bull" +msgstr "Phil Bull" -#: C/send-file.page:66(p) -msgid "" -"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> " -"to halt the transfer." +#: C/add-contact.page:33(page/title) +msgid "Add someone to your list of contacts" +msgstr "Afegiu algú a la llista de contactes" + +#: C/add-contact.page:37(item/p) +msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>." msgstr "" -"Espereu que el contacte accepti la transferència del fitxer o feu clic a " -"<gui>Atura</gui> per aturar la transferència." +"Seleccioneu <guiseq><gui>Xat</gui><gui>Afegeix contacte</gui></guiseq>." -#: C/send-file.page:72(p) +#: C/add-contact.page:40(item/p) msgid "" -"Once the transfer is finished, it is possible to close the <gui>File " -"Transfers</gui> window." +"From the <gui>Account</gui> drop-down list, select the account you wish to " +"use to connect to your contact. Your contact will need to be using the same " +"service as the account you select." msgstr "" -"Una vegada s'hagi acabat la transferència podeu tancar la finestra " -"<gui>Transferències de fitxers</gui>." +"Des de la llista desplegable del <gui>Compte</gui>, seleccioneu el compte " +"que voleu utilitzar per connectar-vos amb el contacte. Haurà d'utilitzar el " +"mateix servei que el compte que seleccioneu." -#: C/send-file.page:80(p) +#: C/add-contact.page:45(item/p) msgid "" -"If you have multiple finished transfers listed in the window, click on " -"<gui>Clear</gui> to empty the list. This will only remove the files from the " -"list and will not delete them from your computer." +"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, " +"screen name, or other appropriate identifier for the service type." msgstr "" -"Si teniu llistades múltiples transferències acabades a la finestra, feu clic " -"a <gui>Neteja</gui> per buidar la llista. Només s'esborraran de la " -"llista, no s'esborraran els fitxers de l'ordinador." +"Al camp <gui>Identificador</gui> introduïu l'identificador d'entrada del " +"contacte, el seu nom d'usuari, el nom de pantalla o qualsevol identificador " +"apropiat per al tipus de servei." -#: C/send-file.page:87(p) +#: C/add-contact.page:49(item/p) msgid "" -"It is possible to send files only using the following services: <em>Jabber</" -"em>, <em>Google Talk</em> and <em>People Nearby</em>." +"In the <gui>Alias</gui> field, type your contact’s name as you would like it " +"to appear in your contact list." msgstr "" -"Només podeu enviar fitxers amb els serveis següents: <em>Jabber</em>, " -"<em>Google Talk</em> i <em>Gent propera</em>." +"Al camp <gui>Àlies</gui> introduïu el nom del contacte tal com voleu que " +"aparegui a la llista de contactes." + +#: C/add-contact.page:53(item/p) +msgid "Click <gui>Add</gui> to add the person to your list of contacts." +msgstr "" +"Feu clic a <gui>Afegeix</gui> per afegir el contacte a la llista de " +"contactes." -#: C/send-file.page:93(p) +#: C/add-contact.page:61(note/p) msgid "" -"In order to send a file to someone, you need to be connected to the " -"Internet, or to a local area network." +"To add a new person to your list of contacts, you need to be connected to " +"the Internet and to your account." msgstr "" -"Per enviar un fitxer a algú us cal estar connectat a Internet o a una " -"xarxa d'à rea local." +"Per afegir una persona nova a la llista de contactes heu d'estar connectat a " +"Internet i al compte." -#: C/salut-protocol.page:8(desc) -msgid "Understanding the People Nearby feature." -msgstr "Explicació sobre la funció de «Gent propera»." +#: C/audio-call.page:10(info/desc) +msgid "Call your contacts over the Internet." +msgstr "Truqueu els contactes per Internet." -#: C/salut-protocol.page:33(title) -msgid "What is People Nearby?" -msgstr "Què és la «Gent propera»?" +#: C/audio-call.page:26(credit/name) C/overview.page:16(credit/name) +#: C/share-desktop.page:18(credit/name) C/video-call.page:29(credit/name) +msgid "Ekaterina Gerasimova" +msgstr "Ekaterina Gerasimova" -#: C/salut-protocol.page:37(p) -msgid "I'd like to see this played up a bit more." -msgstr "" +#: C/audio-call.page:35(page/title) +msgid "Start an audio conversation" +msgstr "Inicieu una conversa de veu" -#: C/salut-protocol.page:40(p) +#: C/audio-call.page:37(page/p) msgid "" -"The People Nearby service is a serverless communication service: you do not " -"need to connect and authenticate to a central server in order to use it." +"You can call your contacts and have an audio conversation with them. This " +"features only works with certain types of accounts and it requires the other " +"person to have an application that supports audio calls." msgstr "" -"El servei de «Gent propera» és un servei de comunicació descentralitzat: no us " -"cal estar connectat ni autenticar-vos amb un servidor central per utilitzar-lo." +"Podeu trucar als contactes i mantenir-hi converses de veu. Aquesta " +"caracterÃstica només funciona amb alguns tipus de comptes i requereix que " +"l'altra persona també tingui una aplicació que permeti realitzar trucades de " +"veu." -#: C/salut-protocol.page:45(p) +#: C/audio-call.page:43(item/p) msgid "" -"This kind of serverless messaging system is restricted to a local area " -"network and an active Internet connection is not necessary." +"Right-click on the contact that you want to call and select <gui style=" +"\"menuitem\">Audio Call</gui>." msgstr "" -"Aquest tipus de sistema de missatgeria descentralitzat està restringit a una " -"xarxa local i no cal una connexió a Internet activa." +"Amb el botó secundari feu clic al contacte amb el qual voleu conversar i " +"escolliu <gui style=\"menuitem\">Trucada de veu</gui>." -#: C/salut-protocol.page:49(p) +#: C/audio-call.page:49(item/p) C/video-call.page:50(item/p) msgid "" -"The people that use this service inside the same local area network will be " -"auto-discovered, and it will be possible to send them messages and files as " -"with other services." +"A new window will open. When the connection is established, you will see the " +"total conversation time at the bottom of the window." msgstr "" -"La gent que utilitza aquest servei dins de la xarxa local apareixeran " -"automà ticament i es podran enviar missatges i fitxers igual com en els altres " -"serveis." +"S'obrirà una finestra nova. Quan s'estableixi la connexió veureu que a la " +"part inferior de la finestra es mostrarà la durada de la conversa." -#: C/salut-protocol.page:54(p) +#: C/audio-call.page:55(item/p) msgid "" -"All the modern local area networks should be able to support this kind of " -"service." +"To end the conversation, click the <gui style=\"button\">hand up</gui> " +"button." msgstr "" -"Totes les xarxes locals modernes haurien de permetre aquest tipus de servei." +"Per acabar la conversa feu clic al botó <gui style=\"button\">Penja</gui>." -#: C/remove-account.page:8(desc) -msgid "Completely remove an account from <app>Empathy</app>." -msgstr "Suprimeix un compte completament de l'<app>Empathy</app>." +#: C/audio-call.page:63(note/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>." +msgstr "" +"Per convertir una conversa de veu en una conversa de vÃdeo, escolliu " +"<guiseq><gui style=\"menu\">VÃdeo</gui> <gui style=\"menuitem\">Activa el " +"vÃdeo</gui></guiseq>." -#: C/remove-account.page:33(title) -msgid "Remove an account" -msgstr "Com suprimir un compte" +#: C/audio-call.page:71(section/title) +msgid "Start an audio conversation with a meta-contact" +msgstr "Inicieu una conversa de veu amb un metacontacte" -#: C/remove-account.page:35(p) +#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p) +#: C/video-call.page:68(item/p) msgid "" -"You can completely remove an account from <app>Empathy</app> if you no " -"longer wish to use the account. If you wish to use the account in " -"<app>Empathy</app> again in the future, you will have to add your account " -"details again." +"From the <gui>Contact List</gui> window, right-click on the meta-contact." msgstr "" -"Podeu suprimir un compte completament de l'<app>Empathy</app> si no voleu " -"utilitzar-lo més. Si voleu utilitzar el compte un altre cop amb l'<app>Empathy" -"</app> en un futur haureu de tornar a crear el compte amb totes les seves dades." +"Des de la finestra <gui>Llista de contactes</gui>, feu clic amb el botó " +"secundari al metacontacte." -#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p) -#: C/disable-account.page:48(p) C/add-account.page:48(p) +#: C/audio-call.page:79(item/p) msgid "" -"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</" -"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>." +"Select the contact you want to have the conversation, and from the menu " +"select <gui style=\"menuitem\">Audio Call</gui>." msgstr "" -"Des de la finestra <gui>Llista de contactes</gui> seleccioneu " -"<guiseq><gui>Edita</gui><gui>Comptes</gui></guiseq> o premeu <key>F4</key>." +"Seleccioneu el contacte amb el que voleu mantenir la conversa i des del menú " +"seleccioneu <gui style=\"menuitem\">Trucada de veu</gui>." -#: C/remove-account.page:46(p) +#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p) +#: C/video-call.page:80(note/p) msgid "" -"Select the account you wish to remove from the accounts list on the left " -"side of the window." +"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a " +"contact in the <gui>Contact List</gui> window, and stop over it for a " +"second: a small pop-up message will appear showing the number of the " +"contacts that form the meta-contact." msgstr "" -"Seleccioneu el compte que vulgueu suprimir de la llista de comptes a la part " -"esquerra de la finestra." +"Per reconèixer si un contacte és un <em>metacontacte</em> situeu el ratolà a " +"sobre d'un contacte de la finestra <gui>Llista de contactes</gui> i " +"mantingueu-lo a sobre durant un segon: apareixerà un petit missatge emergent " +"que mostrarà el nombre de contactes que formen el metacontacte." -#: C/remove-account.page:50(p) -msgid "Click on <gui style=\"button\">Remove</gui>." -msgstr "Feu clic al botó <gui style=\"button\">Suprimeix</gui>." +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/audio-video.page:58(media) +msgctxt "_" +msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'" +msgstr "external ref='figures/audio-input-microphone.png' md5='__failed__'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/audio-video.page:70(media) +msgctxt "_" +msgid "external ref='figures/camera-web.png' md5='__failed__'" +msgstr "external ref='figures/camera-web.png' md5='__failed__'" -#: C/remove-account.page:53(p) +#: C/audio-video.page:8(info/desc) msgid "" -"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> " -"button to permanently remove the account." +"Information on when it is possible to have an audio or video conversation." msgstr "" -"Es mostrarà un dià leg sol·licitant la confirmació. Feu clic al botó " -"<gui>Suprimeix</gui> per a suprimir el compte permanentment." +"Informació sobre quan és possible realitzar una conversa de veu o de vÃdeo." -#: C/remove-account.page:59(p) -msgid "" -"Even after removing an account, <app>Empathy</app> does not delete your " -"conversation history for that account." -msgstr "" -"Fins i tot després de la supressió d'un compte l'<app>Empathy</app> no esborrarà " -"l'historial de converses del compte." +#: C/audio-video.page:32(page/title) +msgid "Audio and video support" +msgstr "Àudio i vÃdeo" -#: C/prob-conn.page:7(desc) -msgid "Diagnose common problems connecting to an instant messaging service." +#: C/audio-video.page:34(page/p) +msgid "" +"You can only have audio and video conversation with contacts who are using " +"an application which also supports this feature. When your contacts support " +"audio or video conversations, you will see the following icons next to their " +"names in the contact list:" msgstr "" -"Diagnostiqueu problemes comuns en intentar-se connectar a un servei de missatgeria " -"instantà nia." +"Només podeu realitzar converses de veu i de vÃdeo amb els contactes que " +"utilitzin una aplicació que permeti aquestes caracterÃstiques. Si les " +"aplicacions dels contactes permeten realitzar converses de veu o de vÃdeo, " +"veureu les icones següents al costat del seu nom a la llista de contactes:" -#: C/prob-conn.page:29(title) -msgid "Problems connecting to an instant messaging service" -msgstr "Problemes connectant a un servei de missatgeria instantà nia" +#: C/audio-video.page:43(td/p) +msgid "Icon" +msgstr "Icona" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/prob-conn-neterror.page:58(None) C/prob-conn-name.page:43(None) -#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None) -msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" -msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" +#: C/audio-video.page:48(td/p) +msgid "Description" +msgstr "Descripció" -#: C/prob-conn-neterror.page:7(desc) +#: C/audio-video.page:57(td/p) msgid "" -"An error message which says “<gui>Network error</gui>†appears in the main " -"window." +"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-" +"microphone.png\"> Icon for audio conversation </media>" msgstr "" -"Apareix un missatge d'error a la finestra principal que diu «<gui>Error de " -"xarxa</gui>»." +"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-" +"microphone.png\"> Icona per a una conversa de veu </media>" -#: C/prob-conn-neterror.page:33(title) -msgid "I get a message that says “Network errorâ€" -msgstr "Veig un missatge que diu «Error de xarxa»" - -#: C/prob-conn-neterror.page:36(cite) -msgid "shaunm" -msgstr "shaunm" +#: C/audio-video.page:64(td/p) +msgid "The contact is able to have an audio conversation." +msgstr "El contacte pot realitzar converses de veu." -#: C/prob-conn-neterror.page:37(p) +#: C/audio-video.page:69(td/p) msgid "" -"Empathy no longer allows you to create an IRC account without a valid nick. " -"I've removed the guide link. Remove the text." +"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> " +"Icon for video conversation </media>" msgstr "" +"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> " +"Icona per a una conversa de vÃdeo </media>" + +#: C/audio-video.page:76(td/p) +msgid "The contact is able to have a video conversation." +msgstr "El contacte pot realitzar converses de vÃdeo." -#: C/prob-conn-neterror.page:41(p) +#: C/audio-video.page:83(note/p) msgid "" -"This kind of error happens when <app>Empathy</app> cannot communicate with " -"the instant messaging service for some reason." +"In order to have an audio conversation, you need to have a sound card that " +"is supported by your operating system, and a working microphone." msgstr "" -"Aquest tipus d'errada succeeix quan l'<app>Empathy</app> no pot comunicar-se " -"amb el servei de missatgeria instantà nia per alguna raó." +"Per realitzar una conversa de veu heu de tenir una targeta de so reconeguda " +"pel sistema operatiu i un micròfon que funcioni." -#: C/prob-conn-neterror.page:45(p) +#: C/audio-video.page:87(note/p) msgid "" -"Also, this kind of error happens when you try to use an IRC account without " -"setting a nickname." +"In order to have a video conversation, you need to have a webcam that is " +"supported by your operating system, and a working microphone." msgstr "" -"També es pot produir quan intenteu utilitzar un compte d'IRC sense configurar " -"el sobrenom." +"Per realitzar una conversa de vÃdeo heu de tenir una cà mera web reconeguda " +"pel sistema operatiu i un micròfon que funcioni." -#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p) -#: C/prob-conn-acctdisabled.page:43(p) -msgid "" -"Make sure that you are connected to the Internet, or to a local area network." -msgstr "Assegureu-vos que esteu connectats a Internet o a una xarxa d'à rea local." +#: C/audio-video.page:95(section/title) +msgid "Supported Account Types" +msgstr "Tipus de comptes permesos" -#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p) -#: C/prob-conn-auth.page:57(p) +#: C/audio-video.page:97(section/p) msgid "" -"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png" -"\">edit</media> icon in the error message." +"You can only have audio and video conversations using accounts on certain " +"supported services. The following table lists whether audio and video is " +"supported for each type of account." msgstr "" -"Feu clic a la icona <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-" -"edit.png\">Edita</media> del missatge d'error." +"Només podeu realitzar converses de veu i de vÃdeo en comptes d'alguns " +"proveïdors de serveis. La taula següent mostra si els tipus de compte " +"permeten converses de veu i de vÃdeo." -#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p) +#: C/audio-video.page:102(note/p) msgid "" -"Check in the <gui>Advanced</gui> section that all the details are correct. " -"You should be able to find these details from the website of the messaging " -"service." +"Account types are provided by plugins. Your system may not have all of the " +"following types available, or it may have types not listed here. Updated " +"plugins may make audio or video conversations possible on account types that " +"are listed as unsupported here." msgstr "" -"Comproveu a la secció <gui>Avançat</gui> que les dades siguin les correctes. " -"HaurÃeu de poder trobar aquestes dades al lloc web del servei de " -"missatgeria." +"Els tipus de comptes es proporcionen els connectors. El sistema pot no " +"disposar de tots el tipus llistats aquÃ, o pot disposar de tipus de comptes " +"que no estiguin llistats. Versions més noves dels connectors poden fer " +"possible les converses de veu i de vÃdeo en tipus de comptes que estan " +"classificats com que no ho permeten." -#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p) -msgid "" -"Deselect the <gui>Enabled</gui>, and then select it again to try to " -"reconnect to the service." -msgstr "" -"Desactiveu <gui>Activat</gui> i torneu-lo a activar de nou per comprovar si " -"es reconnecta el servei." +#: C/audio-video.page:128(td/p) +msgid "Service" +msgstr "Servei" -#: C/prob-conn-neterror.page:90(title) -msgid "Proxy support" -msgstr "Accés a través de servidor intermediari" +#: C/audio-video.page:129(td/p) +msgid "Audio" +msgstr "Àudio" -#: C/prob-conn-neterror.page:91(p) -msgid "" -"At the moment <app>Empathy</app> can not be configured to work with a proxy." -msgstr "" -"Ara mateix l'<app>Empathy</app> no es pot configurar perquè funcioni amb un " -"servidor intermediari." +#: C/audio-video.page:130(td/p) +msgid "Video" +msgstr "VÃdeo" -#: C/prob-conn-name.page:9(title) -msgid "“Name in useâ€" -msgstr "«Nom utilitzat»" +#: C/audio-video.page:135(td/p) +msgid "AIM" +msgstr "AIM" -#: C/prob-conn-name.page:10(desc) -msgid "" -"An error message which says “<gui>Name in use</gui>†appears in the main " -"window." -msgstr "" -"Apareix un missatge a la finestra principal que diu «<gui>Nom utilitzat</gui>»." +#: C/audio-video.page:136(td/p) C/audio-video.page:137(td/p) +#: C/audio-video.page:141(td/p) C/audio-video.page:142(td/p) +#: C/audio-video.page:146(td/p) C/audio-video.page:147(td/p) +#: C/audio-video.page:156(td/p) C/audio-video.page:157(td/p) +#: C/audio-video.page:161(td/p) C/audio-video.page:162(td/p) +#: C/audio-video.page:166(td/p) C/audio-video.page:167(td/p) +#: C/audio-video.page:181(td/p) C/audio-video.page:182(td/p) +#: C/audio-video.page:186(td/p) C/audio-video.page:187(td/p) +#: C/audio-video.page:191(td/p) C/audio-video.page:192(td/p) +#: C/audio-video.page:196(td/p) C/audio-video.page:197(td/p) +#: C/audio-video.page:201(td/p) C/audio-video.page:202(td/p) +#: C/audio-video.page:211(td/p) C/audio-video.page:212(td/p) +#: C/audio-video.page:216(td/p) C/audio-video.page:217(td/p) +msgid "No" +msgstr "No" -#: C/prob-conn-name.page:32(title) -msgid "I get a message that says “Name in useâ€" -msgstr "Teniu un missatge que diu «Nom utilitzat»" +#: C/audio-video.page:140(td/p) +msgid "Facebook Chat" +msgstr "Xat de Facebook" -#: C/prob-conn-name.page:34(p) -msgid "" -"This kind of error happens when you try to connect to your IRC account and " -"you are using a nickname that is already being used by someone else on that " -"particular network." -msgstr "" -"Aquests tipus d'errades apareixen quan intenteu connectar-vos a comptes " -"d'IRC i utilitzeu un sobrenom que ja l'utilitza algú altre en aquella xarxa." +#: C/audio-video.page:145(td/p) +msgid "gadugadu" +msgstr "gadugadu" -#: C/prob-conn-name.page:50(p) -msgid "In the <gui>Nickname</gui> text box, type a new nickname." -msgstr "Al quadre de text <gui>Sobrenom</gui> introduïu el sobrenom nou." +#: C/audio-video.page:150(td/p) +msgid "Google Talk" +msgstr "Google Talk" -#: C/prob-conn-name.page:55(p) -msgid "" -"If you have registered that nickname within the network you are using, set " -"the password for that nickname. For more information, see <link xref=\"irc-" -"nick-password\"/>." -msgstr "" -"Si heu registrat el sobrenom a la xarxa on sou ara, poseu la contrasenya per " -"aquest sobrenom. Vegeu <link xref=\"irc-nick-password\"/> per més informació." +#: C/audio-video.page:151(td/p) C/audio-video.page:152(td/p) +#: C/audio-video.page:171(td/p) C/audio-video.page:172(td/p) +#: C/audio-video.page:176(td/p) C/audio-video.page:177(td/p) +#: C/audio-video.page:206(td/p) C/audio-video.page:207(td/p) +msgid "Yes" +msgstr "SÃ" -#: C/prob-conn-name.page:64(p) -msgid "" -"Deselect the <gui>Enabled</gui> check-box next to the name of your account, " -"and then select it again to try to reconnect to the service." -msgstr "" -"Desseleccioneu la casella de selecció <gui>Habilitat</gui> al costat del nom " -"del compte i llavors seleccioneu-lo de nou per intentar reconnectar-vos al " -"servei." +#: C/audio-video.page:155(td/p) +msgid "Groupwise" +msgstr "Groupwise" -#: C/prob-conn-auth.page:8(desc) -msgid "" -"An error message which says “<gui>Authentication failed</gui>†appears in " -"the main window." -msgstr "" -"Apareix un missatge d'error a la finestra principal que diu «<gui>Errada en " -"l'autenticació</gui>»." +#: C/audio-video.page:160(td/p) +msgid "ICQ" +msgstr "ICQ" -#: C/prob-conn-auth.page:36(title) -msgid "I get a message that says “Authentication failedâ€" -msgstr "Teniu un missatge que diu «Errada en l'autenticació»." +#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title) +msgid "IRC" +msgstr "IRC" -#: C/prob-conn-auth.page:38(p) -msgid "" -"This kind of error happens when your instant messaging service is not " -"allowing you to connect because it does not recognize your username or " -"password for some reason." -msgstr "" -"Aquest tipus d'errors apareix quan el servei de missatgeria instantà nia no " -"permet la connexió perquè no reconeix el vostre nom d'usuari o contrasenya " -"per alguna raó." +#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title) +msgid "Jabber" +msgstr "Jabber" -#: C/prob-conn-auth.page:50(p) -msgid "" -"Make sure that you have registered an account with the service you are " -"trying to connect to. If you do not have an account, most services will not " -"allow you to connect." -msgstr "" -"Comproveu que heu registrat un compte amb el servei amb el qual intenteu " -"connectar-vos. Si no teniu un compte, molts serveis no us permetran " -"connectar-vos." +#: C/audio-video.page:175(td/p) +msgid "MSN" +msgstr "MSN" -#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p) -msgid "" -"Type your username and password again to make sure that they are correct." -msgstr "" -"Escriviu el nom d'usuari i la contrasenya de nou per estar segurs que són " -"correctes." +#: C/audio-video.page:180(td/p) +msgid "myspace" +msgstr "myspace" -#: C/prob-conn-acctdisabled.page:7(desc) -msgid "" -"The instant messaging account that you want to use is not enabled in the " -"list of accounts." -msgstr "" -"El compte del servei de missatgeria instantà nia que voleu utilitzar no està " -"habilitat a la llista de comptes." +#: C/audio-video.page:185(td/p) +msgid "qq" +msgstr "qq" -#: C/prob-conn-acctdisabled.page:33(title) -msgid "My account is not enabled" -msgstr "El meu compte està habilitat" +#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title) +msgid "People Nearby" +msgstr "Gent propera" -#: C/prob-conn-acctdisabled.page:35(p) -msgid "" -"If the instant messaging account that you want to use is not enabled in the " -"drop-down account list when you try to start a new conversation or join a " -"room, your account details may not be correct." -msgstr "" -"Si el compte de missatgeria instantà nia que voleu utilitzar no està " -"habilitat a la llista inferior quan intenteu iniciar una conversa o unir-vos " -"a una sala, els detalls del vostre compte poden no ser correctes." +#: C/audio-video.page:195(td/p) +msgid "sametime" +msgstr "sametime" -#: C/prob-conn-acctdisabled.page:48(p) -msgid "" -"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the " -"account that is not working." -msgstr "" -"Escolliu <guiseq><gui>Edita</gui><gui>Comptes</gui></guiseq> i seleccioneu " -"el compte que no està funcionant." +#: C/audio-video.page:200(td/p) +msgid "silc" +msgstr "silc" -#: C/prob-conn-acctdisabled.page:65(p) -msgid "" -"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. " -"If it is not, select the check-box to enable the account." -msgstr "" -"Comproveu que la caixa de selecció <gui style=\"checkbox\">Habilitat</gui> " -"està seleccionada. Si no ho està , seleccioneu-la per activar el compte." +#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title) +msgid "SIP" +msgstr "SIP" -#: C/prev-conv.page:8(desc) -msgid "Browse or search your previous conversations." -msgstr "Navegueu o cerqueu per les converses anteriors." +#: C/audio-video.page:210(td/p) +msgid "Yahoo!" +msgstr "Yahoo!" -#: C/prev-conv.page:35(title) -msgid "View previous conversations" -msgstr "Visualitzeu les converses anteriors" +#: C/audio-video.page:215(td/p) +msgid "zephyr" +msgstr "zephyr" -#: C/prev-conv.page:39(p) -msgid "" -"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug." -"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, " -"independent of the selection (like in yellow or something), we can use the " -"term \"highlight\". Otherwise we need to use the term \"select\". Watch that " -"bug." -msgstr "" -"El ressaltat de text no funciona del tot bé: <link href=\"http://bugzilla.gnome.org/show_bug." -"cgi?id=593733\">#593733</link>. Si hi ha un ressaltat actuant, " -"independentment de la selecció (com el groc o semblant) , podeu utilitzar el " -"terme «ressalta». D'altra forma us caldrà utilitzar el terme «selecciona». " -"Llegiu el informe d'error." +#: C/change-status.page:9(info/desc) +msgid "Change your status to advertise your availability to your contacts." +msgstr "Canvieu l'estat per avisar la disponibilitat als contactes." -#: C/prev-conv.page:46(p) +#: C/change-status.page:39(page/title) +msgid "Change your status" +msgstr "Canvi de l'estat" + +#: C/change-status.page:41(page/p) msgid "" -"<app>Empathy</app> automatically saves all your text conversations you have " -"with your contacts. You can <link xref=\"#search\">search through all of " -"your previous conversations</link> or <link xref=\"#browse\">browse previous " -"conversations</link> by contact and date." +"You can set your status to indicate your availability to your contacts. " +"<app>Empathy</app> allows you to select from a list of defined statuses." msgstr "" -"L'<app>Empathy</app> desa automà ticament totes les converses que manteniu " -"amb els contactes. Podeu cercar <link xref=\"#search\">per les " -"converses anteriors</link> o <link xref=\"#browse\">navegar per les " -"converses anteriors</link> per contacte i data." +"Podeu canviar l'estat per indicar la disponibilitat als contactes. " +"L'<app>Empathy</app> us permet seleccionar-ne un d'una llista d'estats per " +"defecte." -#: C/prev-conv.page:54(p) +#: C/change-status.page:46(item/p) msgid "" -"You do not need to be connected to the Internet to view and search your " -"previous conversations." +"Click on the drop-down list at the top of the <gui>Contact List</gui> window." msgstr "" -"No us cal estar connectat a Internet per visualitzar i cercar a les " -"converses anteriors." +"Feu clic a la llista desplegable a la part de dalt de la finestra " +"<gui>Llista de contactes</gui>." -#: C/prev-conv.page:61(title) -msgid "Search previous conversations" -msgstr "Cerqueu a les converses anteriors" +#: C/change-status.page:51(item/p) +msgid "Select a status from the list." +msgstr "Seleccioneu un estat de la llista." -#: C/prev-conv.page:63(p) +#: C/change-status.page:57(page/p) msgid "" -"You can perform a full-text search through all of your previous " -"conversations." +"See <link xref=\"status-icons\"/> for a list of the built-in statuses and " +"what they mean. You can also <link xref=\"set-custom-status\">add custom " +"status messages</link> to provide more information about your availability " +"to your contacts." msgstr "" -"Podeu utilitzar cerca de texts complets dins les converses anteriors." +"Vegeu <link xref=\"status-icons\"/> per veure la llista d'estats possibles i " +"què signifiquen. També podeu <link xref=\"set-custom-status\">afegir " +"missatges d'estat personalitzats</link> per proporcionar informació sobre la " +"disponibilitat als contactes." -#: C/prev-conv.page:67(p) C/prev-conv.page:96(p) +#: C/change-status.page:63(note/p) msgid "" -"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</" -"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press " -"<key>F3</key>." +"If you do not use your computer for a while, or if the screensaver is on, " +"the status will be automatically set to Away." msgstr "" -"Des de la finestra <gui>Llista de contactes</gui> escolliu " -"<guiseq><gui>Visualitza</gui><gui>Converses anteriors</gui></guiseq>. " -"O premeu <key>F3</key>." +"Si no utilitzeu l'ordinador durant una estona o s'activa l'estalvi de " +"pantalla, l'estat es posarà a absent." -#: C/prev-conv.page:71(p) -msgid "Select the <gui>Search</gui> tab." -msgstr "Seleccioneu la pestanya <gui>Cerca</gui>." +#: C/create-account.page:9(info/desc) +msgid "Register for an account with one of the supported messaging services." +msgstr "Registreu un compte amb un dels serveis de missatgeria habilitats." -#: C/prev-conv.page:74(p) -msgid "" -"In the <gui>For</gui> field, type the text you want to search for. Click " -"<gui>Find</gui> or press <key>Enter</key>." -msgstr "" -"Al camp <gui>Per</gui> escriviu el text que voleu cercar. Feu clic a " -"<gui>Cerca</gui> o premeu la tecla <key>Retorn</key>." +#: C/create-account.page:34(page/title) +msgid "Register for a new account" +msgstr "Registreu un compte nou" -#: C/prev-conv.page:78(p) +#: C/create-account.page:36(page/p) msgid "" -"Any conversations that matched your search terms will be shown in the list " -"below the search field. By default, conversations are ordered by date." +"Most account types require you to create an account with a account provider " +"before you can connect using instant messaging applications like " +"<app>Empathy</app>. With some account providers, you can use <app>Empathy</" +"app> to register for a new account, using the same steps as you would to " +"<link xref=\"add-account\">add an account</link>." msgstr "" -"Qualsevol conversa que compleixi els criteris de cerca serà mostrada a la " -"llista a sota del camp de cerca. Per defecte, les converses estan ordenades " -"per data." +"La majoria de comptes requereixen que creeu un compte amb un proveïdor abans " +"de connectar-vos amb aplicacions de missatgeria com l'<app>Empathy</app>. " +"Amb alguns proveïdors de comptes, podeu utilitzar l'<app>Empathy</app> per " +"registrar el compte nou, utilitzant el mateixos passos que si <link xref=" +"\"add-account\">afegiu un compte</link>." -#: C/prev-conv.page:82(p) +#: C/create-account.page:42(page/p) msgid "" -"Click on a conversation to view it. <app>Empathy</app> will select the text " -"in the conversation that matched your search terms." +"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 "" -"Feu clic sobre una conversa per veure-la. L'<app>Empathy</app> seleccionarà el " -"text de la conversa que compleixi els criteris de cerca." +"Aquesta pà gina proporciona informació sobre la creació de comptes nous de " +"tipologia variada. El vostre proveïdor de comptes hauria de donar-vos un nom " +"d'usuari i una contrasenya, aixà com qualsevol informació addicional que us " +"pugui fer falta per connectar-vos amb l'<app>Empathy</app>." -#: C/prev-conv.page:89(title) -msgid "Browse previous conversations" -msgstr "Navegueu per les converses anteriors" +#: C/create-account.page:47(section/title) +msgid "Facebook" +msgstr "Facebook" -#: C/prev-conv.page:91(p) +#: C/create-account.page:48(section/p) msgid "" -"You can browse your previous conversations with your contacts or in chat " -"rooms by date." +"Facebook is one of the most-used social networks. It allows users to create " +"their own profile and to communicate with their friends." msgstr "" -"Podeu navegar, per data, per les converses anteriors amb els contactes i " -"pels xats a les sales." +"Facebook és una de les xarxes socials més utilitzades. Permet als usuaris " +"crear el seu propi perfil i comunicar-se amb els seus amics." -#: C/prev-conv.page:100(p) -msgid "Select the <gui>Conversations</gui> tab." -msgstr "Seleccioneu la pestanya <gui>Converses</gui>." - -#: C/prev-conv.page:103(p) +#: C/create-account.page:52(section/p) msgid "" -"Select an account from the drop-down list in the top left. A list of " -"contacts and chat room for that account will be shown below." +"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." +"facebook.com</link>." msgstr "" -"Seleccioneu un compte de la llista desplegable de dalt a l'esquerre. Es mostrarà " -"a sota la llista de contactes i les sales de xat per aquest compte." +"Per utilitzar Facebook per comunicar-vos amb els vostres amics, us cal crear " +"un compte nou al lloc web: <link href=\"http://www.facebook.com\">www." +"facebook.com</link>." -#: C/prev-conv.page:107(p) +#: C/create-account.page:62(section/p) msgid "" -"Select a contact or chat room to view your previous conversations from. By " -"default the most recent conversation will be shown." +"Jabber is an open instant messaging system. Like email, Jabber allows you to " +"choose your account provider and communicate with all other Jabber users, " +"regardless of their account provider." msgstr "" -"Seleccioneu un contacte o una sala de xat per veure'n les converses anteriors. " -"Per defecte es mostrarà la conversa més recent." +"Jabber és un sistema obert de missatgeria instantà nia. Semblant al correu " +"electrònic, Jabber us permet escollir el vostre proveïdor de comptes i " +"comunicar-vos amb altres usuaris de Jabber, sense que importi el seu " +"proveïdor de comptes." -#: C/prev-conv.page:111(p) +#: C/create-account.page:66(section/p) msgid "" -"You can browse your conversations by date. Days on which you had a " -"conversation with the selected contact will be shown in bold text. Click a " -"date to select it. Click the arrows next to the month and year to browse " -"earlier dates." +"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." +"org/\">Jabber.org</link>." msgstr "" -"Podeu navegar per les converses per data. Els dies en els quals heu " -"mantingut converses amb el contacte es mostraran amb negreta. Feu clic " -"a una data per seleccionar-la. Feu clic a les fletxes al costat del mes i de " -"l'any per navegar entre dates." +"Haureu de crear un compte nou amb algun proveïdor de comptes Jabber. Hi ha " +"molt proveïdors gratuïts, un dels més populars és <link href=\"http://" +"register.jabber.org/\">Jabber.org</link>." -#: C/prev-conv.page:117(p) +#: C/create-account.page:71(note/p) msgid "" -"You can search for text in the displayed conversation by typing into the " -"search field at the top. The matching text will be highlighted." +"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 " +"password in <app>Empathy</app> to connect." msgstr "" -"Podeu cercar text a la conversa mostrada escrivint al camp de cerca a la " -"part superior. Es ressaltarà el text que coincideixi." +"Si sou usuaris del Google Mail o del Google Talk, ja teniu un compte de " +"Jabber. El Google Talk és un servei de Jabber. Només us cal utilitzar " +"l'adreça i la contrasenya de Google Mail per connectar-vos a l'<app>Empathy</" +"app>." -#: C/prev-conv.page:121(p) +#: C/create-account.page:80(section/p) 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 "" -"Podeu veure fà cilment les converses anteriors amb algun dels contactes a la " -"finestra <gui>Llista de contactes</gui>. Feu clic sobre el contacte i " -"escolliu <gui>Visualitza les converses anteriors</gui>. S'obrirà la finestra " -"<gui>Converses anteriors</gui> amb el contacte ja seleccionat." - -#: C/link-contacts.page:11(desc) -msgid "Merge and separate different contacts into a single one." +"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, " +"such as a wireless hotspot. It automatically finds all other users on the " +"network who are also using this service." msgstr "" +"No us cal crear cap compte a cap proveïdor de serveis per utilitzar aquesta " +"caracterÃstica. Aquest servei funciona sempre que estigueu connectats a una " +"xarxa d'à rea local, com un punt d'accés Wi-Fi. Us mostra tots els usuaris " +"que fan servir aquest mateix servei de forma automà tica." -#: C/link-contacts.page:25(title) -msgid "Combine and separate contacts" -msgstr "" +#: C/create-account.page:85(section/p) +msgid "For more information, see <link xref=\"salut-protocol\"/>." +msgstr "Vegeu <link xref=\"salut-protocol\"/> per a més informació." -#: C/link-contacts.page:26(p) +#: C/create-account.page:91(section/p) msgid "" -"If one, or more, of your contacts has multiple accounts with different " -"messaging services, you can combine these contacts into a single one." +"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 "" +"El SIP és un sistema obert que permet realitzar converses de veu i de vÃdeo " +"per Internet. Heu de crear un compte amb un proveïdor de SIP. Podeu " +"comunicar-vos amb qualsevol usuari de SIP sense que importi el proveïdor SIP " +"que estiguin utilitzant." -#: C/link-contacts.page:30(p) +#: C/create-account.page:97(note/p) msgid "" -"The resulting contact is called a <em>meta-contact</em>: a contact composed " -"from different single contacts." +"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 "" +"Per motius tècnics, el servei lliure <link href=\"https://www.ekiga.net/" +"index.php?page=register\">Ekiga.net</link> no funciona amb l'<app>Empathy</" +"app>." -#: C/link-contacts.page:34(p) +#: C/create-account.page:102(section/p) msgid "" -"If you have a Jane Smith contact that is using three different messaging " -"services like:" +"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 "" +"Alguns proveïdors de SIP us permeten fer trucades a telèfons fixes i mòbils " +"des de l'ordinador. Normalment us cal una subscripció a un servei de " +"pagament per poder-ho realitzar." -#: C/link-contacts.page:40(p) -msgid "janes@facebook" -msgstr "janes@facebook" - -#: C/link-contacts.page:45(p) -msgid "jane.smith@gmail" -msgstr "jane.smith@gmail" - -#: C/link-contacts.page:50(p) -msgid "jane_smith@hotmail" -msgstr "jane_smith@hotmail" - -#: C/link-contacts.page:55(p) -msgid "You can combine these contacts into a single Jane Smith one." +#: C/create-account.page:109(section/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 "" +"No us cal registrar un compte per utilitzar l'IRC. Encara que especifiqueu " +"un sobrenom quan afegiu el compte d'IRC a l'<app>Empathy</app>, aquest " +"sobrenom només s'utilitza cada vegada que us connecteu. Si un altre usuari " +"està utilitzant aquest sobrenom, us caldrà canviar el sobrenom." -#: C/link-contacts.page:60(title) -#, fuzzy -#| msgid "Modifying a Contact" -msgid "Combining contacts" -msgstr "Com modificar un contacte" - -#: C/link-contacts.page:63(p) +#: C/create-account.page:114(section/p) msgid "" -"From the <gui>Contact List</gui> window, right-click one of the contact that " -"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</" -"gui>." +"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 "" +"Algunes xarxes d'IRC utilitzen un servei anomenat NickServ per permetre als " +"usuaris protegir el seu sobrenom. Vegeu <link xref=\"irc-nick-password\"/> " +"per a més informació." -#: C/link-contacts.page:70(p) -#, fuzzy -#| msgid "" -#| "From the <gui>Saved Presets</gui> box, select the status message you want " -#| "to remove." +#: C/create-account.page:117(section/p) msgid "" -"From the left pane in the <gui>Link Contacts</gui> window, select the " -"contacts you want to combine." +"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 "" -"Des de la caixa<guilabel>Parà metres desats</guilabel>, seleccioneu l'estat " -"del missatge que voleu suprimir." +"Alguns servidors d'IRC estan protegits amb contrasenya. Haureu de saber la " +"contrasenya per connectar-vos-hi. Generalment són xarxes d'IRC privades." -#: C/link-contacts.page:76(p) -msgid "Click <gui style=\"button\">Link</gui>." -msgstr "Feu clic a <gui style=\"button\">Enllaça</gui>." +#: C/create-account.page:122(section/title) +msgid "Proprietary Services" +msgstr "Serveis propietaris" -#: C/link-contacts.page:82(p) +#: C/create-account.page:124(section/p) msgid "" -"When a meta-contact has been created, the default contact that will be used " -"to have a conversation with when you double-click on it, is the contact with " -"the highest presence on-line." +"There are many proprietary instant messaging services that have been " +"developed by different companies or organizations. <app>Empathy</app> allows " +"you to connect to an existing account for most popular services. To create a " +"new account with one of these services, you will need to visit the service’s " +"web site and agree to its terms of use." msgstr "" +"Hi ha molts serveis de missatgeria instantà nia propietaris desenvolupats per " +"diverses organitzacions o empreses. L'<app>Empathy</app> us permet connectar-" +"vos a comptes existent de molts serveis populars. Per crear-vos-hi un compte " +"nou haureu de visitar el lloc web i acceptar la llicència d'ús." -#: C/link-contacts.page:91(title) -msgid "Separating contacts" -msgstr "Separació de contactes" +#: C/create-account.page:132(item/p) +msgid "<link href=\"http://dashboard.aim.com/aim\">AIM</link>" +msgstr "<link href=\"http://dashboard.aim.com/aim\">AIM</link>" -#: C/link-contacts.page:94(p) -msgid "" -"From the <gui>Contact List</gui>, right-click the contact to separate, and " -"select <gui style=\"menuitem\">Link Contacts...</gui>." -msgstr "" +#: C/create-account.page:137(item/p) +msgid "<link href=\"https://www.icq.com/register/\">ICQ</link>" +msgstr "<link href=\"https://www.icq.com/register/\">ICQ</link>" -#: C/link-contacts.page:100(p) -msgid "Click <gui style=\"button\">Unlink</gui>." -msgstr "Feu clic a <gui style=\"button\">Desenllaça</gui>." +#: C/create-account.page:142(item/p) +msgid "<link href=\"https://accountservices.passport.net\">MSN</link>" +msgstr "<link href=\"https://accountservices.passport.net\">MSN</link>" -#: C/license.page:8(desc) -msgid "Legal information." -msgstr "Informació legal." +#: C/create-account.page:147(item/p) +msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>" +msgstr "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>" -#: C/license.page:11(title) -msgid "License" -msgstr "Llicència" +#: C/disable-account.page:9(info/desc) +msgid "Prevent <app>Empathy</app> from automatically logging in to an account." +msgstr "" +"Impedeix que l'<app>Empathy</app> es connecti de forma automà tica a un " +"compte." -#: C/license.page:12(p) +#: C/disable-account.page:40(page/title) +msgid "Disable an account" +msgstr "Inhabiliteu un compte" + +#: C/disable-account.page:42(page/p) msgid "" -"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 " -"Unported license." +"You can disable an account to prevent <app>Empathy</app> from logging in to " +"it without removing the account entirely. You may wish to disable and re-" +"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 "" -"Aquest treball es distribueix sota la llicència Creative Commons " -"Reconeixement-Compartir igual 3.0 llicència no adaptada." +"Podeu inhabilitar un compte per evitar que l'<app>Empathy</app> es connecti " +"sense esborrar completament el compte. Podeu desactivar i reactivar el " +"compte si només voleu connectar-vos al compte esporà dicament, però encara " +"voleu utilitzar l'<app>Empathy</app> per altres comptes." -#: C/license.page:20(p) -msgid "You are free:" -msgstr "Sou lliure de:" +#: C/disable-account.page:53(item/p) +msgid "" +"Select the account you wish to disable from the accounts list on the left " +"side of the window." +msgstr "" +"Seleccioneu el compte que voleu inhabilitar del llistat de comptes al quadre " +"de l'esquerra de la finestra." -#: C/license.page:25(em) -msgid "To share" -msgstr "Compartir" +#: C/disable-account.page:57(item/p) +msgid "On the right side of the window, switch it off." +msgstr "A la part dreta de la finestra, inhabiliteu-lo." -#: C/license.page:26(p) -msgid "To copy, distribute and transmit the work." -msgstr "Copiar, distribuir i transmetre el treball." +#: C/disable-account.page:62(page/p) +msgid "To re-enable the account, switch it on." +msgstr "Per tornar a activar el compte, habiliteu-lo." -#: C/license.page:29(em) -msgid "To remix" -msgstr "Fer-ne obres derivades" +#: C/favorite-rooms.page:10(info/desc) +msgid "Set, join and manage favorite rooms." +msgstr "Com configurar, entrar i gestionar sales preferides." -#: C/license.page:30(p) -msgid "To adapt the work." -msgstr "Adaptar el treball." +#: C/favorite-rooms.page:29(page/title) +msgid "Favorite rooms" +msgstr "Sales preferides" -#: C/license.page:33(p) -msgid "Under the following conditions:" -msgstr "sota les següents condicions:" +#: C/favorite-rooms.page:32(section/title) +msgid "Set a room as a favorite" +msgstr "Establiu un sala com a preferida" -#: C/license.page:38(em) -msgid "Attribution" -msgstr "Reconeixement" +#: C/favorite-rooms.page:35(item/p) +msgid "Join a room." +msgstr "Com entrar en una sala." -#: C/license.page:39(p) +#: C/favorite-rooms.page:40(item/p) msgid "" -"You must attribute the work in the manner specified by the author or " -"licensor (but not in any way that suggests that they endorse you or your use " -"of the work)." +"See <link xref=\"irc-join-room\"/> for more information on how to join an " +"IRC room." msgstr "" -"Cal que reconegueu el treball de la forma especificada per l'autor o el " -"llicenciatari (però no de forma que suggereixi que us dóna suport personal o " -"de l'ús del treball)." - -#: C/license.page:46(em) -msgid "Share Alike" -msgstr "Compartir igual" +"Per saber-ne més de com entrar en una sala d'IRC vegeu <link xref=\"irc-join-" +"room\"/>." -#: C/license.page:47(p) +#: C/favorite-rooms.page:46(item/p) 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." +"See <link xref=\"group-conversations\"/> for more information on how to " +"start or join a group conversation." msgstr "" -"Si altereu, transformeu, o construïu a partir d'aquest treball heu de " -"distribuir el treball resultant sota la mateixa llicència o una de compatible." +"Per saber-ne més de com iniciar o unir-se a una conversa de grup vegeu <link " +"xref=\"group-conversations\"/>." -#: C/license.page:53(p) +#: C/favorite-rooms.page:54(item/p) msgid "" -"For the full text of the license, see the <link href=\"http://" -"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</" -"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-" -"sa/3.0/\">Commons Deed</link>." +"From the conversation window, choose <guiseq><gui>Conversation</" +"gui><gui>Favorite Chat Room</gui></guiseq>." msgstr "" -"Per veure el text de la llicència completa vegeu el <link href=\"http://" -"creativecommons.org/licenses/by-sa/3.0/legalcode\">Lloc web de Creative Commons " -"</link>, o llegiu la pà gina <link href=\"http://creativecommons.org/licenses/" -"by-sa/3.0/\">Commons Deed</link>." +"A la finestra de conversa escolliu <guiseq><gui>Conversa</gui><gui>Sala de " +"xat preferida</gui></guiseq>." -#: C/irc-start-conversation.page:8(desc) -msgid "Start a conversation with an IRC contact." -msgstr "Inicieu un conversa amb un contacte de l'IRC." - -#: C/irc-start-conversation.page:30(title) -msgid "Chat with somebody on IRC" -msgstr "Xatejeu amb algú a l'IRC" +#: C/favorite-rooms.page:63(section/title) +msgid "Join favorite rooms" +msgstr "Com entrar a sales preferides" -#: C/irc-start-conversation.page:32(p) -msgid "" -"You can hold private conversations with other IRC users, outside of the " -"public IRC chat rooms. To start a conversation with another IRC user:" +#: C/favorite-rooms.page:66(item/p) C/send-file.page:40(item/p) +msgid "From the <gui>Contact List</gui> window, perform one of the following:" msgstr "" -"Podeu mantenir converses privades amb altres usuaris de l'IRC fora de la sala " -"pública de l'IRC. Per iniciar una conversa amb un altre usuari de l'IRC:" +"Des de la finestra <gui>Llista de contactes</gui> executeu una de les " +"següents accions:" -#: C/irc-start-conversation.page:37(p) +#: C/favorite-rooms.page:71(item/p) +msgid "Press <key>F5</key>." +msgstr "Premeu <key>F5</key>." + +#: C/favorite-rooms.page:76(item/p) msgid "" -"In the contact list for an IRC chat room, double click the name of the user " -"you want to chat with. Alternatively, right click the name of the user and " -"choose <gui>Chat</gui>." +"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join " +"all your favorite rooms." msgstr "" -"Feu doble clic sobre el nom de l'usuari amb el qual voleu xatejar a la " -"llista de contactes de la sala de xat de l'IRC. També podeu fer clic amb el botó " -"secundari sobre l'usuari i escolliu <gui>Xat</gui>." +"Escolliu <guiseq><gui>Sala</gui><gui>Uneix-te als preferits</gui></guiseq>, " +"per entrar a totes les sales preferides." -#: C/irc-start-conversation.page:45(p) -msgid "" -"The IRC room contact list is not the same as <app>Empathy</app> contact " -"list. It contains a list of users in the IRC chat room you joined. Different " -"rooms can have different contacts listed." +#: C/favorite-rooms.page:82(item/p) +msgid "Choose <gui>Room</gui>, and select the favorite room you want to join." msgstr "" -"La llista de contactes de la sala de l'IRC no és la mateixa que la llista de " -"contactes de l'<app>Empathy</app>. Aquesta conté la llista d'usuaris de la " -"sala de l'IRC a la qual us heu unit. Cada sala tindrà un llista de contactes " -"diferent." +"Escolliu <gui>Sala</gui> i seleccioneu la sala preferida a la qual voleu " +"entrar." -#: C/irc-start-conversation.page:52(p) +#: C/favorite-rooms.page:90(note/p) msgid "" -"The IRC room contact list is usually on the right side of the IRC room " -"window. If you do not see it, choose <guiseq><gui>Conversation</" -"gui><gui>Show Contact List</gui></guiseq>." +"To join a favorite room, you need to be connected to the Internet and to " +"your account." msgstr "" -"La llista de contactes de la sala de l'IRC normalment està a la part dreta de " -"la finestra de la sala de l'IRC. Si no la veieu, escolliu " -"<guiseq><gui>Conversa</gui><gui>Mostra la llista de contacte</gui></guiseq>." - -#: C/irc-send-file.page:9(desc) -msgid "<app>Empathy</app> does not currently support sending files using IRC." -msgstr "L'<app>Empathy</app> encara no permet l'enviament de fitxers utilitzant l'IRC." - -#: C/irc-send-file.page:31(title) -msgid "Send files over IRC" -msgstr "Enviament de fitxer a través de l'IRC." - -#: C/irc-send-file.page:33(p) -msgid "It is not currently possible to send files using IRC." -msgstr "Encara no és possible enviar fitxers a través de l'IRC." - -#: C/irc-nick-password.page:10(desc) -msgid "Protect your nickname to prevent other IRC users from using it." -msgstr "Protegiu el vostre sobrenom per impedir que altres usuaris de l'IRC l'usin." +"Per entrar a una sala preferida us cal estar connectat a Internet i a un " +"compte." -#: C/irc-nick-password.page:33(title) -msgid "Use a nickname password on IRC" -msgstr "Utilitzeu un sobrenom amb contrasenya a l'IRC" +#: C/favorite-rooms.page:98(section/title) +msgid "Manage favorite rooms" +msgstr "Com gestionar les sales preferides" -#: C/irc-nick-password.page:35(p) +#: C/favorite-rooms.page:101(item/p) msgid "" -"On some IRC networks, you can register your nickname with a service called " -"NickServ. By sending special messages to NickServ, you can set your password " -"and identify yourself. Some IRC chat rooms may not allow you to join without " -"a registered nickname." +"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</" +"gui><gui>Manage Favorites</gui></guiseq>." msgstr "" -"En algunes xarxes d'IRC podeu registrar el vostre sobrenom amb un servei anomenat " -"NickServ. Si envieu uns missatges especials a NickServ podreu establir la " -"contrasenya i identificar-vos. Algunes sales d'IRC no permeten entrar si el " -"sobrenom no està registrat." +"A la finestra <gui>Llista de contactes</gui>, escolliu <guiseq><gui>Sala</" +"gui><gui>Gestiona les preferides</gui></guiseq>." -#: C/irc-nick-password.page:40(p) -#, fuzzy -#| msgid "" -#| "<app>Empathy</app> does not currently support nickname registration. Some " -#| "IRC networks, however, will automatically forward a <em>server password</" -#| "em> to NickServ. On these networks, you can use the IRC password in " -#| "<app>Empathy</app> to identify yourself to NickServ. The popular FreeNode " -#| "network is known to have this feature." +#: C/favorite-rooms.page:107(item/p) msgid "" -"<app>Empathy</app> does not currently support nickname registration. Some " -"IRC networks, however, will automatically forward a <em>server password</em> " -"to NickServ. On these networks, you can use the IRC password in " -"<app>Empathy</app> to identify yourself to NickServ. The popular freenode " -"network is known to have this feature." +"From the <gui>Account</gui> drop-down list, select the account you want to " +"manage the favorite rooms of." msgstr "" -"L'<app>Empathy</app> no suporta el registre de sobrenoms. Algunes xarxes d'IRC, " -"tanmateix, us enviaran de forma automà tica una <em>contrasenya de servidor</" -"em> al NickServ. En aquestes xarxes, podeu utilitzar la contrasenya d'IRC a " -"l'<app>Empathy</app> per identificar-vos amb NickServ. La popular xarxa " -"FreeNode és coneguda per aquesta caracterÃstica." +"A la llista desplegable <gui>Compte</gui>, seleccioneu el compte del que " +"vulgueu gestionar les sales preferides." -#: C/irc-nick-password.page:46(p) -msgid "To set an IRC server password:" -msgstr "Per establir una contrasenya de servidor d'IRC:" +#: C/favorite-rooms.page:111(item/p) +msgid "Select <gui>All</gui> to see all you favorite rooms." +msgstr "Seleccioneu <gui>Totes</gui> per veure totes les sales preferides." -#: C/irc-nick-password.page:54(p) -msgid "Select the IRC account from the list on the left of the dialog." -msgstr "Seleccioneu el compte d'IRC al quadre de l'esquerra del dià leg." +#: C/favorite-rooms.page:116(item/p) +msgid "Select the favorite room you want to manage:" +msgstr "Seleccioneu la sala preferida que voleu gestionar:" -#: C/irc-nick-password.page:57(p) +#: C/favorite-rooms.page:121(item/p) msgid "" -"In the <gui>Password</gui> field, type the password you used to register " -"your nikcname." +"Select the <gui>Auto-Connect</gui> check-box in order to automatically join " +"that room when you connect to your account." msgstr "" -"Al camp <gui>Contrasenya</gui> escriviu la contrasenya que heu utilitzat per " -"registrar el sobrenom." - -#: C/irc-nick-password.page:63(p) C/import-account.page:61(p) -msgid "Click <gui style=\"button\">Apply</gui>." -msgstr "Feu clic a <gui style=\"button\">Aplica</gui>." +"Seleccioneu la caixa de verificació <gui>Connecta automà ticament</gui> per " +"entrar de forma automà tica a la sala quan us connecteu amb el compte." -#: C/irc-nick-password.page:69(p) -msgid "" -"These instructions only allow you to use a password-protected nickname on " -"certain IRC networks. It is not currently possible to register an IRC " -"nickname or change your nickname password using <app>Empathy</app>." +#: C/favorite-rooms.page:127(item/p) +msgid "Click on <gui>Remove</gui> to remove the room from your favorites." msgstr "" -"Aquestes instruccions sols us permeten utilitzar un sobrenom protegit per contrasenya " -"en certes xarxes d'IRC. L'<app>Empathy</app> encara no permet registrar un " -"sobrenom de l'IRC o canviar-ne la contrasenya." +"Feu clic a <gui>Suprimeix</gui> per esborrar la sala de la llista de " +"preferides." -#: C/irc-manage.page:9(desc) -msgid "How to use IRC with <app>Empathy</app>." -msgstr "Com utilitzar IRC amb l'<app>Empathy</app>." - -#: C/irc-manage.page:34(title) -msgid "Internet Relay Chat (IRC)" -msgstr "Internet Relay Chat (IRC)" - -#: C/irc-manage.page:37(p) C/account-irc.page:39(p) -msgid "" -"You must have the <sys>telepathy-idle</sys> package installed to use IRC in " -"<app>Empathy</app>." -msgstr "" -"Heu de tenir instal·lat el paquet <sys>telepathy-idle</sys> per utilitzar " -"l'IRC amb l'<app>Empathy</app>." +#: C/favorite-rooms.page:134(item/p) +msgid "When done, click <gui>Close</gui>." +msgstr "Quan acabeu feu clic a <gui>Tanca</gui>." -#: C/irc-manage.page:43(title) -msgid "IRC Chat Rooms and Conversations" -msgstr "Sales de xat de l'IRC i converses" +#: C/geolocation.page:8(info/desc) +msgid "Use and understand geolocation in <app>Empathy</app>." +msgstr "Com utilitzar i entendre la geolocalització a l'<app>Empathy</app>." -#: C/irc-manage.page:45(title) -msgid "Chat Rooms and Conversations" -msgstr "Sales de xat i converses" +#: C/geolocation.page:32(page/title) +msgid "Geographical position" +msgstr "Posició geogrà fica" -#: C/irc-manage.page:50(title) -msgid "Common IRC Problems" -msgstr "Problemes d'IRC comuns" +#: C/geolocation.page:35(section/title) +msgid "Geolocation" +msgstr "Geolocalització" -#: C/irc-manage.page:52(title) C/index.page:55(title) -msgid "Common Problems" -msgstr "Problemes comuns" +#: C/geolocation.page:39(section/title) +msgid "Fix common problems" +msgstr "Arreglar problemes comuns" -#: C/irc-join-room.page:8(desc) -msgid "Join an IRC channel." -msgstr "Uniu-vos a un canal d'IRC." +#: C/geolocation-not-showing.page:8(info/desc) +msgid "<app>Empathy</app> does not publish my geographical position." +msgstr "L'<app>Empathy</app> no publicarà la meva posició geogrà fica." -#: C/irc-join-room.page:31(title) -msgid "Join an IRC chat room" -msgstr "Uniu-vos a la sala de xat de l'IRC" +#: C/geolocation-not-showing.page:32(page/title) +msgid "Geographical position not published" +msgstr "Posició geogrà fica no publicada" -#: C/irc-join-room.page:33(p) +#: C/geolocation-not-showing.page:34(page/p) msgid "" -"You can join IRC chat rooms (also known as IRC channels) on any IRC network " -"you’re connected to. To connect to an IRC network, see <link xref=\"add-" -"account\"/> and <link xref=\"account-irc\"/>." +"If your contacts cannot see your location, <app>Empathy</app> might not be " +"able to discover with a good margin of precision your geographical position." msgstr "" -"Podeu unir-vos a sales de xat de l'IRC (també conegudes com canals de l'IRC) a " -"qualsevol xarxa d'IRC a la qual estigueu connectat. Per connectar-vos a una " -"xarxa d'IRC, vegeu <link xref=\"add-account\"/> i <link xref=\"account-irc\"/" -">." +"Si els contactes no poden veure la vostra localització, l'<app>Empathy</app> " +"no podrà descobrir amb un bon marge de precisió la vostra posició geogrà fica." -#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p) -#: C/group-conversations.page:122(p) +#: C/geolocation-not-showing.page:38(page/p) msgid "" -"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</" -"gui><gui>Join</gui></guiseq>." +"In this case, your position will not be published, but you are still able to " +"see the location of your contacts." msgstr "" -"A la finestra <gui>Llista de contactes</gui> escolliu <guiseq><gui>Sala</" -"gui><gui>Entra</gui></guiseq>." +"En aquest cas, no es publicarà la vostra posició, però podreu veure la " +"localització dels contactes." -#: C/irc-join-room.page:45(p) +#: C/geolocation-not-showing.page:42(page/p) msgid "" -"From the <gui>Account</gui> drop-down list, select the IRC account that " -"corresponds to the network you want to use." +"If you want to publish your geographical position, you can try to use an " +"external device such as a GPS." msgstr "" -"Des de la llista desplegable <gui>Compte</gui>, trieu el compte d'IRC que " -"correspon a la xarxa que voleu utilitzar." +"Si voleu fer pública la posició geogrà fica, podeu utilitzar un dispositiu " +"extern com un GPS." -#: C/irc-join-room.page:51(p) +#: C/geolocation-not-showing.page:48(note/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>)." +"In order to publish your geographical location, your Jabber server needs to " +"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://" +"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support " +"PEP</link> is maintained online. Google Talk does not support this feature " +"at this time." msgstr "" -"Al quadre de text <gui>Sala</gui> introduïu el nom del canal on voleu " -"entrar. Els noms dels canals IRC comencen amb el carà cter coixinet (<sys>#</" -"sys>)." +"Per publicar la posició geogrà fica, el servidor de Jabber ha d'implementar " +"el Protocol personal d'esdeveniments (PEP). Hi ha una llista actualitzada de " +"<link href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html" +"\">servidors que implementen el PEP</link> en lÃnia. El Google Talk encara " +"no l'implementa." -#: C/irc-join-room.page:57(p) -msgid "Click <gui>Join</gui> to enter the room." -msgstr "Feu clic a <gui>Entra</gui> per entrar a la sala." - -#: C/irc-join-room.page:64(p) -msgid "" -"To join multiple rooms, you need to repeat the steps above for each room." -msgstr "" -"Per entrar en més d'una sala, haureu de repetir els passos de sobre per cada " -"sala." +#: C/geolocation-privacy.page:8(info/desc) +msgid "What information are sent and to who." +msgstr "Quina informació s'envia i a qui." -#: C/irc-join-pwd.page:9(desc) -msgid "Enter password-protected IRC chat rooms." -msgstr "Entreu la contrasenya per les sales de xat de l'IRC." +#: C/geolocation-privacy.page:32(page/title) +msgid "Geolocation Privacy" +msgstr "Privacitat de la geolocalització" -#: C/irc-join-pwd.page:25(title) -msgid "Join a protected IRC chat room" -msgstr "Entreu en una sala de xat d'IRC protegida." +#: C/geolocation-privacy.page:35(section/title) +msgid "What information is sent" +msgstr "Quina informació s'envia" -#: C/irc-join-pwd.page:27(p) +#: C/geolocation-privacy.page:36(section/p) msgid "" -"On some IRC networks, private IRC rooms may be protected with a password. If " -"you know the password, use the following steps to join:" +"What is possible to send is: your country, region, locality, area, street, " +"building, floor, room, and postal code, longitude, latitude and altitude, " +"speed and bearing." msgstr "" -"En algunes xarxes d'IRC les sales privades poden estar protegides per " -"contrasenya, si la sabeu seguiu els següents passos per unir-vos-hi:" - -#: C/irc-join-pwd.page:33(p) -msgid "<link xref=\"irc-join-room\">Join the room</link> as normal." -msgstr "<link xref=\"irc-join-room\">Entra a la sala</link> com sempre." +"Les dades que es poden enviar són: el paÃs, la regió, la població, l'à rea, " +"el carrer, l'edifici, la planta, la porta, el codi postal, la longitud, la " +"latitud, l'alçada, la velocitat i la orientació." -#: C/irc-join-pwd.page:38(p) -#, fuzzy +#: C/geolocation-privacy.page:40(section/p) msgid "" -"Empathy will prompt you for a password. Enter the password for the IRC chat " -"room and click <gui style=\"button\">Join</gui>." +"The accuracy and the quantity of information about your geographical " +"position are based on the software or on the infrastructure used to discover " +"your position." msgstr "" -"L'Empathy us demanarà una contrasenya. Introduïu la contrasenya per la sala " -"de xat de l'IRC i feu clic a <gui style=\"button\">Uneix-m'hi</gui>." - -#: C/irc-commands.page:7(desc) -msgid "The supported IRC commands." -msgstr "Ordres de l'IRC interpretades per l'Empathy." - -#: C/irc-commands.page:18(title) -msgid "Supported IRC commands" -msgstr "Ordres de l'IRC" +"L'exactitud i la quantitat d'informació sobre la posició geogrà fica estan " +"basades en el programari o en la infraestructura utilitzada per descobrir la " +"posició." -#: C/irc-commands.page:19(p) +#: C/geolocation-privacy.page:44(section/p) msgid "" -"To see the list of the supported IRC commands, in a chat room type <input>/" -"help</input> and press <key>Enter</key>." +"Different kind of networks may have different accuracy settings, and may " +"send different information. The use of external devices such as GPS or " +"mobile phone will increase the accuracy of the information sent." msgstr "" -"Per veure la llista d'ordres interpretades per l'IRC escriviu, en una sala " -"de xat, <input>/help</input> i premeu <key>Retorn</key>." +"Cada tipus de xarxa pot tenir uns parà metres d'exactitud diferents i poden " +"enviar informació diferent. L'ús de dispositius externs com un GPS o un " +"telèfon mòbil incrementarà l'exactitud de la informació enviada." -#: C/irc-commands.page:24(p) -msgid "All commands available have a small description on their usage." -msgstr "Totes les ordres disponibles tenen una petita descripció del seu ús." - -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/introduction.page:41(None) +#: C/geolocation-privacy.page:49(section/p) msgid "" -"@@image: 'figures/empathy-main-window.png'; " -"md5=54908dcb2588beddb15ef0968d2c2582" +"When the privacy mode is enabled, nothing more precise than your city will " +"be sent, even if you are using an external device." msgstr "" -"@@image: 'figures/empathy-main-window.png'; " -"md5=54908dcb2588beddb15ef0968d2c2582" +"Quan s'habilita el mode de privacitat, la mà xima precisió que s'enviarà serà " +"la ciutat, encara que feu servir un dispositiu extern." -#: C/introduction.page:9(desc) -msgid "Introduction to the <app>Empathy</app> instant messenger." -msgstr "Introducció al client de missatgeria instantà nia <app>Empathy</app>." +#: C/geolocation-privacy.page:56(section/title) +msgid "Who can see the information sent" +msgstr "Qui pot veure la informació enviada" -#: C/introduction.page:21(title) -msgid "Introduction" -msgstr "Introducció" +#: C/geolocation-privacy.page:57(section/p) +msgid "Only your contacts can see your geographical position." +msgstr "Només els contactes poden veure la vostra posició geogrà fica." -#: C/introduction.page:23(p) -#, fuzzy -#| msgid "" -#| "<app>Empathy</app> is an instant messaging application for the GNOME " -#| "Desktop. It supports text messaging, voice & video call, file " -#| "transfers and all the most used messaging systems such as MSN and Google " -#| "Talk." +#: C/geolocation-privacy.page:63(section/title) +msgid "What is the privacy mode" +msgstr "Què és el mode de privacitat" + +#: C/geolocation-privacy.page:64(section/p) msgid "" -"<app>Empathy</app> is an instant messaging application for the GNOME " -"Desktop. It supports text messaging, voice & video calls, file " -"transfers, and all the most used messaging systems such as MSN and Google " -"Talk." +"The privacy mode, enabled by default, is a reduced accuracy mode that will " +"decrease the accuracy of the geographical position sent to your contacts." msgstr "" -"L'<app>Empathy</app> és una aplicació de missatgeria instantà nia per a " -"l'escriptori GNOME. Permet utilitzar la missatgeria de text, trucades de veu " -"i vÃdeo, la transmissió de fitxers i tots els sistemes de missatgeria més " -"utilitzats com l'MSN i el Google Talk." +"El mode de privacitat, habilitat per defecte, és un mode que redueix la " +"precisió de la posició geogrà fica que s'envia als contactes." + +#: C/geolocation-privacy.page:71(section/title) +msgid "Privacy overview" +msgstr "Descripció de la privacitat" -#: C/introduction.page:28(p) +#: C/geolocation-privacy.page:72(section/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." +"Overview of the various geolocation privacy settings in <app>Empathy</app>." msgstr "" -"L'<app>Empathy</app> inclou caracterÃstiques que us ajuden a col·laborar " -"mentre treballeu i que us permeten de forma fà cil estar al dia amb els " -"amics." +"Descripció de varis parà metres de geolocalització en l'<app>Empathy</app>." -#: C/introduction.page:32(p) +#: C/geolocation-privacy.page:77(item/p) +msgid "Geolocation is not enabled by default." +msgstr "La geolocalització no s'activa per defecte." + +#: C/geolocation-privacy.page:82(item/p) +msgid "Privacy mode is enabled by default." +msgstr "El mode de privacitat s'activa per defecte." + +#: C/geolocation-privacy.page:87(item/p) msgid "" -"Using <app>Empathy</app>, you can group all the conversations in a single " -"window, have multiple windows for different kind of conversations, easily " -"search through your previous conversations, and share your desktop in just " -"two clicks." +"Privacy mode prevails even when using external and more precise devices." msgstr "" -"Amb l'<app>Empathy</app> podeu agrupar totes les converses en una única " -"finestra, tenir una finestra per a cada tipus de conversa, fer cerques de " -"forma fà cil a les converses anteriors i compartir el vostre escriptori en tan " -"sols dos clics." +"El mode de privacitat preval inclús quan esteu utilitzant dispositius " +"externs amb més precisió." -#: C/introduction.page:39(title) -msgid "<gui>Contact List</gui> window" -msgstr "Finestra de la <gui>Llista de contactes</gui>" +#: C/geolocation-privacy.page:92(item/p) +msgid "Only your contacts can see your position." +msgstr "Només els contactes poden veure la vostra posició." -#: C/introduction.page:40(desc) -msgid "<app>Empathy</app> main window" -msgstr "Finestra principal de l'<app>Empathy</app>" +#: C/geolocation-supported.page:7(info/desc) +msgid "Services that supports geolocation and compatibility." +msgstr "Serveis que utilitzen la geolocalització i la compatibilitat." -#: C/introduction.page:42(p) -msgid "<app>Empathy</app> main window." -msgstr "Finestra principal de l'<app>Empathy</app>." +#: C/geolocation-supported.page:31(page/title) +msgid "Supported services" +msgstr "Serveis que l'utilitzen" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/index.page:28(None) +#: C/geolocation-supported.page:33(page/p) msgid "" -"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2" +"The geolocation feature at the moment is compatible only with the Jabber " +"service. In order to use it, you and your contacts need to have a Jabber " +"account." msgstr "" -"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2" - -#: C/index.page:7(title) C/index.page:8(title) -msgid "Empathy Internet Messenger" -msgstr "Missatgeria d'Internet Empathy" +"La caracterÃstica de la geolocalització, de moment, només és compatible amb " +"el servei de Jabber. Per utilitzar-la fa falta que tant vós com els " +"contactes tinguin un compte de Jabber." -#: C/index.page:27(title) +#: C/geolocation-supported.page:39(note/p) msgid "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> " -"Empathy Internet Messenger logo </media> Empathy Internet Messenger" +"It is necessary that also the server you are using supports the geolocation " +"feature. Most of the Jabber servers support it. See your service website " +"documentation for more information." msgstr "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> " -"Logotip de la missatgeria d'Internet Empathy</media> Missatgeria d'Internet " -"Empathy" - -#: C/index.page:35(title) -msgid "Account Management" -msgstr "Gestió de comptes" - -#: C/index.page:39(title) -msgid "Contact Management" -msgstr "Gestió de contactes" - -#: C/index.page:43(title) -msgid "Text Conversations" -msgstr "Converses de text" +"És necessari que el servidor que esteu utilitzant també habiliti la " +"caracterÃstica de la geolocalització. Molt servidors de Jabber ja ho tenen " +"habilitat. Per saber-ne més mireu la documentació del servei web." -#: C/index.page:47(title) -msgid "Audio and Video Conversations" -msgstr "Converses d'à udio i vÃdeo" +#: C/geolocation-supported.page:47(section/title) +msgid "Compatibility" +msgstr "Compatibilitat" -#: C/index.page:51(title) -msgid "Advanced Actions" -msgstr "Opcions avançades" +#: C/geolocation-supported.page:49(section/p) +msgid "" +"<app>Empathy</app> geolocation feature is not compatible with other " +"geographical position services such as <em>Google Latitude</em>, <em>Yahoo " +"Fire Eagle</em> or <em>Brightkite</em>." +msgstr "" +"La caracterÃstica de geolocalització de l'<app>Empathy</app> no és " +"compatible amb altres serveis de posicionament geogrà fic com el <em>Google " +"Latitude</em>, el <em>Yahoo Fire Eagle</em> o el <em>Brightkite</em>." -#: C/import-account.page:10(desc) -msgid "Import an account from another instant messaging application." -msgstr "Importeu un compte d'una altra aplicació de missatgeria instantà nia." +#: C/geolocation-turn.page:9(info/desc) +msgid "How to activate and deactivate geolocation in <app>Empathy</app>." +msgstr "Com activar i desactivar la geolocalització a l'<app>Empathy</app>." -#: C/import-account.page:19(name) -msgid "Peter Haslam" -msgstr "Peter Haslam" +#: C/geolocation-turn.page:33(page/title) +msgid "Activate/Deactivate geolocation" +msgstr "Activeu/Desactiveu la geolocalització" -#: C/import-account.page:20(email) -msgid "peter.haslam@freenet.de" -msgstr "peter.haslam@freenet.de" +#: C/geolocation-turn.page:37(item/p) +msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>." +msgstr "Seleccioneu <guiseq><gui>Edita</gui><gui>Preferències</gui></guiseq>." -#: C/import-account.page:42(title) -msgid "Import an existing account" -msgstr "Com importar un compte existent" +#: C/geolocation-turn.page:42(item/p) +msgid "Select the <gui>Location</gui> tab." +msgstr "Seleccioneu la pestanya <gui>Localització</gui>." -#: C/import-account.page:44(p) +#: C/geolocation-turn.page:47(item/p) msgid "" -"The first time you run <app>Empathy</app>, it will offer to import your " -"accounts from other instant messaging applications. Currently, the only " -"supported application is <app>Pidgin</app>." +"Select <gui>Publish location to my contacts</gui> to activate geolocation." msgstr "" -"La primera vegada que executeu l'<app>Empathy</app> us oferirà la importació " -"dels comptes d'una altra aplicació de missatgeria instantà nia. " -"Ara mateix l'única aplicació des de la que es poden importar comptes és el " -"<app>Pidgin</app>." +"Seleccioneu <gui>Publica la localització per als meus contactes</gui> per " +"activar-la." -#: C/import-account.page:50(p) +#: C/geolocation-turn.page:50(item/p) +msgid "To deactivate geolocation, deselect it." +msgstr "Per desactivar la geolocalització, desseleccioneu-ho." + +#: C/geolocation-turn.page:55(item/p) msgid "" -"Run <app>Empathy</app> for the first time. An assistant will offer you a " -"number of options to create new accounts." +"To increase the accuracy of your position, deselect <gui>Reduce location " +"accuracy</gui>." msgstr "" -"Executeu l'<app>Empathy</app> per primer cop. Un assistent us oferirà unes " -"quantes opcions per crear comptes nous." +"Per augmentar l'exactitud de la vostra posició, desseleccioneu <gui>Redueix " +"la precisió de la localització</gui>." -#: C/import-account.page:54(p) +#: C/geolocation-turn.page:61(item/p) msgid "" -"Select <gui>Yes, import my account details from</gui> and click " -"<gui>Forward</gui>." +"If you have an external device like a GPS or want to send a more accurate " +"position, select the appropriate option in the <gui>Location sources</gui> " +"section." msgstr "" -"Seleccioneu <gui>SÃ, importa les dades dels comptes de</gui> i feu clic a " -"<gui>Endavant</gui>." +"Si teniu un dispositiu extern com un GPS o voleu enviar una posició més " +"exacta, seleccioneu l'opció apropiada a la secció <gui>Fonts d'ubicació</" +"gui>." -#: C/import-account.page:58(p) -msgid "Select the check box next to each account you wish to import." -msgstr "Seleccioneu la caixa de selecció de cada compte que vulgueu importar." +#: C/geolocation-what-is.page:9(info/desc) +msgid "Understanding geolocation." +msgstr "Comprenent la geolocalització." -#: C/import-account.page:66(p) +#: C/geolocation-what-is.page:33(page/title) +msgid "What is geolocation" +msgstr "Què és la geolocalització?" + +#: C/geolocation-what-is.page:35(page/p) msgid "" -"It is not currently possible to import accounts after you have completed the " -"first-run assistant." +"Geolocation allows you to identify the real geographical location of a " +"computer or a device connected to the Internet." msgstr "" -"No és possible importar comptes nous després d'haver completat l'auxiliar " -"de la primera execució." +"La geolocalització us permet identificar la localització geogrà fica real " +"d'un ordinador o un dispositiu connectat a Internet." -#: C/hide-contacts.page:8(desc) -msgid "Hide the offline contacts from your <gui>Contact List</gui>." -msgstr "" -"Oculta el contactes fora de lÃnia de la <gui>Llista de contactes</gui>." +#: C/geolocation-what-is.page:37(page/p) +msgid "With geolocation in <app>Empathy</app> you can:" +msgstr "Grà cies a la geolocalització a l'<app>Empathy</app> podeu:" -#: C/hide-contacts.page:19(title) -msgid "Hide offline contacts" -msgstr "Com amagar els contactes fora de lÃnia" +#: C/geolocation-what-is.page:42(item/p) +msgid "Publish your geographical location to your contacts." +msgstr "Fer pública la localització geogrà fica als contactes." -#: C/hide-contacts.page:21(p) -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." +#: C/geolocation-what-is.page:47(item/p) +msgid "See your contacts’ geographical location and quickly contact them." msgstr "" -"Normalment, l'<app>Empathy</app> mostra tots els contactes: aquells " -"que són en lÃnia, amb els quals teniu una conversa i els que són " -"fora de lÃnia." - -#: C/hide-contacts.page:25(p) -msgid "To hide the contacts that are offline:" -msgstr "Per amagar els contactes que són fora de lÃnia:" +"Veure la localització geogrà fica del contactes i contactar fà cilment amb " +"ells." -#: C/hide-contacts.page:31(p) +#: C/geolocation-what-is.page:52(item/p) msgid "" -"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</" -"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</" -"key><key>H</key></keyseq>." +"Set the accuracy of your location and the device used to discover your " +"location." msgstr "" -"Des de la finestra <gui>Llista de contactes</gui> escolliu " -"<guiseq><gui>Visualitza</gui><gui>Contactes fora de lÃnia</gui></guiseq>, o " -"premeu <keyseq><key>Ctrl</key><key>H</key></keyseq>." +"Fixar l'exactitud de la vostra localització i el dispositiu utilitzat per " +"descobrir la localització." -#: C/hide-contacts.page:36(p) -msgid "To show the offline contacts again, repeat the same procedure above." +#: C/geolocation-what-is.page:60(note/p) +msgid "" +"In order to see your contacts’ geographical locations, they need to use a " +"service and an application that supports geolocation." msgstr "" -"Per tornar a mostrar els contactes fora de lÃnia, repetiu els mateixos passos " -"descrits aquà sobre." +"Per veure les localitzacions geogrà fiques dels contactes els caldrà un " +"servei i una aplicació que faci ús de la geolocalització." -#: C/group-conversations.page:8(desc) +#: C/group-conversations.page:8(info/desc) msgid "Start or join a group conversation with your contacts." msgstr "Inicieu o uniu-vos a una conversa de grup amb els contactes." -#: C/group-conversations.page:34(title) +#: C/group-conversations.page:34(page/title) msgid "Group conversations" msgstr "Converses de grup" -#: C/group-conversations.page:36(p) +#: C/group-conversations.page:36(page/p) msgid "" "Group conversations permits you to have text conversations with more than " "one contact at the same time." @@ -1840,7 +1738,7 @@ msgstr "" "Les converses de grup us permeten mantenir converses de text amb més d'un " "contacte al mateix temps." -#: C/group-conversations.page:40(p) +#: C/group-conversations.page:40(page/p) msgid "" "To have a group conversation you need to have a registered account with " "either Jabber or Google Talk, or a People Nearby account." @@ -1848,7 +1746,7 @@ msgstr "" "Per mantenir una conversa de grup us cal tindre un compte registrat a " "Jabber, a Google Talk o a Gent propera." -#: C/group-conversations.page:46(p) +#: C/group-conversations.page:46(note/p) msgid "" "You can have a group conversation only with the contacts that are using the " "same service as yours." @@ -1856,39 +1754,48 @@ msgstr "" "Sols podeu mantenir converses de grup amb els contactes que estan utilitzant " "el mateix servei que vós." -#: C/group-conversations.page:54(title) +#: C/group-conversations.page:54(section/title) msgid "Start a group conversation" msgstr "Com iniciar un conversa de grup" -#: C/group-conversations.page:63(p) +#: C/group-conversations.page:58(item/p) +#: C/group-conversations.page:122(item/p) C/irc-join-room.page:39(item/p) +msgid "" +"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</" +"gui><gui>Join</gui></guiseq>." +msgstr "" +"A la finestra <gui>Llista de contactes</gui> escolliu <guiseq><gui>Sala</" +"gui><gui>Entra</gui></guiseq>." + +#: C/group-conversations.page:63(item/p) msgid "" "From the <gui>Account</gui> drop-down list, select the account you want to " "use for the group conversation." msgstr "" -"Des de la llista desplegable <guilabel>Compte</guilabel> trieu el compte " -"que vulgueu utilitzar per la conversa de grup." +"Des de la llista desplegable <gui>Compte</gui> trieu el compte que vulgueu " +"utilitzar per la conversa de grup." -#: C/group-conversations.page:69(p) +#: C/group-conversations.page:69(item/p) msgid "" "In the <gui>Server</gui> text box, type the name of server in which the " "conversation will be hosted." msgstr "" -"Al quadre de text <guilabel>Servidor</guilabel> introduïu el nom del " -"servidor en qual s'hostatjarà la conversa." +"Al quadre de text <gui>Servidor</gui> introduïu el nom del servidor en el " +"qual s'hostatjarà la conversa." -#: C/group-conversations.page:73(p) +#: C/group-conversations.page:73(item/p) msgid "Leave it empty if it will be on the current server." msgstr "Deixeu el camp buit si serà en el servidor actual." -#: C/group-conversations.page:78(p) +#: C/group-conversations.page:78(item/p) msgid "" "In the <gui>Room</gui> text box, type the name you want to give to the " "conversation." msgstr "" -"Al quadre de text <guilabel>Sala</guilabel> introduïu el nom que vulgueu " -"donar a la conversa." +"Al quadre de text <gui>Sala</gui> introduïu el nom que vulgueu donar a la " +"conversa." -#: C/group-conversations.page:82(p) +#: C/group-conversations.page:82(note/p) msgid "" "This will be the name of the room you are going to have a conversation. This " "name will be publicly available for other people to join. It is not possible " @@ -1897,23 +1804,23 @@ msgstr "" "Aquest serà el nom de la sala on mantindreu la conversa. El nom serà públic " "i altra gent podrà unir-s'hi. No es poden crear sales privades." -#: C/group-conversations.page:90(p) +#: C/group-conversations.page:90(item/p) msgid "" "To invite other contacts to join the group conversation, from the " "<gui>Contact List</gui> window, select the contact you want to invite, and " "perform one of the following:" msgstr "" "Per convidar altres contactes a unir-se a la conversa de grup, seleccioneu " -"el contacte que voleu convidar des de la finestra <gui>Llista de contactes" -"</gui> i feu el següent:" +"el contacte que voleu convidar des de la finestra <gui>Llista de contactes</" +"gui> i feu el següent:" -#: C/group-conversations.page:97(p) +#: C/group-conversations.page:97(item/p) msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>." msgstr "" "Feu clic amb el botó secundari sobre el contacte i escolliu <gui>Convida a " "la sala de xat</gui>." -#: C/group-conversations.page:102(p) +#: C/group-conversations.page:102(item/p) msgid "" "Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</" "gui></guiseq>." @@ -1921,7 +1828,7 @@ msgstr "" "Escolliu <guiseq><gui>Edita</gui><gui>Contacte</gui><gui>Convida a la sala " "de xat</gui></guiseq>." -#: C/group-conversations.page:107(p) +#: C/group-conversations.page:107(item/p) msgid "" "If you have more than one group conversation open, select the one you want " "to invite your contacts." @@ -1929,21 +1836,21 @@ msgstr "" "Si teniu més d'una conversa de grup oberta, seleccioneu la que vulgueu per " "convidar els contactes." -#: C/group-conversations.page:118(title) +#: C/group-conversations.page:118(section/title) msgid "Join a group conversation" msgstr "Uniu-vos a una conversa de grup" -#: C/group-conversations.page:128(p) +#: C/group-conversations.page:128(item/p) msgid "Expand the <gui>Room List</gui> section to see all the existing rooms." msgstr "" "Expandiu la secció <gui>Llista de sales</gui> per veure totes les sales " "existents." -#: C/group-conversations.page:133(p) +#: C/group-conversations.page:133(item/p) msgid "Double-click on the name of a room to join it." msgstr "Feu doble clic sobre el nom de la sala a la qual voleu unir-vos." -#: C/group-conversations.page:139(p) +#: C/group-conversations.page:139(section/p) msgid "" "It is not possible to join all existing rooms. Some of the rooms might " "require a password, or might be invitation only. <app>Empathy</app> does not " @@ -1953,1526 +1860,1674 @@ msgstr "" "requerir una contrasenya o una invitació per entrar-hi. L'<app>Empathy</app> " "encara no permet utilitzar aquest tipus de sales." -#: C/geolocation-what-is.page:9(desc) -msgid "Understanding geolocation." -msgstr "Comprenent la geolocalització." +#: C/hide-contacts.page:8(info/desc) +msgid "Hide the offline contacts from your <gui>Contact List</gui>." +msgstr "" +"Oculta el contactes fora de lÃnia de la <gui>Llista de contactes</gui>." -#: C/geolocation-what-is.page:33(title) -msgid "What is geolocation" -msgstr "Què és la geolocalització?" +#: C/hide-contacts.page:19(page/title) +msgid "Hide offline contacts" +msgstr "Amagueu els contactes fora de lÃnia" -#: C/geolocation-what-is.page:35(p) +#: C/hide-contacts.page:21(page/p) msgid "" -"Geolocation allows you to identify the real geographical location of a " -"computer or a device connected to the Internet." +"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 "" -"La geolocalització us permet identificar la localització geogrà fica real " -"d'un ordinador o un dispositiu connectat a Internet." +"Normalment, l'<app>Empathy</app> mostra tots els contactes: aquells que són " +"en lÃnia, amb els quals teniu una conversa i els que són fora de lÃnia." -#: C/geolocation-what-is.page:37(p) -msgid "With geolocation in <app>Empathy</app> you can:" -msgstr "Grà cies a la geolocalització a l'<app>Empathy</app> podeu:" +#: C/hide-contacts.page:25(page/p) +msgid "To hide the contacts that are offline:" +msgstr "Per amagar els contactes que són fora de lÃnia:" -#: C/geolocation-what-is.page:42(p) -msgid "Publish your geographical location to your contacts." -msgstr "Fer pública la localització geogrà fica als contactes." +#: C/hide-contacts.page:31(item/p) +msgid "" +"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> " +"<gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</key> " +"<key>H</key></keyseq>." +msgstr "" +"Des de la finestra <gui>Llista de contactes</gui> escolliu " +"<guiseq><gui>Visualitza</gui><gui>Contactes fora de lÃnia</gui></guiseq> o " +"premeu <keyseq><key>Ctrl</key><key>H</key></keyseq>." -#: C/geolocation-what-is.page:47(p) -msgid "See your contacts’ geographical location and quickly contact them." +#: C/hide-contacts.page:36(item/p) +msgid "To show the offline contacts again, repeat the same procedure above." msgstr "" -"Veure la localització geogrà fica del contactes i contactar fà cilment amb " -"ells." +"Per tornar a mostrar els contactes fora de lÃnia, repetiu els mateixos " +"passos descrits aquà sobre." + +#: C/import-account.page:10(info/desc) +msgid "Import an account from another instant messaging application." +msgstr "Importeu un compte d'una altra aplicació de missatgeria instantà nia." -#: C/geolocation-what-is.page:52(p) +#: C/import-account.page:19(credit/name) +msgid "Peter Haslam" +msgstr "Peter Haslam" + +#: C/import-account.page:42(page/title) +msgid "Import an existing account" +msgstr "Importeu un compte existent" + +#: C/import-account.page:44(page/p) msgid "" -"Set the accuracy of your location and the device used to discover your " -"location." +"The first time you run <app>Empathy</app>, it will offer to import your " +"accounts from other instant messaging applications. Currently, the only " +"supported application is <app>Pidgin</app>." msgstr "" -"Fixar l'exactitud de la vostra localització i el dispositiu utilitzat per " -"descobrir la localització." +"La primera vegada que executeu l'<app>Empathy</app> us oferirà la importació " +"dels comptes d'una altra aplicació de missatgeria instantà nia. Ara mateix " +"l'única aplicació des de la que es poden importar comptes és el <app>Pidgin</" +"app>." -#: C/geolocation-what-is.page:60(p) +#: C/import-account.page:50(item/p) msgid "" -"In order to see your contacts’ geographical locations, they need to use a " -"service and an application that supports geolocation." +"Run <app>Empathy</app> for the first time. An assistant will offer you a " +"number of options to create new accounts." msgstr "" -"Per veure les localitzacions geogrà fiques dels contactes els caldrà " -"un servei i una aplicació que faci ús de la geolocalització." - -#: C/geolocation-turn.page:9(desc) -msgid "How to activate and deactivate geolocation in <app>Empathy</app>." -msgstr "Com activar i desactivar la geolocalització a l'<app>Empathy</app>." +"Executeu l'<app>Empathy</app> per primer cop. Un assistent us oferirà unes " +"quantes opcions per crear comptes nous." -#: C/geolocation-turn.page:33(title) -msgid "Activate/Deactivate geolocation" -msgstr "Activeu/Desactiveu la geolocalització" +#: C/import-account.page:54(item/p) +msgid "" +"Select <gui>Yes, import my account details from</gui> and click " +"<gui>Forward</gui>." +msgstr "" +"Seleccioneu <gui>SÃ, importa les dades dels comptes de</gui> i feu clic a " +"<gui>Endavant</gui>." -#: C/geolocation-turn.page:37(p) -msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>." -msgstr "Seleccioneu <guiseq><gui>Edita</gui><gui>Preferències</gui></guiseq>." +#: C/import-account.page:58(item/p) +msgid "Select the check box next to each account you wish to import." +msgstr "Seleccioneu la caixa de selecció de cada compte que vulgueu importar." -#: C/geolocation-turn.page:42(p) -msgid "Select the <gui>Location</gui> tab." -msgstr "Seleccioneu la pestanya <gui>Localització</gui>." +#: C/import-account.page:66(note/p) +msgid "" +"It is not currently possible to import accounts after you have completed the " +"first-run assistant." +msgstr "" +"No és possible importar comptes nous després d'haver completat l'auxiliar de " +"la primera execució." -#: C/geolocation-turn.page:47(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/introduction.page:41(media) +msgctxt "_" msgid "" -"Select <gui>Publish location to my contacts</gui> to activate geolocation." +"external ref='figures/empathy-main-window.png' " +"md5='54908dcb2588beddb15ef0968d2c2582'" msgstr "" -"Seleccioneu <gui>Publica la localització per als meus contactes</gui> per " -"activar-la." +"external ref='figures/empathy-main-window.png' " +"md5='54908dcb2588beddb15ef0968d2c2582'" -#: C/geolocation-turn.page:50(p) -msgid "To deactivate geolocation, deselect it." -msgstr "Per desactivar la geolocalització, desseleccioneu-ho." +#: C/introduction.page:9(info/desc) +msgid "Introduction to the <app>Empathy</app> instant messenger." +msgstr "Introducció al client de missatgeria instantà nia <app>Empathy</app>." -#: C/geolocation-turn.page:55(p) +#: C/introduction.page:21(page/title) +msgid "Introduction" +msgstr "Introducció" + +#: C/introduction.page:23(page/p) msgid "" -"To increase the accuracy of your position, deselect <gui>Reduce location " -"accuracy</gui>." +"<app>Empathy</app> is an instant messaging application for the GNOME " +"Desktop. It supports text messaging, voice & video calls, file " +"transfers, and all the most used messaging systems such as MSN and Google " +"Talk." msgstr "" -"Per augmentar l'exactitud de la vostra posició, desseleccioneu <gui>Redueix " -"la precisió de la localització</gui>." +"L'<app>Empathy</app> és una aplicació de missatgeria instantà nia per a " +"l'escriptori GNOME. Permet utilitzar la missatgeria de text, trucades de veu " +"i de vÃdeo, la transmissió de fitxers i tots els sistemes de missatgeria més " +"utilitzats com el MSN i el Google Talk." -#: C/geolocation-turn.page:61(p) +#: C/introduction.page:28(page/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>Location sources</gui> " -"section." +"<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 "" -"Si teniu un dispositiu extern com un GPS o voleu enviar una posició més " -"exacta, seleccioneu l'opció apropiada a la secció <gui>Fonts d'ubicació</gui>." +"L'<app>Empathy</app> inclou caracterÃstiques que us ajuden a col·laborar " +"mentre treballeu i que us permeten de forma fà cil estar al dia amb els amics." -#: C/geolocation-supported.page:7(desc) -msgid "Services that supports geolocation and compatibility." -msgstr "Serveis que utilitzen la geolocalització i la compatibilitat." +#: C/introduction.page:32(page/p) +msgid "" +"Using <app>Empathy</app>, you can group all the conversations in a single " +"window, have multiple windows for different kind of conversations, easily " +"search through your previous conversations, and share your desktop in just " +"two clicks." +msgstr "" +"Amb l'<app>Empathy</app> podeu agrupar totes les converses en una única " +"finestra, tenir una finestra per a cada tipus de conversa, fer cerques de " +"forma fà cil a les converses anteriors i compartir el vostre escriptori en " +"tan sols dos clics." -#: C/geolocation-supported.page:31(title) -msgid "Supported services" -msgstr "Serveis que l'utilitzen" +#: C/introduction.page:39(figure/title) +msgid "<gui>Contact List</gui> window" +msgstr "Finestra de la <gui>Llista de contactes</gui>" -#: C/geolocation-supported.page:33(p) +#: C/introduction.page:40(figure/desc) +msgid "<app>Empathy</app> main window" +msgstr "Finestra principal de l'<app>Empathy</app>" + +#: C/introduction.page:42(media/p) +msgid "<app>Empathy</app> main window." +msgstr "Finestra principal de l'<app>Empathy</app>." + +#: C/irc-commands.page:7(info/desc) +msgid "The supported IRC commands." +msgstr "Ordres de l'IRC interpretades per l'Empathy." + +#: C/irc-commands.page:18(page/title) +msgid "Supported IRC commands" +msgstr "Ordres de l'IRC" + +#: C/irc-commands.page:19(page/p) msgid "" -"The geolocation feature at the moment is compatible only with the Jabber " -"service. In order to use it, you and your contacts need to have a Jabber " -"account." +"To see the list of the supported IRC commands, in a chat room type <input>/" +"help</input> and press <key>Enter</key>." msgstr "" -"La caracterÃstica de la geolocalització, de moment, només és compatible amb " -"el servei de Jabber. Per utilitzar-la fa falta que tant vós com els contactes " -"tinguin un compte de Jabber." +"Per veure la llista d'ordres interpretades per l'IRC escriviu, en una sala " +"de xat, <input>/help</input> i premeu <key>Retorn</key>." -#: C/geolocation-supported.page:39(p) +#: C/irc-commands.page:24(note/p) +msgid "All commands available have a small description on their usage." +msgstr "Totes les ordres disponibles tenen una petita descripció del seu ús." + +#: C/irc-join-pwd.page:9(info/desc) +msgid "Enter password-protected IRC chat rooms." +msgstr "Entreu la contrasenya per les sales de xat de l'IRC." + +#: C/irc-join-pwd.page:25(page/title) +msgid "Join a protected IRC chat room" +msgstr "Entreu en una sala de xat d'IRC protegida." + +#: C/irc-join-pwd.page:27(page/p) msgid "" -"It is necessary that also the server you are using supports the geolocation " -"feature. Most of the Jabber servers support it. See your service website " -"documentation for more information." +"On some IRC networks, private IRC rooms may be protected with a password. If " +"you know the password, use the following steps to join:" msgstr "" -"És necessari que el servidor que esteu utilitzant també habiliti la " -"caracterÃstica de la geolocalització. Molt servidors de Jabber ja ho tenen " -"habilitat. Per saber-ne més mireu la documentació del servei web." +"En algunes xarxes d'IRC les sales privades poden estar protegides per " +"contrasenya, si la sabeu seguiu els següents passos per unir-vos-hi:" -#: C/geolocation-supported.page:47(title) -msgid "Compatibility" -msgstr "Compatibilitat" +#: C/irc-join-pwd.page:33(item/p) +msgid "<link xref=\"irc-join-room\">Join the room</link> as normal." +msgstr "<link xref=\"irc-join-room\">Entra a la sala</link> com sempre." -#: C/geolocation-supported.page:49(p) +#: C/irc-join-pwd.page:38(item/p) msgid "" -"<app>Empathy</app> geolocation feature is not compatible with other " -"geographical position services such as <em>Google Latitude</em>, <em>Yahoo " -"Fire Eagle</em> or <em>Brightkite</em>." +"Empathy will prompt you for a password. Enter the password for the IRC chat " +"room and click <gui style=\"button\">Join</gui>." msgstr "" -"La caracterÃstica de geolocalització de l'<app>Empathy</app> no és compatible amb " -"altres serveis de posicionament geogrà fic com el <em>Google Latitude</em>, " -"el <em>Yahoo Fire Eagle</em> o el <em>Brightkite</em>." - -#: C/geolocation-privacy.page:8(desc) -msgid "What information are sent and to who." -msgstr "Quina informació s'envia i a qui." +"L'Empathy us demanarà una contrasenya. Introduïu la contrasenya de la sala " +"de xat de l'IRC i feu clic a <gui style=\"button\">Uneix-m'hi</gui>." -#: C/geolocation-privacy.page:32(title) -msgid "Geolocation Privacy" -msgstr "Privacitat de la geolocalització" +#: C/irc-join-room.page:8(info/desc) +msgid "Join an IRC channel." +msgstr "Uniu-vos a un canal d'IRC." -#: C/geolocation-privacy.page:35(title) -msgid "What information is sent" -msgstr "Quina informació s'envia" +#: C/irc-join-room.page:31(page/title) +msgid "Join an IRC chat room" +msgstr "Uniu-vos a la sala de xat de l'IRC" -#: C/geolocation-privacy.page:36(p) +#: C/irc-join-room.page:33(page/p) msgid "" -"What is possible to send is: your country, region, locality, area, street, " -"building, floor, room, and postal code, longitude, latitude and altitude, " -"speed and bearing." +"You can join IRC chat rooms (also known as IRC channels) on any IRC network " +"you’re connected to. To connect to an IRC network, see <link xref=\"add-" +"account\"/> and <link xref=\"account-irc\"/>." msgstr "" -"Les dades que es poden enviar són: el paÃs, la regió, la població, l'à rea, " -"el carrer, l'edifici, la planta, la porta, el codi postal, la longitud, la " -"latitud, l'alçada, la velocitat i la orientació." +"Podeu unir-vos a sales de xat de l'IRC (també conegudes com canals de l'IRC) " +"a qualsevol xarxa d'IRC a la qual estigueu connectat. Per connectar-vos a " +"una xarxa d'IRC, vegeu <link xref=\"add-account\"/> i <link xref=\"account-" +"irc\"/>." -#: C/geolocation-privacy.page:40(p) +#: C/irc-join-room.page:45(item/p) msgid "" -"The accuracy and the quantity of information about your geographical " -"position are based on the software or on the infrastructure used to discover " -"your position." +"From the <gui>Account</gui> drop-down list, select the IRC account that " +"corresponds to the network you want to use." msgstr "" -"L'exactitud i la quantitat d'informació sobre la posició geogrà fica estan " -"basades en el programari o en la infraestructura utilitzada per descobrir la " -"posició." +"Des de la llista desplegable <gui>Compte</gui>, trieu el compte d'IRC que " +"correspon a la xarxa que voleu utilitzar." -#: C/geolocation-privacy.page:44(p) +#: C/irc-join-room.page:51(item/p) msgid "" -"Different kind of networks may have different accuracy settings, and may " -"send different information. The use of external devices such as GPS or " -"mobile phone will increase the accuracy of the information sent." +"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 "" -"Cada tipus de xarxa pot tenir uns parà metres d'exactitud diferents i " -"poden enviar informació diferent. L'ús de dispositius externs com un GPS o " -"un telèfon mòbil incrementarà l'exactitud de la informació enviada." +"Al quadre de text <gui>Sala</gui> introduïu el nom del canal on voleu " +"entrar. Els noms dels canals IRC comencen amb el carà cter coixinet (<sys>#</" +"sys>)." + +#: C/irc-join-room.page:57(item/p) +msgid "Click <gui>Join</gui> to enter the room." +msgstr "Feu clic a <gui>Entra</gui> per entrar a la sala." -#: C/geolocation-privacy.page:49(p) +#: C/irc-join-room.page:64(note/p) msgid "" -"When the privacy mode is enabled, nothing more precise than your city will " -"be sent, even if you are using an external device." +"To join multiple rooms, you need to repeat the steps above for each room." msgstr "" -"Quan s'habilita el mode de privacitat, la mà xima precisió que s'enviarà serà la " -"ciutat, encara que feu servir un dispositiu extern." +"Per entrar en més d'una sala, haureu de repetir els passos de sobre per cada " +"sala." -#: C/geolocation-privacy.page:56(title) -msgid "Who can see the information sent" -msgstr "Qui pot veure la informació enviada" +#: C/irc-manage.page:9(info/desc) +msgid "How to use IRC with <app>Empathy</app>." +msgstr "Com utilitzar IRC amb l'<app>Empathy</app>." -#: C/geolocation-privacy.page:57(p) -msgid "Only your contacts can see your geographical position." -msgstr "Només els contactes poden veure la vostra posició geogrà fica." +#: C/irc-manage.page:23(credit/name) +msgid "Sindhu S" +msgstr "Sindhu S" -#: C/geolocation-privacy.page:63(title) -msgid "What is the privacy mode" -msgstr "Què és el mode de privacitat" +#: C/irc-manage.page:39(page/title) +msgid "Internet Relay Chat (IRC)" +msgstr "Internet Relay Chat (IRC)" -#: C/geolocation-privacy.page:64(p) +#: C/irc-manage.page:47(when/p) msgid "" -"The privacy mode, enabled by default, is a reduced accuracy mode that will " -"decrease the accuracy of the geographical position sent to your contacts." +"<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-" +"idle</link>" msgstr "" -"El mode de privacitat, habilitat per defecte, és un mode que redueix la " -"precisió de la posició geogrà fica que s'envia als contactes." +"<link action=\"install:telepathy-idle\" xref=\"index\"> Instal·la el paquet " +"telepathy-idle</link>" -#: C/geolocation-privacy.page:71(title) -msgid "Privacy overview" -msgstr "Descripció de la privacitat" +#: C/irc-manage.page:55(info/title) +msgctxt "link" +msgid "IRC Chat Rooms and Conversations" +msgstr "Sales de xat de l'IRC i converses" + +#: C/irc-manage.page:57(section/title) +msgid "Chat Rooms and Conversations" +msgstr "Sales de xat i converses" + +#: C/irc-manage.page:62(info/title) +msgctxt "link" +msgid "Common IRC Problems" +msgstr "Problemes de l'IRC més habituals" + +#: C/irc-nick-password.page:10(info/desc) +msgid "Protect your nickname to prevent other IRC users from using it." +msgstr "" +"Protegiu el vostre sobrenom per impedir que altres usuaris de l'IRC l'usin." + +#: C/irc-nick-password.page:33(page/title) +msgid "Use a nickname password on IRC" +msgstr "Utilitzeu un sobrenom amb contrasenya a l'IRC" -#: C/geolocation-privacy.page:72(p) +#: C/irc-nick-password.page:35(page/p) msgid "" -"Overview of the various geolocation privacy settings in <app>Empathy</app>." +"On some IRC networks, you can register your nickname with a service called " +"NickServ. By sending special messages to NickServ, you can set your password " +"and identify yourself. Some IRC chat rooms may not allow you to join without " +"a registered nickname." msgstr "" -"Descripció de varis parà metres de geolocalització en l'<app>Empathy</app>." +"En algunes xarxes d'IRC podeu registrar el vostre sobrenom amb un servei " +"anomenat NickServ. Si envieu uns missatges especials a NickServ podreu " +"establir la contrasenya i identificar-vos. Algunes sales d'IRC no permeten " +"entrar si el sobrenom no està registrat." -#: C/geolocation-privacy.page:77(p) -msgid "Geolocation is not enabled by default." -msgstr "La geolocalització no s'activa per defecte." +#: C/irc-nick-password.page:40(page/p) +msgid "" +"<app>Empathy</app> does not currently support nickname registration. Some " +"IRC networks, however, will automatically forward a <em>server password</em> " +"to NickServ. On these networks, you can use the IRC password in " +"<app>Empathy</app> to identify yourself to NickServ. The popular freenode " +"network is known to have this feature." +msgstr "" +"L'<app>Empathy</app> no suporta el registre de sobrenoms. Algunes xarxes " +"d'IRC, tanmateix, us enviaran de forma automà tica una <em>contrasenya de " +"servidor</em> al NickServ. En aquestes xarxes, podeu utilitzar la " +"contrasenya d'IRC a l'<app>Empathy</app> per identificar-vos amb NickServ. " +"La popular xarxa freenode és coneguda per aquesta caracterÃstica." -#: C/geolocation-privacy.page:82(p) -msgid "Privacy mode is enabled by default." -msgstr "El mode de privacitat s'activa per defecte." +#: C/irc-nick-password.page:46(page/p) +msgid "To set an IRC server password:" +msgstr "Per establir una contrasenya de servidor d'IRC:" -#: C/geolocation-privacy.page:87(p) +#: C/irc-nick-password.page:54(item/p) +msgid "Select the IRC account from the list on the left of the dialog." +msgstr "Seleccioneu el compte d'IRC al quadre de l'esquerra del dià leg." + +#: C/irc-nick-password.page:57(item/p) msgid "" -"Privacy mode prevails even when using external and more precise devices." +"In the <gui>Password</gui> field, type the password you used to register " +"your nikcname." msgstr "" -"El mode de privacitat preval inclús quan esteu utilitzant dispositius " -"externs amb més precisió." +"Al camp <gui>Contrasenya</gui> escriviu la contrasenya que heu utilitzat per " +"registrar el sobrenom." -#: C/geolocation-privacy.page:92(p) -msgid "Only your contacts can see your position." -msgstr "Només els contactes poden veure la vostra posició." +#: C/irc-nick-password.page:69(note/p) +msgid "" +"These instructions only allow you to use a password-protected nickname on " +"certain IRC networks. It is not currently possible to register an IRC " +"nickname or change your nickname password using <app>Empathy</app>." +msgstr "" +"Aquestes instruccions sols us permeten utilitzar un sobrenom protegit per " +"contrasenya en certes xarxes d'IRC. L'<app>Empathy</app> encara no permet " +"registrar un sobrenom de l'IRC o canviar-ne la contrasenya." -#: C/geolocation-not-showing.page:8(desc) -msgid "<app>Empathy</app> does not publish my geographical position." -msgstr "L'<app>Empathy</app> no publicarà la meva posició geogrà fica." +#: C/irc-send-file.page:9(info/desc) +msgid "<app>Empathy</app> does not currently support sending files using IRC." +msgstr "" +"L'<app>Empathy</app> encara no permet l'enviament de fitxers utilitzant " +"l'IRC." -#: C/geolocation-not-showing.page:32(title) -msgid "Geographical position not published" -msgstr "Posició geogrà fica no publicada" +#: C/irc-send-file.page:31(page/title) +msgid "Send files over IRC" +msgstr "Enviament de fitxer a través de l'IRC." + +#: C/irc-send-file.page:33(page/p) +msgid "It is not currently possible to send files using IRC." +msgstr "Encara no és possible enviar fitxers a través de l'IRC." + +#: C/irc-start-conversation.page:8(info/desc) +msgid "Start a conversation with an IRC contact." +msgstr "Inicieu un conversa amb un contacte de l'IRC." + +#: C/irc-start-conversation.page:30(page/title) +msgid "Chat with somebody on IRC" +msgstr "Xategeu amb algú a l'IRC" -#: C/geolocation-not-showing.page:34(p) +#: C/irc-start-conversation.page:32(page/p) msgid "" -"If your contacts cannot see your location, <app>Empathy</app> might not be " -"able to discover with a good margin of precision your geographical position." +"You can hold private conversations with other IRC users, outside of the " +"public IRC chat rooms. To start a conversation with another IRC user:" msgstr "" -"Si els contactes no poden veure la vostra localització, " -"l'<app>Empathy</app> no podrà descobrir amb un bon marge de precisió la " -"vostra posició geogrà fica." +"Podeu mantenir converses privades amb altres usuaris de l'IRC fora de la " +"sala pública de l'IRC. Per iniciar una conversa amb un altre usuari de l'IRC:" -#: C/geolocation-not-showing.page:38(p) +#: C/irc-start-conversation.page:37(item/p) msgid "" -"In this case, your position will not be published, but you are still able to " -"see the location of your contacts." +"In the contact list for an IRC chat room, double click the name of the user " +"you want to chat with. Alternatively, right click the name of the user and " +"choose <gui>Chat</gui>." msgstr "" -"En aquest cas, no es publicarà la vostra posició, però podreu veure la " -"localització dels contactes." +"Feu doble clic sobre el nom de l'usuari amb el qual voleu xatejar a la " +"llista de contactes de la sala de xat de l'IRC. També podeu fer clic amb el " +"botó secundari sobre l'usuari i escolliu <gui>Xat</gui>." -#: C/geolocation-not-showing.page:42(p) +#: C/irc-start-conversation.page:45(item/p) msgid "" -"If you want to publish your geographical position, you can try to use an " -"external device such as a GPS." +"The IRC room contact list is not the same as <app>Empathy</app> contact " +"list. It contains a list of users in the IRC chat room you joined. Different " +"rooms can have different contacts listed." msgstr "" -"Si voleu fer pública la posició geogrà fica, podeu utilitzar un " -"dispositiu extern com un GPS." +"La llista de contactes de la sala de l'IRC no és la mateixa que la llista de " +"contactes de l'<app>Empathy</app>. Aquesta conté la llista d'usuaris de la " +"sala de l'IRC a la qual us heu unit. Cada sala tindrà un llista de contactes " +"diferent." -#: C/geolocation-not-showing.page:48(p) +#: C/irc-start-conversation.page:52(item/p) msgid "" -"In order to publish your geographical location, your Jabber server needs to " -"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://" -"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support " -"PEP</link> is maintained online. Google Talk does not support this feature " -"at this time." +"The IRC room contact list is usually on the right side of the IRC room " +"window. If you do not see it, choose <guiseq><gui>Conversation</" +"gui><gui>Show Contact List</gui></guiseq>." msgstr "" -"Per publicar la posició geogrà fica, el servidor de Jabber " -"ha d'implementar el Protocol personal d'esdeveniments (PEP). Hi ha una llista " -"actualitzada de <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">" -"servidors que implementen el PEP</link> en lÃnia. El Google Talk encara no l'implementa." +"La llista de contactes de la sala de l'IRC normalment està a la part dreta " +"de la finestra de la sala de l'IRC. Si no la veieu, escolliu " +"<guiseq><gui>Conversa</gui><gui>Mostra la llista de contacte</gui></guiseq>." -#: C/geolocation.page:8(desc) -msgid "Use and understand geolocation in <app>Empathy</app>." -msgstr "Com utilitzar i entendre la geolocalització a l'<app>Empathy</app>." +#: C/license.page:8(info/desc) +msgid "Legal information." +msgstr "Informació legal." -#: C/geolocation.page:32(title) -msgid "Geographical position" -msgstr "Posició geogrà fica" +#: C/license.page:11(page/title) +msgid "License" +msgstr "Llicència" -#: C/geolocation.page:35(title) -msgid "Geolocation" -msgstr "Geolocalització" +#: C/license.page:12(page/p) +msgid "" +"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 " +"Unported license." +msgstr "" +"Aquest treball es distribueix sota la llicència Creative Commons " +"Reconeixement-Compartir igual 3.0 llicència no adaptada." -#: C/geolocation.page:39(title) -msgid "Fix common problems" -msgstr "Arreglar problemes comuns" +#: C/license.page:20(page/p) +msgid "You are free:" +msgstr "Sou lliure de:" -#: C/favorite-rooms.page:10(desc) -msgid "Set, join and manage favorite rooms." -msgstr "Com configurar, entrar i gestionar sales preferides." +#: C/license.page:25(item/title) +msgid "<em>To share</em>" +msgstr "<em>Compartir</em>" -#: C/favorite-rooms.page:29(title) -msgid "Favorite rooms" -msgstr "Sales preferides" +#: C/license.page:26(item/p) +msgid "To copy, distribute and transmit the work." +msgstr "Copiar, distribuir i transmetre el treball." -#: C/favorite-rooms.page:32(title) -msgid "Set a room as a favorite" -msgstr "Establiu un sala com a preferida" +#: C/license.page:29(item/title) +msgid "<em>To remix</em>" +msgstr "<em>Fer-ne obres derivades</em>" -#: C/favorite-rooms.page:35(p) -msgid "Join a room." -msgstr "Com entrar en una sala." +#: C/license.page:30(item/p) +msgid "To adapt the work." +msgstr "Adaptar el treball." + +#: C/license.page:33(page/p) +msgid "Under the following conditions:" +msgstr "Sota les següents condicions:" -#: C/favorite-rooms.page:40(p) +#: C/license.page:38(item/title) +msgid "<em>Attribution</em>" +msgstr "<em>Reconeixement</em>" + +#: C/license.page:39(item/p) msgid "" -"See <link xref=\"irc-join-room\"/> for more information on how to join an " -"IRC room." +"You must attribute the work in the manner specified by the author or " +"licensor (but not in any way that suggests that they endorse you or your use " +"of the work)." msgstr "" -"Per saber-ne més de com entrar en una sala d'IRC vegeu " -"<link xref=\"irc-join-room\"/>." +"Cal que reconegueu el treball de la forma especificada per l'autor o el " +"llicenciatari (però no de forma que suggereixi que us dóna suport personal o " +"de l'ús del treball)." +#: C/license.page:46(item/title) +msgid "<em>Share Alike</em>" +msgstr "<em>Compartir igual</em>" -#: C/favorite-rooms.page:46(p) +#: C/license.page:47(item/p) msgid "" -"See <link xref=\"group-conversations\"/> for more information on how to " -"start or join a group conversation." +"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 "" -"Per saber-ne més de com iniciar o unir-se a una conversa de grup vegeu " -"<link xref=\"group-conversations\"/>." +"Si altereu, transformeu, o construïu a partir d'aquest treball heu de " +"distribuir el treball resultant sota la mateixa llicència o una de " +"compatible." -#: C/favorite-rooms.page:54(p) +#: C/license.page:53(page/p) msgid "" -"From the conversation window, choose <guiseq><gui>Conversation</" -"gui><gui>Favorite Chat Room</gui></guiseq>." +"For the full text of the license, see the <link href=\"http://" +"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</" +"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-" +"sa/3.0/\">Commons Deed</link>." msgstr "" -"A la finestra de conversa escolliu <guiseq><gui>Conversa</" -"gui><gui>Sala de xat preferida</gui></guiseq>." +"Per veure el text de la llicència completa vegeu el <link href=\"http://" +"creativecommons.org/licenses/by-sa/3.0/legalcode\">Lloc web de Creative " +"Commons </link>, o llegiu la pà gina <link href=\"http://creativecommons.org/" +"licenses/by-sa/3.0/\">Commons Deed</link>." -#: C/favorite-rooms.page:63(title) -msgid "Join favorite rooms" -msgstr "Com entrar a sales preferides" +#: C/link-contacts.page:11(info/desc) +msgid "Merge and separate different contacts into a single one." +msgstr "Fusiona i separa diferents contactes en un de sol." -#: C/favorite-rooms.page:71(p) -msgid "Press <key>F5</key>." -msgstr "Premeu <key>F5</key>." +#: C/link-contacts.page:19(credit/name) +msgid "Shobha Tyagi" +msgstr "Shobha Tyagi" + +#: C/link-contacts.page:29(page/title) +msgid "Link and unlink contacts" +msgstr "Enllaceu i desenllaceu contactes" -#: C/favorite-rooms.page:76(p) +#: C/link-contacts.page:30(page/p) msgid "" -"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join " -"all your favorite rooms." +"If one or more of your contacts has multiple accounts with different " +"messaging services, you can combine these accounts into a single contact." msgstr "" -"Escolliu <guiseq><gui>Sala</gui><gui>Uneix-te als preferits</gui></guiseq>, per " -"entrar a totes les sales preferides." +"Si algun contacte vostre té més d'un compte a diferents serveis de " +"missatgeria, podeu combinar aquests comptes en un sol contacte." -#: C/favorite-rooms.page:82(p) -msgid "Choose <gui>Room</gui>, and select the favorite room you want to join." +#: C/link-contacts.page:34(page/p) +msgid "" +"The resulting contact is called a <em>meta-contact</em>: a contact composed " +"from different single contacts." msgstr "" -"Escolliu <gui>Sala</gui> i seleccioneu la sala preferida a la qual voleu " -"entrar." +"El contacte resultant s'anomena <em>metacontacte</em>: un contacte composat " +"de diferents contactes individuals." -#: C/favorite-rooms.page:90(p) +#: C/link-contacts.page:38(page/p) msgid "" -"To join a favorite room, you need to be connected to the Internet and to " -"your account." +"Suppose you have a contact called Jane Smith who is using three different " +"messaging services like:" msgstr "" -"Per entrar a una sala preferida us cal estar connectat a Internet i a un " -"compte." +"Si teniu un contacte, en Marc Garcia, que té tres serveis de missatgeria " +"diferents, com per exemple:" -#: C/favorite-rooms.page:98(title) -msgid "Manage favorite rooms" -msgstr "Com gestionar les sales preferides" +#: C/link-contacts.page:44(item/p) +msgid "janes@facebook" +msgstr "marc@facebook" -#: C/favorite-rooms.page:101(p) -msgid "" -"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</" -"gui><gui>Manage Favorites</gui></guiseq>." -msgstr "" -"A la finestra <gui>Llista de contactes</gui>, escolliu " -"<guiseq><gui>Sala</gui><gui>Gestiona les preferides</gui></guiseq>." +#: C/link-contacts.page:49(item/p) +msgid "jane.smith@gmail" +msgstr "marc.garcia@gmail" -#: C/favorite-rooms.page:107(p) -msgid "" -"From the <gui>Account</gui> drop-down list, select the account you want to " -"manage the favorite rooms of." +#: C/link-contacts.page:54(item/p) +msgid "jane_smith@hotmail" +msgstr "marc_garcia@hotmail" + +#: C/link-contacts.page:59(page/p) +msgid "You can combine these contacts into a single Jane Smith one." msgstr "" -"A la llista desplegable <guilabel>Compte</guilabel>, seleccioneu el compte " -"del que vulgueu gestionar-ne les preferides." +"Podeu combinar aquests contactes en un de sol amb el nom de Marc Garcia." -#: C/favorite-rooms.page:111(p) -msgid "Select <gui>All</gui> to see all you favorite rooms." -msgstr "Seleccioneu <gui>Totes</gui> per veure totes les sales preferides." +#: C/link-contacts.page:63(section/title) +msgid "Link contacts" +msgstr "Enllaceu contactes" -#: C/favorite-rooms.page:116(p) -msgid "Select the favorite room you want to manage:" -msgstr "Seleccioneu la sala preferida que voleu gestionar:" +#: C/link-contacts.page:64(section/p) +msgid "The way you can link your contacts is as follows:" +msgstr "Podeu enllaçar els vostres contactes de la manera següent:" -#: C/favorite-rooms.page:121(p) +#: C/link-contacts.page:69(item/p) msgid "" -"Select the <gui>Auto-Connect</gui> check-box in order to automatically join " -"that room when you connect to your account." +"Press the tick button to select entries you want to link. This will enable " +"<em>selection mode</em> and you can see a checkbox for each entry." msgstr "" -"Seleccioneu la caixa de verificació <gui>Connecta automà ticament</gui> per " -"entrar de forma automà tica a la sala quan us connecteu amb el compte." +"Feu clic al botó de «vist» per seleccionar les entrades que voleu enllaçar. " +"Haureu habilitat el <em>mode de selecció</em>, veureu que cada element té " +"una casella de selecció." -#: C/favorite-rooms.page:127(p) -msgid "Click on <gui>Remove</gui> to remove the room from your favorites." +#: C/link-contacts.page:75(item/p) +msgid "" +"Tick the checkboxes that correspond to the <app>Contacts</app> entries which " +"belong to the same contact." msgstr "" -"Feu clic a <gui>Suprimeix</gui> per esborrar la sala de la llista de preferides." +"Marqueu les caselles de selecció que corresponguin a les entrades de " +"<app>contactes</app> que pertanyen al mateix contacte." -#: C/favorite-rooms.page:134(p) -msgid "When done, click <gui>Close</gui>." -msgstr "Quan acabeu feu clic a <gui>Tanca</gui>." +#: C/link-contacts.page:81(item/p) +msgid "Press <gui style=\"button\">Link</gui>." +msgstr "Feu clic a <gui style=\"button\">Enllaça</gui>." -#: C/disable-account.page:9(desc) -msgid "Prevent <app>Empathy</app> from automatically logging in to an account." -msgstr "" -"Impedeix que l'<app>Empathy</app> es connecti de forma automà tica a un compte." +#: C/link-contacts.page:86(section/p) +msgid "Repeat steps 3 and 4 in order to link other contacts." +msgstr "Repetiu els passos 3 i 4 per enllaçar altres comptes." -#: C/disable-account.page:39(title) -msgid "Disable an account" -msgstr "Com inhabilitar un compte" +#: C/link-contacts.page:92(section/title) +msgid "Unlink contacts" +msgstr "Desenllaceu contactes" -#: C/disable-account.page:41(p) +#: C/link-contacts.page:93(section/p) +msgid "To unlink a linked contact:" +msgstr "Per desenllaçar un contacte enllaçat:" + +#: C/link-contacts.page:98(item/p) +msgid "Select the contact from your list." +msgstr "Seleccioneu el contacte de la vostra llista." + +#: C/link-contacts.page:103(item/p) msgid "" -"You can disable an account to prevent <app>Empathy</app> from logging in to " -"it without removing the account entirely. You may wish to disable and re-" -"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." +"Press <gui style=\"button\">Edit</gui> in the top-right corner of " +"<app>Contacts</app>." msgstr "" -"Podeu inhabilitar un compte per evitar que l'<app>Empathy</app> es connecti " -"sense esborrar completament el compte. Podeu desactivar i reactivar el " -"compte si només voleu connectar-vos al compte esporà dicament, però encara " -"voleu utilitzar l'<app>Empathy</app> per altres comptes." +"Premeu <gui style=\"button\">Edita</gui> a la cantonada de dalt a la dreta " +"del <app>Contactes</app>." + +#: C/link-contacts.page:108(item/p) +msgid "Press <gui style=\"button\">Linked Contacts</gui>." +msgstr "Feu clic a <gui style=\"button\">Metacontactes</gui>." -#: C/disable-account.page:52(p) +#: C/link-contacts.page:113(item/p) msgid "" -"Select the account you wish to disable from the accounts list on the left " -"side of the window." +"Press <gui style=\"button\">Remove</gui> to unlink an entry from the linked " +"contact." msgstr "" -"Seleccioneu el compte que voleu desactivar del llistat de comptes al quadre " -"de l'esquerra de la finestra." +"Feu clic a <gui style=\"button\">Suprimeix</gui> per desenllaçar una entrada " +"del metacontacte." -#: C/disable-account.page:56(p) +#: C/link-contacts.page:118(item/p) msgid "" -"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the " -"window." +"Press <gui style=\"button\">Close</gui> if you do not want to unlink any " +"more contacts." msgstr "" -"Desseleccioneu <gui style=\"checkbox\">Activat</gui> a la part dreta de la " -"finestra." +"Feu clic a <gui style=\"button\">Tanca</gui> si no voleu desenllaçar més " +"contactes." -#: C/disable-account.page:62(p) -msgid "" -"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</" -"gui>." +#: C/link-contacts.page:123(item/p) +msgid "Finally, press <gui style=\"button\">Done</gui> to finish editing." msgstr "" -"Per tornar a activar el compte, només us cal seleccionar <gui style=\"checkbox" -"\">Activat</gui>." +"Per acabar, feu clic a <gui style=\"button\">Fet</gui> per acabar l'edició." -#: C/create-account.page:9(desc) -msgid "Register for an account with one of the supported messaging services." -msgstr "Registreu un compte amb un dels serveis de missatgeria habilitats." +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/overview.page:37(media) +msgctxt "_" +msgid "" +"external ref='figures/video_overview.png' " +"md5='6cfcfbd833bf2234537d402185c40596'" +msgstr "" +"external ref='figures/video_overview.png' " +"md5='6cfcfbd833bf2234537d402185c40596'" -#: C/create-account.page:34(title) -msgid "Register for a new account" -msgstr "Registre d'un compte nou" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/overview.page:38(media) +msgctxt "_" +msgid "" +"external ref='figures/conf_overview.png' " +"md5='74c58668fe89c84060f12f6b70a6b903'" +msgstr "" +"external ref='figures/conf_overview.png' " +"md5='74c58668fe89c84060f12f6b70a6b903'" -#: C/create-account.page:36(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/overview.page:39(media) +msgctxt "_" msgid "" -"Most account types require you to create an account with a account provider " -"before you can connect using instant messaging applications like " -"<app>Empathy</app>. With some account providers, you can use <app>Empathy</" -"app> to register for a new account, using the same steps as you would to " -"<link xref=\"add-account\">add an account</link>." +"external ref='figures/croom_overview.png' " +"md5='e9619d2c8420bc48a880c03dbc1ae084'" msgstr "" -"La majoria de comptes requereixen que creeu un compte amb un proveïdor " -"abans de connectar-vos amb aplicacions de missatgeria com " -"l'<app>Empathy</app>. Amb alguns proveïdors de comptes, podeu utilitzar " -"l'<app>Empathy</app> per registrar el compte nou, utilitzant el mateixos " -"passos que si <link xref=\"add-account\">afegiu un compte</link>." +"external ref='figures/croom_overview.png' " +"md5='e9619d2c8420bc48a880c03dbc1ae084'" -#: C/create-account.page:42(p) -#, fuzzy -#| 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 with " -#| "<app>Empathy</app>." +#: C/overview.page:8(info/desc) +msgid "What instant messaging is and how you can use it." +msgstr "Què és la missatgeria instantà nia i com la podeu utilitzar?" + +#: C/overview.page:12(credit/name) +msgid "Aruna S" +msgstr "Aruna S" + +#: C/overview.page:24(page/title) +msgid "Overview of instant messaging" +msgstr "Visió general de la missatgeria instantà nia" + +#: C/overview.page:26(page/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>." +"Instant messaging, sometimes abbreviated to IM, is a text-based means to " +"communicate instantly over the internet and the local network. While some IM " +"applications work with only one type of account, others, including <link " +"xref=\"introduction\">Empathy</link>, provide IM facilities by using <link " +"xref=\"add-account\">accounts</link> from different service providers. Some " +"of these even support audio and video calling." msgstr "" -"Aquesta pà gina proporciona informació sobre la creació de comptes nous de " -"tipologia variada. El vostre proveïdor de comptes hauria de donar-vos un " -"nom d'usuari ID i una contrasenya, aixà com qualsevol informació addicional " -"que us pugui fer falta per connectar-vos amb l'<app>Empathy</app>." +"La missatgeria instantà nia, que de vegades s'abreuja com «IM», és un mitjà " +"de comunicació instantani en format text i que funciona a través d'Internet " +"i de les xarxes locals. Tot i que algunes aplicacions d'IM funcionen només " +"amb un tipus de compte, d'altres com l'<link xref=\"introduction\">Empathy</" +"link> permeten l'ús de <link xref=\"add-account\">comptes</link> de " +"diferents proveïdors, fent més còmode l'ús de la missatgeria instantà nia. " +"Alguns d'aquests proveïdors fins i tot permeten fer trucades de veu i de " +"vÃdeo." -#: C/create-account.page:47(title) -msgid "Facebook" -msgstr "Facebook" +#: C/overview.page:42(td/p) +msgid "Video Conference" +msgstr "Conferència de vÃdeo" + +#: C/overview.page:43(td/p) +msgid "Group chats" +msgstr "Xats de grup" + +#: C/overview.page:44(td/p) +msgid "Chat rooms" +msgstr "Sales de xats" + +#: C/overview.page:48(page/p) +msgid "" +"Some instant messaging applications can be used to connect to chat rooms, " +"online places where like-minded people meet to talk. One popular means to " +"connect to several chat rooms is the Internet Relay Chat, also known as " +"<link xref=\"irc-manage\">IRC</link>. IRC provides <link xref=\"irc-join-room" +"\">public</link> chat rooms, which are open to anyone who creates an account " +"on the IRC Server, and private chat rooms, which are <link xref=\"irc-join-" +"pwd\">password protected</link> and open only to a select few." +msgstr "" +"Algunes aplicacions de missatgeria instantà nia es poden utilitzar per " +"connectar-se a sales de xat, llocs en lÃnia on persones amb les mateixes " +"inquietuds es troben per parlar. Una de les vies més populars per connectar-" +"se a moltes sales de xat es l'Internet Relay Chat, també conegut com <link " +"xref=\"irc-manage\">IRC</link>. L'IRC proporciona sales <link xref=\"irc-" +"join-room\">públiques</link> de xat, obertes a tothom que tingui un compte " +"al servidor de l'IRC i sales privades de xat protegides amb <link xref=\"irc-" +"join-pwd\">contrasenya</link> i obertes només a un cert grup de persones." + +#: C/prev-conv.page:8(info/desc) +msgid "Browse or search your previous conversations." +msgstr "Navegueu o cerqueu per les converses anteriors." + +#: C/prev-conv.page:36(page/title) +msgid "View previous conversations" +msgstr "Visualització de les converses anteriors" -#: C/create-account.page:48(p) -#, fuzzy -#| msgid "" -#| "Facebook is one of the most used social network. It provides users with " -#| "the opportunity to create their own profile, and to communicate with " -#| "their friends." +#: C/prev-conv.page:38(page/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." +"<app>Empathy</app> automatically saves all your text conversations you have " +"with your contacts. You can <link xref=\"#search\">search through all of " +"your previous conversations</link> or <link xref=\"#browse\">browse previous " +"conversations</link> by contact and date." msgstr "" -"Facebook és una de les xarxes socials més utilitzades. Proporciona als " -"usuaris la oportunitat de crear-se el seu propi perfil, i de comunicar-se " -"amb els seus amics." +"L'<app>Empathy</app> desa automà ticament totes les converses que manteniu " +"amb els contactes. Podeu cercar <link xref=\"#search\">per les converses " +"anteriors</link> o <link xref=\"#browse\">navegar per les converses " +"anteriors</link> per contacte i data." -#: C/create-account.page:52(p) -#, fuzzy -#| msgid "" -#| "In order 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.facebook.com</link>." +#: C/prev-conv.page:46(note/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." -"facebook.com</link>." +"You do not need to be connected to the Internet to view and search your " +"previous conversations." msgstr "" -"Per utilitzar Facebook per comunicar-vos amb els vostres amics, us cal crear " -"un compte nou al lloc web: <link href=\"http://www.facebook.com\">www." -"facebook.com</link>." +"No us cal estar connectat a Internet per visualitzar i cercar a les " +"converses anteriors." -#: C/create-account.page:60(title) C/audio-video.page:170(p) -msgid "Jabber" -msgstr "Jabber" +#: C/prev-conv.page:53(section/title) +msgid "Search previous conversations" +msgstr "Cerqueu a les converses anteriors" -#: C/create-account.page:62(p) +#: C/prev-conv.page:55(section/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, " -"regardless of their account provider." -msgstr "" -"Jabber és un sistema obert de missatgeria instantà nia. Semblant al correu " -"electrònic, Jabber us permet escollir el vostre proveïdor de comptes i " -"comunicar-vos amb altres usuaris de Jabber, sense que importi el seu " -"proveïdor de comptes." +"You can perform a full-text search through all of your previous " +"conversations." +msgstr "Podeu utilitzar cerca de texts complets dins les converses anteriors." -#: C/create-account.page:66(p) +#: C/prev-conv.page:59(item/p) C/prev-conv.page:87(item/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." -"org/\">Jabber.org</link>." +"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> " +"<gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</" +"key>." msgstr "" -"Haureu de crear un compte nou amb algun proveïdor de comptes Jabber. Hi ha " -"molt proveïdors gratuïts, un dels més populars és <link href=\"http://register.jabber." -"org/\">Jabber.org</link>." +"Des de la finestra <gui>Llista de contactes</gui> escolliu " +"<guiseq><gui>Visualitza</gui><gui>Converses anteriors</gui></guiseq> o " +"premeu <key>F3</key>." -#: C/create-account.page:71(p) +#: C/prev-conv.page:63(item/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 " -"password in <app>Empathy</app> to connect." +"Select an account from the drop-down list in the top. A list of contacts and " +"chat room for that account will be shown below." msgstr "" -"Si sou usuaris del Google Mail o del Google Talk, ja teniu un compte de Jabber. " -"El Google Talk és un servei de Jabber. Només us cal utilitzar l'adreça i la " -"contrasenya de Google Mail per connectar-vos a l'<app>Empathy</app>." +"Seleccioneu un compte de la llista desplegable situada a la part superior. " +"Es mostrarà a sota la llista de contactes i les sales de xat per aquest " +"compte." -#: C/create-account.page:78(title) C/audio-video.page:190(p) -msgid "People Nearby" -msgstr "Gent propera" +#: C/prev-conv.page:67(item/p) +msgid "" +"Type the text you want to search for in the <gui>Search</gui> text field." +msgstr "Escriviu el text que voleu cercar al camp de text <gui>Cerca</gui>." -#: C/create-account.page:80(p) +#: C/prev-conv.page:71(item/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, " -"such as a wireless hotspot. It automatically finds all other users on the " -"network who are also using this service." +"Any conversations that matched your search terms will be shown. By default, " +"conversations are ordered by date." msgstr "" -"No us cal crear cap compte a cap proveïdor de serveis per utilitzar " -"aquesta caracterÃstica. Aquest servei funciona sempre que estigueu connectats a " -"una xarxa d'à rea local, com un punt d'accés Wi-Fi. Us mostra tots els usuaris " -"que fan servir aquest mateix servei de forma automà tica." +"Es mostrarà totes les converses que compleixin els criteris de cerca. Per " +"defecte, les converses estan ordenades per data." -#: C/create-account.page:85(p) -msgid "For more information, see <link xref=\"salut-protocol\"/>." -msgstr "Vegeu <link xref=\"salut-protocol\"/> per a més informació." - -#: C/create-account.page:89(title) C/audio-video.page:205(p) -msgid "SIP" -msgstr "SIP" +#: C/prev-conv.page:80(section/title) +msgid "Browse previous conversations" +msgstr "Navegueu per les converses anteriors" -#: C/create-account.page:91(p) +#: C/prev-conv.page:82(section/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." +"You can browse your previous conversations with your contacts or in chat " +"rooms by date." msgstr "" -"El SIP és un sistema obert que permet realitzar converses d'à udio i de vÃdeo " -"per Internet. Heu de crear un compte amb un proveïdor de SIP. Podeu " -"comunicar-vos amb qualsevol usuari de SIP sense que importi el proveïdor " -"SIP que estiguin utilitzant." +"Podeu navegar, per data, per les converses anteriors amb els contactes i " +"pels xats a les sales." -#: C/create-account.page:97(p) +#: C/prev-conv.page:91(item/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>." +"Select an account from the drop-down list in the top left. A list of " +"contacts and chat room for that account will be shown below." msgstr "" -"Per motius tècnics, el servei lliure <link href=\"https://www.ekiga." -"net/index.php?page=register\">Ekiga.net</link> no funciona amb l'<app>Empathy</" -"app>." +"Seleccioneu un compte de la llista desplegable de dalt a l'esquerre. Es " +"mostrarà a sota la llista de contactes i les sales de xat per aquest compte." -#: C/create-account.page:102(p) +#: C/prev-conv.page:95(item/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." +"Select a contact or chat room to view your previous conversations from. By " +"default the most recent conversation will be shown." msgstr "" -"Alguns proveïdors de SIP us permeten fer trucades a telèfons fixes i mòbils " -"des de l'ordinador. Normalment us cal una subscripció a un servei de pagament " -"per poder-ho realitzar." - -#: C/create-account.page:107(title) C/audio-video.page:165(p) -msgid "IRC" -msgstr "IRC" +"Seleccioneu un contacte o una sala de xat per veure'n les converses " +"anteriors. Per defecte es mostrarà la conversa més recent." -#: C/create-account.page:109(p) +#: C/prev-conv.page:99(item/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." +"You can browse your conversations by date. Days on which you had a " +"conversation with the selected contact will be shown in bold text. Click a " +"date to select it. Click the arrows next to the month and year to browse " +"earlier dates." msgstr "" -"No us cal registrar un compte per utilitzar l'IRC. Encara que especifiqueu " -"un sobrenom quan afegiu el compte d'IRC a l'<app>Empathy</app>, aquest " -"sobrenom només s'utilitza cada vegada que us connecteu. Si un altre usuari està " -"utilitzant aquest sobrenom, us caldrà canviar el sobrenom." +"Podeu navegar per les converses per data. Els dies en els quals heu " +"mantingut converses amb el contacte es mostraran amb negreta. Feu clic a una " +"data per seleccionar-la. Feu clic a les fletxes al costat del mes i de l'any " +"per navegar entre dates." -#: C/create-account.page:114(p) +#: C/prev-conv.page:105(section/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." +"You can search for text in the conversations by typing into the search field " +"at the top. The matching conversations will be showed." msgstr "" -"Algunes xarxes d'IRC utilitzen un servei anomenat NickServ per permetre als " -"usuaris protegir el seu sobrenom. Vegeu <link xref=\"irc-nick-password\"/> " -"per a més informació." +"Podeu cercar alguna paraula o frase de les converses escrivint al camp de " +"cerca situat a la part superior. Es mostraran les converses que coincideixin " +"amb la paraula o la frase cercada." -#: C/create-account.page:117(p) +#: C/prev-conv.page:111(note/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." +"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>Previous Conversations</gui>. The <gui>Previous Conversations</" +"gui> window will open with that contact already selected." msgstr "" -"Alguns servidors d'IRC estan protegits amb contrasenya. Haureu de saber la " -"contrasenya per connectar-vos-hi. Generalment són xarxes d'IRC privades." - -#: C/create-account.page:122(title) -msgid "Proprietary Services" -msgstr "Serveis propietaris" +"Podeu veure fà cilment les converses anteriors amb algun dels contactes a la " +"finestra <gui>Llista de contactes</gui>. Feu clic sobre el contacte i " +"escolliu <gui>Converses anteriors</gui>. S'obrirà la finestra <gui>Converses " +"anteriors</gui> amb el contacte ja seleccionat." -#: C/create-account.page:124(p) +#: C/prob-conn-acctdisabled.page:7(info/desc) msgid "" -"There are many proprietary instant messaging services that have been " -"developed by different companies or organizations. <app>Empathy</app> allows " -"you to connect to an existing account for most popular services. To create a " -"new account with one of these services, you will need to visit the service’s " -"web site and agree to its terms of use." +"The instant messaging account that you want to use is not enabled in the " +"list of accounts." msgstr "" -"Hi ha molts serveis de missatgeria instantà nia propietaris desenvolupats " -"per diverses organitzacions o empreses. L'<app>Empathy</app> " -"us permet connectar-vos a comptes existent de molts serveis populars. Per " -"crear-vos-hi un compte nou haureu de visitar el lloc web i acceptar la " -"llicència d'ús." - -#: C/create-account.page:133(link) C/audio-video.page:135(p) -msgid "AIM" -msgstr "AIM" - -#: C/create-account.page:138(link) C/audio-video.page:160(p) -msgid "ICQ" -msgstr "ICQ" +"El compte del servei de missatgeria instantà nia que voleu utilitzar no està " +"habilitat a la llista de comptes." -#: C/create-account.page:143(link) C/audio-video.page:175(p) -msgid "MSN" -msgstr "MSN" +#: C/prob-conn-acctdisabled.page:34(page/title) +msgid "My account is not enabled" +msgstr "El meu compte està habilitat" -#: C/create-account.page:148(link) C/audio-video.page:210(p) -msgid "Yahoo!" -msgstr "Yahoo!" +#: C/prob-conn-acctdisabled.page:36(page/p) +msgid "" +"If the instant messaging account that you want to use is not enabled in the " +"drop-down account list when you try to start a new conversation or join a " +"room, your account details may not be correct." +msgstr "" +"Si el compte de missatgeria instantà nia que voleu utilitzar no està " +"habilitat a la llista inferior quan intenteu iniciar una conversa o unir-vos " +"a una sala, els detalls del vostre compte poden no ser correctes." -#: C/change-status.page:9(desc) -msgid "Change your status to advertise your availability to your contacts." +#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p) +#: C/prob-conn-neterror.page:53(item/p) +msgid "" +"Make sure that you are connected to the Internet, or to a local area network." msgstr "" -"Canvieu l'estat per avisar la disponibilitat als contactes." +"Assegureu-vos que esteu connectats a Internet o a una xarxa d'à rea local." -#: C/change-status.page:34(title) -msgid "Change your status" -msgstr "Canvieu l'estat" +#: C/prob-conn-acctdisabled.page:49(item/p) +msgid "" +"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the " +"account that is not working." +msgstr "" +"Escolliu <guiseq><gui>Edita</gui><gui>Comptes</gui></guiseq> i seleccioneu " +"el compte que no està funcionant." -#: C/change-status.page:36(p) +#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p) msgid "" -"You can set your status to indicate your availability to your contacts. " -"<app>Empathy</app> allows you to select from a list of defined statuses." +"Type your username and password again to make sure that they are correct." msgstr "" -"Podeu canviar l'estat per indicar la disponibilitat als contactes. " -"L'<app>Empathy</app> us permet seleccionar-ne un d'una llista d'estats " -"per defecte." +"Escriviu el nom d'usuari i la contrasenya de nou per estar segurs que són " +"correctes." -#: C/change-status.page:41(p) +#: C/prob-conn-acctdisabled.page:60(item/p) +#: C/prob-conn-neterror.page:64(item/p) msgid "" -"Click on the drop-down list at the top of the <gui>Contact List</gui> window." +"Check in the <gui>Advanced</gui> section that all the details are correct. " +"You should be able to find these details from the website of the messaging " +"service." msgstr "" -"Feu clic a la llista desplegable a la part de dalt de la finestra <gui>Llista " -"de contactes</gui>." +"Comproveu a la secció <gui>Avançat</gui> que les dades siguin les correctes. " +"HaurÃeu de poder trobar aquestes dades al lloc web del servei de missatgeria." -#: C/change-status.page:46(p) -msgid "Select a status from the list." -msgstr "Seleccioneu un estat de la llista." +#: C/prob-conn-acctdisabled.page:66(item/p) +msgid "Check that the account is switched on." +msgstr "Comproveu que el compte està habilitat." -#: C/change-status.page:52(p) +#: C/prob-conn-auth.page:8(info/desc) msgid "" -"See <link xref=\"status-icons\"/> for a list of the built-in statuses and " -"what they mean. You can also <link xref=\"set-custom-message\">add custom " -"status messages</link> to provide more information about your availability " -"to your contacts." +"An error message which says “<gui>Authentication failed</gui>†appears in " +"the main window." msgstr "" -"Vegeu <link xref=\"status-icons\"/> per veure la llista d'estats possibles i " -"què signifiquen. També podeu <link xref=\"set-custom-message\">" -"afegir missatges d'estat personalitzats</link> per proporcionar informació " -"sobre la disponibilitat als contactes." +"Apareix un missatge d'error a la finestra principal que diu «<gui>Errada en " +"l'autenticació</gui>»." + +#: C/prob-conn-auth.page:36(page/title) +msgid "I get a message that says “Authentication failedâ€" +msgstr "Teniu un missatge que diu «Errada en l'autenticació»." -#: C/change-status.page:58(p) +#: C/prob-conn-auth.page:38(page/p) msgid "" -"If you do not use your computer for a while, or if the screensaver is on, " -"the status will be automatically set to Away." +"This kind of error happens when your instant messaging service is not " +"allowing you to connect because it does not recognize your username or " +"password for some reason." msgstr "" -"Si no utilitzeu l'ordinador durant una estona o s'activa l'estalvi de pantalla, " -"l'estat es posarà a absent." +"Aquest tipus d'errors apareix quan el servei de missatgeria instantà nia no " +"permet la connexió perquè no reconeix el vostre nom d'usuari o contrasenya " +"per alguna raó." -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/audio-video.page:58(None) +#: C/prob-conn-auth.page:50(item/p) msgid "" -"@@image: 'figures/audio-input-microphone.png'; " -"md5=8d89026b66a263a3bc5b1f0665948567" +"Make sure that you have registered an account with the service you are " +"trying to connect to. If you do not have an account, most services will not " +"allow you to connect." msgstr "" -"@@image: 'figures/audio-input-microphone.png'; " -"md5=8d89026b66a263a3bc5b1f0665948567" +"Comproveu que heu registrat un compte amb el servei amb el qual intenteu " +"connectar-vos. Si no teniu un compte, molts serveis no us permetran " +"connectar-vos." -#: C/audio-video.page:8(desc) +#: C/prob-conn-auth.page:57(item/p) C/prob-conn-name.page:43(item/p) +#: C/prob-conn-neterror.page:58(item/p) msgid "" -"Information on when it is possible to have an audio or video conversation." -msgstr "Informació sobre quan és possible realitzar una conversa d'à udio o de vÃdeo." - -#: C/audio-video.page:32(title) -msgid "Audio and video support" -msgstr "Àudio i vÃdeo" +"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png" +"\">edit</media> icon in the error message." +msgstr "" +"Feu clic a la icona <media type=\"image\" mime=\"image/png\" src=\"figures/" +"gtk-edit.png\">Edita</media> del missatge d'error." -#: C/audio-video.page:34(p) +#: C/prob-conn-auth.page:68(item/p) msgid "" -"You can only have audio and video conversation with contacts who are using " -"an application which also supports this feature. When your contacts support " -"audio or video conversations, you will see the following icons next to their " -"names in the contact list:" +"Deselect the <gui>Enabled</gui>, and then select it again to try to " +"reconnect to the service." msgstr "" -"Només podeu realitzar converses d'à udio i de vÃdeo amb els contactes que utilitzin " -"una aplicació que permeti aquestes caracterÃstiques. Si les aplicacions dels " -"contactes permeten realitzar converses d'à udio o de vÃdeo, veureu les icones " -"següents al costat del seu nom a la llista de contactes:" - -#: C/audio-video.page:43(p) -msgid "Icon" -msgstr "Icona" - -#: C/audio-video.page:48(p) -msgid "Description" -msgstr "Descripció" - -#: C/audio-video.page:58(media) -msgid "Icon for audio conversation" -msgstr "Icona per converses d'à udio" - -#: C/audio-video.page:64(p) -msgid "The contact is able to have an audio conversation." -msgstr "El contacte pot realitzar converses d'à udio." - -#: C/audio-video.page:70(media) -msgid "Icon for video conversation" -msgstr "Icona per converses de vÃdeo" +"Desactiveu <gui>Activat</gui> i torneu-lo a activar de nou per comprovar si " +"es reconnecta el servei." -#: C/audio-video.page:76(p) -msgid "The contact is able to have a video conversation." -msgstr "El contacte pot realitzar converses de vÃdeo." +#: C/prob-conn-name.page:9(info/title) +msgctxt "link:error-msg" +msgid "“Name in useâ€" +msgstr "«Nom ja utilitzat»" -#: C/audio-video.page:83(p) +#: C/prob-conn-name.page:10(info/desc) msgid "" -"In order to have an audio conversation, you need to have a sound card that " -"is supported by your operating system, and a working microphone." +"An error message which says “<gui>Name in use</gui>†appears in the main " +"window." msgstr "" -"Per realitzar una conversa d'à udio heu de tenir una targeta de so reconeguda " -"pel sistema operatiu i un micròfon que funcioni." +"Apareix un missatge a la finestra principal que diu «<gui>Nom utilitzat</" +"gui>»." + +#: C/prob-conn-name.page:33(page/title) +msgid "I get a message that says “Name in useâ€" +msgstr "Teniu un missatge que diu «Nom utilitzat»" -#: C/audio-video.page:87(p) +#: C/prob-conn-name.page:35(page/p) msgid "" -"In order to have a video conversation, you need to have a webcam that is " -"supported by your operating system, and a working microphone." +"This kind of error happens when you try to connect to your IRC account and " +"you are using a nickname that is already being used by someone else on that " +"particular network." msgstr "" -"Per realitzar una conversa de vÃdeo heu de tenir una cà mera web reconeguda pel " -"sistema operatiu i un micròfon que funcioni." +"Aquests tipus d'errades apareixen quan intenteu connectar-vos a comptes " +"d'IRC i utilitzeu un sobrenom que ja l'utilitza algú altre en aquella xarxa." -#: C/audio-video.page:95(title) -msgid "Supported Account Types" -msgstr "Tipus de comptes permesos" +#: C/prob-conn-name.page:51(item/p) +msgid "In the <gui>Nickname</gui> text box, type a new nickname." +msgstr "Al quadre de text <gui>Sobrenom</gui> introduïu el sobrenom nou." -#: C/audio-video.page:97(p) +#: C/prob-conn-name.page:56(item/p) msgid "" -"You can only have audio and video conversations using accounts on certain " -"supported services. The following table lists whether audio and video is " -"supported for each type of account." +"If you have registered that nickname within the network you are using, set " +"the password for that nickname. For more information, see <link xref=\"irc-" +"nick-password\"/>." msgstr "" -"Només podeu realitzar converses d'à udio i de vÃdeo en comptes d'alguns " -"proveïdors de serveis. La taula següent mostra si els tipus de " -"compte permeten converses d'à udio i de vÃdeo." +"Si heu registrat el sobrenom a la xarxa on sou ara, poseu la contrasenya per " +"aquest sobrenom. Vegeu <link xref=\"irc-nick-password\"/> per més informació." -#: C/audio-video.page:102(p) +#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p) msgid "" -"Account types are provided by plugins. Your system may not have all of the " -"following types available, or it may have types not listed here. Updated " -"plugins may make audio or video conversations possible on account types that " -"are listed as unsupported here." +"Switch the account off, and then switch it on to try to reconnect to the " +"service." msgstr "" -"Els tipus de comptes es proporcionen els connectors. El sistema pot no disposar " -"de tots el tipus llistats aquÃ, o pot disposar de tipus de comptes que no " -"estiguin llistats. Versions més noves dels connectors poden fer possible les " -"converses d'à udio i de vÃdeo en tipus de comptes que estan classificats com " -"que no ho permeten." +"Desactiveu el compte i torneu-lo a activar de nou per intentar que es " +"connecti de nou al servei." -#: C/audio-video.page:110(p) +#: C/prob-conn-neterror.page:7(info/desc) msgid "" -"I'd like to do tables like this using nothing for No and ✔ for Yes, but we " -"need to look at the accessibility impact. I've <link href=\"http://mail." -"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the " -"accessibility team</link> for input." +"An error message which says “<gui>Network error</gui>†appears in the main " +"window." msgstr "" +"Apareix un missatge d'error a la finestra principal que diu «<gui>Error de " +"xarxa</gui>»." + +#: C/prob-conn-neterror.page:34(page/title) +msgid "I get a message that says “Network errorâ€" +msgstr "Veig un missatge que diu «Error de xarxa»" -#: C/audio-video.page:118(p) +#: C/prob-conn-neterror.page:42(page/p) msgid "" -"There's recent work on telepathy-butterfly and papyon to support audio and " -"video for MSN. It might be released in time for 2.28, but since it doesn't " -"follow the Gnome release schedule, I can't be sure. If it looks like it's " -"going to ship, let's mark it Yes." +"This kind of error happens when <app>Empathy</app> cannot communicate with " +"the instant messaging service for some reason." msgstr "" +"Aquest tipus d'errada succeeix quan l'<app>Empathy</app> no pot comunicar-se " +"amb el servei de missatgeria instantà nia per alguna raó." -#: C/audio-video.page:128(p) -msgid "Service" -msgstr "Servei" - -#: C/audio-video.page:129(p) -msgid "Audio" -msgstr "Àudio" - -#: C/audio-video.page:130(p) -msgid "Video" -msgstr "VÃdeo" +#: C/prob-conn-neterror.page:46(page/p) +msgid "" +"Also, this kind of error happens when you try to use an IRC account without " +"setting a nickname." +msgstr "" +"També es pot produir quan intenteu utilitzar un compte d'IRC sense " +"configurar el sobrenom." -#: C/audio-video.page:136(p) C/audio-video.page:137(p) -#: C/audio-video.page:141(p) C/audio-video.page:142(p) -#: C/audio-video.page:146(p) C/audio-video.page:147(p) -#: C/audio-video.page:156(p) C/audio-video.page:157(p) -#: C/audio-video.page:161(p) C/audio-video.page:162(p) -#: C/audio-video.page:166(p) C/audio-video.page:167(p) -#: C/audio-video.page:181(p) C/audio-video.page:182(p) -#: C/audio-video.page:186(p) C/audio-video.page:187(p) -#: C/audio-video.page:191(p) C/audio-video.page:192(p) -#: C/audio-video.page:196(p) C/audio-video.page:197(p) -#: C/audio-video.page:201(p) C/audio-video.page:202(p) -#: C/audio-video.page:211(p) C/audio-video.page:212(p) -#: C/audio-video.page:216(p) C/audio-video.page:217(p) -msgid "No" -msgstr "No" +#: C/prob-conn-neterror.page:87(section/title) +msgid "Proxy support" +msgstr "Accés a través de servidor intermediari" -#: C/audio-video.page:140(p) -msgid "Facebook Chat" -msgstr "Xat de Facebook" +#: C/prob-conn-neterror.page:88(section/p) +msgid "" +"At the moment <app>Empathy</app> can not be configured to work with a proxy." +msgstr "" +"Ara mateix l'<app>Empathy</app> no es pot configurar perquè funcioni amb un " +"servidor intermediari." -#: C/audio-video.page:145(p) -msgid "gadugadu" -msgstr "gadugadu" +#: C/prob-conn.page:7(info/desc) +msgid "Diagnose common problems connecting to an instant messaging service." +msgstr "" +"Diagnostiqueu problemes comuns en intentar-se connectar a un servei de " +"missatgeria instantà nia." -#: C/audio-video.page:150(p) -msgid "Google Talk" -msgstr "Google Talk" +#: C/prob-conn.page:29(page/title) +msgid "Problems connecting to an instant messaging service" +msgstr "Problemes connectant a un servei de missatgeria instantà nia" -#: C/audio-video.page:151(p) C/audio-video.page:152(p) -#: C/audio-video.page:171(p) C/audio-video.page:172(p) -#: C/audio-video.page:176(p) C/audio-video.page:177(p) -#: C/audio-video.page:206(p) C/audio-video.page:207(p) -msgid "Yes" -msgstr "SÃ" +#: C/remove-account.page:8(info/desc) +msgid "Completely remove an account from <app>Empathy</app>." +msgstr "Suprimeix un compte completament de l'<app>Empathy</app>." -#: C/audio-video.page:155(p) -msgid "Groupwise" -msgstr "Groupwise" +#: C/remove-account.page:34(page/title) +msgid "Remove an account" +msgstr "Suprimiu un compte" -#: C/audio-video.page:180(p) -msgid "myspace" -msgstr "myspace" +#: C/remove-account.page:36(page/p) +msgid "" +"You can completely remove an account from <app>Empathy</app> if you no " +"longer wish to use the account. If you wish to use the account in " +"<app>Empathy</app> again in the future, you will have to add your account " +"details again." +msgstr "" +"Podeu suprimir un compte completament de l'<app>Empathy</app> si no voleu " +"utilitzar-lo més. Si voleu utilitzar el compte un altre cop amb " +"l'<app>Empathy</app> en un futur haureu de tornar a crear el compte amb " +"totes les seves dades." -#: C/audio-video.page:185(p) -msgid "qq" -msgstr "qq" +#: C/remove-account.page:47(item/p) +msgid "" +"Select the account you wish to remove from the accounts list on the left " +"side of the window." +msgstr "" +"Seleccioneu el compte que vulgueu suprimir de la llista de comptes a la part " +"esquerra de la finestra." -#: C/audio-video.page:195(p) -msgid "sametime" -msgstr "sametime" +#: C/remove-account.page:51(item/p) +msgid "Click <gui style=\"button\">-</gui>." +msgstr "Feu clic a <gui style=\"button\">-</gui>." -#: C/audio-video.page:200(p) -msgid "silc" -msgstr "silc" +#: C/remove-account.page:54(item/p) +msgid "" +"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> " +"button to permanently remove the account." +msgstr "" +"Es mostrarà un dià leg sol·licitant la confirmació. Feu clic al botó " +"<gui>Suprimeix</gui> per a suprimir el compte permanentment." -#: C/audio-video.page:215(p) -msgid "zephyr" -msgstr "zephyr" +#: C/remove-account.page:60(note/p) +msgid "" +"Even after removing an account, <app>Empathy</app> does not delete your " +"conversation history for that account." +msgstr "" +"Fins i tot després de la supressió d'un compte l'<app>Empathy</app> no " +"esborrarà l'historial de converses del compte." -#: C/audio-call.page:9(desc) -msgid "Call your contacts over the Internet." -msgstr "Truqueu els contactes per Internet." +#: C/salut-protocol.page:8(info/desc) +msgid "Understanding the People Nearby feature." +msgstr "Explicació sobre la funció de «Gent propera»." -#: C/audio-call.page:27(title) -msgid "Start an audio conversation" -msgstr "Inicieu una conversa d'à udio" +#: C/salut-protocol.page:33(page/title) +msgid "What is People Nearby?" +msgstr "Què és la «Gent propera»?" -#: C/audio-call.page:29(p) +#: C/salut-protocol.page:40(page/p) msgid "" -"You can call your contacts and have an audio conversation with them. This " -"features only works with certain types of accounts, and it requires the " -"other person to have an application that supports audio calls." -msgstr "" -"Podeu trucar els contactes i realitzar-hi converses d'à udio. Aquesta " -"caracterÃstica només funciona amb alguns tipus de comptes i requereix que l'altra " -"persona també tingui una aplicació que permeti realitzar trucades d'à udio." - -#: C/audio-call.page:34(p) -#, fuzzy -#| 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 " -"next to the name of the contact you wish to call and choose <gui style=" -"\"menuitem\">Audio Call</gui>." +"The People Nearby service is a serverless communication service: you do not " +"need to connect and authenticate to a central server in order to use it." msgstr "" -"Des de la finestra de la <gui>Llista de contactes</gui> , feu clic a la " -"icona<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png" -"\">vÃdeo trucada</media> a la vora del nom del contacte que vols trucar i " -"escull <gui style=\"menuitem\">VÃdeo trucada</gui>. També podeu prémer el " -"botó dret sobre el contacte i seleccionar <gui style=\"menuitem\">VÃdeo trucada</" -"gui>." +"El servei de «Gent propera» és un servei de comunicació descentralitzat: no " +"us cal estar connectat ni autenticar-vos amb un servidor central per " +"utilitzar-lo." -#: C/audio-call.page:55(p) -#, fuzzy -#| 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." +#: C/salut-protocol.page:45(page/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>." +"This kind of serverless messaging system is restricted to a local area " +"network and an active Internet connection is not necessary." msgstr "" -"Per convertir una à udio conversa en una vÃdeo conversa, escolliu " -"<guiseq><gui style=\"menu\">VÃdeo</gui><gui style=\"menuitem\">Engega vÃdeo</" -"gui></guiseq>, o premeu el botó de la barra per seleccionar <media type=" -"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">vÃdeo trucada</" -"media>." - -#: C/audio-call.page:63(title) -#, fuzzy -#| msgid "Start a conversation witn an IRC contact." -msgid "Start an audio conversation with a meta-contact" -msgstr "Inicieu un conversa amb un contacte IRC" +"Aquest tipus de sistema de missatgeria descentralitzat està restringit a una " +"xarxa local i no cal una connexió a Internet activa." -#: C/audio-call.page:71(p) -#, fuzzy -#| msgid "" -#| "Right-click on the name of the contact you want to have a conversation " -#| "with, and choose <gui>Chat</gui>." +#: C/salut-protocol.page:49(page/p) msgid "" -"Select the contact you want to have the conversation, and from the menu " -"select <gui style=\"menuitem\">Audio Call</gui>." +"The people that use this service inside the same local area network will be " +"auto-discovered, and it will be possible to send them messages and files as " +"with other services." msgstr "" -"Premeu el botó dret sobre el nom del contacte amb el qual voleu conversar, i " -"escolliu <gui>Xat</gui>." +"La gent que utilitza aquest servei dins de la xarxa local apareixeran " +"automà ticament i es podran enviar missatges i fitxers igual com en els " +"altres serveis." -#: C/add-contact.page:9(desc) -msgid "Add someone to the contact list." -msgstr "Afegiu algú a la llista de contactes." +#: C/salut-protocol.page:54(page/p) +msgid "" +"All the modern local area networks should be able to support this kind of " +"service." +msgstr "" +"Totes les xarxes locals modernes haurien de permetre aquest tipus de servei." -#: C/add-contact.page:33(title) -msgid "Add someone to your list of contacts" -msgstr "Afegiu algú a la llista de contactes" +#: C/send-file.page:8(info/desc) +msgid "Send a file from your computer to one of your contacts." +msgstr "Envieu un fitxer des del vostre ordinador a un dels contactes." -#: C/add-contact.page:37(p) -msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>." -msgstr "Seleccioneu <guiseq><gui>Xat</gui><gui>Afegeix contacte</gui></guiseq>." +#: C/send-file.page:36(page/title) +msgid "Send files" +msgstr "Envieu fitxers" -#: C/add-contact.page:40(p) +#: C/send-file.page:45(item/p) msgid "" -"From the <gui>Account</gui> drop-down list, select the account you wish to " -"use to connect to your contact. Your contact will need to be using the same " -"service as the account you select." +"Right click on the contact you want to send a file to, and choose <gui>Send " +"file</gui>." msgstr "" -"Des de la llista desplegable del <gui>Compte</gui>, seleccioneu el compte " -"que voleu utilitzar per connectar-vos amb el contacte. Haurà d'utilitzar el " -"mateix servei que el compte que seleccioneu." +"Feu clic amb el botó secundari al contacte que li voleu enviar el fitxer i " +"seleccioneu <gui>Envia un fitxer</gui>." -#: C/add-contact.page:45(p) +#: C/send-file.page:50(item/p) msgid "" -"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, " -"screen name, or other appropriate identifier for the service type." +"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</" +"gui> <gui>Contact</gui><gui>Send file</gui></guiseq>." msgstr "" -"Al camp <gui>Identificador</gui> introduïu l'identificador d'entrada del contacte, " -"el seu nom d'usuari, el nom de pantalla o qualsevol identificador apropiat per " -"al tipus de servei." +"Feu clic al contacte a qui voleu enviar un fitxer i seleccioneu " +"<guiseq><gui>Edita</gui><gui>Contacte</gui> <gui>Envia un fitxer</gui></" +"guiseq>." + +#: C/send-file.page:58(item/p) +msgid "Select the file to send, and click on <gui>Send</gui>." +msgstr "Seleccioneu el fitxer a enviar i feu clic a <gui>Envia</gui>." -#: C/add-contact.page:49(p) +#: C/send-file.page:63(item/p) +msgid "The <gui>File Transfers</gui> window will appear." +msgstr "Apareixerà la finestra <gui>Transferències de fitxers</gui>." + +#: C/send-file.page:66(item/p) msgid "" -"In the <gui>Alias</gui> field, type your contact’s name as you would like it " -"to appear in your contact list." +"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> " +"to halt the transfer." msgstr "" -"Al camp <gui>Àlies</gui> introduïu el nom del contacte tal com voleu que " -"aparegui a la llista de contactes." +"Espereu que el contacte accepti la transferència del fitxer o feu clic a " +"<gui>Atura</gui> per aturar la transferència." -#: C/add-contact.page:53(p) -msgid "Click <gui>Add</gui> to add the person to your list of contacts." +#: C/send-file.page:72(item/p) +msgid "" +"Once the transfer is finished, it is possible to close the <gui>File " +"Transfers</gui> window." msgstr "" -"Feu clic a <gui>Afegeix</gui> per afegir el contacte a la llista de contactes." +"Una vegada s'hagi acabat la transferència podeu tancar la finestra " +"<gui>Transferències de fitxers</gui>." -#: C/add-contact.page:61(p) +#: C/send-file.page:80(note/p) msgid "" -"To add a new person to your list of contacts, you need to be connected to " -"the Internet and to your account." +"If you have multiple finished transfers listed in the window, click on " +"<gui>Clear</gui> to empty the list. This will only remove the files from the " +"list and will not delete them from your computer." msgstr "" -"Per afegir una persona nova a la llista de contactes heu d'estar " -"connectat a Internet i al compte." - -#: C/add-account.page:9(desc) -msgid "Add a new account to <app>Empathy</app>." -msgstr "Afegiu un compte nou a l'<app>Empathy</app>." - -#: C/add-account.page:39(title) -msgid "Add a new account" -msgstr "Com afegir un compte nou" +"Si teniu llistades múltiples transferències acabades a la finestra, feu clic " +"a <gui>Neteja</gui> per buidar la llista. Només s'esborraran de la llista, " +"no s'esborraran els fitxers de l'ordinador." -#: C/add-account.page:41(p) +#: C/send-file.page:87(note/p) msgid "" -"You can add instant messaging accounts from any supported service to " -"communicate with all of your contacts in <app>Empathy</app>. For some " -"account providers, these steps will also allow you to register for a new " -"account. For more details, see <link xref=\"create-account\"/>." +"It is possible to send files only using the following services: <em>Jabber</" +"em>, <em>Google Talk</em> and <em>People Nearby</em>." msgstr "" -"Podeu afegir comptes de missatgeria instantà nia per a qualsevol servei " -"habilitat per comunicar-vos amb el contactes a través de l'<app>Empathy</app>. " -"Per a alguns proveïdors de comptes aquests passos us permeten registrar-hi un " -"compte nou. Vegeu <link xref=\"create-account\"/> per a més informació." - -#: C/add-account.page:52(p) -msgid "Click <gui style=\"button\">Add</gui>." -msgstr "Feu clic a <gui style=\"button\">Afegeix</gui>." +"Només podeu enviar fitxers amb els serveis següents: <em>Jabber</em>, " +"<em>Google Talk</em> i <em>Gent propera</em>." -#: C/add-account.page:57(p) +#: C/send-file.page:93(note/p) msgid "" -"From the <gui>Protocol</gui> drop-down list, select the type of account you " -"wish to add." +"In order to send a file to someone, you need to be connected to the " +"Internet, or to a local area network." msgstr "" -"Des de la llista desplegable de <gui>Protocol</gui>, seleccioneu el tipus de " -"compte que vulgueu afegir." +"Per enviar un fitxer a algú us cal estar connectat a Internet o a una xarxa " +"d'à rea local." -#: C/add-account.page:61(p) +#: C/send-message.page:8(info/desc) +msgid "Send a message to one of your contacts." +msgstr "Envieu un missatge a un dels contactes." + +#: C/send-message.page:32(page/title) +msgid "Send a message to someone" +msgstr "Enviament de missatges" + +#: C/send-message.page:36(item/p) msgid "" -"If you do not already have a registered account, select <gui>Create a new " -"account on the server</gui>. This feature is not available for all account " -"types, and may not work with some account providers. See <link xref=\"create-" -"account\"/> for more information." +"From the <gui>Contact List</gui> window, double-click the name of the " +"contact that you want to have a conversation with." msgstr "" -"Si no teniu un compte registrat, seleccioneu <gui>Crea un compte nou al " -"servidor</gui>. Aquesta caracterÃstica no està disponible per tots els tipus " -"de comptes i pot no funcionar amb alguns proveïdors. Vegeu <link xref=" -"\"create-account\"/> per a més informació." +"Des de la finestra <gui>Llista de contactes</gui> feu doble clic al nom del " +"contacte amb el que voleu parlar." -#: C/add-account.page:66(p) +#: C/send-message.page:42(item/p) msgid "" -"Enter the required information. For most accounts, you will only need a " -"login ID and a password. Some accounts may require additional information. " -"See <link xref=\"accounts-window#details\"/> for more information." +"A new window will open. Type a message into the box at the bottom of the " +"window and press <key>Enter</key> to send it." msgstr "" -"Introduïu la informació requerida. Per la majoria de comptes només us caldrà " -"un nom d'usuari i una contrasenya. En alguns comptes cal més informació. Vegeu " -"<link xref=\"accounts-window#details\"/> per a més informació." +"S'obrirà una finestra nova. Teclegeu el missatge a la caixa a la part " +"inferior de la finestra i premeu <key>Retorn</key> per enviar-lo." -#: C/add-account.page:71(p) -msgid "Click <gui style=\"button\">Log in</gui>." -msgstr "Feu clic a <gui style=\"button\">Entra</gui>." +#: C/send-message.page:50(section/title) +msgid "Send a message to a meta-contact" +msgstr "Com enviar un missatge a un metacontacte" -#: C/add-account.page:78(p) +#: C/send-message.page:58(item/p) msgid "" -"To change the name that identifies the account in the <gui>Accounts</gui> " -"window, select the account from the list on the left and either click on the " -"name or press the space bar. Edit the account name and press <key>Enter</" -"key> when you’re finished." +"Select the contact you want to have the conversation, and from the menu " +"select <gui style=\"menuitem\">Chat</gui>." msgstr "" -"Per canviar el nom que identifica el compte a la finestra <gui>Comptes</" -"gui>, seleccioneu el compte des de la llista de l'esquerra i feu clic sobre el " -"nom o premeu la barra espaiadora. Editeu el nom del compte i feu clic a " -"<key>Retorn</key> quan hageu acabat." +"Seleccioneu el contacte amb el que voleu conversar i des del menú " +"seleccioneu <gui style=\"menuitem\">Xat</gui>." -#: C/accounts-window.page:11(desc) -msgid "Add, modify, and delete accounts." -msgstr "Afegiu, modifiqueu i suprimiu comptes." +#: C/set-custom-status.page:9(info/desc) +msgid "Add, edit or delete personal messages for your status." +msgstr "Afegiu, editeu o suprimiu missatges personals dels vostres estats." -#: C/accounts-window.page:33(title) -msgid "Accounts Window" -msgstr "Finestra dels comptes" +#: C/set-custom-status.page:15(credit/name) +msgid "Jim Campbell" +msgstr "Jim Campbell" -#: C/accounts-window.page:35(p) +#: C/set-custom-status.page:34(page/title) +msgid "Set a custom message" +msgstr "Establiu un missatge personalitzat" + +#: C/set-custom-status.page:36(page/p) msgid "" -"The <gui>Accounts</gui> window allows you to add, modify, and delete " -"accounts." +"Sometimes you may want to set a custom message for your status, for example " +"to let people know that you will be unavailable for a certain period of time." msgstr "" -"La finestra dels <gui>Comptes</gui> us permet afegir, modificar i suprimir " -"comptes." +"A vegades voleu deixar un missatge personalitzat pel vostre estat, per " +"exemple per fer saber als contactes que no estareu disponible durant una " +"estona." -#: C/accounts-window.page:43(title) -msgid "Account Details" -msgstr "Dades dels comptes" +#: C/set-custom-status.page:40(page/p) +msgid "" +"It is possible to set a custom message based on the different statuses " +"available." +msgstr "Podeu deixar un missatge personalitzat per a cada estat disponible." -#: C/accounts-window.page:44(p) +#: C/set-custom-status.page:46(item/p) C/set-custom-status.page:82(item/p) msgid "" -"For most types of accounts, you can simply enter a login ID and a password. " -"Certain accounts or account types, however, may require additional " -"information." +"From the <gui>Contact List</gui> window, click on the drop-down list at the " +"top." msgstr "" -"Per a majoria de tipus de comptes només us caldrà entrar el nom d'usuari " -"i la contrasenya. Tanmateix alguns comptes o tipus de comptes requereixen " -"informació addicional." - -#: C/account-jabber.page:7(desc) -msgid "Advanced options for Jabber and Google Talk accounts." -msgstr "Opcions avançades per als comptes de Jabber i de Google Talk." - -#: C/account-jabber.page:29(title) -msgid "Jabber account details" -msgstr "Dades dels comptes de Jabber" +"Des de la finestra <gui>Llista de contactes</gui> feu clic a la llista " +"desplegable de la part superior." -#: C/account-jabber.page:31(p) +#: C/set-custom-status.page:52(item/p) msgid "" -"Most Jabber accounts will require only a login ID and a password to connect. " -"For some accounts or on certain types of networks, you may need to enter " -"additional information in the <gui>Advanced</gui> section. Normally, you " -"will not need to use the advanced options below. For general instructions on " -"adding an account, see <link xref=\"add-account\"/>." +"Select the status you want to add a custom message to. You have to select " +"the one identified with the label <gui>Custom Message</gui>." msgstr "" -"Per connectar-se a la majoria de comptes de Jabber només fa falta el nom " -"d'usuari i la contrasenya. Tot i aixÃ, per alguns comptes o tipus de xarxes haureu " -"d'introduir informació addicional al secció <gui>Avançada</gui>. Normalment, no " -"us farà falta utilitzar les opcions avançades. Vegeu <link xref=\"add-account\"/> " -"per les instruccions generals de com afegir comptes." +"Seleccioneu l'estat al que voleu afegir-li el missatge personalitzat. Heu de " +"seleccionar el que està identificat amb l'etiqueta <gui>Missatge " +"personalitzat</gui>." -#: C/account-jabber.page:39(p) +#: C/set-custom-status.page:58(item/p) msgid "" -"Google Talk is a type of Jabber account. These instructions hold for Google " -"Talk accounts as well." +"Enter your custom message in the text box at the top of the window, and " +"press <key>Enter</key> to set the message." msgstr "" -"Com que el Google Talk també és un tipus de compte de Jabber, les instruccions " -"següents també serveixen." - -#: C/account-jabber.page:45(gui) -msgid "Encryption required (TLS/SSL)" -msgstr "Es requereix encriptació (TLS/SSL)" - -#: C/account-jabber.page:46(gui) -msgid "Ignore SSL certificate errors" -msgstr "Ignora els errors del certificat SSL" +"Introduïu el missatge personalitzat a la caixa de text de dalt de la " +"finestra i premeu <key>Retorn</key> per establir el missatge." -#: C/account-jabber.page:47(p) +#: C/set-custom-status.page:64(item/p) msgid "" -"Whenever possible, communication between <app>Empathy</app> and the Jabber " -"server is encrypted. If encrypted communication is not possible, messages " -"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent " -"<app>Empathy</app> from communicating with the Jabber server when encryption " -"is not possible." +"If you want to set the custom message as a favorite, saving it in order to " +"use it again, click on the little heart on the right of the text box where " +"you wrote your custom message." msgstr "" -"Sempre que sigui possible, es xifren les comunicacions entre l'<app>Empathy" -"</app> i el servidor de Jabber. Si no és possible, s'envien els missatges " -"sense xifrar. Seleccioneu <gui>Es requereix encriptació</gui> per impedir que " -"l'<app>Empathy</app> es comuniqui amb el servidor de Jabber si no es pot " -"establir una comunicació xifrada." +"Si voleu establir el missatge personalitzat com a preferit, per poder-lo " +"utilitzar en un altre moment, feu clic al cor petit a la dreta de la caixa " +"de text on heu escrit el missatge personalitzat." -#: C/account-jabber.page:52(p) +#: C/set-custom-status.page:69(item/p) msgid "" -"Some Jabber servers may encrypt data using invalid certificates, or using " -"certificates from unknown authorities. If you trust the server you are " -"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to " -"allow encrypted communication with invalid certificates." +"If you do not do it, the custom message will not be available the next time " +"you use <app>Empathy</app>. It will be saved only for the current session." msgstr "" -"Alguns servidors de Jabber xifren les dades amb certificats no và lids o " -"d'autoritats no reconegudes. Si confieu en el servidor al que us connecteu, " -"podeu seleccionar <gui>Ignora els errors del certificat SSL</gui> per permetre " -"la comunicació xifrada amb certificats no và lids." +"So no el deseu com a preferit quan torneu a iniciar l'<app>Empathy</app> no " +"estarà disponible com a missatge personalitzat. Només es desarà per la " +"sessió actual." -#: C/account-jabber.page:59(gui) -msgid "Resource" -msgstr "Recurs" +#: C/set-custom-status.page:78(section/title) +msgid "Edit and remove a custom message" +msgstr "Edició i supressió dels missatges personalitzats" -#: C/account-jabber.page:60(gui) -msgid "Priority" -msgstr "Prioritat" +#: C/set-custom-status.page:88(item/p) +msgid "Select <gui>Edit Custom Message</gui>." +msgstr "Seleccioneu <gui>Edita el missatge personalitzat</gui>." -#: C/account-jabber.page:61(p) +#: C/set-custom-status.page:95(item/p) +msgid "To edit a custom message:" +msgstr "Per editar un missatge personalitzat:" + +#: C/set-custom-status.page:100(item/p) msgid "" -"If you have multiple applications (for instance, on separate computers) " -"connected to your account at the same time, you can set a resource to " -"uniquely identify each one. By default, <app>Empathy</app> will use " -"<input>Telepathy</input> as the resource." +"From the <gui>Saved Presets</gui> box, select the status message you want to " +"edit and double-click on it." msgstr "" -"Si teniu més d'una aplicació (en ordinadors diferents) connectats al mateix " -"temps al mateix compte, podeu configurar un recurs per identificar de " -"forma inequÃvoca cadascun d'ells. Per defecte l'<app>Empathy</app> utilitzarà " -"<input>Telepathy</input> com a recurs." +"Des de la caixa <gui>Preestablerts desats</gui>, seleccioneu el missatge " +"d'estat que voleu editar i feu-hi doble clic." -#: C/account-jabber.page:65(p) -msgid "" -"You can set the priority to specify which application should receive " -"incoming messages from your contacts. New messages will be sent to the " -"application with the highest priority." +#: C/set-custom-status.page:106(item/p) +msgid "Type the new custom message and press <key>Enter</key> to modify it." msgstr "" -"Podeu establir la prioritat per especificar quina aplicació rebrà els missatges " -"entrants dels contactes. Els missatges nous s'enviaran a l'aplicació que tingui " -"la mà xima prioritat." +"Teclegeu el missatge personalitzat nou i premeu <key>Retorn</key> per " +"modificar-lo." -#: C/account-jabber.page:70(gui) -msgid "Override server settings" -msgstr "Sobreescriptura dels parà metres del servidor" +#: C/set-custom-status.page:113(item/p) +msgid "To remove a custom message:" +msgstr "Per suprimir un missatge personalitzat:" -#: C/account-jabber.page:71(p) +#: C/set-custom-status.page:118(item/p) msgid "" -"<app>Empathy</app> will use default settings to connect to the Jabber server " -"based on your login ID. For some Jabber servers, you will need to enter " -"custom server settings manually. These settings should be provided for you " -"by your Jabber provider." +"From the <gui>Saved Presets</gui> box, select the status message you want to " +"remove." msgstr "" -"L'<app>Empathy</app> utilitza els parà metres per defecte, basant-se en el nom " -"d'usuari, per connectar-se al servidor de Jabber. Per alguns servidors de " -"Jabber us caldrà introduir els parà metres del servidor manualment. Aquests " -"parà metres els hauria de proporcionar el proveïdor de Jabber." +"Des de la caixa <gui>Preestablerts desats</gui>, seleccioneu el missatge " +"d'estat que voleu suprimir." + +#: C/set-custom-status.page:124(item/p) +msgid "Click on the <gui>Remove</gui> button." +msgstr "Feu clic al botó <gui>Suprimeix</gui>." -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/account-irc.page:106(None) -msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d" -msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d" +#: C/set-custom-status.page:133(item/p) +msgid "When finished, click on <gui>Close</gui>." +msgstr "Feu clic a <gui>Tanca</gui> quan hà giu acabat." -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/account-irc.page:112(None) -msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6" +#: C/set-custom-status.page:140(note/p) +msgid "" +"When you edit a custom message, it will not be set as the current status " +"message. You will need to select it from the <gui>Contact List</gui> window." msgstr "" -"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6" +"Quan editeu un missatge personalitzat, aquest no s'establirà com el missatge " +"actual. L'haureu de seleccionar a la finestra <gui>Llista de contactes</gui>." -#: C/account-irc.page:8(desc) -msgid "Additional information necessary for connecting to IRC networks." -msgstr "Informació addicional per connectar-se a xarxes d'IRC." +#: C/share-desktop.page:7(info/desc) +msgid "Show your desktop to your contacts." +msgstr "Mostreu l'escriptori als contactes." -#: C/account-irc.page:31(title) -msgid "IRC account details" -msgstr "Dades del compte d'IRC" +#: C/share-desktop.page:33(page/title) +msgid "Share your desktop" +msgstr "Compartició de l'escriptori" -#: C/account-irc.page:33(p) +#: C/share-desktop.page:35(page/p) msgid "" -"IRC accounts require different information than many other types of " -"accounts. To create an IRC account, you must specify at least an IRC network " -"and a nickname. This page details the information you can provide for an IRC " -"account." +"It is possible to share your desktop with some of your contacts. You can use " +"this functionality to show your desktop to your contacts to, for example, " +"ask for help or help your contacts resolve a problem." msgstr "" -"Els comptes d'IRC requereixen una informació diferent que els altres tipus de " -"comptes. Per crear un compte d'IRC heu d'especificar com a mÃnim una xarxa " -"d'IRC i un sobrenom. Aquesta pà gina descriu la informació que podeu " -"proporcionar pel compte d'IRC." +"Podeu compartir l'escriptori amb algun contacte. Podeu utilitzar-ho per " +"mostrar l'escriptori als contactes, per exemple per demanar-los ajuda o " +"ajudar-los a resoldre un problema." -#: C/account-irc.page:45(gui) C/account-irc.page:120(gui) -msgid "Network" -msgstr "Xarxa" - -#: C/account-irc.page:46(p) +#: C/share-desktop.page:42(note/p) msgid "" -"IRC is an open system that allows people to run separate IRC networks. Each " -"network is distinct and has its own users and chat rooms. <app>Empathy</app> " -"lists the most popular networks in the <gui>Network</gui> drop-down list. " -"You can add additional networks. See <link xref=\"#networks\"/> below." +"To be able to share your desktop, you need to have a VNC server, which has " +"support for the feature, installed on your system. <app>Vino</app>, the " +"GNOME VNC server, has the required support." msgstr "" -"L'IRC és un sistema obert que permet que puguin haver-hi tantes xarxes d'IRC " -"com es vulgui. Cada xarxa és diferent de les altres i té els seus propis " -"usuaris i sales de xat. L'<app>Empathy</app> us mostra les xarxes més populars " -"a la llista desplegable <gui>Xarxa</gui>. Podeu afegir més xarxes si voleu. " -"Vegeu <link xref=\"#networks\"/> més avall." +"Per poder compartir l'escriptori, cal que tingueu instal·lat al sistema un " +"servidor de VNC que permeti aquesta funció. El <app>Vino</app>, el servidor " +"de VNC del GNOME, ja ho permet." -#: C/account-irc.page:53(gui) -msgid "Nickname" -msgstr "Sobrenom" +#: C/share-desktop.page:51(item/p) +msgid "From the <gui>Contact List</gui> window, do one of the following:" +msgstr "" +"Des de la finestra <gui>Llista de contactes</gui> executeu una de les " +"accions següents:" -#: C/account-irc.page:54(p) +#: C/share-desktop.page:56(item/p) msgid "" -"Your nickname is your unique name on the IRC network. Only one person on a " -"network may use a given nickname. If you get an error message that says " -"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change " -"your nickname." +"Select the contact you want to share your desktop with and choose " +"<guiseq><gui>Edit</gui><gui>Contact</gui> <gui>Share My Desktop</gui></" +"guiseq>." msgstr "" -"El vostre sobrenom és el nom únic que us identifica a la xarxa d'IRC. Només " -"una persona pot utilitzar un sobrenom especÃfic a cada xarxa. Si rebeu un " -"error que diu <link xref=\"prob-conn-name\" role=\"error-msg\"/> haureu de " -"canviar el sobrenom." +"Seleccioneu el contacte amb el que voleu compartir l'escriptori i escolliu " +"<guiseq><gui>Edita</gui><gui>Contacte</gui><gui>Comparteix el meu " +"escriptori</gui></guiseq>." -#: C/account-irc.page:60(gui) -msgid "Password" -msgstr "Contrasenya" +#: C/share-desktop.page:63(item/p) +msgid "" +"Right-click on the name of the contact you want to share your desktop with " +"and select <gui>Share My Desktop</gui>." +msgstr "" +"Feu clic amb el botó secundari sobre el contacte amb el qual voleu compartir " +"l'escriptori i seleccioneu <gui>Comparteix el meu escriptori</gui>." -#: C/account-irc.page:61(p) +#: C/share-desktop.page:71(item/p) msgid "" -"Some servers, particularly those on private networks, require a password to " -"connect. If you are authorized to use the network, the network " -"administrators should provide you with a password." +"An invitation to view your desktop will be sent to the contact you have " +"selected. To view your desktop, they will need to accept it." msgstr "" -"Per connectar-se a alguns servidors, en especial els de les xarxes privades, " -"us farà falta una contrasenya. Si esteu autoritzat a utilitzar la xarxa, " -"els seus administradors us en proporcionaran la contrasenya." +"Perquè pugui veure el vostre escriptori, al contacte que hageu seleccionat " +"se li enviarà una invitació que haurà d'acceptar." -#: C/account-irc.page:65(title) -msgid "NickServ Passwords" -msgstr "Contrasenyes de NickServ" +#: C/share-desktop.page:77(item/p) +msgid "" +"You can disconnect the contact from your computer using your desktop sharing " +"application." +msgstr "" +"Podeu desconnectar el contacte del vostre ordinador mitjançat l'aplicació de " +"compartició d'escriptoris." -#: C/account-irc.page:66(p) -#, fuzzy -#| msgid "" -#| "On some networks, nicknames can be registered using a service known as " -#| "NickServ. <app>Empathy</app> does not directly support nickname " -#| "passwords. On some networks, including the popular FreeNode network, " -#| "server passwords are automatically forwarded to NickServ, allowing you to " -#| "set this field to identify yourself with NickServ. See <link xref=\"irc-" -#| "nick-password\"/> for more details." +#: C/share-desktop.page:82(note/p) msgid "" -"On some networks, nicknames can be registered using a service known as " -"NickServ. <app>Empathy</app> does not directly support nickname passwords. " -"On some networks, including the popular freenode network, server passwords " -"are automatically forwarded to NickServ, allowing you to set this field to " -"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for " -"more details." +"For more information about how to use the remote desktop sharing " +"application, refer to its help." msgstr "" -"En algunes xarxes es poden registrar els sobrenoms amb un servei conegut com a " -"NickServ. L'<app>Empathy</app> encara no permet utilitzar sobrenoms amb " -"contrasenyes. Algunes xarxes, entre elles la popular xarxa FreeNode, els " -"servidors de contrasenyes es reenvien automà ticament al NickServ, de manera " -"que podeu establir aquest camp per identificar-vos amb el NickServ. Vegeu " -"<link xref=\"irc-nick-password\"/> per més informació." +"Per més informació sobre com utilitzar l'aplicació de compartició " +"d'escriptoris remots mireu la seva ajuda." -#: C/account-irc.page:76(gui) -msgid "Real name" -msgstr "Nom real" +#: C/share-desktop.page:90(page/p) +msgid "" +"When you share your desktop with someone else, it is possible to experience " +"system performance slowdown and low Internet speed." +msgstr "" +"Quan compartiu l'escriptori amb algú altre, podeu notar un alentiment del " +"sistema i una disminució de la velocitat d'Internet." -#: C/account-irc.page:77(p) +#: C/share-desktop.page:96(note/p) msgid "" -"You can provide your real name in addition to your nickname. Other users " -"will be able to see this when they view your information." +"Some of your contacts may not be able to use this feature. It is necessary " +"for them to have version 2.28, or newer, of <app>Empathy</app> and a " +"compatible remote desktop viewer application installed in their system." msgstr "" -"Podeu proporcionar el vostre nom real conjuntament amb el sobrenom. Els altres " -"usuaris el podran veure quan vegin la vostra informació." +"Potser no tots els contactes podran utilitzar aquesta funció. Cal que " +"tinguin la versió 2.28 o una més nova de l'<app>Empathy</app> i una " +"aplicació de visualització d'escriptoris remots compatible instal·lada al " +"sistema." -#: C/account-irc.page:81(gui) -msgid "Quit message" -msgstr "Missatge de sortida" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/status-icons.page:39(media) +msgctxt "_" +msgid "" +"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'" +msgstr "" +"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'" -#: C/account-irc.page:82(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/status-icons.page:45(media) +msgctxt "_" +msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'" +msgstr "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/status-icons.page:53(media) +msgctxt "_" +msgid "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'" +msgstr "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/status-icons.page:62(media) C/status-icons.page:69(media) +msgctxt "_" msgid "" -"When you go offline, a quit message is sent to all the chat rooms you’re in " -"and to all the users you’re having a private conversation with. Use this " -"field to provide a custom quit message." +"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'" msgstr "" -"Quan sortiu, s'enviarà un missatge a totes les sales de xat que estigueu i " -"tots els usuaris amb els que tingueu xats privats. Utilitzeu aquest camp per " -"proporcionar un missatge de sortida personalitzat." +"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'" -#: C/account-irc.page:94(title) -msgid "IRC Networks" -msgstr "Xarxes d'IRC" +#: C/status-icons.page:7(info/desc) +msgid "Understanding the various statuses and status icons." +msgstr "Explicació dels diversos estats i icones d'estat." -#: C/account-irc.page:97(title) -msgid "Networks" -msgstr "Xarxes" +#: C/status-icons.page:35(page/title) +msgid "Status Types and Icons" +msgstr "Icones i tipus d'estats" -#: C/account-irc.page:99(p) +#: C/status-icons.page:39(item/title) msgid "" -"<app>Empathy</app> includes a list of popular IRC networks. If you wish to " -"another IRC network, you can add it to the list. You can also modify " -"networks and remove them from the list." +"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png" +"\">Available icon</media> <gui>Available</gui>" msgstr "" -"L'<app>Empathy</app> inclou una llista de les xarxes d'IRC més populars. Si " -"voleu una altra xarxa, podeu afegir-la a la llista. També podeu modificar " -"xarxes existents i esborrar-ne de la llista." +"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png\">Icona " +"de disponible</media> <gui>Disponible</gui>" -#: C/account-irc.page:104(p) +#: C/status-icons.page:41(item/p) msgid "" -"To add a network to the list, click <media type=\"image\" mime=\"image/png\" " -"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>." +"Use the <em>Available</em> status when you are at your computer and able to " +"chat with your contacts. You can set a custom message for this status." msgstr "" -"Feu clic a <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-add.png\" " -"width=\"16\" height=\"16\">Afegeix</media> per afegir una xarxa a la llista." +"Utilitzeu l'estat <em>Disponible</em> quan esteu a l'ordinador i esteu " +"disponibles per xatejar. Podeu configurar un missatge personalitzat per " +"aquest estat." -#: C/account-irc.page:107(p) +#: C/status-icons.page:45(item/title) msgid "" -"To modify a network in the list, select the network and click <media type=" -"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" " -"height=\"16\">Edit</media>." +"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Busy icon</" +"media> <gui>Busy</gui>" msgstr "" -"Seleccioneu una xarxa de la llista i feu clic a <media type=\"image\" " -"mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">" -"Edita</media> per modificar una xarxa de la llista." +"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Icona " +"d'ocupat</media> <gui>Ocupat</gui>" -#: C/account-irc.page:110(p) +#: C/status-icons.page:47(item/p) msgid "" -"To remove a network from the list, select the network and click <media type=" -"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" " -"height=\"16\">Remove</media>." +"Use the <em>Busy</em> status to let your contacts know that you don’t want " +"to chat right now. They can still contact you, for instance if they have " +"something urgent they need to discuss. By default, <app>Empathy</app> will " +"not use notification bubbles and sounds when you are busy. You can set a " +"custom message for this status." msgstr "" -"Seleccioneu una xarxa de la llista i feu clic a <media type=\"image\" " -"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">" -"Suprimeix</media> per suprimir una xarxa de la llista." +"Utilitzeu l'estat <em>Ocupat</em> per mostrar als contactes que no voleu " +"xatejar ara. Encara podran xatejar si volen, per exemple si tenen alguna " +"cosa urgent a comentar-vos. Per defecte, l'<app>Empathy</app> no utilitzarà " +"finestres emergents ni sons quan esteu ocupats. Podeu configurar un missatge " +"personalitzat per aquest estat." -#: C/account-irc.page:115(p) +#: C/status-icons.page:53(item/title) msgid "" -"When adding or modifying a network, you can enter the following information:" +"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Away icon</" +"media> <gui>Away</gui>" msgstr "" -"Quan afegiu o modifiqueu una xarxa podeu introduir la informació següent:" +"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Icona " +"d'absent</media> <gui>Absent</gui>" -#: C/account-irc.page:121(p) +#: C/status-icons.page:55(item/p) msgid "" -"This is the name of the network as you want it to appear in the list of " -"networks." +"Use the <em>Away</em> status when you are going away from your computer. " +"<app>Empathy</app> automatically sets your status to Away if you do not use " +"your computer for a while, or if your screensaver is on. By default, " +"<app>Empathy</app> will not use notification bubbles and sounds when you are " +"away. You can set a custom message for this status." msgstr "" -"Aquest és el nom de la xarxa que voleu que aparegui a la llista de xarxes." +"Utilitzeu l'estat <em>Absent</em> quan sou lluny de l'ordinador. " +"L'<app>Empathy</app> us posa automà ticament l'estat «Absent» si esteu un " +"temps sense utilitzar l'ordinador o si s'activa l'estalvi de pantalla. Per " +"defecte, l'<app>Empathy</app> no utilitzarà finestres emergents ni sons quan " +"esteu absents. Podeu configurar un missatge personalitzat per aquest estat." -#: C/account-irc.page:125(gui) -msgid "Charset" -msgstr "Joc de carà cters" +#: C/status-icons.page:62(item/title) +msgid "" +"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline " +"icon</media> <gui>Invisible</gui>" +msgstr "" +"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Icona " +"d'invisible</media> <gui>Invisible</gui>" -#: C/account-irc.page:126(p) +#: C/status-icons.page:64(item/p) msgid "" -"This specifies the character encoding that is typically used on this " -"network. A character encoding is a specific way of recording characters " -"internally in a computer. There are many character encodings, and you need " -"to use the same character encoding as other users to see their messages " -"correctly." +"When you set your status to <em>Invisible</em>, you will appear as offline " +"to your contacts. You will still be connected to your accounts, and you " +"still see your contacts’ statuses and start conversations with them." msgstr "" -"Això especifica la codificació de carà cters que s'utilitza en aquesta xarxa. " -"Una codificació de carà cters és un format especÃfic per enregistrar carà cters " -"internament a l'ordinador. Hi ha moltes codificacions de carà cters i heu " -"d'utilitzar la mateixa que els altres usuaris per veure els missatges de " -"forma correcta." +"Quan poseu l'estat com a <em>Invisible</em>, apareixereu com a desconnectat " +"per als contactes. Encara estareu connectat als comptes i podreu veure " +"l'estat dels contactes i xatejar-hi." -#. Translators: Recommend character encodings that are common -#. for your language. -#: C/account-irc.page:135(p) +#: C/status-icons.page:69(item/title) msgid "" -"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that " -"can handle text from most of the world's languages. Another common encoding " -"for English and some other Western languages is ISO-8859-1." +"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline " +"icon</media> <gui>Offline</gui>" msgstr "" -"Per defecte l'<app>Empathy</app> utilitza l'UTF-8 , una codificació de " -"carà cters moderna que pot gestionar text escrit en la immensa majoria de les " -"llengües del món. Una altra codificació de carà cters per l'anglès i algunes " -"llengües occidentals és l'ISO-8859-1." +"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Icona " +"de fora de lÃnia</media> <gui>Fora de lÃnia</gui>" + +#: C/status-icons.page:71(item/p) +msgid "" +"Setting your status to <em>Offline</em> disconnects you from all of your " +"accounts." +msgstr "" +"Si establiu l'estat com a <em>Desconnectat</em> us desconnectarà de tots els " +"contactes." -#: C/account-irc.page:141(gui) -msgid "Servers" -msgstr "Servidors" +#: C/video-call.page:11(info/desc) +msgid "Start a video conversation with one of your contacts." +msgstr "Inicieu una conversa de vÃdeo amb un dels contactes." + +#: C/video-call.page:37(page/title) +msgid "Start a video conversation" +msgstr "Inicieu una conversa de vÃdeo" -#: C/account-irc.page:142(p) +#: C/video-call.page:39(page/p) msgid "" -"An IRC network may have many servers you can connect to. When you are " -"connected to a server on a particular network, you can communicate with all " -"users on all other servers on that network. You can add and remove servers " -"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons." +"If you have a webcam, you can call your contacts and have a video " +"conversation with them. This feature only works with certain types of " +"accounts, and it requires the other person to have an application that " +"supports video calls." msgstr "" -"Una xarxa d'IRC pot tenir molts servidors als que us podeu connectar. Quan " -"esteu connectat a un servidor d'una xarxa en particular, us podeu comunicar " -"amb tots els usuaris de tots els servidors d'aquella xarxa. Podeu " -"afegir o suprimir servidors per a aquesta xarxa utilitzant els botons " -"<gui>Afegeix</gui> i <gui>Suprimeix</gui>." +"Si teniu una cà mera web, podeu trucar els contactes i tindre una vÃdeo " +"conferencia amb ells. Aquesta caracterÃstica sols funciona amb certs tipus " +"de comptes, i requereix que l'altra persona tingui una aplicació que permeti " +"fer vÃdeo trucades." -#: C/account-irc.page:147(p) +#: C/video-call.page:46(item/p) msgid "" -"When a server is selected, click the field under <gui>Server</gui> or " -"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys " -"to focus the field, and press the space bar to begin editing." +"Right-click on the contact that you want to call and select <gui style=" +"\"menuitem\">Video Call</gui>." msgstr "" -"Quan seleccioneu un servidor feu clic al camp de <gui>Servidor</gui> o " -"<gui>Port</gui> per editar-lo. També ho podeu fer amb les tecles de navegació " -"de cap a la dreta i de cap a l'esquerra per donar el focus al camp i si feu " -"clic a la barra espaiadora editareu el camp." +"Feu clic amb el botó secundari al contacte que voleu trucar i des del menú " +"seleccioneu <gui style=\"menuitem\">Trucada de vÃdeo</gui>." -#: C/account-irc.page:151(p) +#: C/video-call.page:54(item/p) msgid "" -"Select the check box in the <gui>SSL</gui> column to encrypt all " -"communication with a server. Note that this does not prevent other users on " -"the network from seeing what you write on public chat rooms." +"To end the conversation, click on the <gui style=\"button\">hang up</gui> " +"button." +msgstr "Per acabar la conversa feu clic a <gui style=\"button\">Penja</gui>." + +#: C/video-call.page:60(note/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>." msgstr "" -"Seleccioneu la casella de selecció de la columna <gui>SSL</gui> per xifrar " -"totes les comunicacions amb el servidor. Adoneu-vos que això no impedirà que " -"altres usuaris de la xarxa puguin veure el que escriviu en un xat públic." +"Per canviar d'una conversa de vÃdeo a una conversa de veu, escolliu " +"<guiseq><gui style=\"menu\">VÃdeo</gui><gui style=\"menuitem\">Apaga el " +"vÃdeo</gui></guiseq>." -#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2 -#: C/index.page:0(None) -msgid "translator-credits" +#: C/video-call.page:65(section/title) +msgid "Start a video conversation with a meta-contact" +msgstr "Inicia una conversa de vÃdeo amb un metacontacte" + +#: C/video-call.page:73(item/p) +msgid "" +"Select the contact you want to have the conversation, and from the menu " +"select <gui style=\"menuitem\">Video Call</gui>." msgstr "" -"Joan Duran <jodufi@gmail.com>, 2008, 2009\n" -"Carles Ferrando <carles.ferrando@gmail.com>, 2010\n" -"Gil Forcada <gilforcada@guifi.net>, 2011" +"Seleccioneu el contacte amb el que voleu realitzar la conversa i des del " +"menú seleccioneu <gui style=\"menuitem\">Trucada de vÃdeo</gui>." diff --git a/help/el/el.po b/help/el/el.po index 82c4c3b4a..6e4d45ea0 100644 --- a/help/el/el.po +++ b/help/el/el.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy-master-help-el-4325__.merged\n" -"POT-Creation-Date: 2013-02-03 12:24+0000\n" -"PO-Revision-Date: 2013-03-10 06:15+0300\n" +"POT-Creation-Date: 2013-04-15 22:03+0000\n" +"PO-Revision-Date: 2013-04-26 00:03+0300\n" "Last-Translator: Dimitris Spingos (ΔημήτÏης Σπίγγος) <dmtrs32@gmail.com>\n" "Language-Team: team@gnome.gr\n" "Language: el\n" @@ -29,36 +29,18 @@ msgstr "" "\n" "Για πεÏισσότεÏες πληÏοφοÏίες, επισκεφθείτε τη σελίδα http://www.gnome.gr/" -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#. -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/index.page:28(media) -msgctxt "_" -msgid "" -"external ref='figures/empathy-logo.png' " -"md5='1afc419a644e90b16393807e35cb5cb2'" -msgstr "" -"external ref='figures/empathy-logo.png' " -"md5='1afc419a644e90b16393807e35cb5cb2'" - -#: C/index.page:7(info/title) +#: C/index.page:8(info/title) msgctxt "link" msgid "Empathy Internet Messenger" msgstr "ΜηνÏματα διαδικτÏου Empathy" -#: C/index.page:8(info/title) +#: C/index.page:9(info/title) msgctxt "text" msgid "Empathy Internet Messenger" msgstr "ΜηνÏματα διαδικτÏου Empathy" -#: C/index.page:19(credit/name) C/add-account.page:21(credit/name) -#: C/audio-call.page:19(credit/name) C/audio-video.page:17(credit/name) +#: C/index.page:20(credit/name) C/add-account.page:21(credit/name) +#: C/audio-call.page:22(credit/name) C/audio-video.page:17(credit/name) #: C/create-account.page:19(credit/name) #: C/disable-account.page:21(credit/name) #: C/favorite-rooms.page:14(credit/name) C/geolocation.page:17(credit/name) @@ -81,14 +63,14 @@ msgstr "ΜηνÏματα διαδικτÏου Empathy" #: C/remove-account.page:19(credit/name) C/salut-protocol.page:18(credit/name) #: C/send-file.page:21(credit/name) C/set-custom-status.page:19(credit/name) #: C/share-desktop.page:14(credit/name) C/status-icons.page:16(credit/name) -#: C/video-call.page:22(credit/name) +#: C/video-call.page:25(credit/name) msgid "Milo Casagrande" msgstr "Milo Casagrande" -#: C/index.page:23(license/p) C/account-irc.page:20(license/p) +#: C/index.page:24(license/p) C/account-irc.page:20(license/p) #: C/account-jabber.page:18(license/p) C/accounts-window.page:22(license/p) #: C/add-account.page:29(license/p) C/add-contact.page:22(license/p) -#: C/audio-call.page:23(license/p) C/audio-video.page:21(license/p) +#: C/audio-call.page:31(license/p) C/audio-video.page:21(license/p) #: C/change-status.page:28(license/p) C/create-account.page:23(license/p) #: C/disable-account.page:29(license/p) C/favorite-rooms.page:18(license/p) #: C/geolocation.page:21(license/p) @@ -110,40 +92,43 @@ msgstr "Milo Casagrande" #: C/remove-account.page:23(license/p) C/salut-protocol.page:22(license/p) #: C/send-file.page:25(license/p) C/send-message.page:21(license/p) #: C/set-custom-status.page:23(license/p) C/share-desktop.page:22(license/p) -#: C/status-icons.page:24(license/p) C/video-call.page:26(license/p) +#: C/status-icons.page:24(license/p) C/video-call.page:34(license/p) msgid "Creative Commons Share Alike 3.0" msgstr "Creative Commons Share Alike 3.0" -#: C/index.page:27(page/title) -msgid "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> " -"Empathy Internet Messenger logo </media> Empathy Internet Messenger" -msgstr "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> " -"Λογότυπο του ΑποστολÎα άμεσων μηνυμάτων Empathy</media> ΑποστολÎας άμεσων " -"μηνυμάτων Empathy" +#: C/index.page:30(media/span) +#| msgctxt "link" +#| msgid "Empathy Internet Messenger" +msgid "Empathy Internet Messenger logo" +msgstr "Λογότυπος αγγελιοφόÏου διαδικτÏου Empathy" + +#: C/index.page:28(page/title) +#| msgctxt "link" +#| msgid "Empathy Internet Messenger" +msgid "<_:media-1/> Empathy Internet Messenger" +msgstr "<_:media-1/> ΑγγελιοφόÏος διαδικτÏου Empathy" -#: C/index.page:35(section/title) +#: C/index.page:36(section/title) msgid "Account Management" msgstr "ΔιαχείÏιση λογαÏιασμών" -#: C/index.page:39(section/title) +#: C/index.page:40(section/title) msgid "Contact Management" msgstr "ΔιαχείÏιση επαφών" -#: C/index.page:43(section/title) +#: C/index.page:44(section/title) msgid "Text Conversations" msgstr "ΓÏαπτÎÏ‚ συζητήσεις" -#: C/index.page:47(section/title) +#: C/index.page:48(section/title) msgid "Audio and Video Conversations" msgstr "ΦωνητικÎÏ‚ κλήσεις και βιντεοκλήσεις" -#: C/index.page:51(section/title) +#: C/index.page:52(section/title) msgid "Advanced Actions" msgstr "Για Ï€ÏοχωÏημÎνους" -#: C/index.page:55(section/title) C/irc-manage.page:64(section/title) +#: C/index.page:56(section/title) C/irc-manage.page:64(section/title) msgid "Common Problems" msgstr "Κοινά Ï€Ïοβλήματα" @@ -230,8 +215,8 @@ msgid "" "You must have the <sys>telepathy-idle</sys> package installed to use IRC in " "<app>Empathy</app>." msgstr "" -"Για να χÏησιμοποιήσετε το IRC στο <app>Empathy</app>, θα Ï€ÏÎπει να Îχετε " -"εγκατεστημÎνο το πακÎτο <sys>telepathy-idle</sys>." +"Î ÏÎπει να Îχετε εγκατεστημÎνο το πακÎτο <sys>telepathy-idle</sys> για να " +"χÏησιμοποιήσετε το IRC στο <app>Empathy</app>." #: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title) msgid "<gui>Network</gui>" @@ -408,7 +393,7 @@ msgstr "" "ΟÏίζει την κωδικοποίηση χαÏακτήÏων που χÏησιμοποιείται συνήθως στο δίκτυο " "αυτό. Η κωδικοποίηση χαÏακτήÏων είναι Îνας συγκεκÏιμÎνος Ï„Ïόπος με τον οποίο " "αποθηκεÏει χαÏακτήÏες ο υπολογιστής. ΥπάÏχουν πολλÎÏ‚ διαθÎσιμες " -"κωδικοποιήσεις χαÏακτήÏων. Για να βλÎπετε τα μηνÏματα των άλλων χÏηστών " +"κωδικοποιήσεις χαÏακτήÏων και για να βλÎπετε τα μηνÏματα των άλλων χÏηστών " "χωÏίς Ï€Ïοβλήματα, θα Ï€ÏÎπει να χÏησιμοποιείτε την ίδια κωδικοποίηση με " "αυτοÏÏ‚." @@ -622,11 +607,11 @@ msgid "" "account providers, these steps will also allow you to register for a new " "account. For more details, see <link xref=\"create-account\"/>." msgstr "" -"ΜποÏείτε να Ï€ÏοσθÎτετε λογαÏιασμοÏÏ‚ άμεσων μηνυμάτων για όλες τις " -"υποστηÏιζόμενες υπηÏεσίες. Έτσι, θα μποÏείτε να επικοινωνείτε με όλες τις " -"επαφÎÏ‚ σας μÎσω του <app>Empathy</app>. Τα παÏακάτω βήματα σας επιτÏÎπουν να " -"δημιουÏγήσετε λογαÏιασμοÏÏ‚ σε οÏισμÎνους παÏόχους λογαÏιασμών. Για " -"πεÏισσότεÏες λεπτομÎÏειες, δείτε την <link xref=\"create-account\"/>." +"ΜποÏείτε να Ï€ÏοσθÎτετε λογαÏιασμοÏÏ‚ άμεσων μηνυμάτων από οποιαδήποτε " +"υποστηÏιζόμενη υπηÏεσία για επικοινωνία με όλες τις επαφÎÏ‚ σας στο " +"<app>Empathy</app>. Για μεÏικοÏÏ‚ παÏόχους λογαÏιασμών, αυτά τα βήματα θα σας " +"επιτÏÎψουν επίσης να καταχωÏίσετε Îναν νÎο λογαÏιασμό. Για πεÏισσότεÏες " +"λεπτομÎÏειες, δείτε το <link xref=\"create-account\"/>." #: C/add-account.page:49(item/p) C/disable-account.page:49(item/p) #: C/irc-nick-password.page:50(item/p) C/remove-account.page:43(item/p) @@ -687,7 +672,7 @@ msgid "" msgstr "" "Για να αλλάξετε το όνομα που χÏησιμοποιείται για το λογαÏιασμό στο παÏάθυÏο " "<gui>ΛογαÏιασμοί</gui>, επιλÎξτε το λογαÏιασμό από τη λίστα στα αÏιστεÏά, " -"και μετά πατήστε το όνομα ή πιÎστε το πλήκτÏο «Διάστημα». Αλλάξτε το όνομα " +"και μετά πατήστε το όνομα ή πιÎστε το πλήκτÏο διαστήματος. Αλλάξτε το όνομα " "του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÎºÎ±Î¹ πιÎστε <key>Enter</key> όταν τελειώσετε." #: C/add-contact.page:9(info/desc) @@ -752,95 +737,86 @@ msgstr "" "Για να Ï€ÏοσθÎσετε Îνα νÎο άτομο στη λίστα επαφών σας, θα Ï€ÏÎπει να Îχετε " "συνδεθεί στο διαδίκτυο, καθώς και στο λογαÏιασμό σας." -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#. -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#. -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/audio-call.page:36(media) C/audio-video.page:70(media) -#: C/video-call.page:39(media) -msgctxt "_" -msgid "" -"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'" -msgstr "" -"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'" - -#: C/audio-call.page:9(info/desc) +#: C/audio-call.page:10(info/desc) msgid "Call your contacts over the Internet." msgstr "Κλήση των επαφών σας μÎσω διαδικτÏου." -#: C/audio-call.page:27(page/title) +#: C/audio-call.page:26(credit/name) C/overview.page:16(credit/name) +#: C/share-desktop.page:18(credit/name) C/video-call.page:29(credit/name) +msgid "Ekaterina Gerasimova" +msgstr "Ekaterina Gerasimova" + +#: C/audio-call.page:35(page/title) msgid "Start an audio conversation" msgstr "ΈναÏξη φωνητικής κλήσης" -#: C/audio-call.page:29(page/p) +#: C/audio-call.page:37(page/p) +#| msgid "" +#| "You can call your contacts and have an audio conversation with them. This " +#| "features only works with certain types of accounts, and it requires the " +#| "other person to have an application that supports audio calls." msgid "" "You can call your contacts and have an audio conversation with them. This " -"features only works with certain types of accounts, and it requires the " -"other person to have an application that supports audio calls." +"features only works with certain types of accounts and it requires the other " +"person to have an application that supports audio calls." msgstr "" -"ΜποÏείτε να καλείτε τις επαφÎÏ‚ σας και να μιλάτε μαζί τους. Αυτή η " -"λειτουÏγία διατίθεται μόνο για οÏισμÎνους Ï„Ïπους λογαÏιασμών, και " -"Ï€ÏοϋποθÎτει ότι η επαφή σας θα διαθÎτει επίσης εφαÏμογή με υποστήÏιξη για " -"φωνητικÎÏ‚ κλήσεις." +"ΜποÏείτε να καλείτε τις επαφÎÏ‚ σας και να μιλάτε μαζί τους ηχητικά. Αυτή η " +"λειτουÏγία διατίθεται μόνο για οÏισμÎνους Ï„Ïπους λογαÏιασμών και απαιτεί το " +"άλλο άτομο να διαθÎτει επίσης εφαÏμογή που υποστηÏίζει φωνητικÎÏ‚ κλήσεις." -#: C/audio-call.page:34(item/p) +#: C/audio-call.page:43(item/p) +#| msgid "" +#| "Select the contact you want to have the conversation, and from the menu " +#| "select <gui style=\"menuitem\">Audio 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 " -"next to the name of the contact you wish to call and choose <gui style=" +"Right-click on the contact that you want to call and select <gui style=" "\"menuitem\">Audio Call</gui>." msgstr "" -"Από το παÏάθυÏο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type=" -"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</" -"media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλÎσετε, και " -"επιλÎξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>." +"Δεξιοπατήστε στην επαφή την οποία θÎλετε να καλÎσετε και επιλÎξτε <gui " +"style=\"menuitem\">Φωνητική κλήση</gui>." -#: C/audio-call.page:42(item/p) C/video-call.page:44(item/p) +#: C/audio-call.page:49(item/p) C/video-call.page:50(item/p) +#| msgid "" +#| "A new window will open. When the connection is established, you will see " +#| "<gui>Connected</gui> at the bottom of the window, along with the total " +#| "conversation time." msgid "" -"A new window will open. When the connection is established, you will see " -"<gui>Connected</gui> at the bottom of the window, along with the total " -"conversation time." +"A new window will open. When the connection is established, you will see the " +"total conversation time at the bottom of the window." msgstr "" -"Θα ανοίξει Îνα νÎο παÏάθυÏο. Όταν επιτευχθεί η σÏνδεση, θα δείτε το μήνυμα " -"<gui>Σε σÏνδεση</gui> στο κάτω μÎÏος του παÏαθÏÏου, μαζί με τη διάÏκεια της " -"συνομιλίας." +"Θα ανοίξει Îνα νÎο παÏάθυÏο. Όταν επιτευχθεί η σÏνδεση, θα δείτε τον " +"συνολικό χÏόνο συζήτησης στο κάτω μÎÏος του παÏαθÏÏου." -#: C/audio-call.page:48(item/p) C/video-call.page:49(item/p) -msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>." +#: C/audio-call.page:55(item/p) +#| msgid "" +#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>." +msgid "" +"To end the conversation, click the <gui style=\"button\">hand up</gui> " +"button." msgstr "" -"Για να τεÏματίσετε τη συνομιλία, επιλÎξτε <gui style=\"button\">Κλείσιμο</" -"gui>." +"Για να τεÏματίσετε τη συνομιλία, πατήστε το κουμπί <gui " +"style=\"button\">Κλείσιμο</gui>." -#: C/audio-call.page:55(note/p) +#: C/audio-call.page:63(note/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>." msgstr "" "Για να μετατÏÎψετε μια φωνητική κλήση σε βιντεοκλήση, επιλÎξτε <guiseq><gui " -"style=\"menu\">Βίντεο</gui> <gui style=\"menuitem\">Βίντεο ενεÏγό</gui></" -"guiseq>." +"style=\"menu\">Βίντεο</gui> <gui style=\"menuitem\">Βίντεο " +"ενεÏγό</gui></guiseq>." -#: C/audio-call.page:63(section/title) +#: C/audio-call.page:71(section/title) msgid "Start an audio conversation with a meta-contact" msgstr "ΈναÏξη φωνητικής συζήτησης με μια μετα-επαφή" -#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p) -#: C/video-call.page:64(item/p) +#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p) +#: C/video-call.page:68(item/p) msgid "" "From the <gui>Contact List</gui> window, right-click on the meta-contact." msgstr "Στο παÏάθυÏο <gui>Λίστα επαφών</gui>, κάντε δεξί κλικ στη μετα-επαφή." -#: C/audio-call.page:71(item/p) +#: C/audio-call.page:79(item/p) msgid "" "Select the contact you want to have the conversation, and from the menu " "select <gui style=\"menuitem\">Audio Call</gui>." @@ -848,8 +824,8 @@ msgstr "" "ΕπιλÎξτε την επαφή με την οποία θÎλετε να συζητήσετε, και από το Î¼ÎµÎ½Î¿Ï " "επιλÎξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>." -#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p) -#: C/video-call.page:76(note/p) +#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p) +#: C/video-call.page:80(note/p) msgid "" "To recognize if a contact is a <em>meta-contact</em>, move your mouse on a " "contact in the <gui>Contact List</gui> window, and stop over it for a " @@ -867,13 +843,26 @@ msgstr "" #. update your localized copy. The msgstr is not used at all. Set it to #. whatever you like once you have updated your copy of the file. #: C/audio-video.page:58(media) +#| msgctxt "_" +#| msgid "" +#| "external ref='figures/audio-input-microphone.png' " +#| "md5='8d89026b66a263a3bc5b1f0665948567'" msgctxt "_" -msgid "" -"external ref='figures/audio-input-microphone.png' " -"md5='8d89026b66a263a3bc5b1f0665948567'" -msgstr "" -"external ref='figures/audio-input-microphone.png' " -"md5='8d89026b66a263a3bc5b1f0665948567'" +msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'" +msgstr "external ref='figures/audio-input-microphone.png' md5='__failed__'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/audio-video.page:70(media) +#| msgctxt "_" +#| msgid "" +#| "external ref='figures/camera-web.png' " +#| "md5='8166b4372f25b78cbf5a64fe2eac2ce5'" +msgctxt "_" +msgid "external ref='figures/camera-web.png' md5='__failed__'" +msgstr "external ref='figures/camera-web.png' md5='__failed__'" #: C/audio-video.page:8(info/desc) msgid "" @@ -1114,11 +1103,10 @@ msgid "" "status messages</link> to provide more information about your availability " "to your contacts." msgstr "" -"Στην <link xref=\"status-icons\"/> υπάÏχει μια λίστα με τις " -"Ï€ÏοεγκατεστημÎνες καταστάσεις και το τι σημαίνει η καθεμία. Επίσης, μποÏείτε " -"να <link xref=\"set-custom-message\">Ï€ÏοσθÎτετε Ï€ÏοσαÏμοσμÎνα μηνÏματα " -"κατάστασης</link> που παÏÎχουν πεÏισσότεÏες πληÏοφοÏίες για τη διαθεσιμότητά " -"σας στις επαφÎÏ‚ σας." +"Στο <link xref=\"status-icons\"/> υπάÏχει μια λίστα με τις ενσωματωμÎνες " +"καταστάσεις και το τι σημαίνουν. Επίσης, μποÏείτε να <link xref=\"set-custom-" +"status\">Ï€ÏοσθÎτετε Ï€ÏοσαÏμοσμÎνα μηνÏματα κατάστασης</link> που παÏÎχουν " +"πεÏισσότεÏες πληÏοφοÏίες για τη διαθεσιμότητά σας στις επαφÎÏ‚ σας." #: C/change-status.page:63(note/p) msgid "" @@ -1194,10 +1182,10 @@ msgid "" "choose your account provider and communicate with all other Jabber users, " "regardless of their account provider." msgstr "" -"Το Jabber είναι Îνα ανοιχτό σÏστημα άμεσων μηνυμάτων. Όπως και το email, το " -"Jabber σας επιτÏÎπει να επιλÎγετε όποιον πάÏοχο θÎλετε για το λογαÏιασμό " -"σας. Από εκεί και Ï€ÎÏα, μποÏείτε να επικοινωνείτε με όλους τους υπόλοιπους " -"χÏήστες του Jabber, ανεξάÏτητα από τον πάÏοχό τους." +"Το Jabber είναι Îνα ανοιχτό σÏστημα άμεσων μηνυμάτων. Όπως και η ηλεκτÏονική " +"αλληλογÏαφία, το Jabber σας επιτÏÎπει να επιλÎξετε τον πάÏοχο του " +"λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ±Ï‚ και να επικοινωνήσετε με όλους τους άλλους χÏήστες, " +"ανεξάÏτητα από τον πάÏοχο λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï Ï„Î¿Ï…Ï‚." #: C/create-account.page:66(section/p) msgid "" @@ -1257,9 +1245,9 @@ msgid "" "index.php?page=register\">Ekiga.net</link> service does not currently work " "with <app>Empathy</app>." msgstr "" -"Εξαιτίας οÏισμÎνων τεχνικών διαφοÏών, Ï€Ïος το παÏόν η ελεÏθεÏη υπηÏεσία " -"<link href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</" -"link> δεν υποστηÏίζεται από το <app>Empathy</app>." +"Εξαιτίας οÏισμÎνων τεχνικών διαφοÏών, Ï€Ïος το παÏόν η ελεÏθεÏη υπηÏεσία " +"<link href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> " +"δεν υποστηÏίζεται από το <app>Empathy</app>." #: C/create-account.page:102(section/p) msgid "" @@ -1352,12 +1340,11 @@ 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 "" -"ΜποÏείτε να απενεÏγοποιήσετε Îνα λογαÏιασμό, Îτσι ώστε το <app>Empathy</app> " -"να μη συνδÎεται πλÎον αυτόματα σε αυτόν. Έτσι, δε χÏειάζεται να τον " -"διαγÏάψετε, και μποÏείτε να τον ενεÏγοποιείτε μόνο όποτε τον χÏειάζεστε, " -"απενεÏγοποιώντας τον στη συνÎχεια. ΠαÏάλληλα, θα συνεχίζετε να " -"χÏησιμοποιείτε κανονικά το <app>Empathy</app> για τους υπόλοιπους " -"λογαÏιασμοÏÏ‚ σας." +"ΜποÏείτε να απενεÏγοποιήσετε Îνα λογαÏιασμό για αποφυγή σÏνδεσης του " +"<app>Empathy</app> χωÏίς πλήÏη αφαίÏεση του λογαÏιασμοÏ. ΜποÏεί να θÎλετε να " +"απενεÏγοποιήσετε και να επανεÏγοποιήσετε Îναν λογαÏιασμό αν θÎλετε μόνο να " +"συνδεθείτε στον λογαÏιασμό συγκεκÏιμÎνες φοÏÎÏ‚, αλλά να θÎλετε να " +"χÏησιμοποιήσετε ακόμα το <app>Empathy</app> για άλλους λογαÏιασμοÏÏ‚." #: C/disable-account.page:53(item/p) msgid "" @@ -1542,7 +1529,7 @@ msgid "" "external device such as a GPS." msgstr "" "Αν θÎλετε να δημοσιεÏσετε τη γεωγÏαφική σας θÎση, μποÏείτε να δοκιμάσετε με " -"μια εξωτεÏική συσκευή, Ï€.χ. GPS." +"μια εξωτεÏική συσκευή όπως Îνα GPS." #: C/geolocation-not-showing.page:48(note/p) msgid "" @@ -1662,7 +1649,7 @@ msgstr "Μόνο οι επαφÎÏ‚ σας βλÎπουν την τοποθεσί #: C/geolocation-supported.page:7(info/desc) msgid "Services that supports geolocation and compatibility." -msgstr "ΥπηÏεσίες που υποστηÏίζουν τον εντοπισμό τοποθεσίας. Συμβατότητα." +msgstr "ΥπηÏεσίες που υποστηÏίζουν τον εντοπισμό τοποθεσίας και συμβατότητα." #: C/geolocation-supported.page:31(page/title) msgid "Supported services" @@ -1748,7 +1735,7 @@ msgid "" "position, select the appropriate option in the <gui>Location sources</gui> " "section." msgstr "" -"Αν διαθÎτετε μια εξωτεÏική συσκευή (Ï€.χ. GPS), ή αν θÎλετε να στÎλνετε πιο " +"Αν διαθÎτετε μια εξωτεÏική συσκευή όπως GPS, ή αν θÎλετε να στÎλνετε πιο " "ακÏιβή στοιχεία για την τοποθεσία σας, σημειώστε την κατάλληλη επιλογή στην " "ενότητα <gui>ΠηγÎÏ‚ τοποθεσίας</gui>." @@ -2077,11 +2064,11 @@ msgid "" "search through your previous conversations, and share your desktop in just " "two clicks." msgstr "" -"Η χÏήση του <app>Empathy</app>, σας επιτÏÎπει να ομαδοποιείτε όλες τις " -"συζητήσεις σας σε Îνα παÏάθυÏο, ή να χÏησιμοποιείτε διαφοÏετικά παÏάθυÏα για " -"κάθε συζήτηση. Σας δίνει τη δυνατότητα να κάνετε εÏκολα αναζητήσεις στις " -"Ï€ÏοηγοÏμενες συζητήσεις σας και να μοιÏάζεστε την επιφάνεια εÏγασίας σας με " -"δÏο μόνο κλικ." +"ΧÏησιμοποιώντας το <app>Empathy</app>, μποÏείτε να ομαδοποιείτε όλες τις " +"συζητήσεις σε Îνα ενιαίο παÏάθυÏο, ή να Îχετε πολλαπλά παÏάθυÏα για " +"διαφοÏετικά είδη συνομιλιών, να αναζητήσετε εÏκολα τις Ï€ÏοηγοÏμενες " +"συζητήσεις σας και να μοιÏάζεστε την επιφάνεια εÏγασίας σας με δÏο μόνο " +"πατήματα." #: C/introduction.page:39(figure/title) msgid "<gui>Contact List</gui> window" @@ -2093,7 +2080,7 @@ msgstr "Βασικό παÏάθυÏο του <app>Empathy</app>" #: C/introduction.page:42(media/p) msgid "<app>Empathy</app> main window." -msgstr "Βασικό παÏάθυÏο του <app>Empathy</app>" +msgstr "Βασικό παÏάθυÏο του <app>Empathy</app>." #: C/irc-commands.page:7(info/desc) msgid "The supported IRC commands." @@ -2109,7 +2096,7 @@ msgid "" "help</input> and press <key>Enter</key>." msgstr "" "Για να δείτε τη λίστα των εντολών του IRC που υποστηÏίζονται, σε Îνα δωμάτιο " -"συζητήσεων πληκτÏολογήστε <input>/help</input> και πιÎστε το πλήκτÏο " +"συζητήσεων πληκτÏολογήστε <input>/help</input> και πιÎστε το πλήκτÏο " "<key>Enter</key>." #: C/irc-commands.page:24(note/p) @@ -2205,9 +2192,6 @@ msgid "Internet Relay Chat (IRC)" msgstr "Internet Relay Chat (IRC)" #: C/irc-manage.page:47(when/p) -#| msgid "" -#| "<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button" -#| "\">Install telepathy-idle</link>" msgid "" "<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-" "idle</link>" @@ -2541,9 +2525,6 @@ msgstr "Πατήστε <gui style=\"button\">ΔιαχωÏισμός</gui>." #. update your localized copy. The msgstr is not used at all. Set it to #. whatever you like once you have updated your copy of the file. #: C/overview.page:37(media) -#| msgctxt "_" -#| msgid "" -#| "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'" msgctxt "_" msgid "" "external ref='figures/video_overview.png' " @@ -2557,9 +2538,6 @@ msgstr "" #. update your localized copy. The msgstr is not used at all. Set it to #. whatever you like once you have updated your copy of the file. #: C/overview.page:38(media) -#| msgctxt "_" -#| msgid "" -#| "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'" msgctxt "_" msgid "" "external ref='figures/conf_overview.png' " @@ -2573,10 +2551,6 @@ msgstr "" #. update your localized copy. The msgstr is not used at all. Set it to #. whatever you like once you have updated your copy of the file. #: C/overview.page:39(media) -#| msgctxt "_" -#| msgid "" -#| "external ref='figures/gtk-remove.png' " -#| "md5='215e3a325a3dd619874e35c30a018bb6'" msgctxt "_" msgid "" "external ref='figures/croom_overview.png' " @@ -2593,10 +2567,6 @@ msgstr "Τι άμεσο μήνυμα είναι και πώς μποÏείτε Î msgid "Aruna S" msgstr "Aruna S" -#: C/overview.page:16(credit/name) C/share-desktop.page:18(credit/name) -msgid "Ekaterina Gerasimova" -msgstr "Ekaterina Gerasimova" - #: C/overview.page:24(page/title) msgid "Overview of instant messaging" msgstr "Επισκόπηση άμεσων μηνυμάτων" @@ -2614,21 +2584,19 @@ msgstr "" "κείμενο για στιγμιαία επικοινωνία μÎσω διαδικτÏου και του Ï„Î¿Ï€Î¹ÎºÎ¿Ï Î´Î¹ÎºÏ„Ïου. " "Ενώ μεÏικÎÏ‚ εφαÏμογÎÏ‚ IM δουλεÏουν με μόνο Îναν Ï„Ïπο λογαÏιασμοÏ, άλλες, " "συμπεÏιλαμβάνουν το <link xref=\"introduction\">Empathy</link>, που παÏÎχει " -"διευκολÏνσεις IM χÏησιμοποιώντας <link xref=\"add-" -"account\">λογαÏιασμοÏÏ‚</link> από διαφοÏετικοÏÏ‚ παÏόχους υπηÏεσίας. Κάποιοι " -"από αυτοÏÏ‚ υποστηÏίζουν ακόμα κλήση ήχου και βίντεο." +"διευκολÏνσεις IM χÏησιμοποιώντας <link xref=\"add-account\">λογαÏιασμοÏÏ‚</" +"link> από διαφοÏετικοÏÏ‚ παÏόχους υπηÏεσίας. Κάποιοι από αυτοÏÏ‚ υποστηÏίζουν " +"ακόμα κλήση ήχου και βίντεο." #: C/overview.page:42(td/p) msgid "Video Conference" msgstr "Βιντεοδιάσκεψη" #: C/overview.page:43(td/p) -#| msgid "Group conversations" msgid "Group chats" msgstr "ΟμαδικÎÏ‚ συνομιλίες" #: C/overview.page:44(td/p) -#| msgid "Favorite rooms" msgid "Chat rooms" msgstr "Δωμάτια συνομιλίας" @@ -2646,8 +2614,8 @@ msgstr "" "δωμάτια συνομιλιών, με δικτυακÎÏ‚ θÎσεις όπου άτομα με τα ίδια ενδιαφÎÏοντα " "συναντιοÏνται για να συζητήσουν. Ένα δημοφιλÎÏ‚ μÎσο σÏνδεσης σε πολλά " "δωμάτια συνομιλιών είναι οι διαδικτυακÎÏ‚ μεταγωγÎÏ‚, γνωστÎÏ‚ επίσης ως <link " -"xref=\"irc-manage\">IRC</link>. Το IRC παÏÎχει <link xref=\"irc-join-" -"room\">δημόσια</link> δωμάτια συνομιλίας, που είναι ανοικτά σε οποιονδήποτε " +"xref=\"irc-manage\">IRC</link>. Το IRC παÏÎχει <link xref=\"irc-join-room" +"\">δημόσια</link> δωμάτια συνομιλίας, που είναι ανοικτά σε οποιονδήποτε " "δημιουÏγήσει Îναν λογαÏιασμό στον εξυπηÏετητή IRC και ιδιωτικά δωμάτια " "συνομιλίας, που <link xref=\"irc-join-pwd\">Ï€ÏοστατεÏονται με κωδικό</link> " "και ανοίγουν μόνο σε λίγους επιλεγμÎνους." @@ -2854,12 +2822,12 @@ msgid "" "An error message which says “<gui>Authentication failed</gui>†appears in " "the main window." msgstr "" -"Στο κÏÏιο παÏάθυÏο εμφανίζεται το μήνυμα λάθους «<gui>Η πιστοποίηση απÎτυχε</" -"gui>»." +"Στο κÏÏιο παÏάθυÏο εμφανίζεται το μήνυμα λάθους “<gui>Η πιστοποίηση " +"απÎτυχε</gui>â€." #: C/prob-conn-auth.page:36(page/title) msgid "I get a message that says “Authentication failedâ€" -msgstr "Λαμβάνω το μήνυμα «Η πιστοποίηση απÎτυχε»" +msgstr "Λαμβάνω το μήνυμα “Η πιστοποίηση απÎτυχεâ€" #: C/prob-conn-auth.page:38(page/p) msgid "" @@ -2901,19 +2869,19 @@ msgstr "" #: C/prob-conn-name.page:9(info/title) msgctxt "link:error-msg" msgid "“Name in useâ€" -msgstr "“Όνομα σε χÏήση\"" +msgstr "“Όνομα σε χÏήσηâ€" #: C/prob-conn-name.page:10(info/desc) msgid "" "An error message which says “<gui>Name in use</gui>†appears in the main " "window." msgstr "" -"Στο κÏÏιο παÏάθυÏο εμφανίζεται το μήνυμα λάθους \"<gui>Το όνομα " -"χÏησιμοποιείται ήδη</gui>\"." +"Στο κÏÏιο παÏάθυÏο εμφανίζεται το μήνυμα λάθους “<gui>Το όνομα " +"χÏησιμοποιείται ήδη</gui>â€." #: C/prob-conn-name.page:33(page/title) msgid "I get a message that says “Name in useâ€" -msgstr "Λαμβάνω το μήνυμα «Το όνομα χÏησιμοποιείται ήδη»" +msgstr "Λαμβάνω το μήνυμα “Το όνομα χÏησιμοποιείται ήδηâ€" #: C/prob-conn-name.page:35(page/p) msgid "" @@ -2952,11 +2920,11 @@ msgid "" "An error message which says “<gui>Network error</gui>†appears in the main " "window." msgstr "" -"Στο κÏÏιο παÏάθυÏο εμφανίζεται το μήνυμα λάθους «<gui>Σφάλμα δικτÏου</gui>»." +"Στο κÏÏιο παÏάθυÏο εμφανίζεται το μήνυμα λάθους “<gui>Σφάλμα δικτÏου</gui>â€." #: C/prob-conn-neterror.page:34(page/title) msgid "I get a message that says “Network errorâ€" -msgstr "Λαμβάνω το μήνυμα «Σφάλμα δικτÏου»" +msgstr "Λαμβάνω το μήνυμα “Σφάλμα δικτÏουâ€" #: C/prob-conn-neterror.page:42(page/p) msgid "" @@ -3349,9 +3317,9 @@ msgid "" "support for the feature, installed on your system. <app>Vino</app>, the " "GNOME VNC server, has the required support." msgstr "" -"Για να είστε σε θÎση να μοιÏάσετε την επιφάνεια εÏγασίας σας, χÏειάζεστε Îνα " -"διακομιστή VNC εγκατεστημÎνο στο σÏστημα σας, για την υποστήÏιξη αυτής της " -"λειτουÏγίας.Το <app>Vino</app>, ο διακομιστής VNC του GNOME, Îχει την " +"Για να είστε σε θÎση να μοιÏάσετε την επιφάνεια εÏγασίας σας, χÏειάζεστε να " +"Îχετε Îναν διακομιστή VNC που υποστηÏίζει αυτό το γνώÏισμα, εγκατεστημÎνο " +"στο σÏστημά σας. Το <app>Vino</app>, ο διακομιστής VNC του GNOME, Îχει την " "απαιτοÏμενη υποστήÏιξη." #: C/share-desktop.page:51(item/p) @@ -3572,15 +3540,15 @@ msgstr "" "Αν επιλÎξετε την κατάσταση <em>Εκτός σÏνδεσης</em>, θα αποσυνδεθείτε από " "όλους τους λογαÏιασμοÏÏ‚ σας." -#: C/video-call.page:10(info/desc) +#: C/video-call.page:11(info/desc) msgid "Start a video conversation with one of your contacts." msgstr "ΈναÏξη βιντεοσυζήτησης με τις επαφÎÏ‚ σας." -#: C/video-call.page:29(page/title) +#: C/video-call.page:37(page/title) msgid "Start a video conversation" msgstr "ΈναÏξη βιντεοκλήσης" -#: C/video-call.page:31(page/p) +#: C/video-call.page:39(page/p) msgid "" "If you have a webcam, you can call your contacts and have a video " "conversation with them. This feature only works with certain types of " @@ -3592,35 +3560,41 @@ msgstr "" "ότι ο συνομιλητής σας διαθÎτει και αυτός εφαÏμογή που υποστηÏίζει " "βιντεοκλήσεις." -#: C/video-call.page:38(item/p) +#: C/video-call.page:46(item/p) +#| msgid "" +#| "Select the contact you want to have the conversation, and from the menu " +#| "select <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 " -"next to the name of the contact you wish to call and choose <gui style=" +"Right-click on the contact that you want to call and select <gui style=" "\"menuitem\">Video Call</gui>." msgstr "" -"Από το παÏάθυÏο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type=" -"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</" -"media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλÎσετε, και " -"επιλÎξτε <gui style=\"menuitem\">Βιντεοκλήση</gui>. Εναλλακτικά, κάνετε δεξί " -"κλικ στο όνομα της επαφής και επιλÎξτε <gui>Βιντεοκλήση</gui>." +"Δεξιοπατήστε στην επαφή την οποία θÎλετε να καλÎσετε και επιλÎξτε <gui " +"style=\"menuitem\">Βιντεοκλήση</gui>." -#: C/video-call.page:55(note/p) +#: C/video-call.page:54(item/p) +#| msgid "" +#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>." +msgid "" +"To end the conversation, click on the <gui style=\"button\">hang up</gui> " +"button." +msgstr "" +"Για να τεÏματίσετε τη συνομιλία, πατήστε το κουμπί <gui " +"style=\"button\">Κλείσιμο</gui>." + +#: C/video-call.page:60(note/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>." msgstr "" "Για να μετατÏÎψετε μια βιντεοκλήση σε φωνητική συνομιλία, επιλÎξτε " "<guiseq><gui style=\"menu\">Βίντεο</gui><gui style=\"menuitem\">Βίντεο " -"ανενεÏγό</gui></guiseq>, ή πατήστε το κουμπί <media type=\"image\" mime=" -"\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</media> της " -"εÏγαλειοθήκης για να το αποεπιλÎξετε." +"ανενεÏγό</gui></guiseq>." -#: C/video-call.page:61(section/title) +#: C/video-call.page:65(section/title) msgid "Start a video conversation with a meta-contact" msgstr "ΈναÏξη βιντεοσυζήτησης με μια μετα-επαφή" -#: C/video-call.page:69(item/p) +#: C/video-call.page:73(item/p) msgid "" "Select the contact you want to have the conversation, and from the menu " "select <gui style=\"menuitem\">Video Call</gui>." @@ -3628,6 +3602,45 @@ msgstr "" "ΕπιλÎξτε την επαφή με την οποία θÎλετε να συζητήσετε, και από το Î¼ÎµÎ½Î¿Ï " "επιλÎξτε <gui style=\"menuitem\">Βιντεοκλήση</gui>." +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/empathy-logo.png' " +#~ "md5='1afc419a644e90b16393807e35cb5cb2'" +#~ msgstr "" +#~ "external ref='figures/empathy-logo.png' " +#~ "md5='1afc419a644e90b16393807e35cb5cb2'" + +#~ msgid "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png" +#~ "\"> Empathy Internet Messenger logo </media> Empathy Internet Messenger" +#~ msgstr "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png" +#~ "\"> Λογότυπο του ΑποστολÎα άμεσων μηνυμάτων Empathy</media> ΑποστολÎας " +#~ "άμεσων μηνυμάτων Empathy" + +#~ 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\">Audio Call</gui>." +#~ msgstr "" +#~ "Από το παÏάθυÏο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type=" +#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</" +#~ "media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλÎσετε, και " +#~ "επιλÎξτε <gui style=\"menuitem\">Φωνητική κλήση</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 " +#~ "next to the name of the contact you wish to call and choose <gui style=" +#~ "\"menuitem\">Video Call</gui>." +#~ msgstr "" +#~ "Από το παÏάθυÏο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type=" +#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</" +#~ "media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλÎσετε, και " +#~ "επιλÎξτε <gui style=\"menuitem\">Βιντεοκλήση</gui>. Εναλλακτικά, κάνετε " +#~ "δεξί κλικ στο όνομα της επαφής και επιλÎξτε <gui>Βιντεοκλήση</gui>." + #~ msgid "milo@ubuntu.com" #~ msgstr "milo@ubuntu.com" diff --git a/help/es/es.po b/help/es/es.po index c0c5072d2..96ef4884f 100644 --- a/help/es/es.po +++ b/help/es/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy-help.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-03 12:24+0000\n" -"PO-Revision-Date: 2013-02-04 17:39+0100\n" +"POT-Creation-Date: 2013-06-23 17:39+0000\n" +"PO-Revision-Date: 2013-06-24 16:27+0200\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "Language: \n" @@ -21,40 +21,12 @@ msgstr "" msgctxt "_" msgid "translator-credits" msgstr "" -"Daniel Mustieles <daniel.mustieles@gmail.com>, 2012\n" +"Daniel Mustieles <daniel.mustieles@gmail.com>, 2012, 2013\n" "Jorge González <jorgegonz@svn.gnome.org>, 2008-2010" -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#. -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/index.page:28(media) -msgctxt "_" -msgid "" -"external ref='figures/empathy-logo.png' " -"md5='1afc419a644e90b16393807e35cb5cb2'" -msgstr "" -"external ref='figures/empathy-logo.png' " -"md5='1afc419a644e90b16393807e35cb5cb2'" - -#: C/index.page:7(info/title) -msgctxt "link" -msgid "Empathy Internet Messenger" -msgstr "MensajerÃa para Internet Empathy" - -#: C/index.page:8(info/title) -msgctxt "text" -msgid "Empathy Internet Messenger" -msgstr "MensajeriÌa para Internet Empathy" - -#: C/index.page:19(credit/name) C/add-account.page:21(credit/name) -#: C/audio-call.page:19(credit/name) C/audio-video.page:17(credit/name) -#: C/create-account.page:19(credit/name) +#: C/index.page:20(credit/name) C/add-account.page:21(credit/name) +#: C/audio-call.page:22(credit/name) C/audio-video.page:17(credit/name) +#: C/create-account.page:20(credit/name) #: C/disable-account.page:21(credit/name) #: C/favorite-rooms.page:14(credit/name) C/geolocation.page:17(credit/name) #: C/geolocation-not-showing.page:17(credit/name) @@ -71,20 +43,20 @@ msgstr "MensajeriÌa para Internet Empathy" #: C/irc-start-conversation.page:15(credit/name) #: C/link-contacts.page:15(credit/name) C/prev-conv.page:17(credit/name) #: C/prob-conn-acctdisabled.page:19(credit/name) -#: C/prob-conn-auth.page:21(credit/name) C/prob-conn-name.page:18(credit/name) -#: C/prob-conn-neterror.page:19(credit/name) +#: C/prob-conn-auth.page:22(credit/name) C/prob-conn-name.page:19(credit/name) +#: C/prob-conn-neterror.page:20(credit/name) #: C/remove-account.page:19(credit/name) C/salut-protocol.page:18(credit/name) #: C/send-file.page:21(credit/name) C/set-custom-status.page:19(credit/name) -#: C/share-desktop.page:14(credit/name) C/status-icons.page:16(credit/name) -#: C/video-call.page:22(credit/name) +#: C/share-desktop.page:14(credit/name) C/status-icons.page:17(credit/name) +#: C/video-call.page:25(credit/name) msgid "Milo Casagrande" msgstr "Milo Casagrande" -#: C/index.page:23(license/p) C/account-irc.page:20(license/p) -#: C/account-jabber.page:18(license/p) C/accounts-window.page:22(license/p) +#: C/index.page:25(license/p) C/account-irc.page:21(license/p) +#: C/account-jabber.page:18(license/p) C/accounts-window.page:21(license/p) #: C/add-account.page:29(license/p) C/add-contact.page:22(license/p) -#: C/audio-call.page:23(license/p) C/audio-video.page:21(license/p) -#: C/change-status.page:28(license/p) C/create-account.page:23(license/p) +#: C/audio-call.page:31(license/p) C/audio-video.page:21(license/p) +#: C/change-status.page:28(license/p) C/create-account.page:29(license/p) #: C/disable-account.page:29(license/p) C/favorite-rooms.page:18(license/p) #: C/geolocation.page:21(license/p) #: C/geolocation-not-showing.page:21(license/p) @@ -98,116 +70,86 @@ msgstr "Milo Casagrande" #: C/irc-join-room.page:20(license/p) C/irc-manage.page:28(license/p) #: C/irc-nick-password.page:22(license/p) C/irc-send-file.page:20(license/p) #: C/irc-start-conversation.page:19(license/p) -#: C/link-contacts.page:19(license/p) C/overview.page:20(license/p) +#: C/link-contacts.page:23(license/p) C/overview.page:21(license/p) #: C/prev-conv.page:25(license/p) C/prob-conn-acctdisabled.page:23(license/p) -#: C/prob-conn-auth.page:25(license/p) C/prob-conn-name.page:22(license/p) -#: C/prob-conn-neterror.page:23(license/p) C/prob-conn.page:18(license/p) +#: C/prob-conn-auth.page:26(license/p) C/prob-conn-name.page:23(license/p) +#: C/prob-conn-neterror.page:24(license/p) C/prob-conn.page:18(license/p) #: C/remove-account.page:23(license/p) C/salut-protocol.page:22(license/p) #: C/send-file.page:25(license/p) C/send-message.page:21(license/p) #: C/set-custom-status.page:23(license/p) C/share-desktop.page:22(license/p) -#: C/status-icons.page:24(license/p) C/video-call.page:26(license/p) +#: C/status-icons.page:25(license/p) C/video-call.page:34(license/p) msgid "Creative Commons Share Alike 3.0" msgstr "Creative Commons Compartir Igual 3.0" -#: C/index.page:27(page/title) +#: C/index.page:28(info/desc) +#| msgid "" +#| "<app>Empathy</app> is an instant messaging application for the GNOME " +#| "Desktop. It supports text messaging, voice & video calls, file " +#| "transfers, and all the most used messaging systems such as MSN and Google " +#| "Talk." msgid "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> " -"Empathy Internet Messenger logo </media> Empathy Internet Messenger" +"Empathy is the instant messenging application for GNOME. It supports text, " +"voice and video chat over many protocols." msgstr "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png" -"\">Logotipo de la mensajerÃa para Internet Empathy</media> MensajerÃa para " -"Internet Empathy" +"Empathy es la aplicación de mensajerÃa instantánea para GNOME. Soporta " +"mensajes de texto, llamadas de voz y de vÃdeo sobre varios protocolos." + +#: C/index.page:30(info/title) +msgctxt "link" +msgid "Empathy" +msgstr "Empathy" + +#: C/index.page:31(info/title) +msgctxt "text" +msgid "Empathy" +msgstr "Empathy" + +#: C/index.page:34(page/title) +#| msgid "<_:media-1/> Empathy Internet Messenger" +msgid "<_:media-1/> Empathy" +msgstr "<_:media-1/> Empathy" -#: C/index.page:35(section/title) +#: C/index.page:40(section/title) msgid "Account Management" msgstr "Gestión de cuentas" -#: C/index.page:39(section/title) +#: C/index.page:44(section/title) msgid "Contact Management" msgstr "Gestión de contactos" -#: C/index.page:43(section/title) +#: C/index.page:48(section/title) msgid "Text Conversations" msgstr "Conversaciones de texto" -#: C/index.page:47(section/title) +#: C/index.page:52(section/title) msgid "Audio and Video Conversations" msgstr "Conversaciones de sonido y vÃdeo" -#: C/index.page:51(section/title) +#: C/index.page:56(section/title) msgid "Advanced Actions" msgstr "Acciones avanzadas" -#: C/index.page:55(section/title) C/irc-manage.page:64(section/title) +#: C/index.page:60(section/title) C/irc-manage.page:64(section/title) msgid "Common Problems" msgstr "Problemas comunes" -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/account-irc.page:106(media) -msgctxt "_" -msgid "" -"external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'" -msgstr "" -"external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'" - -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#. -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#. -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#. -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/account-irc.page:109(media) C/prob-conn-auth.page:58(media) -#: C/prob-conn-name.page:44(media) C/prob-conn-neterror.page:59(media) -msgctxt "_" -msgid "" -"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'" -msgstr "" -"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'" - -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/account-irc.page:112(media) -msgctxt "_" -msgid "" -"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'" -msgstr "" -"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'" - -#: C/account-irc.page:8(info/desc) +#: C/account-irc.page:9(info/desc) msgid "Additional information necessary for connecting to IRC networks." msgstr "Información adicional necesaria para conectarse a redes IRC." -#: C/account-irc.page:16(credit/name) C/account-jabber.page:14(credit/name) -#: C/accounts-window.page:18(credit/name) C/add-account.page:25(credit/name) +#: C/account-irc.page:17(credit/name) C/account-jabber.page:14(credit/name) +#: C/accounts-window.page:17(credit/name) C/add-account.page:25(credit/name) #: C/disable-account.page:25(credit/name) #: C/import-account.page:27(credit/name) C/prev-conv.page:21(credit/name) -#: C/status-icons.page:20(credit/name) +#: C/status-icons.page:21(credit/name) msgid "Shaun McCance" msgstr "Shaun McCance" -#: C/account-irc.page:31(page/title) +#: C/account-irc.page:32(page/title) msgid "IRC account details" msgstr "Detalles de la cuenta IRC" -#: C/account-irc.page:33(page/p) +#: C/account-irc.page:34(page/p) msgid "" "IRC accounts require different information than many other types of " "accounts. To create an IRC account, you must specify at least an IRC network " @@ -219,7 +161,7 @@ msgstr "" "apodo. Esta página detalla la información que puede proporcionar para una " "cuenta de IRC." -#: C/account-irc.page:39(note/p) C/irc-manage.page:42(note/p) +#: C/account-irc.page:40(note/p) C/irc-manage.page:42(note/p) msgid "" "You must have the <sys>telepathy-idle</sys> package installed to use IRC in " "<app>Empathy</app>." @@ -227,11 +169,11 @@ msgstr "" "Debe tener instalado el paquete <sys>telepathy-idle</sys> para poder usar el " "IRC en <app>Empathy</app>." -#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title) +#: C/account-irc.page:46(item/title) C/account-irc.page:124(item/title) msgid "<gui>Network</gui>" msgstr "<gui>Red</gui>" -#: C/account-irc.page:46(item/p) +#: C/account-irc.page:47(item/p) msgid "" "IRC is an open system that allows people to run separate IRC networks. Each " "network is distinct and has its own users and chat rooms. <app>Empathy</app> " @@ -244,11 +186,11 @@ msgstr "" "<gui>Red</gui>. Puede añadir redes adicionales. Consulte debajo la <link " "xref=\"#networks\"/>." -#: C/account-irc.page:53(item/title) +#: C/account-irc.page:54(item/title) msgid "<gui>Nickname</gui>" msgstr "<gui>Alias</gui>" -#: C/account-irc.page:54(item/p) +#: C/account-irc.page:55(item/p) msgid "" "Your nickname is your unique name on the IRC network. Only one person on a " "network may use a given nickname. If you get an error message that says " @@ -259,11 +201,11 @@ msgstr "" "usar cierto apodo. Si obtiene un mensaje que dice <link xref=\"prob-conn-name" "\" role=\"error-msg\"/> deberá cambiar su apodo." -#: C/account-irc.page:60(item/title) +#: C/account-irc.page:61(item/title) msgid "<gui>Password</gui>" msgstr "<gui>Contraseña</gui>" -#: C/account-irc.page:61(item/p) +#: C/account-irc.page:62(item/p) msgid "" "Some servers, particularly those on private networks, require a password to " "connect. If you are authorized to use the network, the network " @@ -273,11 +215,11 @@ msgstr "" "una contraseña para la conexión. Si está autorizado a usar la red, los " "administradores de la red le proporcionarán una contraseña." -#: C/account-irc.page:65(note/title) +#: C/account-irc.page:66(note/title) msgid "NickServ Passwords" msgstr "Contraseñas NickServ" -#: C/account-irc.page:66(note/p) +#: C/account-irc.page:67(note/p) msgid "" "On some networks, nicknames can be registered using a service known as " "NickServ. <app>Empathy</app> does not directly support nickname passwords. " @@ -293,11 +235,11 @@ msgstr "" "permitiéndole usar este campo para identificarse con NickServ. Para obtener " "más información consulte la <link xref=\"irc-nick-password\"/>." -#: C/account-irc.page:76(item/title) +#: C/account-irc.page:77(item/title) msgid "<gui>Real name</gui>" msgstr "<gui>Nombre real</gui>" -#: C/account-irc.page:77(item/p) +#: C/account-irc.page:78(item/p) msgid "" "You can provide your real name in addition to your nickname. Other users " "will be able to see this when they view your information." @@ -305,11 +247,11 @@ msgstr "" "Puede proporcionar su nombre real además de su apodo. Otros usuarios podrán " "verlo al ver su información." -#: C/account-irc.page:81(item/title) +#: C/account-irc.page:82(item/title) msgid "<gui>Quit message</gui>" msgstr "<gui>Mensaje de salida</gui>" -#: C/account-irc.page:82(item/p) +#: C/account-irc.page:83(item/p) msgid "" "When you go offline, a quit message is sent to all the chat rooms you’re in " "and to all the users you’re having a private conversation with. Use this " @@ -319,16 +261,16 @@ msgstr "" "en las que está y a todos los usuarios con los que tiene una conversación " "privada. Use este campo para proporcionar un mensaje personalizado." -#: C/account-irc.page:94(info/title) +#: C/account-irc.page:95(info/title) msgctxt "link" msgid "IRC Networks" msgstr "Redes IRC" -#: C/account-irc.page:97(section/title) +#: C/account-irc.page:98(section/title) msgid "Networks" msgstr "Redes" -#: C/account-irc.page:99(section/p) +#: C/account-irc.page:100(section/p) msgid "" "<app>Empathy</app> includes a list of popular IRC networks. If you wish to " "another IRC network, you can add it to the list. You can also modify " @@ -338,52 +280,52 @@ msgstr "" "otra red IRC puede añadirla a la lista. También puede modificar y quitar " "redes de la lista." -#: C/account-irc.page:104(item/p) -msgid "" -"To add a network to the list, click <media type=\"image\" mime=\"image/png\" " -"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>." -msgstr "" -"Para añadir una red a la lista pulse <media type=\"image\" mime=\"image/png" -"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Añadir</media>." +#: C/account-irc.page:108(media/span) +msgid "Add" +msgstr "Añadir" -#: C/account-irc.page:107(item/p) +#: C/account-irc.page:105(item/p) +msgid "To add a network to the list, click <_:media-1/>." +msgstr "Para añadir una red a la lista, pulse <_:media-1/>." + +#: C/account-irc.page:112(media/span) +msgid "Edit" +msgstr "Editar" + +#: C/account-irc.page:109(item/p) msgid "" -"To modify a network in the list, select the network and click <media type=" -"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" " -"height=\"16\">Edit</media>." +"To modify a network in the list, select the network and click <_:media-1/>." msgstr "" -"Para modificar una red de la lista seleccione la red y pulse <media type=" -"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" " -"height=\"16\">Editar</media>." +"Para modificar una red de la lista seleccione la red y pulse <_:media-1/>." + +#: C/account-irc.page:116(media/span) +msgid "Remove" +msgstr "Quitar" -#: C/account-irc.page:110(item/p) +#: C/account-irc.page:113(item/p) msgid "" -"To remove a network from the list, select the network and click <media type=" -"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" " -"height=\"16\">Remove</media>." +"To remove a network from the list, select the network and click <_:media-1/>." msgstr "" -"Para quitar una red de la lista seleccione y pulse <media type=\"image\" " -"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16" -"\">Quitar</media>." +"Para quitar una red de la lista seleccione la red y pulse <_:media-1/>." -#: C/account-irc.page:115(section/p) +#: C/account-irc.page:119(section/p) msgid "" "When adding or modifying a network, you can enter the following information:" msgstr "" "Al añadir o modificar una red puede introducir la siguiente información:" -#: C/account-irc.page:121(item/p) +#: C/account-irc.page:125(item/p) msgid "" "This is the name of the network as you want it to appear in the list of " "networks." msgstr "" "Este es el nombre de la red como quiere que aparezca en la lista de redes." -#: C/account-irc.page:125(item/title) +#: C/account-irc.page:129(item/title) msgid "<gui>Charset</gui>" msgstr "<gui>Conjunto de caracteres</gui>" -#: C/account-irc.page:126(item/p) +#: C/account-irc.page:130(item/p) msgid "" "This specifies the character encoding that is typically used on this " "network. A character encoding is a specific way of recording characters " @@ -397,7 +339,7 @@ msgstr "" "caracteres y debe usar la misma configuración de caracteres que el resto de " "usuarios para poder ver sus mensajes correctamente." -#: C/account-irc.page:135(item/p) +#: C/account-irc.page:139(item/p) msgid "" "By default, <app>Empathy</app> uses UTF-8, a modern character encoding that " "can handle text from most of the world's languages. Another common encoding " @@ -408,11 +350,11 @@ msgstr "" "del mundo. Otra configuración de caracteres común para inglés y otros " "idiomas occidentales es ISO-8859-1." -#: C/account-irc.page:141(item/title) +#: C/account-irc.page:145(item/title) msgid "<gui>Servers</gui>" msgstr "<gui>Servidores</gui>" -#: C/account-irc.page:142(item/p) +#: C/account-irc.page:146(item/p) msgid "" "An IRC network may have many servers you can connect to. When you are " "connected to a server on a particular network, you can communicate with all " @@ -425,7 +367,7 @@ msgstr "" "añadir y quitar servidores para esa red usando los botones <gui>Añadir</gui> " "y <gui>Quitar</gui>." -#: C/account-irc.page:147(item/p) +#: C/account-irc.page:151(item/p) msgid "" "When a server is selected, click the field under <gui>Server</gui> or " "<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys " @@ -436,7 +378,7 @@ msgstr "" "izquierda y derecha para dar el foco al campo y pulse la barra espaciadora " "para comenzar a editarlo." -#: C/account-irc.page:151(item/p) +#: C/account-irc.page:155(item/p) msgid "" "Select the check box in the <gui>SSL</gui> column to encrypt all " "communication with a server. Note that this does not prevent other users on " @@ -558,15 +500,15 @@ msgstr "" "servidores Jabber necesitará introducir manualmente ajustes de servidor. Su " "proveedor Jabber deberá proporcionar esos ajustes." -#: C/accounts-window.page:11(info/desc) +#: C/accounts-window.page:10(info/desc) msgid "Add, modify, and delete accounts." msgstr "Añadir, modificar y eliminar cuentas." -#: C/accounts-window.page:33(page/title) +#: C/accounts-window.page:32(page/title) msgid "Accounts Window" msgstr "Ventana de cuentas" -#: C/accounts-window.page:35(page/p) +#: C/accounts-window.page:34(page/p) msgid "" "The <gui>Accounts</gui> window allows you to add, modify, and delete " "accounts." @@ -574,11 +516,11 @@ msgstr "" "La ventana <gui>Cuentas</gui> le permite añadir, modificar y eliminar " "cuentas." -#: C/accounts-window.page:43(section/title) +#: C/accounts-window.page:42(section/title) msgid "Account Details" msgstr "Detalles de la cuenta" -#: C/accounts-window.page:44(section/p) +#: C/accounts-window.page:43(section/p) msgid "" "For most types of accounts, you can simply enter a login ID and a password. " "Certain accounts or account types, however, may require additional " @@ -676,8 +618,8 @@ msgstr "Añadir alguien a la lista de contactos." #: C/add-contact.page:18(credit/name) C/change-status.page:24(credit/name) #: C/prob-conn-acctdisabled.page:15(credit/name) -#: C/prob-conn-auth.page:17(credit/name) -#: C/prob-conn-neterror.page:15(credit/name) C/prob-conn.page:14(credit/name) +#: C/prob-conn-auth.page:18(credit/name) +#: C/prob-conn-neterror.page:16(credit/name) C/prob-conn.page:14(credit/name) #: C/send-file.page:17(credit/name) C/send-message.page:17(credit/name) msgid "Phil Bull" msgstr "Phil Bull" @@ -730,74 +672,55 @@ msgstr "" "Para añadir una persona nueva a su lista de contactos necesita estar " "conectado a Internet y a su cuenta." -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#. -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#. -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/audio-call.page:36(media) C/audio-video.page:70(media) -#: C/video-call.page:39(media) -msgctxt "_" -msgid "" -"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'" -msgstr "" -"external ref='figures/camera-web.png' md5='8166b4372f25b78cbf5a64fe2eac2ce5'" - -#: C/audio-call.page:9(info/desc) +#: C/audio-call.page:10(info/desc) msgid "Call your contacts over the Internet." msgstr "Llamar a sus contactos a través de Internet." -#: C/audio-call.page:27(page/title) +#: C/audio-call.page:26(credit/name) C/create-account.page:24(credit/name) +#: C/overview.page:17(credit/name) C/share-desktop.page:18(credit/name) +#: C/video-call.page:29(credit/name) +msgid "Ekaterina Gerasimova" +msgstr "Ekaterina Gerasimova" + +#: C/audio-call.page:35(page/title) msgid "Start an audio conversation" msgstr "Iniciar una conversación de sonido" -#: C/audio-call.page:29(page/p) +#: C/audio-call.page:37(page/p) msgid "" "You can call your contacts and have an audio conversation with them. This " -"features only works with certain types of accounts, and it requires the " -"other person to have an application that supports audio calls." +"features only works with certain types of accounts and it requires the other " +"person to have an application that supports audio calls." msgstr "" -"Puede llamar a sus contactos y tener conversaciones de sonido con ellos. " -"Esta caracterÃstica sólo funciona con cierto tipo de cuentas y requiere que " -"la otra persona tenga una aplicación que soporte llamadas de sonido." +"Puede llamar a sus contactos y tener conversaciones de voz con ellos. Esta " +"caracterÃstica sólo funciona con cierto tipo de cuentas y requiere que la " +"otra persona tenga una aplicación que soporte llamadas de voz." -#: C/audio-call.page:34(item/p) +#: C/audio-call.page:43(item/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=" +"Right-click on the contact that you want to call and select <gui style=" "\"menuitem\">Audio Call</gui>." msgstr "" -"Desde la ventana <gui>Lista de contactos</gui> pulse el icono de <media type=" -"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">videollamada</" -"media> junto al nombre del contacto al que quiere llamar y seleccione <gui " -"style=\"menuitem\">Llamada de voz</gui>." +"Pulse con el botón derecho sobre el contacto al que quiere llamar y " +"seleccione <gui style=\"menuitem\">Llamada de voz</gui>." -#: C/audio-call.page:42(item/p) C/video-call.page:44(item/p) +#: C/audio-call.page:49(item/p) C/video-call.page:50(item/p) msgid "" -"A new window will open. When the connection is established, you will see " -"<gui>Connected</gui> at the bottom of the window, along with the total " -"conversation time." +"A new window will open. When the connection is established, you will see the " +"total conversation time at the bottom of the window." msgstr "" -"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá escrito, " -"en la parte inferior de la ventana, <gui>Connectado</gui> y el tiempo total " -"de conversación." +"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá el " +"tiempo total de conversación en la parte inferior de la ventana." -#: C/audio-call.page:48(item/p) C/video-call.page:49(item/p) -msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>." +#: C/audio-call.page:55(item/p) +msgid "" +"To end the conversation, click the <gui style=\"button\">hand up</gui> " +"button." msgstr "" -"Para finalizar una conversación pulse <gui style=\"button\">Colgar</gui>." +"Para finalizar una conversación pulse el botón <gui style=\"button\">Colgar</" +"gui>." -#: C/audio-call.page:55(note/p) +#: C/audio-call.page:63(note/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>." @@ -806,19 +729,19 @@ msgstr "" "<guiseq><gui style=\"menu\">VÃdeo</gui><gui style=\"menuitem\">VÃdeo " "encendido</gui></guiseq>." -#: C/audio-call.page:63(section/title) +#: C/audio-call.page:71(section/title) msgid "Start an audio conversation with a meta-contact" msgstr "Iniciar una conversación con un metacontacto" -#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p) -#: C/video-call.page:64(item/p) +#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p) +#: C/video-call.page:68(item/p) msgid "" "From the <gui>Contact List</gui> window, right-click on the meta-contact." msgstr "" "Desde la ventana <gui>Lista de contactos</gui>, pulse con el botón derecho " "sobre el metacontacto." -#: C/audio-call.page:71(item/p) +#: C/audio-call.page:79(item/p) msgid "" "Select the contact you want to have the conversation, and from the menu " "select <gui style=\"menuitem\">Audio Call</gui>." @@ -826,8 +749,8 @@ msgstr "" "Seleccione el contacto con el que quiere tener la conversación y, del menú, " "seleccione <gui style=\"menuitem\">Llamada de voz</gui>." -#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p) -#: C/video-call.page:76(note/p) +#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p) +#: C/video-call.page:80(note/p) msgid "" "To recognize if a contact is a <em>meta-contact</em>, move your mouse on a " "contact in the <gui>Contact List</gui> window, and stop over it for a " @@ -845,12 +768,17 @@ msgstr "" #. whatever you like once you have updated your copy of the file. #: C/audio-video.page:58(media) msgctxt "_" -msgid "" -"external ref='figures/audio-input-microphone.png' " -"md5='8d89026b66a263a3bc5b1f0665948567'" -msgstr "" -"external ref='figures/audio-input-microphone.png' " -"md5='8d89026b66a263a3bc5b1f0665948567'" +msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'" +msgstr "external ref='figures/audio-input-microphone.png' md5='__failed__'" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/audio-video.page:70(media) +msgctxt "_" +msgid "external ref='figures/camera-web.png' md5='__failed__'" +msgstr "external ref='figures/camera-web.png' md5='__failed__'" #: C/audio-video.page:8(info/desc) msgid "" @@ -1009,11 +937,11 @@ msgstr "Groupwise" msgid "ICQ" msgstr "ICQ" -#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title) +#: C/audio-video.page:165(td/p) C/create-account.page:49(section/title) msgid "IRC" msgstr "IRC" -#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title) +#: C/audio-video.page:170(td/p) C/create-account.page:79(section/title) msgid "Jabber" msgstr "Jabber" @@ -1029,7 +957,7 @@ msgstr "myspace" msgid "qq" msgstr "qq" -#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title) +#: C/audio-video.page:190(td/p) C/create-account.page:97(section/title) msgid "People Nearby" msgstr "Gente cerca" @@ -1041,7 +969,7 @@ msgstr "sametime" msgid "silc" msgstr "silc" -#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title) +#: C/audio-video.page:205(td/p) C/create-account.page:110(section/title) msgid "SIP" msgstr "SIP" @@ -1100,64 +1028,114 @@ msgstr "" "Si no usa su equipo durante un rato, o si se activa el salvapantallas, el " "estado se cambiará automáticamente a Ausente." -#: C/create-account.page:9(info/desc) -msgid "Register for an account with one of the supported messaging services." -msgstr "Registre una cuenta con uno de los servicios de mensajerÃa soportados." +#: C/create-account.page:32(info/desc) +#| msgid "" +#| "Register for an account with one of the supported messaging services." +msgid "Create an account for one of the supported messaging services." +msgstr "Cree una cuenta en uno de los servicios de mensajerÃa soportados." -#: C/create-account.page:34(page/title) -msgid "Register for a new account" +#: C/create-account.page:36(page/title) +#| msgid "Register for a new account" +msgid "Register a new account" msgstr "Registrar una cuenta nueva" -#: C/create-account.page:36(page/p) -msgid "" -"Most account types require you to create an account with a account provider " -"before you can connect using instant messaging applications like " -"<app>Empathy</app>. With some account providers, you can use <app>Empathy</" -"app> to register for a new account, using the same steps as you would to " -"<link xref=\"add-account\">add an account</link>." +#: C/create-account.page:38(page/p) +#| msgid "" +#| "Most account types require you to create an account with a account " +#| "provider before you can connect using instant messaging applications like " +#| "<app>Empathy</app>. With some account providers, you can use " +#| "<app>Empathy</app> to register for a new account, using the same steps as " +#| "you would to <link xref=\"add-account\">add an account</link>." +msgid "" +"Most account types require you to create an account with a service provider " +"before you can use that account with instant messaging applications. You can " +"use <app>Empathy</app> to register for a new account with some account " +"providers using the same steps as you would to <link xref=\"add-account" +"\">add an account</link>." msgstr "" "Muchos tipos de cuenta requieren que cree una cuenta con un proveedor de " "cuentas antes de poder conectarse y usar aplicaciones de mensajerÃa " -"instantánea como <app>Empathy</app>. Con algunos proveedores de cuentas " -"puede usar <app>Empathy</app> para registrar una cuenta nueva, usando los " -"mismos pasos que seguirÃa en <link xref=\"add-account\">añadir una cuenta</" -"link>." +"instantánea. Con algunos proveedores de cuentas puede usar <app>Empathy</" +"app> para registrar una cuenta nueva, siguiendo los mismos pasos que " +"seguirÃa para <link xref=\"add-account\">añadir una cuenta</link>." -#: C/create-account.page:42(page/p) +#: C/create-account.page:44(page/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>." 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>." +"Once you create a new account, your account provider should give you a login " +"or a username and a password, as well as any additional information you need " +"to connect using <app>Empathy</app>." msgstr "" -"Esta página proporciona información acerca de crear una cuenta nueva para " -"varios tipos de cuenta. Su proveedor de cuentas deberÃa proporcionarle un ID " -"de inicio de sesión y una contraseña, asà como otra información adicional " -"que puede necesitar para conectarse con <app>Empathy</app>." +"Una vez que haya creado su nueva cuenta, su proveedor de cuentas deberÃa " +"proporcionarle un ID o un nombre de usuario de inicio de sesión y una " +"contraseña, asà como otra información adicional que puede necesitar para " +"conectarse usando <app>Empathy</app>." -#: C/create-account.page:47(section/title) +#: C/create-account.page:51(section/p) +msgid "" +"IRC networks require that you specify a nick (nickname) when you connect to " +"the server. Some IRC networks use a service, such as NickServ, to allow " +"users to <link xref=\"irc-nick-password\">protect their nick</link>. If you " +"did not register your nick or are unable to do so and another user is using " +"it, then you will need to choose a different one." +msgstr "" +"Las redes IRC requieren que especifique un alias (nick) cuando se conecta al " +"servidor. Algunas redes IRC usan un servicio, como NickServ, para permitir a " +"los usuarios <link xref=\"irc-nick-password\">proteger su nick</link>. Si no " +"registra su nick o no puede hacerlo y otra persona lo está usando, deberá " +"elegir otro diferente." + +#: C/create-account.page:57(section/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 "" +"Algunos servidores de IRC están protegidos con contraseña. Necesitará " +"conocer la contraseña para conectarse a esos servidores. Generalmente son " +"redes de IRC privadas." + +#: C/create-account.page:62(note/p) +msgid "" +"Many GNOME projects use <code>irc.gnome.org</code> for project-related " +"discussion." +msgstr "" +"Muchos proyectos de GNOME usan <code>irc.gnome.org</code> para discusiones " +"relacionadas con el proyecto." + +#: C/create-account.page:68(section/title) msgid "Facebook" msgstr "Facebook" -#: C/create-account.page:48(section/p) +#: C/create-account.page:70(section/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." msgid "" -"Facebook is one of the most-used social networks. It allows users to create " -"their own profile and to communicate with their friends." +"Facebook is one of the more popular social networks. It allows users to " +"create their own profile and to communicate with their friends." msgstr "" "Facebook es una de las redes sociales más usadas. Permite a los usuarios " "crear su propio perfil y comunicarse con sus amigos." -#: C/create-account.page:52(section/p) +#: C/create-account.page:73(section/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.facebook.com</link>." 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." +"new account from the website: <link href=\"https://www.facebook.com\">www." "facebook.com</link>." msgstr "" "Para usar Facebook para comunicarse con sus amigos necesita crear una cuenta " -"nueva desde el sitio web: <link href=\"http://www.facebook.com\">www." +"nueva desde el sitio web: <link href=\"https://www.facebook.com\">www." "facebook.com</link>." -#: C/create-account.page:62(section/p) +#: C/create-account.page:81(section/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, " @@ -1167,44 +1145,62 @@ msgstr "" "Jabber le permite elegir su proveedor de la cuenta y comunicarse con otros " "usuarios de Jabber, independientemente del proveedor de la cuenta." -#: C/create-account.page:66(section/p) +#: C/create-account.page:85(section/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.org/\">Jabber.org</link>." 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." -"org/\">Jabber.org</link>." +"org/\">jabber.org</link>." msgstr "" "Deberá crear una cuenta nueva con un proveedor Jabber. Existen muchos " "proveedores libres; un proveedor popular es <link href=\"http://register." -"jabber.org/\">Jabber.org</link>." +"jabber.org/\">jabber.org</link>." -#: C/create-account.page:71(note/p) +#: C/create-account.page:90(note/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 " +#| "password in <app>Empathy</app> to connect." 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 " -"password in <app>Empathy</app> to connect." +"If you use Gmail or Google+ Hangouts, you already have a Jabber account. Use " +"your Gmail address and password in <app>Empathy</app> to connect." msgstr "" -"Si usa Google Mail o Google Talk ya tiene una cuenta Jabber. Talk es un " -"servicio Jabber. Simplemente use en <app>Empathy</app> su dirección de " -"Google Mail y su contraseña para conectarse." +"Si usa Google Mail o Google+ Hangouts ya tiene una cuenta Jabber. " +"Simplemente use su dirección de GMail y su contraseña en <app>Empathy</app> " +"para conectarse." -#: C/create-account.page:80(section/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, " -"such as a wireless hotspot. It automatically finds all other users on the " -"network who are also using this service." +#: C/create-account.page:99(section/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, such as a wireless hotspot. It automatically finds all other " +#| "users on the network who are also using this service." +msgid "" +"This service works whenever you are connected to a local network, such as a " +"wireless hotspot, you do not need to create an account with service " +"providor, just set up your account through <app>Empathy</app>. It " +"automatically finds all other users on the network who are also using this " +"service." msgstr "" -"Para usar esta caracterÃstica no necesita crear una cuenta con un proveedor " -"de servicios. Este servicio funciona siempre que esté conectado a una red " -"local, tal como un punto inalámbrico. Automáticamente encuentra otros " -"usuarios en la red que estén usando este servicio." +"Este servicio funciona siempre que esté conectado a una red local, tal como " +"un punto inalámbrico; no es necesario crear una cuenta con un proveedor del " +"servicio, simplemente configure su cuenta en <app>Empathy</app>. " +"Automáticamente encuentra otros usuarios en la red que estén usando este " +"servicio." -#: C/create-account.page:85(section/p) -msgid "For more information, see <link xref=\"salut-protocol\"/>." +#: C/create-account.page:105(section/p) +#| msgid "For more information, see <link xref=\"salut-protocol\"/>." +msgid "" +"For more information, see the <link xref=\"salut-protocol\">salut protocol</" +"link>." msgstr "" -"Para obtener más información consulte la <link xref=\"salut-protocol\"/>." +"Para obtener más información consulte el <link xref=\"salut-protocol" +"\">protocolo salut</link>." -#: C/create-account.page:91(section/p) +#: C/create-account.page:112(section/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 " @@ -1216,17 +1212,7 @@ msgstr "" "Puede comunicarse con todos los usuarios SIP, independientemente del " "proveedor SIP que usen." -#: C/create-account.page:97(note/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 algunas diferencias, actualmente el servicio libre <link href=" -"\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> no " -"funciona con <app>Empathy</app>." - -#: C/create-account.page:102(section/p) +#: C/create-account.page:117(section/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." @@ -1235,67 +1221,43 @@ msgstr "" "equipo. Generalmente deberá suscribirse a un servicio de pago para usar esta " "caracterÃstica." -#: C/create-account.page:109(section/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 "" -"No necesita registrar una cuenta para usar el IRC. Aunque especifique un " -"apodo al añadir una cuenta IRC en <app>Empathy</app>, este apodo sólo se " -"establece cada vez que se conecta. Si otro usuario está usando el nombre, " -"deberá elegir un apodo nuevo." - -#: C/create-account.page:114(section/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 "" -"Algunas redes IRC usan un servicio llamado NickServ para permitir a los " -"usuarios proteger sus apodos. Para obtener más información consulte la <link " -"xref=\"irc-nick-password\"/>." - -#: C/create-account.page:117(section/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 "" -"Algunos servidores de IRC están protegidos con contraseña. Necesitará " -"conocer la contraseña para conectarse a esos servidores. Generalmente son " -"redes de IRC privadas." - -#: C/create-account.page:122(section/title) +#: C/create-account.page:123(section/title) msgid "Proprietary Services" msgstr "Servicios propietarios" -#: C/create-account.page:124(section/p) +#: C/create-account.page:125(section/p) +#| msgid "" +#| "There are many proprietary instant messaging services that have been " +#| "developed by different companies or organizations. <app>Empathy</app> " +#| "allows you to connect to an existing account for most popular services. " +#| "To create a new account with one of these services, you will need to " +#| "visit the service’s web site and agree to its terms of use." msgid "" "There are many proprietary instant messaging services that have been " "developed by different companies or organizations. <app>Empathy</app> allows " -"you to connect to an existing account for most popular services. To create a " -"new account with one of these services, you will need to visit the service’s " -"web site and agree to its terms of use." +"you to connect to an existing account for some of these services. To create " +"a new account with one of these services, you will need to visit the website " +"for the service." msgstr "" "Existen muchos servicios propietarios de mensajerÃa instantánea " "desarrollados por diferentes empresas u organizaciones. <app>Empathy</app> " -"le permite conectarse a una cuenta existente de los servicios más populares. " +"le permite conectarse a una cuenta existente de alguno de estos servicios. " "Para crear una cuenta nueva con uno de esos servicios deberá visitar el " -"servicio web del sitio y aceptar los términos de uso." +"sitio web del servicio." -#: C/create-account.page:132(item/p) +#: C/create-account.page:133(item/p) msgid "<link href=\"http://dashboard.aim.com/aim\">AIM</link>" msgstr "<link href=\"http://dashboard.aim.com/aim\">AIM</link>" -#: C/create-account.page:137(item/p) +#: C/create-account.page:136(item/p) msgid "<link href=\"https://www.icq.com/register/\">ICQ</link>" msgstr "<link href=\"https://www.icq.com/register/\">ICQ</link>" -#: C/create-account.page:142(item/p) +#: C/create-account.page:139(item/p) msgid "<link href=\"https://accountservices.passport.net\">MSN</link>" msgstr "<link href=\"https://accountservices.passport.net\">MSN</link>" -#: C/create-account.page:147(item/p) +#: C/create-account.page:142(item/p) msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>" msgstr "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>" @@ -2157,9 +2119,6 @@ msgid "Internet Relay Chat (IRC)" msgstr "Internet Relay Chat (IRC)" #: C/irc-manage.page:47(when/p) -#| msgid "" -#| "<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button" -#| "\">Install telepathy-idle</link>" msgid "" "<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-" "idle</link>" @@ -2387,19 +2346,23 @@ msgstr "" msgid "Merge and separate different contacts into a single one." msgstr "Unir y separar diferentes contactos en uno solo." -#: C/link-contacts.page:25(page/title) -msgid "Combine and separate contacts" -msgstr "Combinar y separar contactos" +#: C/link-contacts.page:19(credit/name) +msgid "Shobha Tyagi" +msgstr "Shobha Tyagi" + +#: C/link-contacts.page:29(page/title) +msgid "Link and unlink contacts" +msgstr "Enlazar y desenlazar contactos" -#: C/link-contacts.page:26(page/p) +#: C/link-contacts.page:30(page/p) msgid "" -"If one, or more, of your contacts has multiple accounts with different " -"messaging services, you can combine these contacts into a single one." +"If one or more of your contacts has multiple accounts with different " +"messaging services, you can combine these accounts into a single contact." msgstr "" -"Si uno o más de sus contactos tiene múltiples cuentas con diferentes " -"servicios de mensajerÃa, puede combinar esos contactos en uno solo." +"Si uno o más de sus contactos tienen varias cuentas con diferentes servicios " +"de mensajerÃa, puede combinar esas cuentas en uno sola." -#: C/link-contacts.page:30(page/p) +#: C/link-contacts.page:34(page/p) msgid "" "The resulting contact is called a <em>meta-contact</em>: a contact composed " "from different single contacts." @@ -2407,139 +2370,120 @@ msgstr "" "Al contacto resultante se le llama <em>metacontacto</em>: un contacto " "compuesto de diferentes contactos simples." -#: C/link-contacts.page:34(page/p) +#: C/link-contacts.page:38(page/p) msgid "" -"If you have a Jane Smith contact that is using three different messaging " -"services like:" +"Suppose you have a contact called Jane Smith who is using three different " +"messaging services like:" msgstr "" -"Si tiene un contacto Juan Pérez que usa tres servicios de mensajerÃa de " -"contactos como:" +"Suponga que tiene un contacto llamado Juan Pérez que usa tres servicios de " +"mensajerÃa de contactos como:" -#: C/link-contacts.page:40(item/p) +#: C/link-contacts.page:44(item/p) msgid "janes@facebook" msgstr "juan@facebook" -#: C/link-contacts.page:45(item/p) +#: C/link-contacts.page:49(item/p) msgid "jane.smith@gmail" msgstr "juan.perez@gmail" -#: C/link-contacts.page:50(item/p) +#: C/link-contacts.page:54(item/p) msgid "jane_smith@hotmail" msgstr "juan_perez@hotmail" -#: C/link-contacts.page:55(page/p) +#: C/link-contacts.page:59(page/p) msgid "You can combine these contacts into a single Jane Smith one." msgstr "Puede combinar estos contactos en un solo Juan Pérez." -#: C/link-contacts.page:60(section/title) -msgid "Combining contacts" -msgstr "Combinar contactos" +#: C/link-contacts.page:63(section/title) +msgid "Link contacts" +msgstr "Enlazar contactos" -#: C/link-contacts.page:63(item/p) +#: C/link-contacts.page:64(section/p) +msgid "The way you can link your contacts is as follows:" +msgstr "Puede enlazar sus contactos de la siguiente manera:" + +#: C/link-contacts.page:69(item/p) msgid "" -"From the <gui>Contact List</gui> window, right-click one of the contact that " -"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</" -"gui>." +"Press the tick button to select entries you want to link. This will enable " +"<em>selection mode</em> and you can see a checkbox for each entry." msgstr "" -"Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho " -"uno de los contactos que tiene diferentes cuentas y seleccione <gui style=" -"\"menuitem\">Enlazar contactos...</gui>." +"Pulse el botón para seleccionar las entradas que quiere enlazar. Esto " +"activará el <em>modo de selección</em> y verá una casilla por cada entrada." -#: C/link-contacts.page:70(item/p) +#: C/link-contacts.page:75(item/p) msgid "" -"From the left pane in the <gui>Link Contacts</gui> window, select the " -"contacts you want to combine." +"Tick the checkboxes that correspond to the <app>Contacts</app> entries which " +"belong to the same contact." msgstr "" -"Desde el panel izquierdo, en la ventana <gui>Enlazar contatos</gui>, " -"seleccione los contactos que quiere combinar." +"Marque las casillas que corresponden a las entradas de <app>Contactos</app> " +"que pertenecen al mismo contacto." -#: C/link-contacts.page:76(item/p) -msgid "Click <gui style=\"button\">Link</gui>." +#: C/link-contacts.page:81(item/p) +msgid "Press <gui style=\"button\">Link</gui>." msgstr "Pulse <gui style=\"button\">Enlazar</gui>." -#: C/link-contacts.page:82(note/p) -msgid "" -"When a meta-contact has been created, the default contact that will be used " -"to have a conversation with when you double-click on it, is the contact with " -"the highest presence on-line." -msgstr "" -"Cuando se ha creado un metacontacto, el contacto predeterminado que se usará " -"para tener una conversación al pulsar dos veces sobre él, es el último " -"contacto con presencia en lÃnea." +#: C/link-contacts.page:86(section/p) +msgid "Repeat steps 3 and 4 in order to link other contacts." +msgstr "Repita los pasos 3 y 4 para enlazar otros contactos." + +#: C/link-contacts.page:92(section/title) +msgid "Unlink contacts" +msgstr "Desenlazar contactos" -#: C/link-contacts.page:91(section/title) -msgid "Separating contacts" -msgstr "Separar contactos" +#: C/link-contacts.page:93(section/p) +msgid "To unlink a linked contact:" +msgstr "Para desenlazar un contacto enlazado:" -#: C/link-contacts.page:94(item/p) +#: C/link-contacts.page:98(item/p) +msgid "Select the contact from your list." +msgstr "Seleccione el contacto de su lista." + +#: C/link-contacts.page:103(item/p) msgid "" -"From the <gui>Contact List</gui>, right-click the contact to separate, and " -"select <gui style=\"menuitem\">Link Contacts...</gui>." +"Press <gui style=\"button\">Edit</gui> in the top-right corner of " +"<app>Contacts</app>." msgstr "" -"Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho " -"del ratón para separar, y seleccione <gui style=\"menuitem\">Enlazar " -"contactos...</gui>." +"Pulse <gui style=\"button\">Editar</gui> en la esquina superior derecha de " +"<app>Contactos</app>." -#: C/link-contacts.page:100(item/p) -msgid "Click <gui style=\"button\">Unlink</gui>." -msgstr "Pulse <gui style=\"button\">Desenlazar</gui>." +#: C/link-contacts.page:108(item/p) +msgid "Press <gui style=\"button\">Linked Contacts</gui>." +msgstr "Pulse <gui style=\"button\">Contactos enlazados</gui>." -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/overview.page:37(media) -msgctxt "_" +#: C/link-contacts.page:113(item/p) msgid "" -"external ref='figures/video_overview.png' " -"md5='6cfcfbd833bf2234537d402185c40596'" +"Press <gui style=\"button\">Remove</gui> to unlink an entry from the linked " +"contact." msgstr "" -"external ref='figures/video_overview.png' " -"md5='6cfcfbd833bf2234537d402185c40596'" +"Pulse <gui style=\"button\">Quitar</gui> para desenlazar una entrada de un " +"contacto enlazado." -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/overview.page:38(media) -msgctxt "_" +#: C/link-contacts.page:118(item/p) msgid "" -"external ref='figures/conf_overview.png' " -"md5='74c58668fe89c84060f12f6b70a6b903'" +"Press <gui style=\"button\">Close</gui> if you do not want to unlink any " +"more contacts." msgstr "" -"external ref='figures/conf_overview.png' " -"md5='74c58668fe89c84060f12f6b70a6b903'" +"Pulse <gui style=\"button\">Cerrar</gui> si no quiere desenlazar más " +"contactos." -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/overview.page:39(media) -msgctxt "_" -msgid "" -"external ref='figures/croom_overview.png' " -"md5='e9619d2c8420bc48a880c03dbc1ae084'" +#: C/link-contacts.page:123(item/p) +msgid "Finally, press <gui style=\"button\">Done</gui> to finish editing." msgstr "" -"external ref='figures/croom_overview.png' " -"md5='e9619d2c8420bc48a880c03dbc1ae084'" +"Finalmente, pulse <gui style=\"button\">Hecho</gui> para terminar la edición." -#: C/overview.page:8(info/desc) +#: C/overview.page:9(info/desc) msgid "What instant messaging is and how you can use it." msgstr "Qué es la mensajerÃa instantánea y cómo puede usarla." -#: C/overview.page:12(credit/name) +#: C/overview.page:13(credit/name) msgid "Aruna S" msgstr "Aruna S" -#: C/overview.page:16(credit/name) C/share-desktop.page:18(credit/name) -msgid "Ekaterina Gerasimova" -msgstr "Ekaterina Gerasimova" - -#: C/overview.page:24(page/title) +#: C/overview.page:25(page/title) msgid "Overview of instant messaging" msgstr "Visión general de la mensajerÃa instantánea" -#: C/overview.page:26(page/p) +#: C/overview.page:27(page/p) msgid "" "Instant messaging, sometimes abbreviated to IM, is a text-based means to " "communicate instantly over the internet and the local network. While some IM " @@ -2556,19 +2500,19 @@ msgstr "" "link> de diferentes proveedores de servicios. Algunos de ellos soportan " "incluso llamadas con sonido y vÃdeo." -#: C/overview.page:42(td/p) +#: C/overview.page:43(td/p) msgid "Video Conference" msgstr "Videoconferencia" -#: C/overview.page:43(td/p) +#: C/overview.page:44(td/p) msgid "Group chats" msgstr "Conversaciones en grupo" -#: C/overview.page:44(td/p) +#: C/overview.page:45(td/p) msgid "Chat rooms" msgstr "Salas de chat" -#: C/overview.page:48(page/p) +#: C/overview.page:49(page/p) msgid "" "Some instant messaging applications can be used to connect to chat rooms, " "online places where like-minded people meet to talk. One popular means to " @@ -2745,8 +2689,8 @@ msgstr "" "nueva o unirse a una charla, puede que los detalles de su cuenta no sean " "correctos." -#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p) -#: C/prob-conn-neterror.page:53(item/p) +#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:46(item/p) +#: C/prob-conn-neterror.page:54(item/p) msgid "" "Make sure that you are connected to the Internet, or to a local area network." msgstr "Asegúrese de que está conectado a Internet o a una red de área local." @@ -2759,7 +2703,7 @@ msgstr "" "Elija <guiseq><gui>Editar</gui><gui>Cuentas</gui></guiseq> y seleccione la " "cuenta que no está funcionando." -#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p) +#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:62(item/p) msgid "" "Type your username and password again to make sure that they are correct." msgstr "" @@ -2767,7 +2711,7 @@ msgstr "" "correctos." #: C/prob-conn-acctdisabled.page:60(item/p) -#: C/prob-conn-neterror.page:64(item/p) +#: C/prob-conn-neterror.page:63(item/p) msgid "" "Check in the <gui>Advanced</gui> section that all the details are correct. " "You should be able to find these details from the website of the messaging " @@ -2781,7 +2725,7 @@ msgstr "" msgid "Check that the account is switched on." msgstr "Compruebe que la cuenta está activada" -#: C/prob-conn-auth.page:8(info/desc) +#: C/prob-conn-auth.page:9(info/desc) msgid "" "An error message which says “<gui>Authentication failed</gui>†appears in " "the main window." @@ -2789,11 +2733,11 @@ msgstr "" "Aparece un mensaje de error en la ventana principal que muestra «<gui>Falló " "la autenticación</gui>»." -#: C/prob-conn-auth.page:36(page/title) +#: C/prob-conn-auth.page:37(page/title) msgid "I get a message that says “Authentication failedâ€" msgstr "Obtengo un mensaje que dice «Falló la autenticación»" -#: C/prob-conn-auth.page:38(page/p) +#: C/prob-conn-auth.page:39(page/p) msgid "" "This kind of error happens when your instant messaging service is not " "allowing you to connect because it does not recognize your username or " @@ -2803,7 +2747,7 @@ msgstr "" "está permitiendo conectar porque por alguna razón no reconoce su nombre de " "usuario o contraseña." -#: C/prob-conn-auth.page:50(item/p) +#: C/prob-conn-auth.page:51(item/p) msgid "" "Make sure that you have registered an account with the service you are " "trying to connect to. If you do not have an account, most services will not " @@ -2813,16 +2757,17 @@ msgstr "" "intentando conectarse. Si no tiene una cuenta la mayorÃa de los servicios no " "le permitirán que se conecte." -#: C/prob-conn-auth.page:57(item/p) C/prob-conn-name.page:43(item/p) -#: C/prob-conn-neterror.page:58(item/p) -msgid "" -"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png" -"\">edit</media> icon in the error message." -msgstr "" -"Pulse el icono <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-" -"edit.png\">Editar</media> en el mensaje de error." +#: C/prob-conn-auth.page:58(media/span) C/prob-conn-name.page:44(media/span) +#: C/prob-conn-neterror.page:59(media/span) +msgid "edit" +msgstr "editar" -#: C/prob-conn-auth.page:68(item/p) +#: C/prob-conn-auth.page:58(item/p) C/prob-conn-name.page:44(item/p) +#: C/prob-conn-neterror.page:59(item/p) +msgid "Click the <_:media-1/> icon in the error message." +msgstr "Pulse el icono <_:media-1/> en el mensaje de error." + +#: C/prob-conn-auth.page:67(item/p) msgid "" "Deselect the <gui>Enabled</gui>, and then select it again to try to " "reconnect to the service." @@ -2830,12 +2775,12 @@ msgstr "" "Deseleccione la casilla de verificación <gui>Activada</gui> y después " "selecciónela de nuevo para intentar reconectar con el servicio." -#: C/prob-conn-name.page:9(info/title) +#: C/prob-conn-name.page:10(info/title) msgctxt "link:error-msg" msgid "“Name in useâ€" msgstr "«Nombre en uso»" -#: C/prob-conn-name.page:10(info/desc) +#: C/prob-conn-name.page:11(info/desc) msgid "" "An error message which says “<gui>Name in use</gui>†appears in the main " "window." @@ -2843,11 +2788,11 @@ msgstr "" "Aparecen en la ventana principal un mensaje de error que dice «<gui>Nombre en " "uso</gui>»." -#: C/prob-conn-name.page:33(page/title) +#: C/prob-conn-name.page:34(page/title) msgid "I get a message that says “Name in useâ€" msgstr "Obtengo un mensaje de error que muestra «Nombre en uso»" -#: C/prob-conn-name.page:35(page/p) +#: C/prob-conn-name.page:36(page/p) msgid "" "This kind of error happens when you try to connect to your IRC account and " "you are using a nickname that is already being used by someone else on that " @@ -2857,11 +2802,11 @@ msgstr "" "está usando un apodo que ya está usando otra persona en esa red en " "particular." -#: C/prob-conn-name.page:51(item/p) +#: C/prob-conn-name.page:50(item/p) msgid "In the <gui>Nickname</gui> text box, type a new nickname." msgstr "En la caja de texto <gui>Apodo</gui> escriba un apodo nuevo." -#: C/prob-conn-name.page:56(item/p) +#: C/prob-conn-name.page:55(item/p) msgid "" "If you have registered that nickname within the network you are using, set " "the password for that nickname. For more information, see <link xref=\"irc-" @@ -2871,14 +2816,14 @@ msgstr "" "contraseña para ese apodo. Para obtener más información consulte la <link " "xref=\"irc-nick-password\"/>." -#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p) +#: C/prob-conn-name.page:64(item/p) C/prob-conn-neterror.page:78(item/p) msgid "" "Switch the account off, and then switch it on to try to reconnect to the " "service." msgstr "" "Salga de la cuenta y vuelva a entrar para volver a conectarse al servicio." -#: C/prob-conn-neterror.page:7(info/desc) +#: C/prob-conn-neterror.page:8(info/desc) msgid "" "An error message which says “<gui>Network error</gui>†appears in the main " "window." @@ -2886,11 +2831,11 @@ msgstr "" "Aparecerá el mensaje de error «<gui>Error de red</gui>» en la ventana " "principal." -#: C/prob-conn-neterror.page:34(page/title) +#: C/prob-conn-neterror.page:35(page/title) msgid "I get a message that says “Network errorâ€" msgstr "Obtengo un mensaje que muestra «Error de red»" -#: C/prob-conn-neterror.page:42(page/p) +#: C/prob-conn-neterror.page:43(page/p) msgid "" "This kind of error happens when <app>Empathy</app> cannot communicate with " "the instant messaging service for some reason." @@ -2898,7 +2843,7 @@ msgstr "" "Este tipo de mensaje sucede cuando <app>Empathy</app> no se puede comunicar " "con el servicio de mensajerÃa instantánea por alguna razón." -#: C/prob-conn-neterror.page:46(page/p) +#: C/prob-conn-neterror.page:47(page/p) msgid "" "Also, this kind of error happens when you try to use an IRC account without " "setting a nickname." @@ -2906,11 +2851,11 @@ msgstr "" "Este tipo de error también sucede cuando intenta usar una cuenta de IRC sin " "haber configurado el apodo." -#: C/prob-conn-neterror.page:87(section/title) +#: C/prob-conn-neterror.page:86(section/title) msgid "Proxy support" msgstr "Soporte de proxy" -#: C/prob-conn-neterror.page:88(section/p) +#: C/prob-conn-neterror.page:87(section/p) msgid "" "At the moment <app>Empathy</app> can not be configured to work with a proxy." msgstr "" @@ -3351,68 +3296,23 @@ msgstr "" "necesario que tengan al menos la versión 2.28 de <app>Empathy</app> y una " "aplicación de visión remota de escritorios instalada en su sistema." -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/status-icons.page:39(media) -msgctxt "_" -msgid "" -"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'" -msgstr "" -"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'" - -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/status-icons.page:45(media) -msgctxt "_" -msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'" -msgstr "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'" - -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/status-icons.page:53(media) -msgctxt "_" -msgid "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'" -msgstr "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'" - -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#. -#. This is a reference to an external file such as an image or video. When -#. the file changes, the md5 hash will change to let you know you need to -#. update your localized copy. The msgstr is not used at all. Set it to -#. whatever you like once you have updated your copy of the file. -#: C/status-icons.page:62(media) C/status-icons.page:69(media) -msgctxt "_" -msgid "" -"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'" -msgstr "" -"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'" - -#: C/status-icons.page:7(info/desc) +#: C/status-icons.page:8(info/desc) msgid "Understanding the various statuses and status icons." msgstr "Entender los diversos estados e iconos de estado." -#: C/status-icons.page:35(page/title) +#: C/status-icons.page:36(page/title) msgid "Status Types and Icons" msgstr "Tipos de estados e iconos" -#: C/status-icons.page:39(item/title) -msgid "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png" -"\">Available icon</media> <gui>Available</gui>" -msgstr "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png\">Icono " -"de «disponible»</media> <gui>Disponible</gui>" +#: C/status-icons.page:40(media/span) +msgid "Available icon" +msgstr "Icono de disponible" -#: C/status-icons.page:41(item/p) +#: C/status-icons.page:40(item/title) +msgid "<_:media-1/> <gui>Available</gui>" +msgstr "<_:media-1/> <gui>Disponible</gui>" + +#: C/status-icons.page:42(item/p) msgid "" "Use the <em>Available</em> status when you are at your computer and able to " "chat with your contacts. You can set a custom message for this status." @@ -3421,15 +3321,15 @@ msgstr "" "charlar con sus contactos. Puede establecer un mensaje personalizado para " "este estado." -#: C/status-icons.page:45(item/title) -msgid "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Busy icon</" -"media> <gui>Busy</gui>" -msgstr "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Icono de " -"«ocupado»</media> <gui>Ocupado</gui>" +#: C/status-icons.page:46(media/span) +msgid "Busy icon" +msgstr "Icono de ocupado" + +#: C/status-icons.page:46(item/title) +msgid "<_:media-1/> <gui>Busy</gui>" +msgstr "<_:media-1/> <gui>Ocupado</gui>" -#: C/status-icons.page:47(item/p) +#: C/status-icons.page:48(item/p) msgid "" "Use the <em>Busy</em> status to let your contacts know that you don’t want " "to chat right now. They can still contact you, for instance if they have " @@ -3443,15 +3343,15 @@ msgstr "" "no usará las burbujas de notificación y sonidos cuando esté ocupado. Puede " "establecer un mensaje personalizado para este estado." -#: C/status-icons.page:53(item/title) -msgid "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Away icon</" -"media> <gui>Away</gui>" -msgstr "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Icono de " -"«ausente»</media> <gui>Ausente</gui>" +#: C/status-icons.page:54(media/span) +msgid "Away icon" +msgstr "Icono de ausente" + +#: C/status-icons.page:54(item/title) +msgid "<_:media-1/> <gui>Away</gui>" +msgstr "<_:media-1/> <gui>Ausente</gui>" -#: C/status-icons.page:55(item/p) +#: C/status-icons.page:56(item/p) msgid "" "Use the <em>Away</em> status when you are going away from your computer. " "<app>Empathy</app> automatically sets your status to Away if you do not use " @@ -3466,15 +3366,15 @@ msgstr "" "sonidos cuando esté ocupado. Puede establecer un mensaje personalizado para " "este estado." -#: C/status-icons.page:62(item/title) -msgid "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline " -"icon</media> <gui>Invisible</gui>" -msgstr "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Icono " -"de «desconectado»</media> <gui>Invisible</gui>" +#: C/status-icons.page:63(media/span) C/status-icons.page:70(media/span) +msgid "Offline icon" +msgstr "Icono de desconectado" + +#: C/status-icons.page:63(item/title) +msgid "<_:media-1/> <gui>Invisible</gui>" +msgstr "<_:media-1/> <gui>Invisible</gui>" -#: C/status-icons.page:64(item/p) +#: C/status-icons.page:65(item/p) msgid "" "When you set your status to <em>Invisible</em>, you will appear as offline " "to your contacts. You will still be connected to your accounts, and you " @@ -3484,15 +3384,11 @@ msgstr "" "contactos. Aún estará conectado a sus cuentas, verá los estados de sus " "contactos y podrá iniciar conversaciones con ellos." -#: C/status-icons.page:69(item/title) -msgid "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline " -"icon</media> <gui>Offline</gui>" -msgstr "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Icono " -"de «desconectado»</media> <gui>Desconectado</gui>" +#: C/status-icons.page:70(item/title) +msgid "<_:media-1/> <gui>Offline</gui>" +msgstr "<_:media-1/> <gui>Desconectado</gui>" -#: C/status-icons.page:71(item/p) +#: C/status-icons.page:72(item/p) msgid "" "Setting your status to <em>Offline</em> disconnects you from all of your " "accounts." @@ -3500,15 +3396,15 @@ msgstr "" "Establecer su estado como <em>Desconectado</em> le desconecta de todas sus " "cuentas." -#: C/video-call.page:10(info/desc) +#: C/video-call.page:11(info/desc) msgid "Start a video conversation with one of your contacts." msgstr "Iniciar una conversación de vÃdeo con uno de sus contactos." -#: C/video-call.page:29(page/title) +#: C/video-call.page:37(page/title) msgid "Start a video conversation" msgstr "Comenzar una conversación de vÃdeo" -#: C/video-call.page:31(page/p) +#: C/video-call.page:39(page/p) msgid "" "If you have a webcam, you can call your contacts and have a video " "conversation with them. This feature only works with certain types of " @@ -3520,19 +3416,23 @@ msgstr "" "cuentas y requiere que la otra persona tenga una aplicación que soporte " "llamadas de vÃdeo." -#: C/video-call.page:38(item/p) +#: C/video-call.page:46(item/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=" +"Right-click on the contact that you want to call and select <gui style=" "\"menuitem\">Video Call</gui>." msgstr "" -"Desde la ventana <gui>Lista de contactos</gui> pulse el icono de <media type=" -"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">vÃdeo llamada</" -"media> junto al nombre del contacto al que quiere llamar y seleccione <gui " -"style=\"menuitem\">Llamada de vÃdeo</gui>." +"Pulse con el botón derecho sobre el contacto al que quiere llamar y " +"seleccione <gui style=\"menuitem\">Llamada de vÃdeo</gui>." + +#: C/video-call.page:54(item/p) +msgid "" +"To end the conversation, click on the <gui style=\"button\">hang up</gui> " +"button." +msgstr "" +"Para finalizar una conversación pulse el botón <gui style=\"button\">Colgar</" +"gui>." -#: C/video-call.page:55(note/p) +#: C/video-call.page:60(note/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>." @@ -3541,11 +3441,11 @@ msgstr "" "<guiseq><gui style=\"menu\">VÃdeo</gui><gui style=\"menuitem\">VÃdeo " "apagado</gui></guiseq>." -#: C/video-call.page:61(section/title) +#: C/video-call.page:65(section/title) msgid "Start a video conversation with a meta-contact" msgstr "Iniciar una conversación de vÃdeo con uno de sus metacontactos." -#: C/video-call.page:69(item/p) +#: C/video-call.page:73(item/p) msgid "" "Select the contact you want to have the conversation, and from the menu " "select <gui style=\"menuitem\">Video Call</gui>." @@ -3553,33 +3453,261 @@ msgstr "" "Seleccione el contacto con el que quiere tener la conversacioÌn y, del menuÌ, " "seleccione <gui style=\"menuitem\">Llamada de vÃdeo</gui>." +#~ msgctxt "link" +#~ msgid "Empathy Internet Messenger" +#~ msgstr "MensajerÃa para Internet Empathy" + +#~ msgctxt "text" +#~ msgid "Empathy Internet Messenger" +#~ msgstr "MensajeriÌa para Internet Empathy" + +#~ msgid "Empathy Internet Messenger logo" +#~ msgstr "Logo de mensajerÃa para Internet Empathy" + +#~ 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 algunas diferencias, actualmente el servicio libre <link href=" +#~ "\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> no " +#~ "funciona con <app>Empathy</app>." + +#~ 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 "" +#~ "No necesita registrar una cuenta para usar el IRC. Aunque especifique un " +#~ "apodo al añadir una cuenta IRC en <app>Empathy</app>, este apodo sólo se " +#~ "establece cada vez que se conecta. Si otro usuario está usando el nombre, " +#~ "deberá elegir un apodo nuevo." + +#~ 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 "" +#~ "Algunas redes IRC usan un servicio llamado NickServ para permitir a los " +#~ "usuarios proteger sus apodos. Para obtener más información consulte la " +#~ "<link xref=\"irc-nick-password\"/>." + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'" +#~ msgstr "" +#~ "external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'" + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'" +#~ msgstr "" +#~ "external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'" + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/gtk-remove.png' " +#~ "md5='215e3a325a3dd619874e35c30a018bb6'" +#~ msgstr "" +#~ "external ref='figures/gtk-remove.png' " +#~ "md5='215e3a325a3dd619874e35c30a018bb6'" + +#~ msgid "" +#~ "To add a network to the list, click <media type=\"image\" mime=\"image/png" +#~ "\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>." +#~ msgstr "" +#~ "Para añadir una red a la lista pulse <media type=\"image\" mime=\"image/" +#~ "png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Añadir</" +#~ "media>." + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/video_overview.png' " +#~ "md5='6cfcfbd833bf2234537d402185c40596'" +#~ msgstr "" +#~ "external ref='figures/video_overview.png' " +#~ "md5='6cfcfbd833bf2234537d402185c40596'" + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/conf_overview.png' " +#~ "md5='74c58668fe89c84060f12f6b70a6b903'" +#~ msgstr "" +#~ "external ref='figures/conf_overview.png' " +#~ "md5='74c58668fe89c84060f12f6b70a6b903'" + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/croom_overview.png' " +#~ "md5='e9619d2c8420bc48a880c03dbc1ae084'" +#~ msgstr "" +#~ "external ref='figures/croom_overview.png' " +#~ "md5='e9619d2c8420bc48a880c03dbc1ae084'" + +#~ msgid "" +#~ "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit." +#~ "png\">edit</media> icon in the error message." +#~ msgstr "" +#~ "Pulse el icono <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-" +#~ "edit.png\">Editar</media> en el mensaje de error." + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/available.png' " +#~ "md5='2196b2f0ad4ce26fdb7b9d48e75d1947'" +#~ msgstr "" +#~ "external ref='figures/available.png' " +#~ "md5='2196b2f0ad4ce26fdb7b9d48e75d1947'" + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'" +#~ msgstr "" +#~ "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'" + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'" +#~ msgstr "" +#~ "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'" + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'" +#~ msgstr "" +#~ "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'" + +#~ msgid "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/available.png" +#~ "\">Available icon</media> <gui>Available</gui>" +#~ msgstr "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/available.png" +#~ "\">Icono de «disponible»</media> <gui>Disponible</gui>" + +#~ msgid "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Busy " +#~ "icon</media> <gui>Busy</gui>" +#~ msgstr "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Icono " +#~ "de «ocupado»</media> <gui>Ocupado</gui>" + +#~ msgid "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Away " +#~ "icon</media> <gui>Away</gui>" +#~ msgstr "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Icono " +#~ "de «ausente»</media> <gui>Ausente</gui>" + +#~ msgid "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png" +#~ "\">Offline icon</media> <gui>Invisible</gui>" +#~ msgstr "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png" +#~ "\">Icono de «desconectado»</media> <gui>Invisible</gui>" + +#~ msgid "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png" +#~ "\">Offline icon</media> <gui>Offline</gui>" +#~ msgstr "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png" +#~ "\">Icono de «desconectado»</media> <gui>Desconectado</gui>" + +#~ msgid "Combine and separate contacts" +#~ msgstr "Combinar y separar contactos" + +#~ msgid "" +#~ "From the <gui>Contact List</gui> window, right-click one of the contact " +#~ "that has different accounts, and select <gui style=\"menuitem\">Link " +#~ "Contacts...</gui>." +#~ msgstr "" +#~ "Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho " +#~ "uno de los contactos que tiene diferentes cuentas y seleccione <gui style=" +#~ "\"menuitem\">Enlazar contactos...</gui>." + +#~ msgid "" +#~ "From the left pane in the <gui>Link Contacts</gui> window, select the " +#~ "contacts you want to combine." +#~ msgstr "" +#~ "Desde el panel izquierdo, en la ventana <gui>Enlazar contatos</gui>, " +#~ "seleccione los contactos que quiere combinar." + +#~ msgid "" +#~ "When a meta-contact has been created, the default contact that will be " +#~ "used to have a conversation with when you double-click on it, is the " +#~ "contact with the highest presence on-line." +#~ msgstr "" +#~ "Cuando se ha creado un metacontacto, el contacto predeterminado que se " +#~ "usará para tener una conversación al pulsar dos veces sobre él, es el " +#~ "último contacto con presencia en lÃnea." + +#~ msgid "Separating contacts" +#~ msgstr "Separar contactos" + +#~ msgid "" +#~ "From the <gui>Contact List</gui>, right-click the contact to separate, " +#~ "and select <gui style=\"menuitem\">Link Contacts...</gui>." +#~ msgstr "" +#~ "Desde la ventana <gui>Lista de contactos</gui> pulse con el botón derecho " +#~ "del ratón para separar, y seleccione <gui style=\"menuitem\">Enlazar " +#~ "contactos...</gui>." + +#~ msgid "Click <gui style=\"button\">Unlink</gui>." +#~ msgstr "Pulse <gui style=\"button\">Desenlazar</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 " +#~ "next to the name of the contact you wish to call and choose <gui style=" +#~ "\"menuitem\">Audio Call</gui>." +#~ msgstr "" +#~ "Desde la ventana <gui>Lista de contactos</gui> pulse el icono de <media " +#~ "type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png" +#~ "\">videollamada</media> junto al nombre del contacto al que quiere llamar " +#~ "y seleccione <gui style=\"menuitem\">Llamada de voz</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 " +#~ "next to the name of the contact you wish to call and choose <gui style=" +#~ "\"menuitem\">Video Call</gui>." +#~ msgstr "" +#~ "Desde la ventana <gui>Lista de contactos</gui> pulse el icono de <media " +#~ "type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">vÃdeo " +#~ "llamada</media> junto al nombre del contacto al que quiere llamar y " +#~ "seleccione <gui style=\"menuitem\">Llamada de vÃdeo</gui>." + +#~ msgctxt "_" +#~ msgid "" +#~ "external ref='figures/empathy-logo.png' " +#~ "md5='1afc419a644e90b16393807e35cb5cb2'" +#~ msgstr "" +#~ "external ref='figures/empathy-logo.png' " +#~ "md5='1afc419a644e90b16393807e35cb5cb2'" + +#~ msgid "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png" +#~ "\"> Empathy Internet Messenger logo </media> Empathy Internet Messenger" +#~ msgstr "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png" +#~ "\">Logotipo de la mensajerÃa para Internet Empathy</media> MensajerÃa " +#~ "para Internet Empathy" + #~ msgid "milo@ubuntu.com" #~ msgstr "milo@ubuntu.com" #~ msgid "shaunm@gnome.org" #~ msgstr "shaunm@gnome.org" -#~ msgid "Available icon" -#~ msgstr "Icono de disponible" - #~ msgid "Available" #~ msgstr "Disponible" -#~ msgid "Busy icon" -#~ msgstr "Icono de ocupado" - #~ msgid "Busy" #~ msgstr "Ocupado" -#~ msgid "Away icon" -#~ msgstr "Icono de ausente" - #~ msgid "Away" #~ msgstr "Ausente" -#~ msgid "Offline icon" -#~ msgstr "Icono de desconectado" - #~ msgid "Invisible" #~ msgstr "Invisible" @@ -3828,9 +3956,6 @@ msgstr "" #~ msgid "Click <gui>Apply</gui>." #~ msgstr "Pulse el botón <gui>Aplicar</gui>." -#~ msgid "Click on the <gui>Edit Account</gui> button in the error message." -#~ msgstr "Pulse el botón <gui>Editar cuenta</gui> en el mensaje de error." - #~ msgid "" #~ "In the case of an IRC account, type your nickname in the <gui>Nickname</" #~ "gui> text box." @@ -3854,10 +3979,6 @@ msgstr "" #~ msgid "Click the <gui style=\"button\">Add</gui> button." #~ msgstr "Pulse el botón <gui style=\"button\">Añadir</gui>." -#~ msgid "Click <gui style=\"button\">Connect</gui> to enable the new account." -#~ msgstr "" -#~ "Pulse <gui style=\"button\">Conectar</gui> para activar la nueva cuenta." - #~ msgid "" #~ "If you select another account without clicking <gui>Connect</gui>, any " #~ "information you have entered will be lost." diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po index c70bd5cd2..de41b6a30 100644 --- a/help/zh_CN/zh_CN.po +++ b/help/zh_CN/zh_CN.po @@ -5,1716 +5,1714 @@ # Tao Wang <dancefire@gmail.com>, 2010 # lainme <lainme993@gmail.com>, 2011 # Guanhao Yin <yinguanhao@gmail.com>, 2011 +# tuhaihe <wangdianjin@linuxdeepin.com>, 2012 +# Wylmer Wang <wantinghard@gmail.com>, 2012 # msgid "" msgstr "" "Project-Id-Version: empathy master\n" -"POT-Creation-Date: 2011-12-11 14:58+0000\n" -"PO-Revision-Date: 2011-12-09 21:36+0800\n" -"Last-Translator: Guanhao Yin <yinguanhao@gmail.com>\n" +"POT-Creation-Date: 2013-04-15 22:03+0000\n" +"PO-Revision-Date: 2012-02-14 13:34+0800\n" +"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n" +"Language: zh-CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh-CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/video-call.page:38(None) C/audio-video.page:70(None) -#: C/audio-call.page:36(None) -msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" +#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 +#, fuzzy +#| msgid "translator-credits" +msgctxt "_" +msgid "translator-credits" msgstr "" -"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" +"Lavande <lavande@thislove.cz.cc>, 2010\n" +"Tao Wang <dancefire@gmail.com>, 2010\n" +"lainme <lainme993@gmail.com>, 2011\n" +"Guanhao Yin <yinguanhao@gmail.com>, 2011\n" +"tuhaihe <wangdianjin@linuxdeepin.com>, 2012" -#: C/video-call.page:10(desc) -msgid "Start a video conversation with one of your contacts." -msgstr "åŒæ‚¨çš„è”系人进行视频èŠå¤©ã€‚" +#: C/index.page:8(info/title) +#, fuzzy +#| msgid "Empathy Internet Messenger" +msgctxt "link" +msgid "Empathy Internet Messenger" +msgstr "Empathy 网络èŠå¤©å·¥å…·" + +#: C/index.page:9(info/title) +#, fuzzy +#| msgid "Empathy Internet Messenger" +msgctxt "text" +msgid "Empathy Internet Messenger" +msgstr "Empathy 网络èŠå¤©å·¥å…·" -#: C/video-call.page:21(name) C/status-icons.page:16(name) -#: C/share-desktop.page:14(name) C/set-custom-status.page:19(name) -#: C/send-file.page:21(name) C/salut-protocol.page:18(name) -#: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name) -#: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name) -#: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name) -#: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name) -#: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name) -#: C/irc-manage.page:20(name) C/irc-join-room.page:16(name) -#: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name) -#: C/introduction.page:13(name) C/index.page:19(name) -#: C/import-account.page:23(name) C/hide-contacts.page:11(name) -#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name) -#: 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:19(name) -#: C/audio-video.page:17(name) C/audio-call.page:19(name) -#: C/add-account.page:20(name) +#: C/index.page:20(credit/name) C/add-account.page:21(credit/name) +#: C/audio-call.page:22(credit/name) C/audio-video.page:17(credit/name) +#: C/create-account.page:19(credit/name) +#: C/disable-account.page:21(credit/name) +#: C/favorite-rooms.page:14(credit/name) C/geolocation.page:17(credit/name) +#: C/geolocation-not-showing.page:17(credit/name) +#: C/geolocation-privacy.page:17(credit/name) +#: C/geolocation-supported.page:16(credit/name) +#: C/geolocation-turn.page:18(credit/name) +#: C/geolocation-what-is.page:18(credit/name) +#: C/group-conversations.page:19(credit/name) +#: C/hide-contacts.page:11(credit/name) C/import-account.page:23(credit/name) +#: C/introduction.page:13(credit/name) C/irc-commands.page:10(credit/name) +#: C/irc-join-pwd.page:17(credit/name) C/irc-join-room.page:16(credit/name) +#: C/irc-manage.page:19(credit/name) C/irc-nick-password.page:18(credit/name) +#: C/irc-send-file.page:16(credit/name) +#: C/irc-start-conversation.page:15(credit/name) +#: C/link-contacts.page:15(credit/name) C/prev-conv.page:17(credit/name) +#: C/prob-conn-acctdisabled.page:19(credit/name) +#: C/prob-conn-auth.page:21(credit/name) C/prob-conn-name.page:18(credit/name) +#: C/prob-conn-neterror.page:19(credit/name) +#: C/remove-account.page:19(credit/name) C/salut-protocol.page:18(credit/name) +#: C/send-file.page:21(credit/name) C/set-custom-status.page:19(credit/name) +#: C/share-desktop.page:14(credit/name) C/status-icons.page:16(credit/name) +#: C/video-call.page:25(credit/name) msgid "Milo Casagrande" msgstr "Milo Casagrande" -#: C/video-call.page:22(email) C/status-icons.page:17(email) -#: C/share-desktop.page:15(email) C/set-custom-status.page:20(email) -#: C/send-file.page:22(email) C/salut-protocol.page:19(email) -#: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email) -#: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email) -#: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email) -#: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email) -#: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email) -#: C/irc-manage.page:21(email) C/irc-join-room.page:17(email) -#: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email) -#: C/introduction.page:14(email) C/index.page:20(email) -#: C/import-account.page:24(email) C/hide-contacts.page:12(email) -#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email) -#: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email) -#: 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: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" - -#: C/video-call.page:25(p) C/status-icons.page:24(p) -#: C/share-desktop.page:22(p) C/set-custom-status.page:23(p) -#: C/send-message.page:21(p) C/send-file.page:25(p) -#: C/salut-protocol.page:22(p) C/remove-account.page:22(p) -#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p) -#: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p) -#: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p) -#: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p) -#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p) -#: C/irc-manage.page:24(p) C/irc-join-room.page:20(p) -#: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p) -#: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p) -#: C/hide-contacts.page:15(p) C/group-conversations.page:23(p) -#: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p) -#: 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: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) +#: C/index.page:24(license/p) C/account-irc.page:20(license/p) +#: C/account-jabber.page:18(license/p) C/accounts-window.page:22(license/p) +#: C/add-account.page:29(license/p) C/add-contact.page:22(license/p) +#: C/audio-call.page:31(license/p) C/audio-video.page:21(license/p) +#: C/change-status.page:28(license/p) C/create-account.page:23(license/p) +#: C/disable-account.page:29(license/p) C/favorite-rooms.page:18(license/p) +#: C/geolocation.page:21(license/p) +#: C/geolocation-not-showing.page:21(license/p) +#: C/geolocation-privacy.page:21(license/p) +#: C/geolocation-supported.page:20(license/p) +#: C/geolocation-turn.page:22(license/p) +#: C/geolocation-what-is.page:22(license/p) +#: C/group-conversations.page:23(license/p) C/hide-contacts.page:15(license/p) +#: C/import-account.page:31(license/p) C/introduction.page:17(license/p) +#: C/irc-commands.page:14(license/p) C/irc-join-pwd.page:21(license/p) +#: C/irc-join-room.page:20(license/p) C/irc-manage.page:28(license/p) +#: C/irc-nick-password.page:22(license/p) C/irc-send-file.page:20(license/p) +#: C/irc-start-conversation.page:19(license/p) +#: C/link-contacts.page:19(license/p) C/overview.page:20(license/p) +#: C/prev-conv.page:25(license/p) C/prob-conn-acctdisabled.page:23(license/p) +#: C/prob-conn-auth.page:25(license/p) C/prob-conn-name.page:22(license/p) +#: C/prob-conn-neterror.page:23(license/p) C/prob-conn.page:18(license/p) +#: C/remove-account.page:23(license/p) C/salut-protocol.page:22(license/p) +#: C/send-file.page:25(license/p) C/send-message.page:21(license/p) +#: C/set-custom-status.page:23(license/p) C/share-desktop.page:22(license/p) +#: C/status-icons.page:24(license/p) C/video-call.page:34(license/p) msgid "Creative Commons Share Alike 3.0" msgstr "知识共享-相åŒæ–¹å¼å…±äº« (Creative Commons Share Alike) 3.0" -#: C/video-call.page:28(title) -msgid "Start a video conversation" -msgstr "开始视频èŠå¤©" +#: C/index.page:30(media/span) +#, fuzzy +#| msgid "Empathy Internet Messenger" +msgid "Empathy Internet Messenger logo" +msgstr "Empathy 网络èŠå¤©å·¥å…·" -#: C/video-call.page:30(p) -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 " -"accounts, and it requires the other person to have an application that " -"supports video calls." -msgstr "" -"如果您有网络摄åƒå¤´ï¼Œæ‚¨å¯ä»¥å‘¼å«æ‚¨çš„è”系人并和他们进行视频èŠå¤©ã€‚æ¤åŠŸèƒ½ä»…特定类" -"型的账户å¯ç”¨ï¼Œå¹¶éœ€è¦å¯¹æ–¹ä½¿ç”¨çš„程åºæ”¯æŒè§†é¢‘呼å«ã€‚" +#: C/index.page:28(page/title) +#, fuzzy +#| msgid "Empathy Internet Messenger" +msgid "<_:media-1/> Empathy Internet Messenger" +msgstr "Empathy 网络èŠå¤©å·¥å…·" -#: 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>." -msgstr "" -"在<gui>è”系人列表</gui>窗å£ï¼Œç‚¹å‡»æ‚¨æƒ³å‘¼å«çš„è”系人的åå—æ—çš„<media type=" -"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼å«</media>" -"å›¾æ ‡å¹¶é€‰æ‹©<gui style=\"menuitem\">视频呼å«</gui>。" +#: C/index.page:36(section/title) +msgid "Account Management" +msgstr "å¸å·ç®¡ç†" -#: C/video-call.page:43(p) C/audio-call.page:42(p) -msgid "" -"A new window will open. When the connection is established, you will see " -"<gui>Connected</gui> at the bottom of the window, along with the total " -"conversation time." -msgstr "" -"一个新窗å£ä¼šè¢«æ‰“开。连接建立åŽï¼Œæ‚¨å°†åœ¨çª—å£åº•éƒ¨çœ‹åˆ°<gui>已连接</gui>，以åŠæ€»ä¼š" -"è¯æ—¶é—´ã€‚" +#: C/index.page:40(section/title) +msgid "Contact Management" +msgstr "è”系人管ç†" -#: C/video-call.page:48(p) C/audio-call.page:48(p) -msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>." -msgstr "点击<gui style=\"button\">挂æ–</gui>以结æŸä¼šè¯ã€‚" +#: C/index.page:44(section/title) +msgid "Text Conversations" +msgstr "æ–‡å—èŠå¤©" -#: 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>." -msgstr "" -"è¦å°†è§†é¢‘会è¯è½¬ä¸ºè¯éŸ³ä¼šè¯ï¼Œé€‰æ‹© <guiseq><gui style=\"menu\">视频</gui><gui " -"style=\"menuitem\">视频关é—</gui></guiseq>。" +#: C/index.page:48(section/title) +msgid "Audio and Video Conversations" +msgstr "è¯éŸ³å’Œè§†é¢‘èŠå¤©" -#: C/video-call.page:60(title) -msgid "Start a video conversation with a meta-contact" -msgstr "和一ä½å…ƒè”系人进行视频èŠå¤©ã€‚" +#: C/index.page:52(section/title) +msgid "Advanced Actions" +msgstr "高级æ“作" -#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p) -msgid "" -"From the <gui>Contact List</gui> window, right-click on the meta-contact." -msgstr "在<gui>è”系人列表</gui>窗å£ï¼Œå³é”®ç‚¹å‡»è¯¥å…ƒè”系人。" +#: C/index.page:56(section/title) C/irc-manage.page:64(section/title) +msgid "Common Problems" +msgstr "常è§é—®é¢˜" -#: C/video-call.page:68(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/account-irc.page:106(media) +#, fuzzy +#| msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d" +msgctxt "_" msgid "" -"Select the contact you want to have the conversation, and from the menu " -"select <gui style=\"menuitem\">Video Call</gui>." -msgstr "" -"选择è¦èŠå¤©çš„è”系人，然åŽåœ¨èœå•ä¸é€‰æ‹©<gui style=\"menuitem\">视频呼å«</gui>" +"external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'" +msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d" -#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/account-irc.page:109(media) C/prob-conn-auth.page:58(media) +#: C/prob-conn-name.page:44(media) C/prob-conn-neterror.page:59(media) +#, fuzzy +#| msgid "" +#| "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" +msgctxt "_" +msgid "" +"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'" +msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/account-irc.page:112(media) +#, fuzzy +#| msgid "" +#| "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6" +msgctxt "_" msgid "" -"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a " -"contact in the <gui>Contact List</gui> window, and stop over it for a " -"second: a small pop-up message will appear showing the number of the " -"contacts that form the meta-contact." +"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'" msgstr "" -"è¦è¯†åˆ«ä¸€ä¸ªè”系人是å¦æ˜¯<em>å…ƒè”系人</em>ï¼Œå°†æ‚¨çš„é¼ æ ‡ç§»åŠ¨åˆ°<gui>è”系人列表</" -"gui>窗å£ä¸çš„一个è”系人上，并åœç•™å‡ 秒钟：一个å°å¼¹å‡ºæ¶ˆæ¯ä¼šæ˜¾ç¤ºè¿™ä¸ªå…ƒè”系人是由" -"å‡ ä¸ªè”系人组æˆçš„。" - -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/status-icons.page:39(None) -msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947" -msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947" - -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/status-icons.page:45(None) -msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a" -msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a" - -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/status-icons.page:53(None) -msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33" -msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33" - -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/status-icons.page:62(None) C/status-icons.page:69(None) -msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964" -msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964" +"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6" -#: C/status-icons.page:7(desc) -msgid "Understanding the various statuses and status icons." -msgstr "ç†è§£å„ç§çŠ¶æ€å’ŒçŠ¶æ€å›¾æ ‡ã€‚" +#: C/account-irc.page:8(info/desc) +msgid "Additional information necessary for connecting to IRC networks." +msgstr "连接 IRC 网络需è¦çš„é¢å¤–ä¿¡æ¯ã€‚" -#: C/status-icons.page:20(name) C/salut-protocol.page:36(cite) -#: C/prev-conv.page:20(name) C/prev-conv.page:38(cite) -#: C/import-account.page:27(name) C/disable-account.page:24(name) -#: C/audio-video.page:109(cite) C/audio-video.page:117(cite) -#: C/add-account.page:24(name) C/accounts-window.page:18(name) -#: C/account-jabber.page:14(name) C/account-irc.page:16(name) +#: C/account-irc.page:16(credit/name) C/account-jabber.page:14(credit/name) +#: C/accounts-window.page:18(credit/name) C/add-account.page:25(credit/name) +#: C/disable-account.page:25(credit/name) +#: C/import-account.page:27(credit/name) C/prev-conv.page:21(credit/name) +#: C/status-icons.page:20(credit/name) msgid "Shaun McCance" msgstr "Shaun McCance" -#: C/status-icons.page:21(email) C/prev-conv.page:21(email) -#: C/import-account.page:28(email) C/disable-account.page:25(email) -#: C/add-account.page:25(email) C/accounts-window.page:19(email) -#: C/account-jabber.page:15(email) C/account-irc.page:17(email) -msgid "shaunm@gnome.org" -msgstr "shaunm@gnome.org" +#: C/account-irc.page:31(page/title) +msgid "IRC account details" +msgstr "IRC å¸å·è¯¦æƒ…" -#: C/status-icons.page:35(title) -msgid "Status Types and Icons" -msgstr "状æ€çš„类别åŠå…¶å›¾æ ‡" +#: C/account-irc.page:33(page/p) +msgid "" +"IRC accounts require different information than many other types of " +"accounts. To create an IRC account, you must specify at least an IRC network " +"and a nickname. This page details the information you can provide for an IRC " +"account." +msgstr "" +"IRC å¸å·éœ€è¦ä¸Žå…¶ä»–类型的å¸å·ä¸åŒçš„ä¿¡æ¯ã€‚è¦åˆ›å»º IRC å¸å·ï¼Œæ‚¨è‡³å°‘需è¦æŒ‡å®šä¸€ä¸ª " +"IRC 网络和一个昵称。本页详细介ç»äº†æ‚¨å¯ä»¥ä¸ºä¸€ä¸ª IRC å¸å·æ供的信æ¯ã€‚" -#: C/status-icons.page:39(media) -msgid "Available icon" -msgstr "åœ¨çº¿å›¾æ ‡" +#: C/account-irc.page:39(note/p) C/irc-manage.page:42(note/p) +msgid "" +"You must have the <sys>telepathy-idle</sys> package installed to use IRC in " +"<app>Empathy</app>." +msgstr "" +"è¦åœ¨ <app>Empathy</app> ä¸ä½¿ç”¨ IRC，您必须安装 <sys>telepathy-idle</sys> 包。" -#: C/status-icons.page:40(gui) -msgid "Available" -msgstr "在线" +#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title) +msgid "<gui>Network</gui>" +msgstr "" -#: C/status-icons.page:41(p) +#: C/account-irc.page:46(item/p) msgid "" -"Use the <em>Available</em> status when you are at your computer and able to " -"chat with your contacts. You can set a custom message for this status." +"IRC is an open system that allows people to run separate IRC networks. Each " +"network is distinct and has its own users and chat rooms. <app>Empathy</app> " +"lists the most popular networks in the <gui>Network</gui> drop-down list. " +"You can add additional networks. See <link xref=\"#networks\"/> below." msgstr "" -"当您在电脑æ—并且有空和您的è”系人èŠå¤©æ—¶ï¼Œä½¿ç”¨<em>在线</em>状æ€ã€‚您å¯ä»¥ä¸ºæ¤çŠ¶æ€" -"自定一æ¡æ¶ˆæ¯ã€‚" - -#: C/status-icons.page:45(media) -msgid "Busy icon" -msgstr "å¿™ç¢Œå›¾æ ‡" +"IRC 是一ç§å¼€æ”¾çš„系统，它å…许人们è¿è¡Œå„自的 IRC 网络。æ¯ä¸ªç½‘络是独立的，有特有" +"的用户和èŠå¤©å®¤ã€‚<app>Empathy</app> 在 <gui>网络</gui> 下拉列表ä¸åˆ—出了一些最" +"æµè¡Œçš„网络。您å¯ä»¥æ·»åŠ 其他的网络。å‚看下é¢çš„<link xref=\"#networks\"/>。" -#: C/status-icons.page:46(gui) -msgid "Busy" -msgstr "忙碌" +#: C/account-irc.page:53(item/title) +msgid "<gui>Nickname</gui>" +msgstr "" -#: C/status-icons.page:47(p) +#: C/account-irc.page:54(item/p) msgid "" -"Use the <em>Busy</em> status to let your contacts know that you don’t want " -"to chat right now. They can still contact you, for instance if they have " -"something urgent they need to discuss. By default, <app>Empathy</app> will " -"not use notification bubbles and sounds when you are busy. You can set a " -"custom message for this status." +"Your nickname is your unique name on the IRC network. Only one person on a " +"network may use a given nickname. If you get an error message that says " +"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change " +"your nickname." msgstr "" -"使用<em>忙碌</em>以让您的è”系人知é“您当å‰ä¸æƒ³èŠå¤©ã€‚他们ä»ç„¶å¯ä»¥è”系您，比如他" -"们å¯èƒ½æœ‰æ€¥äº‹éœ€è¦è®¨è®ºã€‚默认地，当您忙碌时，<app>Empathy</app> ä¸ä¼šä½¿ç”¨æ°”泡æ示" -"和声音æ示。您å¯ä»¥ä¸ºæ¤çŠ¶æ€è‡ªå®šä¸€æ¡æ¶ˆæ¯ã€‚" - -#: C/status-icons.page:53(media) -msgid "Away icon" -msgstr "ç¦»å¼€å›¾æ ‡" +"您的昵称是您在 IRC 网络上的唯一性的åå—。åªæœ‰ä¸€ä¸ªäººå¯ä»¥ä½¿ç”¨æŸä¸ªç‰¹å®šçš„昵称。如" +"果您得到<link xref=\"prob-conn-name\" role=\"error-msg\"/>错误信æ¯ï¼Œæ‚¨éœ€è¦æ”¹" +"å˜æ‚¨çš„昵称。" -#: C/status-icons.page:54(gui) -msgid "Away" -msgstr "离开" +#: C/account-irc.page:60(item/title) +msgid "<gui>Password</gui>" +msgstr "" -#: C/status-icons.page:55(p) +#: C/account-irc.page:61(item/p) msgid "" -"Use the <em>Away</em> status when you are going away from your computer. " -"<app>Empathy</app> automatically sets your status to Away if you do not use " -"your computer for a while, or if your screensaver is on. By default, " -"<app>Empathy</app> will not use notification bubbles and sounds when you are " -"away. You can set a custom message for this status." +"Some servers, particularly those on private networks, require a password to " +"connect. If you are authorized to use the network, the network " +"administrators should provide you with a password." msgstr "" -"当您ä¸åœ¨ç”µè„‘æ—时，使用<em>离开</em>状æ€ã€‚如果您一段时间内ä¸ä½¿ç”¨ç”µè„‘，或者å±å¹•" -"ä¿æŠ¤æ‰“开了，<app>Empathy</app> 将自动设置您的状æ€ä¸ºç¦»å¼€ã€‚默认地，当您离开时，" -"<app>Empathy</app> ä¸ä¼šä½¿ç”¨æ°”泡æ示和声音æ示。您å¯ä»¥ä¸ºæ¤çŠ¶æ€è‡ªå®šä¸€æ¡æ¶ˆæ¯ã€‚" - -#: C/status-icons.page:62(media) C/status-icons.page:69(media) -msgid "Offline icon" -msgstr "ç¦»çº¿å›¾æ ‡" +"一些æœåŠ¡å™¨ï¼Œå°¤å…¶æ˜¯é‚£äº›ç§æœ‰ç½‘络，需è¦å¯†ç æ‰èƒ½è¿žæŽ¥ã€‚如果您被授æƒä½¿ç”¨ï¼Œç½‘络的管" +"ç†å‘˜åº”当为您æ供了密ç 。" -#: C/status-icons.page:63(gui) -msgid "Invisible" -msgstr "éšèº«" +#: C/account-irc.page:65(note/title) +msgid "NickServ Passwords" +msgstr "NickServ 密ç " -#: C/status-icons.page:64(p) +#: C/account-irc.page:66(note/p) msgid "" -"When you set your status to <em>Invisible</em>, you will appear as offline " -"to your contacts. You will still be connected to your accounts, and you " -"still see your contacts’ statuses and start conversations with them." +"On some networks, nicknames can be registered using a service known as " +"NickServ. <app>Empathy</app> does not directly support nickname passwords. " +"On some networks, including the popular freenode network, server passwords " +"are automatically forwarded to NickServ, allowing you to set this field to " +"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for " +"more details." msgstr "" -"当您将状æ€è®¾ç½®ä¸º<em>éšèº«</em>时，您的è”系人会看到您已离线。但您ä»ç„¶è¿žæŽ¥ç€æ‚¨çš„" -"账户，并且å¯ä»¥çœ‹åˆ°æ‚¨çš„è”系人的状æ€ï¼Œæˆ–者和他们èŠå¤©ã€‚" +"在æŸäº›ç½‘络上，昵称å¯ä»¥é€šè¿‡ä¸€ç§å«åš NickServ çš„æœåŠ¡è¢«æ³¨å†Œã€‚<app>Empathy</app> " +"并ä¸ç›´æŽ¥æ”¯æŒæ˜µç§°å¯†ç 。在æŸäº›ç½‘络上，包括æµè¡Œçš„ freenode 网络，æœåŠ¡å™¨å¯†ç 会被" +"自动转å‘ç»™ NickServ，从而å…许您设置æ¤é¡¹å‘ NickServ è¯æ˜Žæ‚¨è‡ªå·±ã€‚更多信æ¯å‚è§" +"<link xref=\"irc-nick-password\"/>。" -#: C/status-icons.page:70(gui) -msgid "Offline" -msgstr "离线" +#: C/account-irc.page:76(item/title) +#, fuzzy +#| msgid "Real name" +msgid "<gui>Real name</gui>" +msgstr "真实姓å" -#: C/status-icons.page:71(p) +#: C/account-irc.page:77(item/p) msgid "" -"Setting your status to <em>Offline</em> disconnects you from all of your " -"accounts." -msgstr "将状æ€è®¾ç½®ä¸º<em>离线</em>将会æ–开您所有账户的连接。" +"You can provide your real name in addition to your nickname. Other users " +"will be able to see this when they view your information." +msgstr "" +"除了昵称，您还å¯ä»¥æ供您的真实姓å。其他用户查看您的信æ¯æ—¶å¯ä»¥çœ‹åˆ°æ‚¨çš„真实姓" +"å。" -#: C/share-desktop.page:7(desc) -msgid "Show your desktop to your contacts." -msgstr "å‘您的è”系人展示您的桌é¢ã€‚" +#: C/account-irc.page:81(item/title) +#, fuzzy +#| msgid "Select <gui>Edit Custom Message</gui>." +msgid "<gui>Quit message</gui>" +msgstr "选择<gui>编辑自定义消æ¯</gui>。" -#: C/share-desktop.page:18(name) -msgid "Ekaterina Gerasimova" -msgstr "Ekaterina Gerasimova" +#: C/account-irc.page:82(item/p) +msgid "" +"When you go offline, a quit message is sent to all the chat rooms you’re in " +"and to all the users you’re having a private conversation with. Use this " +"field to provide a custom quit message." +msgstr "" +"当您离线时，一个退出消æ¯ä¼šè¢«å‘é€ç»™æ‰€æœ‰æ‚¨åŠ 入的èŠå¤©å®¤å’Œæ£åœ¨ä¸Žæ‚¨è¿›è¡Œç§äººèŠå¤©çš„" +"用户。设置æ¤é¡¹ä»¥æ供自定义的退出消æ¯ã€‚" -#: C/share-desktop.page:19(email) -msgid "kittykat3756@gmail.com" -msgstr "kittykat3756@gmail.com" +#: C/account-irc.page:94(info/title) +#, fuzzy +#| msgid "IRC Networks" +msgctxt "link" +msgid "IRC Networks" +msgstr "IRC 网络" -#: C/share-desktop.page:33(title) -msgid "Share your desktop" -msgstr "共享您的桌é¢" +#: C/account-irc.page:97(section/title) +msgid "Networks" +msgstr "网络" -#: C/share-desktop.page:35(p) +#: C/account-irc.page:99(section/p) msgid "" -"It is possible to share your desktop with some of your contacts. You can use " -"this functionality to show your desktop to your contacts to, for example, " -"ask for help or help your contacts resolve a problem." +"<app>Empathy</app> includes a list of popular IRC networks. If you wish to " +"another IRC network, you can add it to the list. You can also modify " +"networks and remove them from the list." msgstr "" -"您å¯ä»¥å’Œè”系人共享桌é¢ã€‚使用这个功能，您å¯ä»¥å‘è”系人展示您的桌é¢ï¼Œæ¥å¯»æ±‚帮助" -"或帮助è”系人解决问题。" +"<app>Empathy</app> 包括了一份常用 IRC 网络的列表。如果您想使用其他的 IRC 网" +"络，您å¯ä»¥å°†å…¶æ·»åŠ 到这个列表ä¸ã€‚您也å¯ä»¥ä¿®æ”¹ç½‘络或从列表ä¸åˆ 除网络。" -#: C/share-desktop.page:42(p) +#: C/account-irc.page:104(item/p) msgid "" -"To be able to share your desktop, you need to have a VNC server, which has " -"support for the feature, installed on your system. <app>Vino</app>, the " -"GNOME VNC server, has the required support." +"To add a network to the list, click <media type=\"image\" mime=\"image/png\" " +"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>." msgstr "" -"è¦å…±äº«æ‚¨çš„æ¡Œé¢ï¼Œæ‚¨çš„系统ä¸å¿…须安装支æŒæ¤åŠŸèƒ½çš„ VNC æœåŠ¡å™¨ã€‚<app>Vino</app>，" -"GNOME çš„ VNC æœåŠ¡å™¨ï¼Œå°±æœ‰è¿™é¡¹åŠŸèƒ½ã€‚" - -#: C/share-desktop.page:51(p) -msgid "From the <gui>Contact List</gui> window, do one of the following:" -msgstr "在<gui>è”系人列表</gui>窗å£ï¼Œæ‰§è¡Œä¸‹åˆ—æ“作之一：" +"è¦æƒ³åˆ—表ä¸æ·»åŠ 网络，点击<media type=\"image\" mime=\"image/png\" src=" +"\"figures/gtk-add.png\" width=\"16\" height=\"16\">æ·»åŠ </media>。" -#: C/share-desktop.page:56(p) +#: C/account-irc.page:107(item/p) msgid "" -"Select the contact you want to share your desktop with and choose " -"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></" -"guiseq>." +"To modify a network in the list, select the network and click <media type=" +"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" " +"height=\"16\">Edit</media>." msgstr "" -"选择您想è¦å…±äº«æ‚¨çš„æ¡Œé¢çš„è”系人，并选择 <guiseq><gui>编辑</gui><gui>è”系人</" -"gui><gui>共享我的桌é¢</gui></guiseq>。" +"è¦ä¿®æ”¹åˆ—表ä¸çš„网络，选择那个网络并点击<media type=\"image\" mime=\"image/png" +"\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">编辑</media>。" -#: C/share-desktop.page:63(p) +#: C/account-irc.page:110(item/p) msgid "" -"Right-click on the name of the contact you want to share your desktop with " -"and select <gui>Share My Desktop</gui>." +"To remove a network from the list, select the network and click <media type=" +"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" " +"height=\"16\">Remove</media>." msgstr "" -"å³é”®ç‚¹å‡»æ‚¨æƒ³è¦å…±äº«æ‚¨æ¡Œé¢çš„è”系人的åå—，然åŽé€‰æ‹©<gui>共享我的桌é¢</gui>。" +"è¦ä»Žåˆ—表ä¸åˆ 除网络，选择è¦åˆ 除的网络并点击<media type=\"image\" mime=\"image/" +"png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">åˆ é™¤</" +"media>。" -#: C/share-desktop.page:71(p) +#: C/account-irc.page:115(section/p) msgid "" -"An invitation to view your desktop will be sent to the contact you have " -"selected. To view your desktop, they will need to accept it." -msgstr "" -"您选择的è”系人会收到一个查看您桌é¢çš„邀请。è¦æŸ¥çœ‹æ‚¨çš„æ¡Œé¢ï¼Œä»–们需è¦æŽ¥å—邀请。" +"When adding or modifying a network, you can enter the following information:" +msgstr "åœ¨æ·»åŠ æˆ–ä¿®æ”¹ä¸€ä¸ªç½‘ç»œæ—¶ï¼Œæ‚¨å¯ä»¥è¾“入下列信æ¯ï¼š" -#: C/share-desktop.page:77(p) +#: C/account-irc.page:121(item/p) msgid "" -"You can disconnect the contact from your computer using your desktop sharing " -"application." -msgstr "在您的桌é¢å…±äº«ç¨‹åºä¸ï¼Œæ‚¨å¯ä»¥æ–开您的è”系人到您的计算机的连接。" +"This is the name of the network as you want it to appear in the list of " +"networks." +msgstr "这是您希望网络显示在网络列表ä¸çš„åå—。" -#: C/share-desktop.page:82(p) +#: C/account-irc.page:125(item/title) +#, fuzzy +#| msgid "<gui>Contact List</gui> window" +msgid "<gui>Charset</gui>" +msgstr "<gui>è”系人列表</gui>窗å£" + +#: C/account-irc.page:126(item/p) msgid "" -"For more information about how to use the remote desktop sharing " -"application, refer to its help." -msgstr "如果需è¦æ›´å¤šå…³äºŽå¦‚何使用远程桌é¢æŸ¥å…±äº«ç¨‹åºçš„ä¿¡æ¯ï¼Œè¯·å‚看其帮助。" +"This specifies the character encoding that is typically used on this " +"network. A character encoding is a specific way of recording characters " +"internally in a computer. There are many character encodings, and you need " +"to use the same character encoding as other users to see their messages " +"correctly." +msgstr "" +"这指明了网络上常用的å—符编ç 。å—符编ç 是计算机内部记录å—符的一ç§ç‰¹å®šæ–¹å¼ã€‚有" +"许多ä¸åŒçš„å—符编ç ，您需è¦ä¸Žå…¶ä»–用户使用åŒæ ·çš„å—符编ç æ‰èƒ½æ£ç¡®åœ°çœ‹åˆ°ä»–们的信" +"æ¯ã€‚" -#: C/share-desktop.page:90(p) +#: C/account-irc.page:135(item/p) msgid "" -"When you share your desktop with someone else, it is possible to experience " -"system performance slowdown and low Internet speed." +"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that " +"can handle text from most of the world's languages. Another common encoding " +"for English and some other Western languages is ISO-8859-1." msgstr "" -"当您与其他人共享您的桌é¢çš„时候，å¯èƒ½ä¼šå‡ºçŽ°ç³»ç»Ÿæ€§èƒ½é™ä½Žå’Œç½‘络速度下é™çš„现象。" +"默认地，<app>Empathy</app> 使用 UTF-8，一ç§èƒ½å¤Ÿå¤„ç†ä¸–界上大多数è¯è¨€çš„现代化的" +"å—符编ç 。简体ä¸æ–‡å¸¸ç”¨çš„ç¼–ç 还有 GB18030，GBK å’Œ GB2312。" -#: C/share-desktop.page:96(p) +#: C/account-irc.page:141(item/title) +msgid "<gui>Servers</gui>" +msgstr "" + +#: C/account-irc.page:142(item/p) msgid "" -"Some of your contacts may not be able to use this feature. It is necessary " -"for them to have version 2.28, or newer, of <app>Empathy</app> and a " -"compatible remote desktop viewer application installed in their system." +"An IRC network may have many servers you can connect to. When you are " +"connected to a server on a particular network, you can communicate with all " +"users on all other servers on that network. You can add and remove servers " +"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons." msgstr "" -"并éžæ‚¨çš„所有è”系人都å¯ä»¥ä½¿ç”¨è¿™ä¸ªåŠŸèƒ½ã€‚他们必须使用 2.28 或更新版本的 " -"<app>Empathy</app> 并且在安装了兼容的远程桌é¢æŸ¥çœ‹å™¨ç¨‹åºã€‚" +"一个 IRC 网络å¯èƒ½æœ‰è®¸å¤šæœåŠ¡å™¨ä¾›æ‚¨è¿žæŽ¥ã€‚当您连接到一个特定网络的æœåŠ¡å™¨åŽï¼Œæ‚¨å¯" +"以和åŒä¸€ç½‘络ä¸æ‰€æœ‰æœåŠ¡å™¨çš„用户交æµã€‚您å¯ä»¥ä¸ºä¸€ä¸ªç½‘ç»œæ·»åŠ æˆ–åˆ é™¤æœåŠ¡å™¨ï¼Œä½¿ç”¨" +"<gui>æ·»åŠ </gui>或<gui>åˆ é™¤</gui>按钮。" -#: C/set-custom-status.page:9(desc) -msgid "Add, edit or delete personal messages for your status." -msgstr "为您的状æ€æ·»åŠ ã€ç¼–è¾‘æˆ–åˆ é™¤ä¸ªäººæ¶ˆæ¯ã€‚" +#: C/account-irc.page:147(item/p) +msgid "" +"When a server is selected, click the field under <gui>Server</gui> or " +"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys " +"to focus the field, and press the space bar to begin editing." +msgstr "" +"当一个æœåŠ¡å™¨è¢«é€‰æ‹©åŽï¼Œç‚¹å‡»<gui>æœåŠ¡å™¨</gui>或<gui>端å£</gui>下方的å—段æ¥ç¼–辑" +"它。或者，使用左å³æ–¹å‘é”®æ¥èšç„¦æŸä¸ªå—æ®µï¼Œå¹¶æŒ‰ç©ºæ ¼é”®å¼€å§‹ç¼–è¾‘ã€‚" -#: C/set-custom-status.page:15(name) -msgid "Jim Campbell" -msgstr "Jim Campbell" +#: C/account-irc.page:151(item/p) +msgid "" +"Select the check box in the <gui>SSL</gui> column to encrypt all " +"communication with a server. Note that this does not prevent other users on " +"the network from seeing what you write on public chat rooms." +msgstr "" +"选择 <gui>SSL</gui> 列ä¸çš„å¤é€‰æ¡†ä»¥åŠ 密与æœåŠ¡å™¨é—´çš„所有通讯。注æ„这并ä¸èƒ½æ„味" +"ç€å…¶ä»–用户ä¸èƒ½çœ‹åˆ°æ‚¨åœ¨å…¬å…±èŠå¤©å®¤ä¸çš„å‘言。" -#: C/set-custom-status.page:16(email) -msgid "jwcampbell@gmail.com" -msgstr "jwcampbell@gmail.com" +#: C/account-jabber.page:7(info/desc) +msgid "Advanced options for Jabber and Google Talk accounts." +msgstr "Jabber å’Œ Google Talk å¸å·çš„高级选项。" -#: C/set-custom-status.page:34(title) -msgid "Set a custom message" -msgstr "设置一个自定义消æ¯" +#: C/account-jabber.page:29(page/title) +msgid "Jabber account details" +msgstr "Jabber å¸å·è¯¦æƒ…" -#: C/set-custom-status.page:36(p) +#: C/account-jabber.page:31(page/p) msgid "" -"Sometimes you may want to set a custom message for your status, for example " -"to let people know that you will be unavailable for a certain period of time." +"Most Jabber accounts will require only a login ID and a password to connect. " +"For some accounts or on certain types of networks, you may need to enter " +"additional information in the <gui>Advanced</gui> section. Normally, you " +"will not need to use the advanced options below. For general instructions on " +"adding an account, see <link xref=\"add-account\"/>." msgstr "" -"有时您也许想è¦ä¸ºæ‚¨çš„状æ€è®¾ç½®ä¸€ä¸ªè‡ªå®šä¹‰æ¶ˆæ¯ï¼Œä¾‹å¦‚，让别人知é“您å¯èƒ½åœ¨ä¸€æ®µæ—¶é—´" -"内ä¸åœ¨ã€‚" +"大多 Jabber å¸å·åªéœ€è¦ç™»å½• ID 和密ç å°±å¯ä»¥è¿žæŽ¥ã€‚但对于æŸäº›å¸å·æˆ–æŸäº›ç½‘络，您" +"å¯èƒ½éœ€è¦åœ¨<gui>高级</gui>选项å¡ä¸è¾“入一些é¢å¤–çš„ä¿¡æ¯ã€‚通常，您ä¸éœ€è¦ä½¿ç”¨ä¸‹é¢çš„" +"è¿™äº›é«˜çº§é€‰é¡¹ã€‚æ·»åŠ å¸å·çš„一般指导å‚è§<link xref=\"add-account\"/>。" -#: C/set-custom-status.page:40(p) +#: C/account-jabber.page:39(note/p) msgid "" -"It is possible to set a custom message based on the different statuses " -"available." -msgstr "å¯ä»¥æ ¹æ®ä¸åŒçš„状æ€æ¥è®¾ç½®è‡ªå®šä¹‰æ¶ˆæ¯ã€‚" +"Google Talk is a type of Jabber account. These instructions hold for Google " +"Talk accounts as well." +msgstr "Google Talk æ˜¯ä¸€ç§ Jabber å¸å·ã€‚这些指å—对 Google Talk å¸å·åŒæ ·é€‚用。" -#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p) -msgid "" -"From the <gui>Contact List</gui> window, click on the drop-down list at the " -"top." -msgstr "在<gui>è”系人列表</gui>窗å£ï¼Œç‚¹å‡»é¡¶éƒ¨çš„下拉列表。" +#: C/account-jabber.page:45(item/title) +#, fuzzy +#| msgid "Encryption required (TLS/SSL)" +msgid "<gui>Encryption required (TLS/SSL)</gui>" +msgstr "需è¦åŠ 密(TLS/SSL)" -#: C/set-custom-status.page:52(p) +#: C/account-jabber.page:46(item/title) +#, fuzzy +#| msgid "Ignore SSL certificate errors" +msgid "<gui>Ignore SSL certificate errors</gui>" +msgstr "忽略 SSL è¯ä¹¦é”™è¯¯" + +#: C/account-jabber.page:47(item/p) msgid "" -"Select the status you want to add a custom message to. You have to select " -"the one identified with the label <gui>Custom Message</gui>." +"Whenever possible, communication between <app>Empathy</app> and the Jabber " +"server is encrypted. If encrypted communication is not possible, messages " +"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent " +"<app>Empathy</app> from communicating with the Jabber server when encryption " +"is not possible." msgstr "" -"é€‰æ‹©æ‚¨å¸Œæœ›æ·»åŠ è‡ªå®šä¹‰æ¶ˆæ¯çš„状æ€ã€‚您必须选择有<gui>自定义消æ¯</gui>æ ‡ç¾æ ‡è®°çš„状" -"æ€ã€‚" +"åªè¦æœ‰å¯èƒ½ï¼Œ<app>Empathy</app> 与 Jabber æœåŠ¡å™¨ä¹‹é—´çš„é€šè®¯å°±ä¼šè¢«åŠ å¯†ã€‚å¦‚æžœä¸å¯" +"èƒ½åŠ å¯†ï¼Œæ¶ˆæ¯å°±å¯èƒ½è¢«æ˜Žæ–‡å‘é€ã€‚选择<gui>需è¦åŠ 密</gui>以阻æ¢ä¸èƒ½åŠ 密时 " +"<app>Empathy</app> 与 Jabber æœåŠ¡å™¨è¿›è¡Œæ˜Žæ–‡é€šè®¯ã€‚" -#: C/set-custom-status.page:58(p) +#: C/account-jabber.page:52(item/p) msgid "" -"Enter your custom message in the text box at the top of the window, and " -"press <key>Enter</key> to set the message." +"Some Jabber servers may encrypt data using invalid certificates, or using " +"certificates from unknown authorities. If you trust the server you are " +"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to " +"allow encrypted communication with invalid certificates." msgstr "" -"在窗å£é¡¶éƒ¨çš„文本框ä¸è¾“入您的自定义消æ¯ï¼Œç„¶åŽæŒ‰<key>Enter</key>æ¥è®¾å®šè¿™ä¸ªæ¶ˆ" -"æ¯ã€‚" +"有些 Jabber æœåŠ¡å™¨å¯èƒ½ä½¿ç”¨ä¸åˆæ³•çš„è¯ä¹¦åŠ 密数æ®ï¼Œæˆ–者使用æ¥è‡ªæœªçŸ¥çš„è¯ä¹¦è®¤è¯æœº" +"æž„çš„è¯ä¹¦ã€‚如果您信任您的æœåŠ¡å™¨ï¼Œæ‚¨å¯ä»¥é€‰æ‹©<gui>忽略 SSL è¯ä¹¦é”™è¯¯</gui>以å…许" +"使用ä¸åˆæ³•çš„è¯ä¹¦è¿›è¡ŒåŠ 密通讯。" -#: C/set-custom-status.page:64(p) -msgid "" -"If you want to set the custom message as a favorite, saving it in order to " -"use it again, click on the little star on the right of the text box where " -"you wrote your custom message." +#: C/account-jabber.page:59(item/title) +msgid "<gui>Resource</gui>" msgstr "" -"如果您希望收è—一个自定义消æ¯ï¼Œå³å°†å®ƒä¿å˜ä¸‹æ¥æ–¹ä¾¿æ—¥åŽä½¿ç”¨ï¼Œè¯·ç‚¹å‡»æ‚¨æ’°å†™è‡ªå®šä¹‰" -"消æ¯çš„文本框å³ä¾§çš„å°æ˜Ÿæ˜Ÿã€‚" -#: C/set-custom-status.page:69(p) -msgid "" -"If you do not do it, the custom message will not be available the next time " -"you use <app>Empathy</app>. It will be saved only for the current session." +#: C/account-jabber.page:60(item/title) +msgid "<gui>Priority</gui>" msgstr "" -"如果您ä¸è¿™ä¹ˆåšï¼Œé‚£ä¹ˆä¸‹æ¬¡æ‚¨ä½¿ç”¨ <app>Empathy</app> 的时候，这个自定义消æ¯å°±ä¸" -"会å†å‡ºçŽ°ã€‚它åªåœ¨ <app>Empathy</app> 本次è¿è¡ŒæœŸé—´è¢«ä¿ç•™ã€‚" -#: C/set-custom-status.page:78(title) -msgid "Edit, remove and add a custom message" -msgstr "编辑ã€åˆ é™¤å’Œæ·»åŠ è‡ªå®šä¹‰æ¶ˆæ¯" +#: C/account-jabber.page:61(item/p) +msgid "" +"If you have multiple applications (for instance, on separate computers) " +"connected to your account at the same time, you can set a resource to " +"uniquely identify each one. By default, <app>Empathy</app> will use " +"<input>Telepathy</input> as the resource." +msgstr "" +"如果您有多个应用程åº(比如，在å¦ä¸€å°è®¡ç®—机上)åŒæ—¶è¿žæŽ¥äº†æ‚¨çš„å¸å·ï¼Œæ‚¨å¯ä»¥è®¾ç½®â€œèµ„" +"æºâ€ä»¥å”¯ä¸€åœ°æ ‡è¯†æ¯ä¸€ä¸ªè¿žæŽ¥çš„程åºã€‚默认地，<app>Empathy</app> 会使用 " +"<input>Telepathy</input> 作为“资æºâ€ã€‚" -#: C/set-custom-status.page:88(p) -msgid "Select <gui>Edit Custom Message</gui>." -msgstr "选择<gui>编辑自定义消æ¯</gui>。" +#: C/account-jabber.page:65(item/p) +msgid "" +"You can set the priority to specify which application should receive " +"incoming messages from your contacts. New messages will be sent to the " +"application with the highest priority." +msgstr "" +"您å¯ä»¥è®¾ç½®ä¼˜å…ˆçº§ä»¥æŒ‡å®šå“ªä¸€ä¸ªç¨‹åºä¼˜å…ˆæ”¶åˆ°æ‚¨çš„è”系人å‘é€æ¥çš„消æ¯ã€‚新的消æ¯ä¼šè¢«" +"å‘é€ç»™ä¼˜å…ˆçº§æœ€é«˜çš„程åºã€‚" -#: C/set-custom-status.page:95(p) -msgid "To edit a custom message:" -msgstr "è¦ç¼–辑自定义消æ¯ï¼š" +#: C/account-jabber.page:70(item/title) +#, fuzzy +#| msgid "Override server settings" +msgid "<gui>Override server settings</gui>" +msgstr "覆盖æœåŠ¡å™¨è®¾ç½®" -#: C/set-custom-status.page:100(p) +#: C/account-jabber.page:71(item/p) msgid "" -"From the <gui>Saved Presets</gui> box, select the status message you want to " -"edit and double-click on it." -msgstr "在<gui>å·²ä¿å˜çš„自定义状æ€</gui>ä¸ï¼Œé€‰æ‹©æ‚¨æƒ³è¦ç¼–辑的状æ€æ¶ˆæ¯å¹¶åŒå‡»å®ƒã€‚" +"<app>Empathy</app> will use default settings to connect to the Jabber server " +"based on your login ID. For some Jabber servers, you will need to enter " +"custom server settings manually. These settings should be provided for you " +"by your Jabber provider." +msgstr "" +"<app>Empathy</app> ä¼šæ ¹æ®æ‚¨çš„登录 ID 以默认的设置连接 Jabber æœåŠ¡å™¨ã€‚对æŸäº› " +"Jabber æœåŠ¡å™¨ï¼Œæ‚¨éœ€è¦äººå·¥è¾“入一些æœåŠ¡å™¨è®¾ç½®ã€‚这些设置应该由您的 Jabber æœåŠ¡æ" +"供商æ供。" -#: C/set-custom-status.page:106(p) -msgid "Type the new custom message and press <key>Enter</key> to modify it." -msgstr "输入新的自定义消æ¯å¹¶ä¸”按<key>Enter</key>æ¥ä¿®æ”¹å®ƒã€‚" +#: C/accounts-window.page:11(info/desc) +msgid "Add, modify, and delete accounts." +msgstr "æ·»åŠ ã€ä¿®æ”¹å’Œåˆ 除å¸å·ã€‚" -#: C/set-custom-status.page:113(p) -msgid "To remove a custom message:" -msgstr "è¦åˆ 除自定义消æ¯ï¼š" +#: C/accounts-window.page:33(page/title) +msgid "Accounts Window" +msgstr "å¸å·çª—å£" -#: C/set-custom-status.page:118(p) +#: C/accounts-window.page:35(page/p) msgid "" -"From the <gui>Saved Presets</gui> box, select the status message you want to " -"remove." -msgstr "在<gui>å·²ä¿å˜çš„自定义状æ€</gui>ä¸ï¼Œé€‰æ‹©è¦åˆ 除的状æ€æ¶ˆæ¯ã€‚" - -#: C/set-custom-status.page:124(p) -msgid "Click on the <gui>Remove</gui> button." -msgstr "点击<gui>åˆ é™¤</gui>按钮。" +"The <gui>Accounts</gui> window allows you to add, modify, and delete " +"accounts." +msgstr "<gui>å¸å·</gui>窗å£å…è®¸æ‚¨æ·»åŠ ã€ä¿®æ”¹å’Œåˆ 除å¸å·ã€‚" -#: C/set-custom-status.page:131(p) -msgid "" -"To add a new custom message, from the <gui>Add New Preset</gui> section:" -msgstr "è¦æ·»åŠ 一æ¡æ–°çš„自定义消æ¯ï¼Œåœ¨<gui>æ·»åŠ æ–°è‡ªå®šä¹‰çŠ¶æ€</gui>选项å¡ï¼š" +#: C/accounts-window.page:43(section/title) +msgid "Account Details" +msgstr "å¸å·è¯¦ç»†ä¿¡æ¯" -#: C/set-custom-status.page:136(p) +#: C/accounts-window.page:44(section/p) msgid "" -"Click on the drop-down list to select the status you want to set a custom " -"message to." -msgstr "点击下拉列表选择您想è¦è®¾å®šè‡ªå®šä¹‰æ¶ˆæ¯çš„状æ€ã€‚" - -#: C/set-custom-status.page:142(p) -msgid "Click on the text box, and type the new custom message." -msgstr "点击文本框，输入新的自定义消æ¯ã€‚" +"For most types of accounts, you can simply enter a login ID and a password. " +"Certain accounts or account types, however, may require additional " +"information." +msgstr "" +"对于大多数的å¸å·ï¼Œæ‚¨åªéœ€è¦è¾“入登录 ID 和密ç 。但有些å¸å·æˆ–有些类型的å¸å·å¯èƒ½" +"需è¦é¢å¤–çš„ä¿¡æ¯ã€‚" -#: C/set-custom-status.page:147(p) -msgid "Click on <gui>Add</gui> to add the new message to the presets ones." -msgstr "点击<gui>æ·»åŠ </gui>将新消æ¯æ·»åŠ 到已ä¿å˜çš„的自定义消æ¯åˆ—表ä¸ã€‚" +#: C/add-account.page:9(info/desc) +msgid "Add a new account to <app>Empathy</app>." +msgstr "å‘ <app>Empathy</app> æ·»åŠ æ–°å¸å·ã€‚" -#: C/set-custom-status.page:156(p) -msgid "When finished, click on <gui>Close</gui>." -msgstr "完æˆåŽï¼Œç‚¹å‡»<gui>å…³é—</gui>。" +#: C/add-account.page:40(page/title) +msgid "Add a new account" +msgstr "æ·»åŠ ä¸€ä¸ªæ–°å¸å·" -#: C/set-custom-status.page:163(p) +#: C/add-account.page:42(page/p) msgid "" -"When you edit or add a new custom message, it will not be set as the current " -"status message. You will need to select it from the <gui>Contact List</gui> " -"window." +"You can add instant messaging accounts from any supported service to " +"communicate with all of your contacts in <app>Empathy</app>. For some " +"account providers, these steps will also allow you to register for a new " +"account. For more details, see <link xref=\"create-account\"/>." msgstr "" -"å½“ä½ ç¼–è¾‘æˆ–æ·»åŠ æ–°è‡ªå®šä¹‰æ¶ˆæ¯çš„时候，它ä¸ä¼šè¢«è®¾ä¸ºå½“å‰çŠ¶æ€æ¶ˆæ¯ã€‚您需è¦åœ¨<gui>è”ç³»" -"人列表</gui>窗å£ä¸é€‰ä¸å®ƒã€‚" - -#: C/send-message.page:8(desc) -msgid "Send a message to one of your contacts." -msgstr "å‘é€æ¶ˆæ¯ç»™ä¸€ä¸ªæ‚¨çš„è”系人。" - -#: C/send-message.page:17(name) C/send-file.page:17(name) -#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name) -#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name) -#: C/change-status.page:19(name) C/add-contact.page:18(name) -msgid "Phil Bull" -msgstr "Phil Bull" +"您å¯ä»¥æ·»åŠ 任何支æŒçš„æœåŠ¡çš„å³æ—¶æ¶ˆæ¯å¸å·ï¼Œä»¥åœ¨ <app>Empathy</app> ä¸ä¸Žæ‚¨çš„è”ç³»" +"人交æµã€‚对于æŸäº›å¸å·æ供商，这些æ¥éª¤ä¹Ÿå…许您注册新å¸å·ã€‚更多细节å‚è§<link " +"xref=\"create-account\"/>。" -#: C/send-message.page:18(email) C/send-file.page:18(email) -#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email) -#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email) -#: C/change-status.page:20(email) C/add-contact.page:19(email) -msgid "philbull@gmail.com" -msgstr "philbull@gmail.com" +#: C/add-account.page:49(item/p) C/disable-account.page:49(item/p) +#: C/irc-nick-password.page:50(item/p) C/remove-account.page:43(item/p) +#, fuzzy +#| msgid "" +#| "From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</" +#| "gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>." +msgid "" +"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui> " +"<gui>Accounts</gui></guiseq>, or press <key>F4</key>." +msgstr "" +"在<gui>è”系人列表</gui>窗å£ä¸ï¼Œé€‰æ‹©<guiseq><gui>编辑</gui><gui>å¸å·</gui></" +"guiseq>，或按<key>F4</key>。" -#: C/send-message.page:32(title) -msgid "Send a message to someone" -msgstr "å‘æŸäººå‘é€æ¶ˆæ¯" +# 这个在显示时，也是一个“+“，建议ä¿ç•™ +#: C/add-account.page:53(item/p) +msgid "Click <gui style=\"button\">+</gui>." +msgstr "点击<gui style=\"button\">+</gui>。" -#: C/send-message.page:36(p) +#: C/add-account.page:58(item/p) msgid "" -"From the <gui>Contact List</gui> window, double-click the name of the " -"contact that you want to have a conversation with." -msgstr "在<gui>è”系人列表</gui>窗å£ä¸ï¼ŒåŒå‡»è¦ä¸Žä¹‹èŠå¤©çš„è”系人的åå—。" +"From the <gui>Protocol</gui> drop-down list, select the type of account you " +"wish to add." +msgstr "在<gui>åè®®</gui>下拉列表，选择您è¦åˆ›å»ºçš„å¸å·ç±»åž‹ã€‚" -#: C/send-message.page:42(p) +#: C/add-account.page:62(item/p) msgid "" -"A new window will open. Type a message into the box at the bottom of the " -"window and press <key>Enter</key> to send it." +"If you do not already have a registered account, select <gui>Create a new " +"account on the server</gui>. This feature is not available for all account " +"types, and may not work with some account providers. See <link xref=\"create-" +"account\"/> for more information." msgstr "" -"一个新窗å£ä¼šè¢«æ‰“开。在窗å£åº•éƒ¨çš„文本框ä¸è¾“入一æ¡æ¶ˆæ¯ï¼Œç„¶åŽæŒ‰<key>Enter</key>" -"å‘é€ã€‚" - -#: C/send-message.page:50(title) -msgid "Send a message to a meta-contact" -msgstr "å‘一ä½å…ƒè”系人å‘é€æ¶ˆæ¯" +"如果您还没有注册å¸å·ï¼Œé€‰æ‹©<gui>在æœåŠ¡å™¨ä¸Šåˆ›å»ºæ–°çš„å¸å·</gui>。这个功能并ä¸æ˜¯å¯¹" +"于æ¯ä¸€ç§å¸å·éƒ½å¯ç”¨ï¼Œä¹Ÿå¯èƒ½å¯¹äºŽæŸäº›å¸å·æ供商ä¸å¯ç”¨ã€‚更多信æ¯å‚è§<link xref=" +"\"create-account\"/>。" -#: C/send-message.page:58(p) +#: C/add-account.page:69(item/p) msgid "" -"Select the contact you want to have the conversation, and from the menu " -"select <gui style=\"menuitem\">Chat</gui>." +"Enter the required information. For most accounts, you will only need a " +"login ID and a password. Some accounts may require additional information. " +"See <link xref=\"accounts-window#details\"/>for more information." msgstr "" -"选择您想è¦ä¸Žä¹‹èŠå¤©çš„è”系人，并在èœå•ä¸é€‰æ‹© <gui style=\"menuitem\">èŠå¤©</" -"gui>。" - -#: C/send-file.page:8(desc) -msgid "Send a file from your computer to one of your contacts." -msgstr "从您的计算机å‘é€æ–‡ä»¶ç»™æ‚¨çš„è”系人。" - -#: C/send-file.page:36(title) -msgid "Send files" -msgstr "å‘é€æ–‡ä»¶" - -#: C/send-file.page:40(p) C/favorite-rooms.page:66(p) -msgid "From the <gui>Contact List</gui> window, perform one of the following:" -msgstr "在<gui>è”系人列表</gui>窗å£ï¼Œæ‰§è¡Œä¸‹åˆ—æ“作之一：" +"输入必è¦çš„ä¿¡æ¯ã€‚对于大多数å¸å·ï¼Œæ‚¨åªéœ€è¦è¾“入登录 ID 和密ç 。有些å¸å·å¯èƒ½éœ€è¦" +"更多信æ¯ã€‚å‚è§<link xref=\"accounts-window#details\"/>获å–更多信æ¯ã€‚" -#: C/send-file.page:45(p) -msgid "" -"Right click on the contact you want to send a file to, and choose <gui>Send " -"file</gui>." -msgstr "å³é”®ç‚¹å‡»è¦å‘å…¶å‘é€æ–‡ä»¶çš„è”系人，然åŽé€‰æ‹©<gui>å‘é€æ–‡ä»¶</gui>。" +#: C/add-account.page:74(item/p) C/import-account.page:61(item/p) +#: C/irc-nick-password.page:63(item/p) +msgid "Click <gui style=\"button\">Apply</gui>." +msgstr "点击<gui style=\"button\">应用</gui>。" -#: C/send-file.page:50(p) +#: C/add-account.page:81(note/p) msgid "" -"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</" -"gui><gui>Contact</gui><gui>Send file</gui></guiseq>." +"To change the name that identifies the account in the <gui>Accounts</gui> " +"window, select the account from the list on the left and either click on the " +"name or press the space bar. Edit the account name and press <key>Enter</" +"key> when you’re finished." msgstr "" -"点击è¦å‘å…¶å‘é€æ–‡ä»¶çš„è”系人，然åŽé€‰æ‹©<guiseq><gui>编辑</gui><gui>è”系人</" -"gui><gui>å‘é€æ–‡ä»¶</gui></guiseq>。" +"è¦æ”¹å˜å¸å·åœ¨<gui>å¸å·</gui>窗å£ä¸çš„ä½œä¸ºæ ‡è¯†çš„åå—，在左侧的列表ä¸é€‰æ‹©å¸å·ï¼Œç„¶" +"åŽç‚¹å‡»åå—æˆ–è€…æŒ‰ç©ºæ ¼é”®ã€‚ç¼–è¾‘å¸å·çš„åå—，完æˆåŽæŒ‰<key>Enter</key>。" -#: C/send-file.page:58(p) -msgid "Select the file to send, and click on <gui>Send</gui>." -msgstr "选择è¦å‘é€çš„文件，并点击<gui>å‘é€</gui>。" +#: C/add-contact.page:9(info/desc) +msgid "Add someone to the contact list." +msgstr "æ·»åŠ æŸäººåˆ°è”系人列表。" -#: C/send-file.page:63(p) -msgid "The <gui>File Transfers</gui> window will appear." -msgstr "<gui>æ–‡ä»¶ä¼ è¾“</gui>窗å£ä¼šè¢«æ˜¾ç¤ºã€‚" +#: C/add-contact.page:18(credit/name) C/change-status.page:24(credit/name) +#: C/prob-conn-acctdisabled.page:15(credit/name) +#: C/prob-conn-auth.page:17(credit/name) +#: C/prob-conn-neterror.page:15(credit/name) C/prob-conn.page:14(credit/name) +#: C/send-file.page:17(credit/name) C/send-message.page:17(credit/name) +msgid "Phil Bull" +msgstr "Phil Bull" -#: C/send-file.page:66(p) -msgid "" -"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> " -"to halt the transfer." -msgstr "请ç‰å¾…您的è”系人接å—æ–‡ä»¶ä¼ è¾“ï¼Œæˆ–ç‚¹å‡»<gui>åœæ¢</gui>æ¥ç»ˆæ¢ä¼ 输。" +#: C/add-contact.page:33(page/title) +msgid "Add someone to your list of contacts" +msgstr "æ·»åŠ æŸäººåˆ°æ‚¨çš„è”系人列表" -#: C/send-file.page:72(p) -msgid "" -"Once the transfer is finished, it is possible to close the <gui>File " -"Transfers</gui> window." -msgstr "ä¼ è¾“ç»“æŸä¹‹åŽï¼Œå°±å¯ä»¥å…³é—<gui>æ–‡ä»¶ä¼ è¾“</gui>窗å£äº†ã€‚" +#: C/add-contact.page:37(item/p) +msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>." +msgstr "选择<guiseq><gui>èŠå¤©</gui><gui>æ·»åŠ è”系人</gui></guiseq>。" -#: C/send-file.page:80(p) +#: C/add-contact.page:40(item/p) msgid "" -"If you have multiple finished transfers listed in the window, click on " -"<gui>Clear</gui> to empty the list. This will only remove the files from the " -"list and will not delete them from your computer." +"From the <gui>Account</gui> drop-down list, select the account you wish to " +"use to connect to your contact. Your contact will need to be using the same " +"service as the account you select." msgstr "" -"如果窗å£ä¸åˆ—出了很多已ç»å®Œæˆçš„ä¼ è¾“ï¼Œç‚¹å‡»<gui>清除</gui>å¯ä»¥æ¸…空列表。这åªä¼šå°†" -"列表清空，而ä¸ä¼šä»Žæ‚¨çš„è®¡ç®—æœºä¸Šåˆ é™¤è¿™äº›æ–‡ä»¶ã€‚" +"在 <gui>å¸å·</gui> 下拉列表ä¸ï¼Œé€‰æ‹©æ‚¨ç”¨æ¥ä¸Žæ‚¨çš„è”系人è”系的å¸å·ã€‚您的è”系人需" +"è¦ä½¿ç”¨ä¸Žæ‚¨é€‰æ‹©çš„å¸å·ç›¸åŒçš„æœåŠ¡ã€‚" -#: C/send-file.page:87(p) +#: C/add-contact.page:45(item/p) msgid "" -"It is possible to send files only using the following services: <em>Jabber</" -"em>, <em>Google Talk</em> and <em>People Nearby</em>." +"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, " +"screen name, or other appropriate identifier for the service type." msgstr "" -"åªæœ‰ä½¿ç”¨ä¸‹åˆ—æœåŠ¡æ‰èƒ½å‘é€æ–‡ä»¶ï¼š<em>Jabber</em>ã€<em>Google Talk</em>å’Œ<em>附近" -"的人</em>。" +"在 <gui>æ ‡è¯†ç¬¦</gui> 一æ ä¸ï¼Œè¾“入这ç§æœåŠ¡ä¸æ‚¨çš„è”系人的登录 ID，用户å，显示" +"å或其他åˆé€‚çš„æ ‡è¯†ç¬¦ã€‚" -#: C/send-file.page:93(p) +#: C/add-contact.page:49(item/p) msgid "" -"In order to send a file to someone, you need to be connected to the " -"Internet, or to a local area network." -msgstr "è¦å‘别人å‘é€æ–‡ä»¶ï¼Œæ‚¨éœ€è¦è¿žæŽ¥åˆ°äº’è”网，或本地局域网。" +"In the <gui>Alias</gui> field, type your contact’s name as you would like it " +"to appear in your contact list." +msgstr "在 <gui>别å</gui> ä¸ï¼Œè¾“入您希望这个è”系人显示在è”系人列表ä¸çš„åå—。" -#: C/salut-protocol.page:8(desc) -msgid "Understanding the People Nearby feature." -msgstr "ç†è§£é™„近的人(People Nearby)功能" +#: C/add-contact.page:53(item/p) +msgid "Click <gui>Add</gui> to add the person to your list of contacts." +msgstr "点击<gui>æ·»åŠ </gui>å°†æ¤äººæ·»åŠ 到您的è”系人列表。" -#: C/salut-protocol.page:33(title) -msgid "What is People Nearby?" -msgstr "什么是“附近的人â€ï¼Ÿ" +#: C/add-contact.page:61(note/p) +msgid "" +"To add a new person to your list of contacts, you need to be connected to " +"the Internet and to your account." +msgstr "è¦æ·»åŠ è”系人到您的è”系人列表，您需è¦è¿žæŽ¥å› 特网和您的å¸å·ã€‚" + +#: C/audio-call.page:10(info/desc) +msgid "Call your contacts over the Internet." +msgstr "通过互è”网呼å«æ‚¨çš„è”系人。" -#: C/salut-protocol.page:37(p) -msgid "I'd like to see this played up a bit more." -msgstr "我希望看到更多的人æ¥ç”¨è¿™ä¸ªã€‚" +#: C/audio-call.page:26(credit/name) C/overview.page:16(credit/name) +#: C/share-desktop.page:18(credit/name) C/video-call.page:29(credit/name) +msgid "Ekaterina Gerasimova" +msgstr "Ekaterina Gerasimova" + +#: C/audio-call.page:35(page/title) +msgid "Start an audio conversation" +msgstr "开始è¯éŸ³èŠå¤©" -#: C/salut-protocol.page:40(p) +#: C/audio-call.page:37(page/p) +#, fuzzy +#| msgid "" +#| "You can call your contacts and have an audio conversation with them. This " +#| "features only works with certain types of accounts, and it requires the " +#| "other person to have an application that supports audio calls." msgid "" -"The People Nearby service is a serverless communication service: you do not " -"need to connect and authenticate to a central server in order to use it." +"You can call your contacts and have an audio conversation with them. This " +"features only works with certain types of accounts and it requires the other " +"person to have an application that supports audio calls." msgstr "" -"附近的人(People Nearby)æœåŠ¡æ˜¯ä¸€ä¸ªæ— æœåŠ¡å™¨çš„通讯æœåŠ¡ï¼šæ‚¨ä¸éœ€è¦è¿žæŽ¥å¹¶è®¤è¯åˆ°ä¸€ä¸ª" -"ä¸å¤®æœåŠ¡å™¨æ¥ä½¿ç”¨è¿™ä¸ªåŠŸèƒ½ã€‚" +"您å¯ä»¥å‘¼å«æ‚¨çš„è”系人，与他们进行è¯éŸ³èŠå¤©ã€‚这个功能仅对于一些特定类型的å¸å·å¯" +"用，并且需è¦å¦ä¸€ä¸ªäººä½¿ç”¨çš„应用程åºä¹Ÿæ”¯æŒè¯éŸ³å‘¼å«ã€‚" -#: C/salut-protocol.page:45(p) +#: C/audio-call.page:43(item/p) +#, fuzzy +#| msgid "" +#| "Select the contact you want to have the conversation, and from the menu " +#| "select <gui style=\"menuitem\">Audio Call</gui>." msgid "" -"This kind of serverless messaging system is restricted to a local area " -"network and an active Internet connection is not necessary." -msgstr "è¿™ç±»æ— æœåŠ¡å™¨çš„通讯系统åªå±€é™äºŽæœ¬åœ°å±€åŸŸç½‘，并且ä¸éœ€è¦äº’è”网链接。" +"Right-click on the contact that you want to call and select <gui style=" +"\"menuitem\">Audio Call</gui>." +msgstr "" +"选择您想è¦äº¤è°ˆçš„è”系人，然åŽåœ¨èœå•ä¸é€‰æ‹©<gui style=\"menuitem\">è¯éŸ³å‘¼å«</" +"gui>。" -#: C/salut-protocol.page:49(p) +#: C/audio-call.page:49(item/p) C/video-call.page:50(item/p) +#, fuzzy +#| msgid "" +#| "A new window will open. When the connection is established, you will see " +#| "<gui>Connected</gui> at the bottom of the window, along with the total " +#| "conversation time." msgid "" -"The people that use this service inside the same local area network will be " -"auto-discovered, and it will be possible to send them messages and files as " -"with other services." +"A new window will open. When the connection is established, you will see the " +"total conversation time at the bottom of the window." msgstr "" -"会自动的å‘现在åŒä¸€ä¸ªå±€åŸŸç½‘ä¸ä½¿ç”¨è¿™ä¸ªæœåŠ¡çš„人，并且å¯ä»¥ç»™ä»–们å‘é€æ¶ˆæ¯ç”šè‡³æ–‡" -"件，想其它æœåŠ¡ä¸€æ ·ã€‚" +"一个新窗å£ä¼šè¢«æ‰“开。连接建立åŽï¼Œæ‚¨å°†åœ¨çª—å£åº•éƒ¨çœ‹åˆ°<gui>已连接</gui>，以åŠæ€»ä¼š" +"è¯æ—¶é—´ã€‚" -#: C/salut-protocol.page:54(p) +#: C/audio-call.page:55(item/p) +#, fuzzy +#| msgid "" +#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>." msgid "" -"All the modern local area networks should be able to support this kind of " -"service." -msgstr "所有现代的本地局域网都应该å¯ä»¥æ”¯æŒè¿™ç±»æœåŠ¡ã€‚" +"To end the conversation, click the <gui style=\"button\">hand up</gui> " +"button." +msgstr "点击<gui style=\"button\">挂æ–</gui>以结æŸä¼šè¯ã€‚" -#: C/remove-account.page:8(desc) -msgid "Completely remove an account from <app>Empathy</app>." -msgstr "从 <app>Empathy</app> ä¸å®Œå…¨åœ°åˆ 除一个账户。" +#: C/audio-call.page:63(note/p) +#, fuzzy +#| msgid "" +#| "To turn an audio conversation into a video conversation, choose " +#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</" +#| "gui></guiseq>." +msgid "" +"To turn an audio conversation into a video conversation, choose <guiseq><gui " +"style=\"menu\">Video</gui> <gui style=\"menuitem\">Video On</gui></guiseq>." +msgstr "" +"è¦å°†è¯éŸ³ä¼šè¯è½¬ä¸ºè§†é¢‘会è¯ï¼Œé€‰æ‹© <guiseq><gui style=\"menu\">视频</gui><gui " +"style=\"menuitem\">视频开å¯</gui></guiseq>。" -#: C/remove-account.page:33(title) -msgid "Remove an account" -msgstr "åˆ é™¤è´¦æˆ·" +#: C/audio-call.page:71(section/title) +msgid "Start an audio conversation with a meta-contact" +msgstr "å‘一ä½å…ƒè”系人å‘èµ·è¯éŸ³ä¼šè¯" -#: C/remove-account.page:35(p) +#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p) +#: C/video-call.page:68(item/p) msgid "" -"You can completely remove an account from <app>Empathy</app> if you no " -"longer wish to use the account. If you wish to use the account in " -"<app>Empathy</app> again in the future, you will have to add your account " -"details again." -msgstr "" -"å¦‚æžœä½ ä¸æƒ³å†ä½¿ç”¨æŸä¸ªè´¦æˆ·ï¼Œæ‚¨å¯ä»¥ä»Ž <app>Empathy</app> ä¸å®Œå…¨åœ°åˆ 除这个账户。" -"如果您将æ¥åˆå¸Œæœ›åœ¨ <app>Empathy</app> ä¸ä½¿ç”¨è¿™ä¸ªè´¦æˆ·äº†ï¼Œæ‚¨å¯ä»¥å†æ·»åŠ 这个账" -"户。" +"From the <gui>Contact List</gui> window, right-click on the meta-contact." +msgstr "在<gui>è”系人列表</gui>窗å£ï¼Œå³é”®ç‚¹å‡»è¯¥å…ƒè”系人。" -#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p) -#: C/disable-account.page:48(p) C/add-account.page:48(p) +#: C/audio-call.page:79(item/p) msgid "" -"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</" -"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>." +"Select the contact you want to have the conversation, and from the menu " +"select <gui style=\"menuitem\">Audio Call</gui>." msgstr "" -"在<gui>è”系人列表</gui>窗å£ä¸ï¼Œé€‰æ‹©<guiseq><gui>编辑</gui><gui>账户</gui></" -"guiseq>，或按<key>F4</key>。" +"选择您想è¦äº¤è°ˆçš„è”系人，然åŽåœ¨èœå•ä¸é€‰æ‹©<gui style=\"menuitem\">è¯éŸ³å‘¼å«</" +"gui>。" -#: C/remove-account.page:46(p) +#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p) +#: C/video-call.page:80(note/p) msgid "" -"Select the account you wish to remove from the accounts list on the left " -"side of the window." -msgstr "在窗å£å·¦ä¾§çš„账户列表ä¸é€‰æ‹©æ‚¨æƒ³è¦åˆ 除的账户。" +"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a " +"contact in the <gui>Contact List</gui> window, and stop over it for a " +"second: a small pop-up message will appear showing the number of the " +"contacts that form the meta-contact." +msgstr "" +"è¦è¯†åˆ«ä¸€ä¸ªè”系人是å¦æ˜¯<em>å…ƒè”系人</em>ï¼Œå°†æ‚¨çš„é¼ æ ‡ç§»åŠ¨åˆ°<gui>è”系人列表</" +"gui>窗å£ä¸çš„一个è”系人上，并åœç•™å‡ 秒钟：一个å°å¼¹å‡ºæ¶ˆæ¯ä¼šæ˜¾ç¤ºè¿™ä¸ªå…ƒè”系人是由" +"å‡ ä¸ªè”系人组æˆçš„。" -#: C/remove-account.page:50(p) -msgid "Click on <gui style=\"button\">Remove</gui>." -msgstr "点击<gui style=\"button\">åˆ é™¤</gui>。" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/audio-video.page:58(media) +msgctxt "_" +msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'" +msgstr "" -#: C/remove-account.page:53(p) -msgid "" -"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> " -"button to permanently remove the account." +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/audio-video.page:70(media) +msgctxt "_" +msgid "external ref='figures/camera-web.png' md5='__failed__'" msgstr "" -"一个弹出对è¯æ¡†ä¼šè¦æ±‚æ‚¨ç¡®è®¤åˆ é™¤ã€‚ç‚¹å‡»<gui>åˆ é™¤</gui>按钮æ¥æ°¸ä¹…çš„åˆ é™¤è¿™ä¸ªè´¦æˆ·ã€‚" -#: C/remove-account.page:59(p) +#: C/audio-video.page:8(info/desc) msgid "" -"Even after removing an account, <app>Empathy</app> does not delete your " -"conversation history for that account." -msgstr "å³ä½¿åˆ 除了账户，<app>Empathy</app> 也ä¸ä¼šåˆ 除这个账户的èŠå¤©è®°å½•ã€‚" - -#: C/prob-conn.page:7(desc) -msgid "Diagnose common problems connecting to an instant messaging service." -msgstr "诊æ–连接到一个å³æ—¶æ¶ˆæ¯æœåŠ¡çš„常è§é—®é¢˜ã€‚" - -#: C/prob-conn.page:29(title) -msgid "Problems connecting to an instant messaging service" -msgstr "连接到å³æ—¶æ¶ˆæ¯æœåŠ¡æ—¶çš„问题" +"Information on when it is possible to have an audio or video conversation." +msgstr "è¯éŸ³æˆ–视频会è¯çš„æ¡ä»¶ã€‚" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/prob-conn-neterror.page:58(None) C/prob-conn-name.page:43(None) -#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None) -msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" -msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b" +#: C/audio-video.page:32(page/title) +msgid "Audio and video support" +msgstr "è¯éŸ³å’Œè§†é¢‘支æŒ" -#: C/prob-conn-neterror.page:7(desc) +#: C/audio-video.page:34(page/p) msgid "" -"An error message which says “<gui>Network error</gui>†appears in the main " -"window." -msgstr "主窗å£ä¸æ˜¾ç¤ºäº†ä¸€ä¸ªé”™è¯¯æ示信æ¯ï¼Œâ€œ<gui>网络错误</gui>â€ã€‚" +"You can only have audio and video conversation with contacts who are using " +"an application which also supports this feature. When your contacts support " +"audio or video conversations, you will see the following icons next to their " +"names in the contact list:" +msgstr "" +"您的è”系人也在使用支æŒè¯éŸ³å’Œè§†é¢‘会è¯çš„程åºæ—¶ï¼Œæ‚¨æ‰å¯ä»¥å’Œä»–们进行è¯éŸ³ã€è§†é¢‘会" +"è¯ã€‚如果您的è”系人å¯ä»¥è¿›è¡Œè¯éŸ³æˆ–视频会è¯ï¼Œæ‚¨å°†åœ¨è”系人列表ä¸ä»–们的姓åæ—看到" +"ä¸‹åˆ—å›¾æ ‡ï¼š" -#: C/prob-conn-neterror.page:33(title) -msgid "I get a message that says “Network errorâ€" -msgstr "我收到“网络错误â€çš„错误æ示信æ¯" +#: C/audio-video.page:43(td/p) +msgid "Icon" +msgstr "å›¾æ ‡" -#: C/prob-conn-neterror.page:36(cite) -msgid "shaunm" -msgstr "shaunm" +#: C/audio-video.page:48(td/p) +msgid "Description" +msgstr "æè¿°" -#: C/prob-conn-neterror.page:37(p) +#: C/audio-video.page:57(td/p) +#, fuzzy +#| msgid "" +#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit." +#| "png\">edit</media> icon in the error message." msgid "" -"Empathy no longer allows you to create an IRC account without a valid nick. " -"I've removed the guide link. Remove the text." +"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-" +"microphone.png\"> Icon for audio conversation </media>" msgstr "" +"点击错误æ示信æ¯ä¸Šçš„<media type=\"image\" mime=\"image/png\" src=\"figures/" +"gtk-edit.png\">编辑</media>å›¾æ ‡ã€‚" -#: C/prob-conn-neterror.page:41(p) +#: C/audio-video.page:64(td/p) +msgid "The contact is able to have an audio conversation." +msgstr "è”系人å¯ä»¥è¿›è¡Œè¯éŸ³èŠå¤©ã€‚" + +#: C/audio-video.page:69(td/p) +#, fuzzy +#| msgid "" +#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit." +#| "png\">edit</media> icon in the error message." msgid "" -"This kind of error happens when <app>Empathy</app> cannot communicate with " -"the instant messaging service for some reason." +"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> " +"Icon for video conversation </media>" msgstr "" -"è¿™ç§é”™è¯¯åœ¨ <app>Empathy</app> 由于æŸç§åŽŸå› è€Œæ— æ³•å’Œå³æ—¶é€šè®¯æœåŠ¡å™¨è¿žä¸Šæ—¶å‡ºçŽ°ã€‚" +"点击错误æ示信æ¯ä¸Šçš„<media type=\"image\" mime=\"image/png\" src=\"figures/" +"gtk-edit.png\">编辑</media>å›¾æ ‡ã€‚" -#: C/prob-conn-neterror.page:45(p) +#: C/audio-video.page:76(td/p) +msgid "The contact is able to have a video conversation." +msgstr "è”系人å¯ä»¥è¿›è¡Œè§†é¢‘èŠå¤©ã€‚" + +#: C/audio-video.page:83(note/p) msgid "" -"Also, this kind of error happens when you try to use an IRC account without " -"setting a nickname." -msgstr "æ¤å¤–，这ç§é”™è¯¯ä¹Ÿåœ¨æ‚¨è¯•å›¾ä¸è®¾ç½®æ˜µç§°è€Œä½¿ç”¨ IRC 账户时出现。" +"In order to have an audio conversation, you need to have a sound card that " +"is supported by your operating system, and a working microphone." +msgstr "" +"è¦è¿›è¡Œè¯éŸ³èŠå¤©ï¼Œæ‚¨éœ€è¦æœ‰ä¸€å—声å¡ï¼Œä¸”您的æ“作系统必需支æŒå®ƒï¼Œè¿˜éœ€è¦ä¸€ä¸ªèƒ½æ£å¸¸" +"工作的麦克风。" -#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p) -#: C/prob-conn-acctdisabled.page:43(p) +#: C/audio-video.page:87(note/p) msgid "" -"Make sure that you are connected to the Internet, or to a local area network." -msgstr "ç¡®ä¿æ‚¨å·²ç»è¿žæŽ¥åˆ°äº’è”网，或者一个本地网络。" +"In order to have a video conversation, you need to have a webcam that is " +"supported by your operating system, and a working microphone." +msgstr "è¦è¿›è¡Œè§†é¢‘èŠå¤©ï¼Œæ‚¨éœ€è¦æ“作系统支æŒçš„æ‘„åƒå¤´ï¼ŒåŠå¯ä»¥æ£å¸¸å·¥ä½œçš„麦克风。" -#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p) -#: C/prob-conn-auth.page:57(p) +#: C/audio-video.page:95(section/title) +msgid "Supported Account Types" +msgstr "支æŒçš„å¸å·ç±»åž‹" + +#: C/audio-video.page:97(section/p) msgid "" -"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png" -"\">edit</media> icon in the error message." +"You can only have audio and video conversations using accounts on certain " +"supported services. The following table lists whether audio and video is " +"supported for each type of account." msgstr "" -"点击错误æ示信æ¯ä¸Šçš„<media type=\"image\" mime=\"image/png\" src=\"figures/" -"gtk-edit.png\">编辑</media>å›¾æ ‡ã€‚" +"åªæœ‰ä¸€äº›ç‰¹å®šç±»åž‹çš„å¸å·æ”¯æŒè¯éŸ³æˆ–视频èŠå¤©ã€‚下表列出了æ¯ç§ç±»åž‹çš„å¸å·çš„è¯éŸ³ã€è§†" +"频支æŒæƒ…况。" -#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p) +#: C/audio-video.page:102(note/p) msgid "" -"Check in the <gui>Advanced</gui> section that all the details are correct. " -"You should be able to find these details from the website of the messaging " -"service." +"Account types are provided by plugins. Your system may not have all of the " +"following types available, or it may have types not listed here. Updated " +"plugins may make audio or video conversations possible on account types that " +"are listed as unsupported here." msgstr "" -"检查<gui>高级</gui>选项å¡ä¸çš„所有细节是å¦æ£ç¡®ã€‚您应当å¯ä»¥ä»Žå³æ—¶é€šè®¯æœåŠ¡å•†çš„网" -"站上找到这些信æ¯ã€‚" +"å¸å·ç±»åž‹æ˜¯ç”±æ’件æ供的。您的系统上ä¸ä¸€å®šæœ‰ä»¥ä¸‹åˆ—出的全部类型，也å¯èƒ½æœ‰ä¸€äº›ç±»" +"型没有在下é¢åˆ—出。æ’件的å‡çº§å¯èƒ½ä½¿ä¸‹è¡¨ä¸ä¸æ”¯æŒè¯éŸ³æˆ–视频的å¸å·ç±»åž‹èŽ·å¾—支æŒã€‚" -#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p) -msgid "" -"Deselect the <gui>Enabled</gui>, and then select it again to try to " -"reconnect to the service." -msgstr "å–消选择<gui>å·²å¯ç”¨</gui>，然åŽå†æ¬¡é€‰ä¸ä»¥é‡æ–°è¿žæŽ¥åˆ°æœåŠ¡å™¨ã€‚" +#: C/audio-video.page:128(td/p) +msgid "Service" +msgstr "æœåŠ¡" -#: C/prob-conn-neterror.page:90(title) -msgid "Proxy support" -msgstr "代ç†æ”¯æŒ" +#: C/audio-video.page:129(td/p) +msgid "Audio" +msgstr "è¯éŸ³" -#: C/prob-conn-neterror.page:91(p) -msgid "" -"At the moment <app>Empathy</app> can not be configured to work with a proxy." -msgstr "ç›®å‰ <app>Empathy</app> æ— æ³•åœ¨ä»£ç†ä¸‹å·¥ä½œã€‚" +#: C/audio-video.page:130(td/p) +msgid "Video" +msgstr "视频" -#: C/prob-conn-name.page:9(title) -msgid "“Name in useâ€" -msgstr "“用户åå·²ç»è¢«å 用â€" +#: C/audio-video.page:135(td/p) +msgid "AIM" +msgstr "AIM" -#: C/prob-conn-name.page:10(desc) -msgid "" -"An error message which says “<gui>Name in use</gui>†appears in the main " -"window." -msgstr "主窗å£ä¸æ˜¾ç¤ºäº†ä¸€ä¸ªé”™è¯¯æ示信æ¯ï¼Œâ€œ<gui>用户å已被å 用</gui>â€ã€‚" +#: C/audio-video.page:136(td/p) C/audio-video.page:137(td/p) +#: C/audio-video.page:141(td/p) C/audio-video.page:142(td/p) +#: C/audio-video.page:146(td/p) C/audio-video.page:147(td/p) +#: C/audio-video.page:156(td/p) C/audio-video.page:157(td/p) +#: C/audio-video.page:161(td/p) C/audio-video.page:162(td/p) +#: C/audio-video.page:166(td/p) C/audio-video.page:167(td/p) +#: C/audio-video.page:181(td/p) C/audio-video.page:182(td/p) +#: C/audio-video.page:186(td/p) C/audio-video.page:187(td/p) +#: C/audio-video.page:191(td/p) C/audio-video.page:192(td/p) +#: C/audio-video.page:196(td/p) C/audio-video.page:197(td/p) +#: C/audio-video.page:201(td/p) C/audio-video.page:202(td/p) +#: C/audio-video.page:211(td/p) C/audio-video.page:212(td/p) +#: C/audio-video.page:216(td/p) C/audio-video.page:217(td/p) +msgid "No" +msgstr "å¦" -#: C/prob-conn-name.page:32(title) -msgid "I get a message that says “Name in useâ€" -msgstr "我收到“用户åå·²ç»è¢«å 用â€çš„错误æ示信æ¯" +#: C/audio-video.page:140(td/p) +msgid "Facebook Chat" +msgstr "Facebook èŠå¤©" -#: C/prob-conn-name.page:34(p) -msgid "" -"This kind of error happens when you try to connect to your IRC account and " -"you are using a nickname that is already being used by someone else on that " -"particular network." -msgstr "" -"è¿™ç§é”™è¯¯å‡ºçŽ°åœ¨æ‚¨å°è¯•è¿žæŽ¥åˆ° IRC 账户，然而您使用的昵称æ£åœ¨è¢«è¯¥ç½‘络上其他人使用" -"的情况下。" +#: C/audio-video.page:145(td/p) +msgid "gadugadu" +msgstr "gadugadu" -#: C/prob-conn-name.page:50(p) -msgid "In the <gui>Nickname</gui> text box, type a new nickname." -msgstr "在<gui>昵称</gui>文本框ä¸ï¼Œè¾“入一个新昵称。" +#: C/audio-video.page:150(td/p) +msgid "Google Talk" +msgstr "Google Talk" -#: C/prob-conn-name.page:55(p) -msgid "" -"If you have registered that nickname within the network you are using, set " -"the password for that nickname. For more information, see <link xref=\"irc-" -"nick-password\"/>." -msgstr "" -"如果您在所用的网路ä¸æ³¨å†Œäº†è¿™ä¸ªæ˜µç§°ï¼Œè¯·ä¸ºè¯¥æ˜µç§°è®¾ç½®å¯†ç 。更多信æ¯å‚è§<link " -"xref=\"irc-nick-password\"/>。" +#: C/audio-video.page:151(td/p) C/audio-video.page:152(td/p) +#: C/audio-video.page:171(td/p) C/audio-video.page:172(td/p) +#: C/audio-video.page:176(td/p) C/audio-video.page:177(td/p) +#: C/audio-video.page:206(td/p) C/audio-video.page:207(td/p) +msgid "Yes" +msgstr "是" -#: C/prob-conn-name.page:64(p) -msgid "" -"Deselect the <gui>Enabled</gui> check-box next to the name of your account, " -"and then select it again to try to reconnect to the service." -msgstr "" -"å–消选择账户æ—边的<gui>å·²å¯ç”¨</gui>å¤é€‰æ¡†ï¼Œç„¶åŽå†æ¬¡é€‰ä¸ä»¥é‡æ–°è¿žæŽ¥åˆ°æœåŠ¡å™¨ã€‚" +#: C/audio-video.page:155(td/p) +msgid "Groupwise" +msgstr "Groupwise" -#: C/prob-conn-auth.page:8(desc) -msgid "" -"An error message which says “<gui>Authentication failed</gui>†appears in " -"the main window." -msgstr "主窗å£ä¸æ˜¾ç¤ºäº†ä¸€ä¸ªé”™è¯¯æ示信æ¯ï¼Œâ€œ<gui>验è¯å¤±è´¥</gui>â€ã€‚" +#: C/audio-video.page:160(td/p) +msgid "ICQ" +msgstr "ICQ" -#: C/prob-conn-auth.page:36(title) -msgid "I get a message that says “Authentication failedâ€" -msgstr "我收到“验è¯å¤±è´¥â€çš„错误æ示信æ¯" +#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title) +msgid "IRC" +msgstr "IRC" -#: C/prob-conn-auth.page:38(p) -msgid "" -"This kind of error happens when your instant messaging service is not " -"allowing you to connect because it does not recognize your username or " -"password for some reason." -msgstr "" -"è¿™ç§é”™è¯¯å‘生在您的å³æ—¶é€šä¿¡æœåŠ¡å™¨æ— 法确认您的身份，ä¸å…è®¸æ‚¨è¿žæŽ¥æ—¶ã€‚æ¯”å¦‚ï¼Œå› ä¸º" -"æŸç§åŽŸå› ï¼Œå®ƒæ— æ³•è¯†åˆ«æ‚¨çš„ç”¨æˆ·å或者密ç 。" +#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title) +msgid "Jabber" +msgstr "Jabber" -#: C/prob-conn-auth.page:50(p) -msgid "" -"Make sure that you have registered an account with the service you are " -"trying to connect to. If you do not have an account, most services will not " -"allow you to connect." -msgstr "" -"ç¡®ä¿æ‚¨å·²ç»åœ¨è¦è¿žæŽ¥çš„æœåŠ¡ä¸Šæ³¨å†Œäº†è´¦æˆ·ã€‚如果没有账户，多数æœåŠ¡éƒ½ä¸ä¼šå…许您连" -"接。" +#: C/audio-video.page:175(td/p) +msgid "MSN" +msgstr "MSN" -#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p) -msgid "" -"Type your username and password again to make sure that they are correct." -msgstr "å†æ¬¡è¾“入您的用户å和密ç ，以确ä¿å®ƒä»¬æ˜¯æ£ç¡®çš„。" +#: C/audio-video.page:180(td/p) +msgid "myspace" +msgstr "myspace" -#: C/prob-conn-acctdisabled.page:7(desc) -msgid "" -"The instant messaging account that you want to use is not enabled in the " -"list of accounts." -msgstr "您è¦è¿žæŽ¥çš„å³æ—¶é€šä¿¡è´¦æˆ·æ²¡æœ‰åœ¨è´¦æˆ·åˆ—表ä¸å¯ç”¨ã€‚" +#: C/audio-video.page:185(td/p) +msgid "qq" +msgstr "qq" -#: C/prob-conn-acctdisabled.page:33(title) -msgid "My account is not enabled" -msgstr "我的账户没有å¯ç”¨" +#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title) +msgid "People Nearby" +msgstr "附近的人" -#: C/prob-conn-acctdisabled.page:35(p) -msgid "" -"If the instant messaging account that you want to use is not enabled in the " -"drop-down account list when you try to start a new conversation or join a " -"room, your account details may not be correct." -msgstr "" -"如果当您å°è¯•å¼€å§‹ä¸€ä¸ªæ–°ä¼šè¯æˆ–è€…åŠ å…¥æˆ¿é—´æ—¶ï¼Œè¦ä½¿ç”¨çš„å³æ—¶èŠå¤©è´¦æˆ·æ²¡æœ‰åœ¨ä¸‹æ‹‰çš„è´¦" -"户列表ä¸å¯ç”¨ï¼Œæ‚¨çš„账户信æ¯å¯èƒ½ä¸æ£ç¡®ã€‚" +#: C/audio-video.page:195(td/p) +msgid "sametime" +msgstr "sametime" -#: C/prob-conn-acctdisabled.page:48(p) -msgid "" -"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the " -"account that is not working." -msgstr "" -"选择<guiseq><gui>编辑</gui><gui>账户</gui></guiseq>，å†é€‰æ‹©ä¸å·¥ä½œçš„账户。" +#: C/audio-video.page:200(td/p) +msgid "silc" +msgstr "silc" -#: C/prob-conn-acctdisabled.page:65(p) -msgid "" -"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. " -"If it is not, select the check-box to enable the account." -msgstr "" -"检查<gui style=\"checkbox\">å·²å¯ç”¨</gui>选框是å¦å‹¾é€‰ã€‚没有的勾选它已å¯ç”¨è´¦" -"户。" +#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title) +msgid "SIP" +msgstr "SIP" -#: C/prev-conv.page:8(desc) -msgid "Browse or search your previous conversations." -msgstr "æµè§ˆæˆ–æœç´¢æ‚¨ä¹‹å‰çš„会è¯ã€‚" +#: C/audio-video.page:210(td/p) +msgid "Yahoo!" +msgstr "Yahoo!" -#: C/prev-conv.page:35(title) -msgid "View previous conversations" -msgstr "查看之å‰çš„会è¯" +#: C/audio-video.page:215(td/p) +msgid "zephyr" +msgstr "zephyr" -#: C/prev-conv.page:39(p) -msgid "" -"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug." -"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, " -"independent of the selection (like in yellow or something), we can use the " -"term \"highlight\". Otherwise we need to use the term \"select\". Watch that " -"bug." -msgstr "" +#: C/change-status.page:9(info/desc) +msgid "Change your status to advertise your availability to your contacts." +msgstr "改å˜æ‚¨çš„状æ€ä»¥å‘您的è”系人表明您是å¦é—²æš‡ã€‚" -#: C/prev-conv.page:46(p) +#: C/change-status.page:39(page/title) +msgid "Change your status" +msgstr "改å˜æ‚¨çš„状æ€" + +#: C/change-status.page:41(page/p) msgid "" -"<app>Empathy</app> automatically saves all your text conversations you have " -"with your contacts. You can <link xref=\"#search\">search through all of " -"your previous conversations</link> or <link xref=\"#browse\">browse previous " -"conversations</link> by contact and date." +"You can set your status to indicate your availability to your contacts. " +"<app>Empathy</app> allows you to select from a list of defined statuses." msgstr "" -"<app>Empathy</app> 自动ä¿å˜æ‚¨å’Œè”系人的所有文å—会è¯ã€‚您å¯ä»¥<link xref=" -"\"#search\">æœç´¢ä¹‹å‰å…¨éƒ¨çš„会è¯</link>æˆ–è€…æ ¹æ®è”系人和日期<link xref=\"#browse" -"\">æµè§ˆä¹‹å‰çš„会è¯</link>。" +"您å¯ä»¥æ”¹å˜æ‚¨çš„状æ€ï¼Œä»Žè€Œå‘è”系人表明您现在是å¦é—²æš‡ã€‚<app>Empathy</app> å…许您" +"从一些定义好的状æ€ä¸é€‰æ‹©ä¸€ä¸ªã€‚" -#: C/prev-conv.page:54(p) +#: C/change-status.page:46(item/p) msgid "" -"You do not need to be connected to the Internet to view and search your " -"previous conversations." -msgstr "您ä¸éœ€è¦è¿žæŽ¥åˆ°ç½‘络æ¥æŸ¥çœ‹å’Œæœç´¢æ‚¨ä¹‹å‰çš„会è¯ã€‚" +"Click on the drop-down list at the top of the <gui>Contact List</gui> window." +msgstr "点击 <gui>è”系人列表</gui> 窗å£é¡¶éƒ¨çš„下拉列表。" -#: C/prev-conv.page:61(title) -msgid "Search previous conversations" -msgstr "æœç´¢ä¹‹å‰çš„会è¯" +#: C/change-status.page:51(item/p) +msgid "Select a status from the list." +msgstr "从列表ä¸é€‰æ‹©ä¸€ä¸ªçŠ¶æ€ã€‚" -#: C/prev-conv.page:63(p) +#: C/change-status.page:57(page/p) msgid "" -"You can perform a full-text search through all of your previous " -"conversations." -msgstr "您å¯ä»¥åœ¨ä¹‹å‰çš„所有会è¯ä¸è¿›è¡Œå…¨æ–‡æœç´¢ã€‚" +"See <link xref=\"status-icons\"/> for a list of the built-in statuses and " +"what they mean. You can also <link xref=\"set-custom-status\">add custom " +"status messages</link> to provide more information about your availability " +"to your contacts." +msgstr "" +"内置状æ€åŠå…¶å«ä¹‰å‚è§<link xref=\"status-icons\"/>。您也å¯ä»¥<link xref=\"set-" +"custom-message\">æ·»åŠ è‡ªå®šä¹‰æ¶ˆæ¯</link>æ¥å‘您的è”系人æ供更多有关您当å‰çŠ¶æ€çš„" +"ä¿¡æ¯ã€‚" -#: C/prev-conv.page:67(p) C/prev-conv.page:96(p) +#: C/change-status.page:63(note/p) msgid "" -"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</" -"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press " -"<key>F3</key>." +"If you do not use your computer for a while, or if the screensaver is on, " +"the status will be automatically set to Away." msgstr "" -"从<gui>è”系人列表</gui>窗å£ï¼Œé€‰æ‹©<guiseq><gui>查看</gui><gui>以å‰çš„会è¯</" -"gui></guiseq>。或者å¯ä»¥æŒ‰<key>F3</key>键。" +"如果您一段时间ä¸ä½¿ç”¨è®¡ç®—机，或å±å¹•ä¿æŠ¤å¼€å§‹è¿è¡Œï¼Œæ‚¨çš„状æ€ä¼šè‡ªåŠ¨å˜ä¸ºâ€œç¦»å¼€â€ã€‚" -#: C/prev-conv.page:71(p) -msgid "Select the <gui>Search</gui> tab." -msgstr "选择<gui>æœç´¢</gui>æ ‡ç¾ã€‚" +#: C/create-account.page:9(info/desc) +msgid "Register for an account with one of the supported messaging services." +msgstr "为æŸç§æ”¯æŒçš„æœåŠ¡æ³¨å†Œå¸å·ã€‚" -#: C/prev-conv.page:74(p) -msgid "" -"In the <gui>For</gui> field, type the text you want to search for. Click " -"<gui>Find</gui> or press <key>Enter</key>." -msgstr "" -"在<gui>关键è¯</gui>ä¸ï¼Œè¾“入您想è¦æœç´¢çš„æ–‡å—。点击<gui>查找</gui>或按" -"<key>Enter</key>。" +#: C/create-account.page:34(page/title) +msgid "Register for a new account" +msgstr "注册一个新å¸å·" -#: C/prev-conv.page:78(p) +#: C/create-account.page:36(page/p) msgid "" -"Any conversations that matched your search terms will be shown in the list " -"below the search field. By default, conversations are ordered by date." -msgstr "符åˆæœç´¢æ¡ä»¶çš„会è¯ä¼šæ˜¾ç¤ºåœ¨ä¸‹é¢çš„列表ä¸ã€‚会è¯é»˜è®¤æŒ‰æ—¥æœŸæŽ’åºã€‚" +"Most account types require you to create an account with a account provider " +"before you can connect using instant messaging applications like " +"<app>Empathy</app>. With some account providers, you can use <app>Empathy</" +"app> to register for a new account, using the same steps as you would to " +"<link xref=\"add-account\">add an account</link>." +msgstr "" +"大多å¸å·ç±»åž‹éœ€è¦æ‚¨åœ¨ä½¿ç”¨ <app>Empathy</app> è¿™æ ·çš„å³æ—¶é€šè®¯è½¯ä»¶è¿žæŽ¥ä¹‹å‰å…ˆå»ºç«‹" +"å¸å·ã€‚但对于æŸäº›å¸å·æ供商，您å¯ä»¥ä½¿ç”¨ <app>Empathy</app> æ¥æ³¨å†Œæ–°å¸å·ï¼Œä½¿ç”¨" +"与 <link xref=\"add-account\">æ·»åŠ å¸å·</link> 相åŒçš„æ¥éª¤ã€‚" -#: C/prev-conv.page:82(p) +#: C/create-account.page:42(page/p) msgid "" -"Click on a conversation to view it. <app>Empathy</app> will select the text " -"in the conversation that matched your search terms." +"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 "" -"点击一个会è¯ä»¥æŸ¥çœ‹ã€‚<app>Empathy</app> 会选择这个会è¯ä¸ç¬¦åˆæ‚¨æœç´¢æ¡ä»¶çš„æ–‡å—。" +"这一页是关于建立å„ç§ç±»åž‹çš„å¸å·çš„。您应当已ç»ä»Žæ‚¨çš„å¸å·æ供商那里得到了登录 " +"ID 和密ç ，以åŠå…¶ä»–使用 <app>Empathy</app> 连接这个å¸å·éœ€è¦çš„ä¿¡æ¯ã€‚" -#: C/prev-conv.page:89(title) -msgid "Browse previous conversations" -msgstr "æµè§ˆä¹‹å‰çš„会è¯" +#: C/create-account.page:47(section/title) +msgid "Facebook" +msgstr "Facebook" -#: C/prev-conv.page:91(p) +#: C/create-account.page:48(section/p) msgid "" -"You can browse your previous conversations with your contacts or in chat " -"rooms by date." -msgstr "您å¯ä»¥æŒ‰æ—¶é—´é¡ºåºæµè§ˆä¹‹å‰å’Œè”系人或在èŠå¤©å®¤ä¸çš„会è¯ã€‚" - -#: C/prev-conv.page:100(p) -msgid "Select the <gui>Conversations</gui> tab." -msgstr "选择<gui>会è¯</gui>æ ‡ç¾ã€‚" +"Facebook is one of the most-used social networks. It allows users to create " +"their own profile and to communicate with their friends." +msgstr "" +"Facebook 是最常用的社交网络之一。它å…许用户对自己进行个性化的æ述并与朋å‹ä»¬äº¤" +"æµã€‚" -#: C/prev-conv.page:103(p) +#: C/create-account.page:52(section/p) msgid "" -"Select an account from the drop-down list in the top left. A list of " -"contacts and chat room for that account will be shown below." +"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." +"facebook.com</link>." msgstr "" -"在左上的下拉列表ä¸é€‰æ‹©ä¸€ä¸ªè´¦æˆ·ã€‚下方会显示这个账户的è”系人和èŠå¤©å®¤åˆ—表。" +"è¦ä½¿ç”¨ Facebook 与您的朋å‹ä»¬äº¤æµï¼Œæ‚¨éœ€è¦åœ¨å…¶ç½‘站上建立一个新å¸å·ï¼š<link href=" +"\"http://www.facebook.com\">www.facebook.com</link>。" -#: C/prev-conv.page:107(p) +#: C/create-account.page:62(section/p) msgid "" -"Select a contact or chat room to view your previous conversations from. By " -"default the most recent conversation will be shown." -msgstr "选择一个è”系人或èŠå¤©å®¤ä»¥æŸ¥çœ‹ä¹‹å‰çš„会è¯ã€‚默认显示的是最近的会è¯ã€‚" +"Jabber is an open instant messaging system. Like email, Jabber allows you to " +"choose your account provider and communicate with all other Jabber users, " +"regardless of their account provider." +msgstr "" +"Jabber 是一ç§å¼€æ”¾çš„å³æ—¶é€šè®¯ç³»ç»Ÿã€‚åƒ email ä¸€æ ·ï¼ŒJabber å…许您选择å¸å·æ供商，" +"并与其他 Jabber 用户交æµï¼Œæ— 论他们使用哪里å¸å·æ供商。" -#: C/prev-conv.page:111(p) +#: C/create-account.page:66(section/p) msgid "" -"You can browse your conversations by date. Days on which you had a " -"conversation with the selected contact will be shown in bold text. Click a " -"date to select it. Click the arrows next to the month and year to browse " -"earlier dates." +"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." +"org/\">Jabber.org</link>." msgstr "" -"您å¯ä»¥æŒ‰æ—¥æœŸæµè§ˆæ‚¨çš„会è¯ã€‚如果在æŸæ—¥æ‚¨æ‰€é€‰æ‹©çš„账户有过会è¯ï¼Œè¯¥æ—¥ä¼šä»¥ç²—体显" -"示。点击一个日期以选择它。点击月和年æ—çš„ç®å¤´ä»¥æµè§ˆæ›´æ—©çš„日期。" +"您需è¦åœ¨æŸä¸ª Jabber æœåŠ¡æ供商那里建立å¸å·ã€‚有许多 Jabber æœåŠ¡æ供商，<link " +"href=\"http://register.jabber.org/\">Jabber.org</link> 是很æµè¡Œçš„一个。" -#: C/prev-conv.page:117(p) +#: C/create-account.page:71(note/p) msgid "" -"You can search for text in the displayed conversation by typing into the " -"search field at the top. The matching text will be highlighted." +"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 " +"password in <app>Empathy</app> to connect." msgstr "" -"您å¯ä»¥åœ¨ä¸Šæ–¹çš„æœç´¢æ ä¸è¾“入文å—，以在显示的会è¯ä¸æœç´¢æ–‡å—。匹é…çš„æ–‡å—会被高亮" -"显示。" +"如果您使用 Google Mail 或者 Google Talk，那么您已ç»æ‹¥æœ‰ Jabber å¸å·äº†ã€‚" +"Google Talk 就是一个 Jabber æœåŠ¡ã€‚您åªéœ€è¦ä½¿ç”¨æ‚¨çš„ Google Mail 地å€å’Œå¯†ç 在 " +"<app>Empathy</app> ä¸è¿žæŽ¥ã€‚" -#: C/prev-conv.page:121(p) +#: C/create-account.page:80(section/p) 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." +"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, " +"such as a wireless hotspot. It automatically finds all other users on the " +"network who are also using this service." msgstr "" -"在 <gui>è”系人列表</gui> 窗å£ä¸ï¼Œæ‚¨å¯ä»¥å¿«é€Ÿçš„查看与æŸä¸ªè”系人之å‰è¿›è¡Œè¿‡çš„会" -"è¯ã€‚å³é”®ç‚¹å‡»è¯¥è”系人并选择 <gui>查看以å‰çš„对è¯</gui>。<gui>最近会è¯</gui>窗å£" -"会打开，且该è”系人会被选ä¸ã€‚" - -#: C/link-contacts.page:11(desc) -msgid "Merge and separate different contacts into a single one." -msgstr "å°†ä¸åŒçš„è”系人åˆå¹¶åˆ†å‰²ä¸ºä¸€ä¸ªè”系人。" +"è¦ä½¿ç”¨è¿™ä¸ªæœåŠ¡ï¼Œæ‚¨å¹¶ä¸éœ€è¦åœ¨æŸä¸ªæœåŠ¡æ供商那里创建å¸å·ï¼Œåªéœ€è¦è¿žæŽ¥åˆ°ä¸€ä¸ªæœ¬åœ°" +"ç½‘ç»œï¼Œæ¯”å¦‚ä¸€ä¸ªæ— çº¿çƒç‚¹ã€‚它会自动å‘现网络ä¸ä½¿ç”¨è¿™ä¸ªæœåŠ¡çš„其他用户。" -#: C/link-contacts.page:25(title) -msgid "Combine and separate contacts" -msgstr "åˆå¹¶å’Œåˆ†å‰²è”系人" +#: C/create-account.page:85(section/p) +msgid "For more information, see <link xref=\"salut-protocol\"/>." +msgstr "更多信æ¯å‚è§<link xref=\"salut-protocol\"/>。" -#: C/link-contacts.page:26(p) +#: C/create-account.page:91(section/p) 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 "如果您的è”系人有多个èŠå¤©æœåŠ¡çš„多个账户，您å¯ä»¥å°†ä»–们åˆå¹¶æˆä¸€ä¸ªè”系人。" +"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 是一ç§å…许用户通过互è”网进行è¯éŸ³å’Œè§†é¢‘会è¯çš„开放系统。您需è¦åœ¨æŸä¸ª SIP æœ" +"务æ供商处创建å¸å·ã€‚您å¯ä»¥å’Œå…¶ä»–çš„ SIP 用户交æµï¼Œæ— 论他们的 SIP æœåŠ¡æ供商与" +"您是å¦ç›¸åŒã€‚" -#: C/link-contacts.page:30(p) +#: C/create-account.page:97(note/p) msgid "" -"The resulting contact is called a <em>meta-contact</em>: a contact composed " -"from different single contacts." -msgstr "产生的è”系人称为一个<em>å…ƒè”系人</em>：由多个ä¸åŒè”系人组æˆçš„è”系人。" +"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 "" +"由于技术上的差别，å…费的 <link href=\"https://www.ekiga.net/index.php?" +"page=register\">Ekiga.net</link> æœåŠ¡ç›®å‰åœ¨ <app>Empathy</app> ä¸è¿˜ä¸èƒ½ä½¿ç”¨ã€‚" -#: C/link-contacts.page:34(p) +#: C/create-account.page:102(section/p) msgid "" -"If you have a Jane Smith contact that is using three different messaging " -"services like:" -msgstr "如果您有一个å«åš Jane Smith çš„è”系人，她使用三ç§ä¸åŒçš„èŠå¤©æœåŠ¡ï¼š" - -#: C/link-contacts.page:40(p) -msgid "janes@facebook" -msgstr "janes@facebook" - -#: C/link-contacts.page:45(p) -msgid "jane.smith@gmail" -msgstr "jane.smith@gmail" - -#: C/link-contacts.page:50(p) -msgid "jane_smith@hotmail" -msgstr "jane_smith@hotmail" - -#: C/link-contacts.page:55(p) -msgid "You can combine these contacts into a single Jane Smith one." -msgstr "您å¯ä»¥å°†è¿™äº›è”系人åˆå¹¶æˆä¸€ä¸ª Jane Smith." +"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 "" +"有些 SIP æœåŠ¡æ供商å…许用您的计算机呼å«ä¸€èˆ¬çš„电è¯ã€‚通常，您需è¦è®¢é˜…æŸç§ä»˜è´¹æœ" +"务æ‰èƒ½ä½¿ç”¨è¿™ä¸ªåŠŸèƒ½ã€‚" -#: C/link-contacts.page:60(title) -msgid "Combining contacts" -msgstr "åˆå¹¶è”系人" +#: C/create-account.page:109(section/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 "" +"您ä¸éœ€è¦æ³¨å†Œå¸å·å°±å¯ä»¥ä½¿ç”¨ IRC。尽管您在 <app>Empathy</app> ä¸æ·»åŠ IRC å¸å·æ—¶" +"指定了一个昵称，这个昵称åªæ˜¯æ‚¨æ¯æ¬¡è¿žæŽ¥æ—¶æ‰å»ºç«‹ã€‚如果有其他用户在使用这个昵" +"称，您需è¦é€‰æ‹©ä¸€ä¸ªå…¶ä»–昵称。" -#: C/link-contacts.page:63(p) +#: C/create-account.page:114(section/p) msgid "" -"From the <gui>Contact List</gui> window, right-click one of the contact that " -"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</" -"gui>." +"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 "" -"在 <gui>è”系人列表</gui> 窗å£ï¼Œå³é”®ç‚¹å‡»æœ‰ä¸åŒè´¦æˆ·çš„è”系人，并选择 <gui style=" -"\"menuitem\">绑定è”系人…</gui>" +"有些 IRC 网络上有一ç§å«åš NickServ çš„æœåŠ¡ï¼Œå…许用户ä¿æŠ¤ä»–们的昵称。更多信æ¯å‚" +"è§<link xref=\"irc-nick-password\"/>。" -#: C/link-contacts.page:70(p) +#: C/create-account.page:117(section/p) msgid "" -"From the left pane in the <gui>Link Contacts</gui> window, select the " -"contacts you want to combine." -msgstr "在 <gui>绑定è”系人</gui> 窗å£çš„å·¦çª—æ ¼ï¼Œé€‰æ‹©æ‚¨æƒ³è¦å…³è”èµ·æ¥çš„è”系人。" +"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 "" +"有些 IRC æœåŠ¡å™¨æ˜¯è¢«å¯†ç ä¿æŠ¤çš„。您需è¦çŸ¥é“密ç æ‰èƒ½è¿žæŽ¥åˆ°è¿™äº›æœåŠ¡å™¨ã€‚é€šå¸¸ï¼Œè¿™æ ·" +"çš„æœåŠ¡å™¨æ˜¯ç§æœ‰çš„。" -#: C/link-contacts.page:76(p) -msgid "Click <gui style=\"button\">Link</gui>." -msgstr "点击 <gui style=\"button\">绑定</gui>." +#: C/create-account.page:122(section/title) +msgid "Proprietary Services" +msgstr "专有的æœåŠ¡" -#: C/link-contacts.page:82(p) +#: C/create-account.page:124(section/p) msgid "" -"When a meta-contact has been created, the default contact that will be used " -"to have a conversation with when you double-click on it, is the contact with " -"the highest presence on-line." +"There are many proprietary instant messaging services that have been " +"developed by different companies or organizations. <app>Empathy</app> allows " +"you to connect to an existing account for most popular services. To create a " +"new account with one of these services, you will need to visit the service’s " +"web site and agree to its terms of use." msgstr "" -"当一个元è”系人被创建åŽï¼Œæ‚¨åŒå‡»è¯¥è”系人时默认使用的è”系人是有最高的在线状æ€çš„" -"è”系人。" +"许多ä¸åŒçš„å…¬å¸æˆ–组织开å‘了一些专è¥çš„å³æ—¶æ¶ˆæ¯æœåŠ¡ã€‚<app>Empathy</app> å…许您连" +"接大多常è§æœåŠ¡çš„æ—¢å˜å¸å·ã€‚è¦ä¸ºè¿™æ ·çš„æœåŠ¡åˆ›å»ºå¸å·ï¼Œæ‚¨éœ€è¦è®¿é—®å…¶ç½‘站并åŒæ„其使" +"用æ¡æ¬¾ã€‚" -#: C/link-contacts.page:91(title) -msgid "Separating contacts" -msgstr "分割è”系人" +#: C/create-account.page:132(item/p) +msgid "<link href=\"http://dashboard.aim.com/aim\">AIM</link>" +msgstr "" -#: C/link-contacts.page:94(p) -msgid "" -"From the <gui>Contact List</gui>, right-click the contact to separate, and " -"select <gui style=\"menuitem\">Link Contacts...</gui>." +#: C/create-account.page:137(item/p) +msgid "<link href=\"https://www.icq.com/register/\">ICQ</link>" msgstr "" -"在 <gui>è”系人列表</gui> 窗å£ä¸ï¼Œå³é”®ç‚¹å‡»è¦åˆ†å‰²çš„è”系人，并选择 <gui style=" -"\"menuitem\">绑定è”系人…</gui>" -#: C/link-contacts.page:100(p) -msgid "Click <gui style=\"button\">Unlink</gui>." -msgstr "点击 <gui style=\"button\">解除绑定</gui>。" +#: C/create-account.page:142(item/p) +msgid "<link href=\"https://accountservices.passport.net\">MSN</link>" +msgstr "" -#: C/license.page:8(desc) -msgid "Legal information." -msgstr "法律信æ¯ã€‚" +#: C/create-account.page:147(item/p) +msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>" +msgstr "" -#: C/license.page:11(title) -msgid "License" -msgstr "许å¯" +#: C/disable-account.page:9(info/desc) +msgid "Prevent <app>Empathy</app> from automatically logging in to an account." +msgstr "使 <app>Empathy</app> ä¸è¦è‡ªåŠ¨ç™»å½•ä¸€ä¸ªå¸å·ã€‚" + +#: C/disable-account.page:40(page/title) +msgid "Disable an account" +msgstr "ç¦ç”¨ä¸€ä¸ªå¸å·" -#: C/license.page:12(p) +#: C/disable-account.page:42(page/p) msgid "" -"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 " -"Unported license." +"You can disable an account to prevent <app>Empathy</app> from logging in to " +"it without removing the account entirely. You may wish to disable and re-" +"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 "" -"本作å“在 CreativeCommons Attribution-Share Alike 3.0 Unported license下å‘布。" +"您å¯ä»¥ç¦ç”¨ä¸€ä¸ªå¸å·ä»¥é˜»æ¢ <app>Empathy</app> 自动登录这个å¸å·è€Œä¸å¿…å°†å…¶å½»åº•åˆ " +"除。您å¯èƒ½æƒ³è¦ç¦ç”¨ã€å¯ç”¨æŸä¸ªå¸å·å¦‚果您åªæƒ³å¶å°”登录这个å¸å·ï¼Œä½†åˆæƒ³ä½¿ç”¨ " +"<app>Empathy</app> ä¸çš„其他å¸å·ã€‚" -#: C/license.page:20(p) -msgid "You are free:" -msgstr "您å¯ä»¥è‡ªç”±ï¼š" +#: C/disable-account.page:53(item/p) +msgid "" +"Select the account you wish to disable from the accounts list on the left " +"side of the window." +msgstr "在窗å£å·¦ä¾§çš„å¸å·åˆ—表ä¸ï¼Œé€‰æ‹©æ‚¨æƒ³è¦ç¦ç”¨çš„å¸å·ã€‚" -#: C/license.page:25(em) -msgid "To share" -msgstr "分享" +#: C/disable-account.page:57(item/p) +msgid "On the right side of the window, switch it off." +msgstr "在窗å£çš„å³ä¾§å…³é—它。" -#: C/license.page:26(p) -msgid "To copy, distribute and transmit the work." -msgstr "å¤åˆ¶ã€åˆ†å‘æˆ–è€…ä¼ æ’作å“。" +#: C/disable-account.page:62(page/p) +msgid "To re-enable the account, switch it on." +msgstr "è¦é‡æ–°å¯ç”¨è¿™ä¸ªå¸å·ï¼Œåˆ™å¼€å¯å®ƒã€‚" -#: C/license.page:29(em) -msgid "To remix" -msgstr "å†åˆ›ä½œ" +#: C/favorite-rooms.page:10(info/desc) +msgid "Set, join and manage favorite rooms." +msgstr "è®¾ç«‹ï¼ŒåŠ å…¥æˆ–ç®¡ç†èŠå¤©å®¤æ”¶è—。" -#: C/license.page:30(p) -msgid "To adapt the work." -msgstr "修改作å“。" +#: C/favorite-rooms.page:29(page/title) +msgid "Favorite rooms" +msgstr "èŠå¤©å®¤æ”¶è—" -#: C/license.page:33(p) -msgid "Under the following conditions:" -msgstr "需éµå®ˆä¸€ä¸‹æ¡ä»¶ï¼š" +#: C/favorite-rooms.page:32(section/title) +msgid "Set a room as a favorite" +msgstr "收è—一个èŠå¤©å®¤" -#: C/license.page:38(em) -msgid "Attribution" -msgstr "ç½²å" +#: C/favorite-rooms.page:35(item/p) +msgid "Join a room." +msgstr "åŠ å…¥ä¸€ä¸ªèŠå¤©å®¤ã€‚" -#: C/license.page:39(p) +#: C/favorite-rooms.page:40(item/p) msgid "" -"You must attribute the work in the manner specified by the author or " -"licensor (but not in any way that suggests that they endorse you or your use " -"of the work)." -msgstr "" -"您必须按照作者或许å¯äººæŒ‡å®šçš„æ–¹å¼å¯¹ä½œå“ç½²å(但ä¸èƒ½ä»¥ä»»ä½•æ–¹å¼æš—示他们认å¯æ‚¨æˆ–者" -"您对作å“的使用)。" - -#: C/license.page:46(em) -msgid "Share Alike" -msgstr "相åŒæ–¹å¼å…±äº«" +"See <link xref=\"irc-join-room\"/> for more information on how to join an " +"IRC room." +msgstr "å…³äºŽå¦‚ä½•åŠ å…¥ IRC èŠå¤©å®¤ï¼Œå‚è§ <link xref=\"irc-join-room\"/>。" -#: C/license.page:47(p) +#: C/favorite-rooms.page:46(item/p) 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." +"See <link xref=\"group-conversations\"/> for more information on how to " +"start or join a group conversation." msgstr "" -"如果您改å˜ã€è½¬æ¢æœ¬ä½œå“或者以本作å“为基础进行å†åˆ›ä½œï¼Œæ‚¨åº”以相åŒã€ç›¸ä¼¼æˆ–者兼容" -"çš„åè®®å‘布修改åŽçš„作å“。" +"关于如何å‘èµ·æˆ–åŠ å…¥ç¾¤ç»„èŠå¤©ï¼Œå‚è§ <link xref=\"group-conversations\"/>。" -#: C/license.page:53(p) +#: C/favorite-rooms.page:54(item/p) msgid "" -"For the full text of the license, see the <link href=\"http://" -"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</" -"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-" -"sa/3.0/\">Commons Deed</link>." +"From the conversation window, choose <guiseq><gui>Conversation</" +"gui><gui>Favorite Chat Room</gui></guiseq>." msgstr "" -"许å¯çš„全文å‚è§ <link href=\"http://creativecommons.org/licenses/by-sa/3.0/" -"legalcode\">CreativeCommons 网站</link>，或者阅读完整的<link href=\"http://" -"creativecommons.org/licenses/by-sa/3.0/\">通俗åè®®</link>。" +"在会è¯çª—å£ï¼Œé€‰æ‹© <guiseq><gui>会è¯</gui><gui>收è—èŠå¤©å®¤</gui></guiseq>。" -#: C/irc-start-conversation.page:8(desc) -msgid "Start a conversation with an IRC contact." -msgstr "å‘ä¸€ä½ IRC è”系人å‘起会è¯ã€‚" +#: C/favorite-rooms.page:63(section/title) +msgid "Join favorite rooms" +msgstr "åŠ å…¥æ”¶è—çš„èŠå¤©å®¤" -#: C/irc-start-conversation.page:30(title) -msgid "Chat with somebody on IRC" -msgstr "与 IRC ä¸æŸäººèŠå¤©" +#: C/favorite-rooms.page:66(item/p) C/send-file.page:40(item/p) +msgid "From the <gui>Contact List</gui> window, perform one of the following:" +msgstr "在<gui>è”系人列表</gui>窗å£ï¼Œæ‰§è¡Œä¸‹åˆ—æ“作之一：" -#: C/irc-start-conversation.page:32(p) -msgid "" -"You can hold private conversations with other IRC users, outside of the " -"public IRC chat rooms. To start a conversation with another IRC user:" -msgstr "" -"您å¯ä»¥åœ¨å…¬å…±çš„ IRC èŠå¤©å®¤ä¹‹å¤–与其他的 IRC 用户进行ç§äººèŠå¤©ã€‚è¦ä¸Žå¦ä¸€ä½ IRC 用" -"户进行会è¯ï¼š" +#: C/favorite-rooms.page:71(item/p) +msgid "Press <key>F5</key>." +msgstr "按 <key>F5</key> 键。" -#: C/irc-start-conversation.page:37(p) +#: C/favorite-rooms.page:76(item/p) msgid "" -"In the contact list for an IRC chat room, double click the name of the user " -"you want to chat with. Alternatively, right click the name of the user and " -"choose <gui>Chat</gui>." +"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join " +"all your favorite rooms." msgstr "" -"在一个 IRC èŠå¤©å®¤çš„è”系人列表ä¸ï¼ŒåŒå‡»æ‚¨æƒ³è¦èŠå¤©çš„用户。或者，å³é”®ç‚¹å‡»ç”¨æˆ·çš„姓" -"å并选择 <gui>èŠå¤©</gui>" +"选择 <guiseq><gui>èŠå¤©å®¤</gui><gui>åŠ å…¥å·²æ”¶è—çš„èŠå¤©å®¤</gui></guiseq>ï¼Œä»¥åŠ å…¥" +"您之å‰æ”¶è—çš„èŠå¤©å®¤ã€‚" -#: C/irc-start-conversation.page:45(p) -msgid "" -"The IRC room contact list is not the same as <app>Empathy</app> contact " -"list. It contains a list of users in the IRC chat room you joined. Different " -"rooms can have different contacts listed." -msgstr "" -"IRC èŠå¤©å®¤çš„è”系人列表与 <app>Empathy</app> çš„è”系人列表ä¸åŒã€‚它包å«äº†æ‚¨åŠ å…¥" -"的这个 IRC èŠå¤©å®¤ä¸çš„用户列表。ä¸åŒçš„èŠå¤©å®¤å¯èƒ½æœ‰ä¸åŒçš„è”系人列表。" +#: C/favorite-rooms.page:82(item/p) +msgid "Choose <gui>Room</gui>, and select the favorite room you want to join." +msgstr "选择 <gui>èŠå¤©å®¤</gui>，并选择您è¦åŠ 入的已收è—çš„èŠå¤©å®¤ã€‚" -#: C/irc-start-conversation.page:52(p) +#: C/favorite-rooms.page:90(note/p) msgid "" -"The IRC room contact list is usually on the right side of the IRC room " -"window. If you do not see it, choose <guiseq><gui>Conversation</" -"gui><gui>Show Contact List</gui></guiseq>." -msgstr "" -"IRC èŠå¤©å®¤çš„è”系人列表通常ä½äºŽçª—å£å³ä¾§ã€‚如果您没有看到它，选择 <guiseq><gui>" -"对è¯</gui><gui>显示è”系人列表</gui></guiseq>。" - -#: C/irc-send-file.page:9(desc) -msgid "<app>Empathy</app> does not currently support sending files using IRC." -msgstr "<app>Empathy</app> ç›®å‰ä¸æ”¯æŒ IRC ä¼ æ–‡ä»¶ã€‚" - -#: C/irc-send-file.page:31(title) -msgid "Send files over IRC" -msgstr "通过 IRC ä¼ é€æ–‡ä»¶" - -#: C/irc-send-file.page:33(p) -msgid "It is not currently possible to send files using IRC." -msgstr "ç›®å‰æ— 法用 IRC ä¼ é€æ–‡ä»¶ã€‚" - -#: C/irc-nick-password.page:10(desc) -msgid "Protect your nickname to prevent other IRC users from using it." -msgstr "ä¿æŠ¤æ‚¨çš„昵称，以防其他 IRC 用户使用。" +"To join a favorite room, you need to be connected to the Internet and to " +"your account." +msgstr "è¦åŠ 入一个已收è—çš„èŠå¤©å®¤ï¼Œæ‚¨å¿…须连接互è”网和您的å¸å·ã€‚" -#: C/irc-nick-password.page:33(title) -msgid "Use a nickname password on IRC" -msgstr "在 IRC ä¸ä½¿ç”¨æ˜µç§°å’Œå¯†ç " +#: C/favorite-rooms.page:98(section/title) +msgid "Manage favorite rooms" +msgstr "管ç†èŠå¤©å®¤æ”¶è—" -#: C/irc-nick-password.page:35(p) +#: C/favorite-rooms.page:101(item/p) msgid "" -"On some IRC networks, you can register your nickname with a service called " -"NickServ. By sending special messages to NickServ, you can set your password " -"and identify yourself. Some IRC chat rooms may not allow you to join without " -"a registered nickname." +"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</" +"gui><gui>Manage Favorites</gui></guiseq>." msgstr "" -"在æŸäº› IRC 网络上，您å¯ä»¥é€šè¿‡ NickServ æœåŠ¡æ³¨å†Œæ‚¨çš„æ˜µç§°ã€‚é€šè¿‡å‘ NickServ å‘é€" -"特殊的消æ¯ï¼Œæ‚¨å¯ä»¥è®¾ç½®å¯†ç æ¥è®¤è¯æ‚¨è‡ªå·±ã€‚一些 IRC èŠå¤©å®¤å¯èƒ½ä¸å…è®¸æ‚¨åŠ å…¥ï¼Œé™¤éž" -"您有注册过的昵称。" +"在 <gui>è”系人列表</gui> 窗å£ï¼Œé€‰æ‹© <guiseq><gui>èŠå¤©å®¤</gui><gui>管ç†æ”¶è—夹" +"</gui></guiseq>。" -#: C/irc-nick-password.page:40(p) +#: C/favorite-rooms.page:107(item/p) msgid "" -"<app>Empathy</app> does not currently support nickname registration. Some " -"IRC networks, however, will automatically forward a <em>server password</em> " -"to NickServ. On these networks, you can use the IRC password in " -"<app>Empathy</app> to identify yourself to NickServ. The popular freenode " -"network is known to have this feature." -msgstr "" -"<app>Empathy</app> ç›®å‰è¿˜ä¸æ”¯æŒæ˜µç§°æ³¨å†Œã€‚但一些 IRC ç½‘ç»œä¼šè‡ªåŠ¨å‘ NickServ å‘" -"é€ä¸€ä¸ª <em>æœåŠ¡å™¨å¯†ç </em>ã€‚åœ¨è¿™æ ·çš„ç½‘ç»œä¸Šï¼Œæ‚¨å¯ä»¥åœ¨ <app>Empathy</app> ä¸ä½¿" -"ç”¨è¿™æ ·çš„å¯†ç å‘ NickServ 认è¯æ‚¨è‡ªå·±ã€‚æµè¡Œçš„ freenode 网络就有这个功能。" - -#: C/irc-nick-password.page:46(p) -msgid "To set an IRC server password:" -msgstr "设置一个 IRC 密ç ：" - -#: C/irc-nick-password.page:54(p) -msgid "Select the IRC account from the list on the left of the dialog." -msgstr "在左侧的对è¯æ¡†ä¸é€‰æ‹©ä¸€ä¸ª IRC 账户" +"From the <gui>Account</gui> drop-down list, select the account you want to " +"manage the favorite rooms of." +msgstr "在 <gui>å¸å·</gui> 下拉列表ä¸ï¼Œé€‰æ‹©æ‚¨è¦ç®¡ç†èŠå¤©å®¤æ”¶è—çš„å¸å·ã€‚" -#: C/irc-nick-password.page:57(p) -msgid "" -"In the <gui>Password</gui> field, type the password you used to register " -"your nikcname." -msgstr "在 <gui>密ç </gui> 一æ ä¸ï¼Œè¾“入您注册您的昵称时使用的密ç 。" +#: C/favorite-rooms.page:111(item/p) +msgid "Select <gui>All</gui> to see all you favorite rooms." +msgstr "选择 <gui>全部</gui> 以看到æœæœ‰æ‚¨æ”¶è—çš„èŠå¤©å®¤ã€‚" -#: C/irc-nick-password.page:63(p) C/import-account.page:61(p) -msgid "Click <gui style=\"button\">Apply</gui>." -msgstr "点击<gui style=\"button\">应用</gui>。" +#: C/favorite-rooms.page:116(item/p) +msgid "Select the favorite room you want to manage:" +msgstr "选择您è¦ç®¡ç†çš„收è—：" -#: C/irc-nick-password.page:69(p) +#: C/favorite-rooms.page:121(item/p) msgid "" -"These instructions only allow you to use a password-protected nickname on " -"certain IRC networks. It is not currently possible to register an IRC " -"nickname or change your nickname password using <app>Empathy</app>." -msgstr "" -"这些说明åªæ˜¯å…许您在特定的 IRC 网络上使用密ç ä¿æŠ¤çš„昵称。目å‰åœ¨ " -"<app>Empathy</app> ä¸è¿˜ä¸èƒ½æ³¨å†Œ IRC 昵称或修改密ç 。" - -#: C/irc-manage.page:10(desc) -msgid "How to use IRC with <app>Empathy</app>." -msgstr "如何在 <app>Empathy</app> ä¸ä½¿ç”¨ IRC。" - -#: C/irc-manage.page:35(title) -msgid "Internet Relay Chat (IRC)" -msgstr "互è”网ä¸ç»§èŠå¤©(IRC)" +"Select the <gui>Auto-Connect</gui> check-box in order to automatically join " +"that room when you connect to your account." +msgstr "选择 <gui>自动连接</gui>，则您连接到您的å¸å·åŽï¼Œä¼šè‡ªåŠ¨åŠ 入这个èŠå¤©å®¤ã€‚" -#: C/irc-manage.page:38(p) C/account-irc.page:39(p) -msgid "" -"You must have the <sys>telepathy-idle</sys> package installed to use IRC in " -"<app>Empathy</app>." -msgstr "" -"è¦åœ¨ <app>Empathy</app> ä¸ä½¿ç”¨ IRC，您必须安装 <sys>telepathy-idle</sys> 包。" +#: C/favorite-rooms.page:127(item/p) +msgid "Click on <gui>Remove</gui> to remove the room from your favorites." +msgstr "点击 <gui>åˆ é™¤</gui> 以从收è—夹ä¸åˆ 除这个èŠå¤©å®¤ã€‚" -#: C/irc-manage.page:42(link) -msgid "Install telepathy-idle" -msgstr "安装 telepathy-idle" +#: C/favorite-rooms.page:134(item/p) +msgid "When done, click <gui>Close</gui>." +msgstr "完æˆåŽï¼Œç‚¹å‡» <gui>å…³é—</gui>。" -#: C/irc-manage.page:49(title) -msgid "IRC Chat Rooms and Conversations" -msgstr "IRC èŠå¤©å®¤å’Œä¼šè¯" +#: C/geolocation.page:8(info/desc) +msgid "Use and understand geolocation in <app>Empathy</app>." +msgstr "使用和了解 <app>Empathy</app> ä¸çš„地ç†ä½ç½®ã€‚" -#: C/irc-manage.page:51(title) -msgid "Chat Rooms and Conversations" -msgstr "èŠå¤©å®¤å’Œä¼šè¯" +#: C/geolocation.page:32(page/title) +msgid "Geographical position" +msgstr "地ç†ä½ç½®" -#: C/irc-manage.page:56(title) -msgid "Common IRC Problems" -msgstr "å¸¸è§ IRC 问题" +#: C/geolocation.page:35(section/title) +msgid "Geolocation" +msgstr "地ç†ä½ç½®" -#: C/irc-manage.page:58(title) C/index.page:55(title) -msgid "Common Problems" -msgstr "常è§é—®é¢˜" +#: C/geolocation.page:39(section/title) +msgid "Fix common problems" +msgstr "ä¿®å¤å¸¸è§é—®é¢˜" -#: C/irc-join-room.page:8(desc) -msgid "Join an IRC channel." -msgstr "åŠ å…¥ä¸€ä¸ª IRC 频é“。" +#: C/geolocation-not-showing.page:8(info/desc) +msgid "<app>Empathy</app> does not publish my geographical position." +msgstr "<app>Empathy</app> 没有å‘布我的地ç†ä½ç½®ã€‚" -#: C/irc-join-room.page:31(title) -msgid "Join an IRC chat room" -msgstr "åŠ å…¥ä¸€ä¸ª IRC èŠå¤©å®¤" +#: C/geolocation-not-showing.page:32(page/title) +msgid "Geographical position not published" +msgstr "地ç†ä½ç½®æ²¡æœ‰è¢«å…¬å¸ƒã€‚" -#: C/irc-join-room.page:33(p) +#: C/geolocation-not-showing.page:34(page/p) msgid "" -"You can join IRC chat rooms (also known as IRC channels) on any IRC network " -"you’re connected to. To connect to an IRC network, see <link xref=\"add-" -"account\"/> and <link xref=\"account-irc\"/>." +"If your contacts cannot see your location, <app>Empathy</app> might not be " +"able to discover with a good margin of precision your geographical position." msgstr "" -"您å¯ä»¥åŠ 入您已ç»è¿žæŽ¥çš„所有 IRC 网络上的 IRC èŠå¤©å®¤(也称为 IRC 频é“)。è¦è¿žæŽ¥ä¸€" -"个 IRC 网络，å‚è§ <link xref=\"add-account\"/> and <link xref=\"account-irc" -"\"/>。" +"如果您的è”系人ä¸èƒ½çœ‹åˆ°æ‚¨çš„ä½ç½®ï¼Œå¯èƒ½æ˜¯å› 为 <app>Empathy</app> æ— æ³•å‘现有一定" +"精度的您的地ç†ä½ç½®ä¿¡æ¯ã€‚" -#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p) -#: C/group-conversations.page:122(p) +#: C/geolocation-not-showing.page:38(page/p) msgid "" -"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</" -"gui><gui>Join</gui></guiseq>." +"In this case, your position will not be published, but you are still able to " +"see the location of your contacts." msgstr "" -"在 <gui>è”系人列表</gui> 窗å£ï¼Œé€‰æ‹© <guiseq><gui>èŠå¤©å®¤</gui><gui>åŠ å…¥</" -"gui></guiseq>。" +"在这ç§æƒ…况下，您的ä½ç½®ä¿¡æ¯ä¸ä¼šè¢«å…¬å¸ƒï¼Œä½†æ‚¨ä»å¯ä»¥çœ‹åˆ°æ‚¨çš„è”系人的ä½ç½®ä¿¡æ¯ã€‚" -#: C/irc-join-room.page:45(p) +#: C/geolocation-not-showing.page:42(page/p) msgid "" -"From the <gui>Account</gui> drop-down list, select the IRC account that " -"corresponds to the network you want to use." -msgstr "在 <gui>账户</gui> 下拉列表ä¸ï¼Œé€‰æ‹©ä¸Žæ‚¨æƒ³è¦ä½¿ç”¨çš„网络对应的 IRC 账户。" +"If you want to publish your geographical position, you can try to use an " +"external device such as a GPS." +msgstr "如果您想è¦å…¬å¸ƒæ‚¨çš„地ç†ä½ç½®ï¼Œæ‚¨å¯ä»¥è¯•ä¸€è¯•ä½¿ç”¨ GPS ç‰å¤–部设备。" -#: C/irc-join-room.page:51(p) +#: C/geolocation-not-showing.page:48(note/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>)." +"In order to publish your geographical location, your Jabber server needs to " +"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://" +"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support " +"PEP</link> is maintained online. Google Talk does not support this feature " +"at this time." msgstr "" -"在 <gui>èŠå¤©å®¤</gui> 文本框ä¸ï¼Œè¾“入您想è¦åŠ 入的频é“çš„å称。IRC 频é“å称以井å·" -"(<sys>#</sys>)开头。" - -#: C/irc-join-room.page:57(p) -msgid "Click <gui>Join</gui> to enter the room." -msgstr "点击<gui>åŠ å…¥</gui>æ¥è¿›å…¥æˆ¿é—´ã€‚" +"è¦å‘布您的地ç†ä½ç½®ï¼Œæ‚¨çš„ Jabber æœåŠ¡å™¨å¿…é¡»æ”¯æŒ Personal Eventing Protocal " +"(PEP)。互è”网上有人维护ç€ä¸€ä»½<link href=\"http://coccinella.im/servers/" +"servers_by_pubsub_pep.html\">æ”¯æŒ PEP çš„æœåŠ¡å™¨åˆ—表</link>。Google Talk ç›®å‰ä¸" +"æ”¯æŒ PEP。" -#: C/irc-join-room.page:64(p) -msgid "" -"To join multiple rooms, you need to repeat the steps above for each room." -msgstr "è¦åŠ 入多个房间，您需è¦å¯¹æ¯ä¸ªæˆ¿é—´é‡å¤ä¸Šé¢çš„æ¥éª¤ã€‚" +#: C/geolocation-privacy.page:8(info/desc) +msgid "What information are sent and to who." +msgstr "å‘é€äº†ä»€ä¹ˆä¿¡æ¯ï¼Œå‘é€ç»™è°äº†ï¼Ÿ" -#: C/irc-join-pwd.page:9(desc) -msgid "Enter password-protected IRC chat rooms." -msgstr "进入有密ç ä¿æŠ¤çš„ IRC èŠå¤©å®¤ã€‚" +#: C/geolocation-privacy.page:32(page/title) +msgid "Geolocation Privacy" +msgstr "地ç†ä½ç½®éšç§" -#: C/irc-join-pwd.page:25(title) -msgid "Join a protected IRC chat room" -msgstr "åŠ å…¥ä¸€ä¸ªå—ä¿æŠ¤çš„ IRC èŠå¤©å®¤" +#: C/geolocation-privacy.page:35(section/title) +msgid "What information is sent" +msgstr "什么信æ¯è¢«å‘é€äº†" -#: C/irc-join-pwd.page:27(p) +#: C/geolocation-privacy.page:36(section/p) msgid "" -"On some IRC networks, private IRC rooms may be protected with a password. If " -"you know the password, use the following steps to join:" +"What is possible to send is: your country, region, locality, area, street, " +"building, floor, room, and postal code, longitude, latitude and altitude, " +"speed and bearing." msgstr "" -"在æŸäº› IRC 网络上，ç§äººçš„ IRC 房间å¯ä»¥è¢«å¯†ç ä¿æŠ¤ã€‚如果您知é“这密ç ，按照下é¢" -"çš„æ¥éª¤åŠ 入：" - -#: C/irc-join-pwd.page:33(p) -msgid "<link xref=\"irc-join-room\">Join the room</link> as normal." -msgstr "å¦‚å¾€å¸¸ä¸€æ ·<link xref=\"irc-join-room\">åŠ å…¥æˆ¿é—´</link>。" +"有å¯èƒ½è¢«å‘é€çš„ä¿¡æ¯ï¼šæ‚¨æ‰€åœ¨çš„国家，地区，地方，区域，街é“，建ç‘，楼层，房间，" +"邮政编ç åŠç»çº¬åº¦ï¼Œæ‚¨çš„速度和方å‘。" -#: C/irc-join-pwd.page:38(p) +#: C/geolocation-privacy.page:40(section/p) msgid "" -"Empathy will prompt you for a password. Enter the password for the IRC chat " -"room and click <gui style=\"button\">Join</gui>." -msgstr "" -"Empathy 会æ示您输入密ç 。输入这个 IRC èŠå¤©å®¤çš„密ç 并点击 <gui style=\"button" -"\">åŠ å…¥</gui>。" - -#: C/irc-commands.page:7(desc) -msgid "The supported IRC commands." -msgstr "支æŒçš„ IRC 命令。" - -#: C/irc-commands.page:18(title) -msgid "Supported IRC commands" -msgstr "支æŒçš„ IRC 命令" +"The accuracy and the quantity of information about your geographical " +"position are based on the software or on the infrastructure used to discover " +"your position." +msgstr "您的地ç†ä½ç½®ä¿¡æ¯çš„精度和质é‡å–决于软件或者用于å‘现您的ä½ç½®çš„设施。" -#: C/irc-commands.page:19(p) +#: C/geolocation-privacy.page:44(section/p) msgid "" -"To see the list of the supported IRC commands, in a chat room type <input>/" -"help</input> and press <key>Enter</key>." +"Different kind of networks may have different accuracy settings, and may " +"send different information. The use of external devices such as GPS or " +"mobile phone will increase the accuracy of the information sent." msgstr "" -"è¦æŸ¥çœ‹æ”¯æŒçš„ IRC 命令的列表，在一个èŠå¤©å®¤ä¸è¾“å…¥<input>/help</input>并按" -"<key>Enter</key>。" - -#: C/irc-commands.page:24(p) -msgid "All commands available have a small description on their usage." -msgstr "所有å¯ç”¨å‘½ä»¤éƒ½æœ‰ä¸€ä¸ªç®€å•çš„用法æ述。" +"ä¸åŒçš„网络å¯èƒ½æœ‰ä¸åŒçš„精度设置，å¯èƒ½å‘é€ä¸åŒçš„ä¿¡æ¯ã€‚使用外部设备，如 GPS 或手" +"机，å¯ä»¥å¢žåŠ å‘é€çš„ä¿¡æ¯çš„精度。" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/introduction.page:41(None) +#: C/geolocation-privacy.page:49(section/p) msgid "" -"@@image: 'figures/empathy-main-window.png'; " -"md5=54908dcb2588beddb15ef0968d2c2582" +"When the privacy mode is enabled, nothing more precise than your city will " +"be sent, even if you are using an external device." msgstr "" -"@@image: 'figures/empathy-main-window.png'; " -"md5=54908dcb2588beddb15ef0968d2c2582" +"当éšç§æ¨¡å¼è¢«å¯ç”¨åŽï¼Œåªæœ‰æ‚¨æ‰€åœ¨çš„城市信æ¯ä¼šè¢«å‘é€ï¼Œå³ä½¿æ‚¨æ£åœ¨ä½¿ç”¨å¤–部设备。" -#: C/introduction.page:9(desc) -msgid "Introduction to the <app>Empathy</app> instant messenger." -msgstr "ä»‹ç» <app>Empathy</app> å³æ—¶èŠå¤©å·¥å…·ã€‚" +#: C/geolocation-privacy.page:56(section/title) +msgid "Who can see the information sent" +msgstr "è°ä¼šçœ‹åˆ°è¿™äº›å‘é€å‡ºåŽ»çš„ä¿¡æ¯" -#: C/introduction.page:21(title) -msgid "Introduction" -msgstr "介ç»" +#: C/geolocation-privacy.page:57(section/p) +msgid "Only your contacts can see your geographical position." +msgstr "åªæœ‰æ‚¨çš„è”系人å¯ä»¥çœ‹åˆ°æ‚¨çš„地ç†ä½ç½®ã€‚" + +#: C/geolocation-privacy.page:63(section/title) +msgid "What is the privacy mode" +msgstr "什么是éšç§æ¨¡å¼" -#: C/introduction.page:23(p) +#: C/geolocation-privacy.page:64(section/p) msgid "" -"<app>Empathy</app> is an instant messaging application for the GNOME " -"Desktop. It supports text messaging, voice & video calls, file " -"transfers, and all the most used messaging systems such as MSN and Google " -"Talk." +"The privacy mode, enabled by default, is a reduced accuracy mode that will " +"decrease the accuracy of the geographical position sent to your contacts." msgstr "" -"<app>Empathy</app> 是 GNOME æ¡Œé¢çš„å³æ—¶é€šè®¯ç¨‹åºã€‚它支æŒæ–‡å—消æ¯ï¼Œè¯éŸ³å’Œè§†é¢‘呼" -"å«ï¼Œæ–‡ä»¶ä¼ 输，支æŒæœ€å¸¸ç”¨çš„å³æ—¶é€šè®¯ç³»ç»Ÿï¼ŒåŒ…括 MSN å’Œ Google Talk." +"éšç§æ¨¡å¼æ˜¯ç²¾åº¦é™ä½Žæ¨¡å¼ï¼Œå®ƒä¼šé™ä½Žå‘é€ç»™æ‚¨çš„è”系人的地ç†ä½ç½®ä¿¡æ¯çš„精度。éšç§æ¨¡" +"å¼é»˜è®¤å¼€å¯ã€‚" + +#: C/geolocation-privacy.page:71(section/title) +msgid "Privacy overview" +msgstr "éšç§æ¦‚è¿°" -#: C/introduction.page:28(p) +#: C/geolocation-privacy.page:72(section/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> å¯ä»¥å¸®åŠ©æ‚¨åœ¨å·¥ä½œä¸æ›´å¥½çš„åˆä½œï¼Œä¹Ÿå¯ä»¥å¸®åŠ©æ‚¨ä¸Žæ‚¨çš„朋å‹ä»¬ä¿æŒ" -"è”系。" +"Overview of the various geolocation privacy settings in <app>Empathy</app>." +msgstr "<app>Empathy</app> ä¸ä¸€äº›å…³äºŽåœ°ç†ä½ç½®éšç§çš„选项的概况。" -#: C/introduction.page:32(p) +#: C/geolocation-privacy.page:77(item/p) +msgid "Geolocation is not enabled by default." +msgstr "地ç†ä½ç½®é»˜è®¤ä¸å¼€å¯ã€‚" + +#: C/geolocation-privacy.page:82(item/p) +msgid "Privacy mode is enabled by default." +msgstr "éšç§æ¨¡å¼é»˜è®¤è¢«æ¿€æ´»" + +#: C/geolocation-privacy.page:87(item/p) msgid "" -"Using <app>Empathy</app>, you can group all the conversations in a single " -"window, have multiple windows for different kind of conversations, easily " -"search through your previous conversations, and share your desktop in just " -"two clicks." -msgstr "" -"使用 <app>Empathy</app>，您å¯ä»¥å°†æ‰€æœ‰çš„会è¯ç»„织在åŒä¸€ä¸ªçª—å£ä¸ï¼Œæˆ–者为ä¸åŒç±»åž‹" -"的会è¯ä½¿ç”¨ä¸åŒçš„窗å£ï¼Œè¿˜å¯ä»¥å¾ˆå®¹æ˜“地æœç´¢ä¹‹å‰çš„会è¯ï¼Œæˆ–者共享您的桌é¢ï¼Œåªéœ€è¦" -"两次点击。" +"Privacy mode prevails even when using external and more precise devices." +msgstr "å³ä½¿åœ¨ä½¿ç”¨ç²¾åº¦æ›´é«˜çš„外部设备，éšç§æ¨¡å¼ä¹Ÿä¼šå‘挥作用。" -#: C/introduction.page:39(title) -msgid "<gui>Contact List</gui> window" -msgstr "<gui>è”系人列表</gui>窗å£" +#: C/geolocation-privacy.page:92(item/p) +msgid "Only your contacts can see your position." +msgstr "åªæœ‰æ‚¨çš„è”系人å¯ä»¥çœ‹åˆ°æ‚¨çš„ä½ç½®ã€‚" -#: C/introduction.page:40(desc) -msgid "<app>Empathy</app> main window" -msgstr "<app>Empathy</app> 主窗å£" +#: C/geolocation-supported.page:7(info/desc) +msgid "Services that supports geolocation and compatibility." +msgstr "支æŒåœ°ç†ä½ç½®çš„æœåŠ¡å’ŒåŠå…¶å…¼å®¹æ€§ã€‚" -#: C/introduction.page:42(p) -msgid "<app>Empathy</app> main window." -msgstr "<app>Empathy</app> 主窗å£ã€‚" +#: C/geolocation-supported.page:31(page/title) +msgid "Supported services" +msgstr "支æŒçš„设备" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/index.page:28(None) +#: C/geolocation-supported.page:33(page/p) msgid "" -"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2" +"The geolocation feature at the moment is compatible only with the Jabber " +"service. In order to use it, you and your contacts need to have a Jabber " +"account." msgstr "" -"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2" - -#: C/index.page:7(title) C/index.page:8(title) -msgid "Empathy Internet Messenger" -msgstr "Empathy 网络èŠå¤©å·¥å…·" +"ç›®å‰ï¼Œåªæœ‰ Jabber æœåŠ¡ä¸Žåœ°ç†ä½ç½®åŠŸèƒ½å…¼å®¹ã€‚è¦ä½¿ç”¨åœ°ç†ä½ç½®ï¼Œæ‚¨å’Œæ‚¨çš„è”系人必须" +"有 Jabber å¸å·ã€‚" -#: C/index.page:27(title) +#: C/geolocation-supported.page:39(note/p) msgid "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> " -"Empathy Internet Messenger logo </media> Empathy Internet Messenger" +"It is necessary that also the server you are using supports the geolocation " +"feature. Most of the Jabber servers support it. See your service website " +"documentation for more information." msgstr "" -"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> " -"Empathy 网络èŠå¤©å·¥å…·æ ‡è¯†</media> Empathy 网络èŠå¤©å·¥å…·" - -#: C/index.page:35(title) -msgid "Account Management" -msgstr "账户管ç†" +"而且，您使用的æœåŠ¡å™¨ä¹Ÿéœ€è¦æ”¯æŒåœ°ç†ä½ç½®åŠŸèƒ½ã€‚大多 Jabber æœåŠ¡å™¨éƒ½æ”¯æŒã€‚è¦äº†è§£" +"更多，请å‚看您的æœåŠ¡æ供者的网站文档。" -#: C/index.page:39(title) -msgid "Contact Management" -msgstr "è”系人管ç†" +#: C/geolocation-supported.page:47(section/title) +msgid "Compatibility" +msgstr "兼容性" -#: C/index.page:43(title) -msgid "Text Conversations" -msgstr "æ–‡å—èŠå¤©" +#: C/geolocation-supported.page:49(section/p) +msgid "" +"<app>Empathy</app> geolocation feature is not compatible with other " +"geographical position services such as <em>Google Latitude</em>, <em>Yahoo " +"Fire Eagle</em> or <em>Brightkite</em>." +msgstr "" +"<app>Empathy</app> 的地ç†ä½ç½®åŠŸèƒ½ä¸Žå…¶ä»–一些地ç†ä½ç½®ä¿¡æ¯æœåŠ¡å¹¶ä¸å…¼å®¹ï¼Œå¦‚ " +"<em>Google Latitude</em>，<em>Yahoo Fire Eggle</em> å’Œ <em>Brightkite</em>。" -#: C/index.page:47(title) -msgid "Audio and Video Conversations" -msgstr "è¯éŸ³å’Œè§†é¢‘èŠå¤©" +#: C/geolocation-turn.page:9(info/desc) +msgid "How to activate and deactivate geolocation in <app>Empathy</app>." +msgstr "在 <app>Empathy</app> ä¸å¦‚何激活和ç¦ç”¨åœ°ç†ä½ç½®ã€‚" -#: C/index.page:51(title) -msgid "Advanced Actions" -msgstr "高级æ“作" +#: C/geolocation-turn.page:33(page/title) +msgid "Activate/Deactivate geolocation" +msgstr "激活/ç¦ç”¨åœ°ç†ä½ç½®" -#: C/import-account.page:10(desc) -msgid "Import an account from another instant messaging application." -msgstr "从其他å³æ—¶èŠå¤©ç¨‹åºä¸å¯¼å…¥è´¦æˆ·ã€‚" +#: C/geolocation-turn.page:37(item/p) +msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>." +msgstr "选择<guiseq><gui>编辑</gui><gui>首选项</gui></guiseq>。" -#: C/import-account.page:19(name) -msgid "Peter Haslam" -msgstr "Peter Haslam" +#: C/geolocation-turn.page:42(item/p) +msgid "Select the <gui>Location</gui> tab." +msgstr "选择<gui>ä½ç½®</gui>æ ‡ç¾ã€‚" -#: C/import-account.page:20(email) -msgid "peter.haslam@freenet.de" -msgstr "peter.haslam@freenet.de" +#: C/geolocation-turn.page:47(item/p) +msgid "" +"Select <gui>Publish location to my contacts</gui> to activate geolocation." +msgstr "选择 <gui>å‘我的è”系人公布ä½ç½®ä¿¡æ¯</gui> 以激活地ç†ä½ç½®ã€‚" -#: C/import-account.page:42(title) -msgid "Import an existing account" -msgstr "导入已å˜åœ¨çš„账户" +#: C/geolocation-turn.page:50(item/p) +msgid "To deactivate geolocation, deselect it." +msgstr "è¦ç¦ç”¨åœ°ç†ä½ç½®ï¼Œè¯·å–消选择。" -#: C/import-account.page:44(p) +#: C/geolocation-turn.page:55(item/p) msgid "" -"The first time you run <app>Empathy</app>, it will offer to import your " -"accounts from other instant messaging applications. Currently, the only " -"supported application is <app>Pidgin</app>." -msgstr "" -"<app>Empathy</app> 第一次è¿è¡Œæ—¶ï¼Œä¼šæ示您å¯ä»¥ä»Žå…¶ä»–å³æ—¶é€šè®¯ç¨‹åºä¸å¯¼å…¥è´¦æˆ·ã€‚ç›®" -"å‰ï¼Œæ”¯æŒçš„程åºåªæœ‰ <app>Pidgin</app>。" +"To increase the accuracy of your position, deselect <gui>Reduce location " +"accuracy</gui>." +msgstr "è¦æ高您的ä½ç½®çš„精度，请å–消选择 <gui>é™ä½Žä½ç½®ä¿¡æ¯ç²¾åº¦</gui>。" -#: C/import-account.page:50(p) +#: C/geolocation-turn.page:61(item/p) msgid "" -"Run <app>Empathy</app> for the first time. An assistant will offer you a " -"number of options to create new accounts." +"If you have an external device like a GPS or want to send a more accurate " +"position, select the appropriate option in the <gui>Location sources</gui> " +"section." msgstr "" -"第一次è¿è¡Œ <app>Empathy</app>，一个助ç†ç¨‹åºä¼šæ供若干选项以创建新账户。" +"如果您有 GPS è¿™æ ·çš„å¤–éƒ¨è®¾å¤‡ï¼Œæˆ–è€…æƒ³è¦å‘é€æ›´åŠ 精确的ä½ç½®ä¿¡æ¯ï¼Œåœ¨<gui>ä½ç½®æ¥æº" +"</gui>选项å¡ä¸é€‰æ‹©é€‚当的选项。" -#: C/import-account.page:54(p) -msgid "" -"Select <gui>Yes, import my account details from</gui> and click " -"<gui>Forward</gui>." -msgstr "选择 <gui>有，请导入我的账户信æ¯</gui> 并点击 <gui>å‰è¿›</gui>。" +#: C/geolocation-what-is.page:9(info/desc) +msgid "Understanding geolocation." +msgstr "了解地ç†ä½ç½®ã€‚" -#: C/import-account.page:58(p) -msgid "Select the check box next to each account you wish to import." -msgstr "选择æ¯ä¸ªæ‚¨æƒ³è¦å¯¼å…¥çš„账户æ—çš„å¤é€‰æ¡†ã€‚" +#: C/geolocation-what-is.page:33(page/title) +msgid "What is geolocation" +msgstr "什么是地ç†ä½ç½®" -#: C/import-account.page:66(p) +#: C/geolocation-what-is.page:35(page/p) msgid "" -"It is not currently possible to import accounts after you have completed the " -"first-run assistant." -msgstr "ç›®å‰ï¼Œæ‚¨åªèƒ½åœ¨ç¬¬ä¸€æ¬¡è¿è¡Œæ—¶çš„助ç†ç¨‹åºä¸å¯¼å…¥è´¦æˆ·ã€‚" - -#: C/hide-contacts.page:8(desc) -msgid "Hide the offline contacts from your <gui>Contact List</gui>." -msgstr "在 <gui>è”系人列表</gui> ä¸éšè—离线è”系人。" +"Geolocation allows you to identify the real geographical location of a " +"computer or a device connected to the Internet." +msgstr "地ç†ä½ç½®å…许您确定连接到网络的一å°ç”µè„‘或设备在地ç†ä¸Šçš„真实ä½ç½®ã€‚" -#: C/hide-contacts.page:19(title) -msgid "Hide offline contacts" -msgstr "éšè—离线的è”系人" +#: C/geolocation-what-is.page:37(page/p) +msgid "With geolocation in <app>Empathy</app> you can:" +msgstr "通过 <app>Empathy</app> ä¸çš„地ç†ä½ç½®ï¼Œæ‚¨å¯ä»¥ï¼š" -#: C/hide-contacts.page:21(p) -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 "" -"一般情况下，<app>Empathy</app> 会显示您所有的è”系人：您å¯ä»¥ä¸Žä¹‹è¿›è¡Œä¼šè¯çš„在线" -"çš„è”系人，和那些离线的è”系人。" +#: C/geolocation-what-is.page:42(item/p) +msgid "Publish your geographical location to your contacts." +msgstr "公布您的地ç†ä½ç½®ç»™è”系人。" -#: C/hide-contacts.page:25(p) -msgid "To hide the contacts that are offline:" -msgstr "è¦éšè—离线的è”系人：" +#: C/geolocation-what-is.page:47(item/p) +msgid "See your contacts’ geographical location and quickly contact them." +msgstr "查看è”系人的地å€ä½ç½®å¹¶å¿«é€Ÿè”系他们。" -#: C/hide-contacts.page:31(p) +#: C/geolocation-what-is.page:52(item/p) msgid "" -"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</" -"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</" -"key><key>H</key></keyseq>." -msgstr "" -"在 <gui>è”系人列表</gui> 窗å£ï¼Œé€‰æ‹© <guiseq><gui>查看</gui><gui>离线è”系人</" -"gui></guiseq>，或按下 <keyseq><key>Ctrl</key><key>H</key></keyseq>。" +"Set the accuracy of your location and the device used to discover your " +"location." +msgstr "设置您的地ç†ä½ç½®çš„精度åŠå¯ä»¥ç”¨æ¥å‘现您的地ç†ä½ç½®çš„设备。" -#: C/hide-contacts.page:36(p) -msgid "To show the offline contacts again, repeat the same procedure above." -msgstr "è¦å†æ¬¡æ˜¾ç¤ºç¦»çº¿çš„è”系人，é‡å¤ä¸Šé¢çš„æ¥éª¤ã€‚" +#: C/geolocation-what-is.page:60(note/p) +msgid "" +"In order to see your contacts’ geographical locations, they need to use a " +"service and an application that supports geolocation." +msgstr "您的è”系人必须使用支æŒåœ°ç†ä½ç½®çš„程åºï¼Œæ‚¨æ‰èƒ½çœ‹åˆ°ä»–们的地ç†ä½ç½®ã€‚" -#: C/group-conversations.page:8(desc) +#: C/group-conversations.page:8(info/desc) msgid "Start or join a group conversation with your contacts." msgstr "开始和您的è”系人进行群组èŠå¤©ï¼Œæˆ–åŠ å…¥ç¾¤ç»„èŠå¤©ã€‚" -#: C/group-conversations.page:34(title) +#: C/group-conversations.page:34(page/title) msgid "Group conversations" msgstr "群组èŠå¤©" -#: C/group-conversations.page:36(p) +#: C/group-conversations.page:36(page/p) msgid "" "Group conversations permits you to have text conversations with more than " "one contact at the same time." msgstr "在群组èŠå¤©ä¸ï¼Œæ‚¨å¯ä»¥å’Œä¸æ¢ä¸€ä½è”系人åŒæ—¶è¿›è¡Œæ–‡å—交谈。" -#: C/group-conversations.page:40(p) +#: C/group-conversations.page:40(page/p) 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 "" -"è¦è¿›è¡Œç¾¤ç»„èŠå¤©æ‚¨éœ€è¦æ³¨å†Œæœ‰ Jabber 账户或者 Google Talk 账户，或者“附近的人â€è´¦" +"è¦è¿›è¡Œç¾¤ç»„èŠå¤©æ‚¨éœ€è¦æ³¨å†Œæœ‰ Jabber å¸å·æˆ–者 Google Talk å¸å·ï¼Œæˆ–者“附近的人â€è´¦" "户。" -#: C/group-conversations.page:46(p) +#: C/group-conversations.page:46(note/p) msgid "" "You can have a group conversation only with the contacts that are using the " "same service as yours." msgstr "您åªèƒ½å’Œé‚£äº›ä¸Žæ‚¨ä½¿ç”¨åŒæ ·çš„æœåŠ¡çš„è”系人进行群组èŠå¤©ã€‚" -#: C/group-conversations.page:54(title) +#: C/group-conversations.page:54(section/title) msgid "Start a group conversation" msgstr "开始群组èŠå¤©" -#: C/group-conversations.page:63(p) +#: C/group-conversations.page:58(item/p) +#: C/group-conversations.page:122(item/p) C/irc-join-room.page:39(item/p) +msgid "" +"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</" +"gui><gui>Join</gui></guiseq>." +msgstr "" +"在 <gui>è”系人列表</gui> 窗å£ï¼Œé€‰æ‹© <guiseq><gui>èŠå¤©å®¤</gui><gui>åŠ å…¥</" +"gui></guiseq>。" + +#: C/group-conversations.page:63(item/p) msgid "" "From the <gui>Account</gui> drop-down list, select the account you want to " "use for the group conversation." -msgstr "在 <gui>账户</gui> 下拉列表ä¸ï¼Œé€‰æ‹©ä¸€ä¸ªè´¦æˆ·ç”¨æ¥è¿›è¡Œç¾¤ç»„èŠå¤©ã€‚" +msgstr "在 <gui>å¸å·</gui> 下拉列表ä¸ï¼Œé€‰æ‹©ä¸€ä¸ªå¸å·ç”¨æ¥è¿›è¡Œç¾¤ç»„èŠå¤©ã€‚" -#: C/group-conversations.page:69(p) +#: C/group-conversations.page:69(item/p) msgid "" "In the <gui>Server</gui> text box, type the name of server in which the " "conversation will be hosted." msgstr "在 <gui>æœåŠ¡å™¨</gui> 文本框ä¸ï¼Œè¾“入将会承载这次èŠå¤©çš„æœåŠ¡å™¨å称。" -#: C/group-conversations.page:73(p) +#: C/group-conversations.page:73(item/p) msgid "Leave it empty if it will be on the current server." msgstr "如果è¦ä½¿ç”¨å½“å‰æœåŠ¡å™¨ï¼Œè¯·å°†å…¶ç•™ç©ºã€‚" -#: C/group-conversations.page:78(p) +#: C/group-conversations.page:78(item/p) msgid "" "In the <gui>Room</gui> text box, type the name you want to give to the " "conversation." msgstr "在 <gui>èŠå¤©å®¤</gui> 文本框ä¸ï¼Œè¾“入您为这次群组èŠå¤©èµ·çš„åå—。" -#: C/group-conversations.page:82(p) +#: C/group-conversations.page:82(note/p) msgid "" "This will be the name of the room you are going to have a conversation. This " "name will be publicly available for other people to join. It is not possible " @@ -1723,7 +1721,7 @@ msgstr "" "这将是您进行群组èŠå¤©çš„èŠå¤©å®¤çš„åå—。这个åå—会被大家看到以使大家å¯ä»¥åŠ 入。您" "ä¸èƒ½å»ºç«‹ä¸€ä¸ªç§äººçš„èŠå¤©å®¤ã€‚" -#: C/group-conversations.page:90(p) +#: C/group-conversations.page:90(item/p) msgid "" "To invite other contacts to join the group conversation, from the " "<gui>Contact List</gui> window, select the contact you want to invite, and " @@ -1732,11 +1730,11 @@ msgstr "" "è¦é‚€è¯·å…¶ä»–è”ç³»äººåŠ å…¥è¿™æ¬¡ç¾¤ç»„èŠå¤©ï¼Œåœ¨ <gui>è”系人列表</gui> 窗å£ï¼Œé€‰æ‹©æ‚¨æƒ³è¦é‚€" "请的è”系人，并进行下列æ“作ä¸çš„æŸä¸€é¡¹ï¼š" -#: C/group-conversations.page:97(p) +#: C/group-conversations.page:97(item/p) msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>." msgstr "å³é”®ç‚¹å‡»è”系人，并选择 <gui>邀请到èŠå¤©å®¤</gui>。" -#: C/group-conversations.page:102(p) +#: C/group-conversations.page:102(item/p) msgid "" "Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</" "gui></guiseq>." @@ -1744,25 +1742,25 @@ msgstr "" "选择 <guiseq><gui>编辑</gui><gui>è”系人</gui><gui>邀请到èŠå¤©å®¤</gui></" "guiseq>。" -#: C/group-conversations.page:107(p) +#: C/group-conversations.page:107(item/p) msgid "" "If you have more than one group conversation open, select the one you want " "to invite your contacts." msgstr "如果您打开了ä¸æ¢ä¸€ä¸ªç¾¤ç»„èŠå¤©ï¼Œé€‰æ‹©æ‚¨æƒ³è¦é‚€è¯·è”ç³»äººåŠ å…¥çš„é‚£ä¸ªã€‚" -#: C/group-conversations.page:118(title) +#: C/group-conversations.page:118(section/title) msgid "Join a group conversation" msgstr "åŠ å…¥ç¾¤ç»„èŠå¤©ã€‚" -#: C/group-conversations.page:128(p) +#: C/group-conversations.page:128(item/p) msgid "Expand the <gui>Room List</gui> section to see all the existing rooms." msgstr "展开<gui>èŠå¤©å®¤åˆ—表</gui>选项å¡æ¥æŸ¥çœ‹æ‰€æœ‰å˜åœ¨çš„房间。" -#: C/group-conversations.page:133(p) +#: C/group-conversations.page:133(item/p) msgid "Double-click on the name of a room to join it." msgstr "åŒå‡»æˆ¿é—´çš„åç§°åŠ å…¥ã€‚" -#: C/group-conversations.page:139(p) +#: C/group-conversations.page:139(section/p) msgid "" "It is not possible to join all existing rooms. Some of the rooms might " "require a password, or might be invitation only. <app>Empathy</app> does not " @@ -1771,1347 +1769,1760 @@ msgstr "" "并éžæ‰€æœ‰çš„èŠå¤©å®¤éƒ½å¯ä»¥åŠ 入。有些èŠå¤©å®¤å¯èƒ½éœ€è¦å¯†ç ，有些åªæœ‰æ”¶åˆ°é‚€è¯·æ‰èƒ½åŠ " "入。<app>Empathy</app> ä¸æ”¯æŒè¿™äº›æˆ¿é—´ã€‚" -#: C/geolocation-what-is.page:9(desc) -msgid "Understanding geolocation." -msgstr "了解地ç†ä½ç½®ã€‚" +#: C/hide-contacts.page:8(info/desc) +msgid "Hide the offline contacts from your <gui>Contact List</gui>." +msgstr "在 <gui>è”系人列表</gui> ä¸éšè—离线è”系人。" -#: C/geolocation-what-is.page:33(title) -msgid "What is geolocation" -msgstr "什么是地ç†ä½ç½®" +#: C/hide-contacts.page:19(page/title) +msgid "Hide offline contacts" +msgstr "éšè—离线的è”系人" -#: C/geolocation-what-is.page:35(p) +#: C/hide-contacts.page:21(page/p) msgid "" -"Geolocation allows you to identify the real geographical location of a " -"computer or a device connected to the Internet." -msgstr "地ç†ä½ç½®å…许您确定连接到网络的一å°ç”µè„‘或设备在地ç†ä¸Šçš„真实ä½ç½®ã€‚" - -#: C/geolocation-what-is.page:37(p) -msgid "With geolocation in <app>Empathy</app> you can:" -msgstr "通过 <app>Empathy</app> ä¸çš„地ç†ä½ç½®ï¼Œæ‚¨å¯ä»¥ï¼š" - -#: C/geolocation-what-is.page:42(p) -msgid "Publish your geographical location to your contacts." -msgstr "公布您的地ç†ä½ç½®ç»™è”系人。" - -#: C/geolocation-what-is.page:47(p) -msgid "See your contacts’ geographical location and quickly contact them." -msgstr "查看è”系人的地å€ä½ç½®å¹¶å¿«é€Ÿè”系他们。" +"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 "" +"一般情况下，<app>Empathy</app> 会显示您所有的è”系人：您å¯ä»¥ä¸Žä¹‹è¿›è¡Œä¼šè¯çš„在线" +"çš„è”系人，和那些离线的è”系人。" -#: C/geolocation-what-is.page:52(p) -msgid "" -"Set the accuracy of your location and the device used to discover your " -"location." -msgstr "设置您的地ç†ä½ç½®çš„精度åŠå¯ä»¥ç”¨æ¥å‘现您的地ç†ä½ç½®çš„设备。" +#: C/hide-contacts.page:25(page/p) +msgid "To hide the contacts that are offline:" +msgstr "è¦éšè—离线的è”系人：" -#: C/geolocation-what-is.page:60(p) +#: C/hide-contacts.page:31(item/p) +#, fuzzy +#| msgid "" +#| "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</" +#| "gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</" +#| "key><key>H</key></keyseq>." msgid "" -"In order to see your contacts’ geographical locations, they need to use a " -"service and an application that supports geolocation." -msgstr "您的è”系人必须使用支æŒåœ°ç†ä½ç½®çš„程åºï¼Œæ‚¨æ‰èƒ½çœ‹åˆ°ä»–们的地ç†ä½ç½®ã€‚" +"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> " +"<gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</key> " +"<key>H</key></keyseq>." +msgstr "" +"在 <gui>è”系人列表</gui> 窗å£ï¼Œé€‰æ‹© <guiseq><gui>查看</gui><gui>离线è”系人</" +"gui></guiseq>，或按下 <keyseq><key>Ctrl</key><key>H</key></keyseq>。" -#: C/geolocation-turn.page:9(desc) -msgid "How to activate and deactivate geolocation in <app>Empathy</app>." -msgstr "在 <app>Empathy</app> ä¸å¦‚何激活和ç¦ç”¨åœ°ç†ä½ç½®ã€‚" +#: C/hide-contacts.page:36(item/p) +msgid "To show the offline contacts again, repeat the same procedure above." +msgstr "è¦å†æ¬¡æ˜¾ç¤ºç¦»çº¿çš„è”系人，é‡å¤ä¸Šé¢çš„æ¥éª¤ã€‚" -#: C/geolocation-turn.page:33(title) -msgid "Activate/Deactivate geolocation" -msgstr "激活/ç¦ç”¨åœ°ç†ä½ç½®" +#: C/import-account.page:10(info/desc) +msgid "Import an account from another instant messaging application." +msgstr "从其他å³æ—¶èŠå¤©ç¨‹åºä¸å¯¼å…¥å¸å·ã€‚" -#: C/geolocation-turn.page:37(p) -msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>." -msgstr "选择<guiseq><gui>编辑</gui><gui>首选项</gui></guiseq>。" +#: C/import-account.page:19(credit/name) +msgid "Peter Haslam" +msgstr "Peter Haslam" -#: C/geolocation-turn.page:42(p) -msgid "Select the <gui>Location</gui> tab." -msgstr "选择<gui>ä½ç½®</gui>æ ‡ç¾ã€‚" +#: C/import-account.page:42(page/title) +msgid "Import an existing account" +msgstr "导入已å˜åœ¨çš„å¸å·" -#: C/geolocation-turn.page:47(p) +#: C/import-account.page:44(page/p) msgid "" -"Select <gui>Publish location to my contacts</gui> to activate geolocation." -msgstr "选择 <gui>å‘我的è”系人公布ä½ç½®ä¿¡æ¯</gui> 以激活地ç†ä½ç½®ã€‚" +"The first time you run <app>Empathy</app>, it will offer to import your " +"accounts from other instant messaging applications. Currently, the only " +"supported application is <app>Pidgin</app>." +msgstr "" +"<app>Empathy</app> 第一次è¿è¡Œæ—¶ï¼Œä¼šæ示您å¯ä»¥ä»Žå…¶ä»–å³æ—¶é€šè®¯ç¨‹åºä¸å¯¼å…¥å¸å·ã€‚ç›®" +"å‰ï¼Œæ”¯æŒçš„程åºåªæœ‰ <app>Pidgin</app>。" -#: C/geolocation-turn.page:50(p) -msgid "To deactivate geolocation, deselect it." -msgstr "è¦ç¦ç”¨åœ°ç†ä½ç½®ï¼Œè¯·å–消选择。" +#: C/import-account.page:50(item/p) +msgid "" +"Run <app>Empathy</app> for the first time. An assistant will offer you a " +"number of options to create new accounts." +msgstr "" +"第一次è¿è¡Œ <app>Empathy</app>，一个助ç†ç¨‹åºä¼šæ供若干选项以创建新å¸å·ã€‚" -#: C/geolocation-turn.page:55(p) +#: C/import-account.page:54(item/p) msgid "" -"To increase the accuracy of your position, deselect <gui>Reduce location " -"accuracy</gui>." -msgstr "è¦æ高您的ä½ç½®çš„精度，请å–消选择 <gui>é™ä½Žä½ç½®ä¿¡æ¯ç²¾åº¦</gui>。" +"Select <gui>Yes, import my account details from</gui> and click " +"<gui>Forward</gui>." +msgstr "选择 <gui>有，请导入我的å¸å·ä¿¡æ¯</gui> 并点击 <gui>å‰è¿›</gui>。" + +#: C/import-account.page:58(item/p) +msgid "Select the check box next to each account you wish to import." +msgstr "选择æ¯ä¸ªæ‚¨æƒ³è¦å¯¼å…¥çš„å¸å·æ—çš„å¤é€‰æ¡†ã€‚" -#: C/geolocation-turn.page:61(p) +#: C/import-account.page:66(note/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>Location sources</gui> " -"section." +"It is not currently possible to import accounts after you have completed the " +"first-run assistant." +msgstr "ç›®å‰ï¼Œæ‚¨åªèƒ½åœ¨ç¬¬ä¸€æ¬¡è¿è¡Œæ—¶çš„助ç†ç¨‹åºä¸å¯¼å…¥å¸å·ã€‚" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/introduction.page:41(media) +#, fuzzy +#| msgid "" +#| "@@image: 'figures/empathy-main-window.png'; " +#| "md5=54908dcb2588beddb15ef0968d2c2582" +msgctxt "_" +msgid "" +"external ref='figures/empathy-main-window.png' " +"md5='54908dcb2588beddb15ef0968d2c2582'" msgstr "" -"如果您有 GPS è¿™æ ·çš„å¤–éƒ¨è®¾å¤‡ï¼Œæˆ–è€…æƒ³è¦å‘é€æ›´åŠ 精确的ä½ç½®ä¿¡æ¯ï¼Œåœ¨<gui>ä½ç½®æ¥æº" -"</gui>选项å¡ä¸é€‰æ‹©é€‚当的选项。" +"@@image: 'figures/empathy-main-window.png'; " +"md5=54908dcb2588beddb15ef0968d2c2582" -#: C/geolocation-supported.page:7(desc) -msgid "Services that supports geolocation and compatibility." -msgstr "支æŒåœ°ç†ä½ç½®çš„æœåŠ¡å’ŒåŠå…¶å…¼å®¹æ€§ã€‚" +#: C/introduction.page:9(info/desc) +msgid "Introduction to the <app>Empathy</app> instant messenger." +msgstr "ä»‹ç» <app>Empathy</app> å³æ—¶èŠå¤©å·¥å…·ã€‚" -#: C/geolocation-supported.page:31(title) -msgid "Supported services" -msgstr "支æŒçš„设备" +#: C/introduction.page:21(page/title) +msgid "Introduction" +msgstr "介ç»" -#: C/geolocation-supported.page:33(p) +#: C/introduction.page:23(page/p) msgid "" -"The geolocation feature at the moment is compatible only with the Jabber " -"service. In order to use it, you and your contacts need to have a Jabber " -"account." +"<app>Empathy</app> is an instant messaging application for the GNOME " +"Desktop. It supports text messaging, voice & video calls, file " +"transfers, and all the most used messaging systems such as MSN and Google " +"Talk." msgstr "" -"ç›®å‰ï¼Œåªæœ‰ Jabber æœåŠ¡ä¸Žåœ°ç†ä½ç½®åŠŸèƒ½å…¼å®¹ã€‚è¦ä½¿ç”¨åœ°ç†ä½ç½®ï¼Œæ‚¨å’Œæ‚¨çš„è”系人必须" -"有 Jabber 账户。" +"<app>Empathy</app> 是 GNOME æ¡Œé¢çš„å³æ—¶é€šè®¯ç¨‹åºã€‚它支æŒæ–‡å—消æ¯ï¼Œè¯éŸ³å’Œè§†é¢‘呼" +"å«ï¼Œæ–‡ä»¶ä¼ 输，支æŒæœ€å¸¸ç”¨çš„å³æ—¶é€šè®¯ç³»ç»Ÿï¼ŒåŒ…括 MSN å’Œ Google Talk." -#: C/geolocation-supported.page:39(p) +#: C/introduction.page:28(page/p) msgid "" -"It is necessary that also the server you are using supports the geolocation " -"feature. Most of the Jabber servers support it. See your service website " -"documentation for more information." +"<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 "" -"而且，您使用的æœåŠ¡å™¨ä¹Ÿéœ€è¦æ”¯æŒåœ°ç†ä½ç½®åŠŸèƒ½ã€‚大多 Jabber æœåŠ¡å™¨éƒ½æ”¯æŒã€‚è¦äº†è§£" -"更多，请å‚看您的æœåŠ¡æ供者的网站文档。" - -#: C/geolocation-supported.page:47(title) -msgid "Compatibility" -msgstr "兼容性" +"<app>Empathy</app> å¯ä»¥å¸®åŠ©æ‚¨åœ¨å·¥ä½œä¸æ›´å¥½çš„åˆä½œï¼Œä¹Ÿå¯ä»¥å¸®åŠ©æ‚¨ä¸Žæ‚¨çš„朋å‹ä»¬ä¿æŒ" +"è”系。" -#: C/geolocation-supported.page:49(p) +#: C/introduction.page:32(page/p) msgid "" -"<app>Empathy</app> geolocation feature is not compatible with other " -"geographical position services such as <em>Google Latitude</em>, <em>Yahoo " -"Fire Eagle</em> or <em>Brightkite</em>." +"Using <app>Empathy</app>, you can group all the conversations in a single " +"window, have multiple windows for different kind of conversations, easily " +"search through your previous conversations, and share your desktop in just " +"two clicks." msgstr "" -"<app>Empathy</app> 的地ç†ä½ç½®åŠŸèƒ½ä¸Žå…¶ä»–一些地ç†ä½ç½®ä¿¡æ¯æœåŠ¡å¹¶ä¸å…¼å®¹ï¼Œå¦‚ " -"<em>Google Latitude</em>，<em>Yahoo Fire Eggle</em> å’Œ <em>Brightkite</em>。" +"使用 <app>Empathy</app>，您å¯ä»¥å°†æ‰€æœ‰çš„会è¯ç»„织在åŒä¸€ä¸ªçª—å£ä¸ï¼Œæˆ–者为ä¸åŒç±»åž‹" +"的会è¯ä½¿ç”¨ä¸åŒçš„窗å£ï¼Œè¿˜å¯ä»¥å¾ˆå®¹æ˜“地æœç´¢ä¹‹å‰çš„会è¯ï¼Œæˆ–者共享您的桌é¢ï¼Œåªéœ€è¦" +"两次点击。" -#: C/geolocation-privacy.page:8(desc) -msgid "What information are sent and to who." -msgstr "å‘é€äº†ä»€ä¹ˆä¿¡æ¯ï¼Œå‘é€ç»™è°äº†ï¼Ÿ" +#: C/introduction.page:39(figure/title) +msgid "<gui>Contact List</gui> window" +msgstr "<gui>è”系人列表</gui>窗å£" -#: C/geolocation-privacy.page:32(title) -msgid "Geolocation Privacy" -msgstr "地ç†ä½ç½®éšç§" +#: C/introduction.page:40(figure/desc) +msgid "<app>Empathy</app> main window" +msgstr "<app>Empathy</app> 主窗å£" -#: C/geolocation-privacy.page:35(title) -msgid "What information is sent" -msgstr "什么信æ¯è¢«å‘é€äº†" +#: C/introduction.page:42(media/p) +msgid "<app>Empathy</app> main window." +msgstr "<app>Empathy</app> 主窗å£ã€‚" + +#: C/irc-commands.page:7(info/desc) +msgid "The supported IRC commands." +msgstr "支æŒçš„ IRC 命令。" + +#: C/irc-commands.page:18(page/title) +msgid "Supported IRC commands" +msgstr "支æŒçš„ IRC 命令" -#: C/geolocation-privacy.page:36(p) +#: C/irc-commands.page:19(page/p) msgid "" -"What is possible to send is: your country, region, locality, area, street, " -"building, floor, room, and postal code, longitude, latitude and altitude, " -"speed and bearing." +"To see the list of the supported IRC commands, in a chat room type <input>/" +"help</input> and press <key>Enter</key>." msgstr "" -"有å¯èƒ½è¢«å‘é€çš„ä¿¡æ¯ï¼šæ‚¨æ‰€åœ¨çš„国家，地区，地方，区域，街é“，建ç‘，楼层，房间，" -"邮政编ç åŠç»çº¬åº¦ï¼Œæ‚¨çš„速度和方å‘。" +"è¦æŸ¥çœ‹æ”¯æŒçš„ IRC 命令的列表，在一个èŠå¤©å®¤ä¸è¾“å…¥<input>/help</input>并按" +"<key>Enter</key>。" -#: C/geolocation-privacy.page:40(p) -msgid "" -"The accuracy and the quantity of information about your geographical " -"position are based on the software or on the infrastructure used to discover " -"your position." -msgstr "您的地ç†ä½ç½®ä¿¡æ¯çš„精度和质é‡å–决于软件或者用于å‘现您的ä½ç½®çš„设施。" +#: C/irc-commands.page:24(note/p) +msgid "All commands available have a small description on their usage." +msgstr "所有å¯ç”¨å‘½ä»¤éƒ½æœ‰ä¸€ä¸ªç®€å•çš„用法æ述。" + +#: C/irc-join-pwd.page:9(info/desc) +msgid "Enter password-protected IRC chat rooms." +msgstr "进入有密ç ä¿æŠ¤çš„ IRC èŠå¤©å®¤ã€‚" + +#: C/irc-join-pwd.page:25(page/title) +msgid "Join a protected IRC chat room" +msgstr "åŠ å…¥ä¸€ä¸ªå—ä¿æŠ¤çš„ IRC èŠå¤©å®¤" -#: C/geolocation-privacy.page:44(p) +#: C/irc-join-pwd.page:27(page/p) msgid "" -"Different kind of networks may have different accuracy settings, and may " -"send different information. The use of external devices such as GPS or " -"mobile phone will increase the accuracy of the information sent." +"On some IRC networks, private IRC rooms may be protected with a password. If " +"you know the password, use the following steps to join:" msgstr "" -"ä¸åŒçš„网络å¯èƒ½æœ‰ä¸åŒçš„精度设置，å¯èƒ½å‘é€ä¸åŒçš„ä¿¡æ¯ã€‚使用外部设备，如 GPS 或手" -"机，å¯ä»¥å¢žåŠ å‘é€çš„ä¿¡æ¯çš„精度。" +"在æŸäº› IRC 网络上，ç§äººçš„ IRC 房间å¯ä»¥è¢«å¯†ç ä¿æŠ¤ã€‚如果您知é“这密ç ，按照下é¢" +"çš„æ¥éª¤åŠ 入：" -#: C/geolocation-privacy.page:49(p) +#: C/irc-join-pwd.page:33(item/p) +msgid "<link xref=\"irc-join-room\">Join the room</link> as normal." +msgstr "å¦‚å¾€å¸¸ä¸€æ ·<link xref=\"irc-join-room\">åŠ å…¥æˆ¿é—´</link>。" + +#: C/irc-join-pwd.page:38(item/p) msgid "" -"When the privacy mode is enabled, nothing more precise than your city will " -"be sent, even if you are using an external device." +"Empathy will prompt you for a password. Enter the password for the IRC chat " +"room and click <gui style=\"button\">Join</gui>." msgstr "" -"当éšç§æ¨¡å¼è¢«å¯ç”¨åŽï¼Œåªæœ‰æ‚¨æ‰€åœ¨çš„城市信æ¯ä¼šè¢«å‘é€ï¼Œå³ä½¿æ‚¨æ£åœ¨ä½¿ç”¨å¤–部设备。" +"Empathy 会æ示您输入密ç 。输入这个 IRC èŠå¤©å®¤çš„密ç 并点击 <gui style=\"button" +"\">åŠ å…¥</gui>。" -#: C/geolocation-privacy.page:56(title) -msgid "Who can see the information sent" -msgstr "è°ä¼šçœ‹åˆ°è¿™äº›å‘é€å‡ºåŽ»çš„ä¿¡æ¯" +#: C/irc-join-room.page:8(info/desc) +msgid "Join an IRC channel." +msgstr "åŠ å…¥ä¸€ä¸ª IRC 频é“。" -#: C/geolocation-privacy.page:57(p) -msgid "Only your contacts can see your geographical position." -msgstr "åªæœ‰æ‚¨çš„è”系人å¯ä»¥çœ‹åˆ°æ‚¨çš„地ç†ä½ç½®ã€‚" +#: C/irc-join-room.page:31(page/title) +msgid "Join an IRC chat room" +msgstr "åŠ å…¥ä¸€ä¸ª IRC èŠå¤©å®¤" -#: C/geolocation-privacy.page:63(title) -msgid "What is the privacy mode" -msgstr "什么是éšç§æ¨¡å¼" +#: C/irc-join-room.page:33(page/p) +msgid "" +"You can join IRC chat rooms (also known as IRC channels) on any IRC network " +"you’re connected to. To connect to an IRC network, see <link xref=\"add-" +"account\"/> and <link xref=\"account-irc\"/>." +msgstr "" +"您å¯ä»¥åŠ 入您已ç»è¿žæŽ¥çš„所有 IRC 网络上的 IRC èŠå¤©å®¤(也称为 IRC 频é“)。è¦è¿žæŽ¥ä¸€" +"个 IRC 网络，å‚è§ <link xref=\"add-account\"/> and <link xref=\"account-irc" +"\"/>。" -#: C/geolocation-privacy.page:64(p) +#: C/irc-join-room.page:45(item/p) msgid "" -"The privacy mode, enabled by default, is a reduced accuracy mode that will " -"decrease the accuracy of the geographical position sent to your contacts." +"From the <gui>Account</gui> drop-down list, select the IRC account that " +"corresponds to the network you want to use." +msgstr "在 <gui>å¸å·</gui> 下拉列表ä¸ï¼Œé€‰æ‹©ä¸Žæ‚¨æƒ³è¦ä½¿ç”¨çš„网络对应的 IRC å¸å·ã€‚" + +#: C/irc-join-room.page:51(item/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 "" -"éšç§æ¨¡å¼æ˜¯ç²¾åº¦é™ä½Žæ¨¡å¼ï¼Œå®ƒä¼šé™ä½Žå‘é€ç»™æ‚¨çš„è”系人的地ç†ä½ç½®ä¿¡æ¯çš„精度。éšç§æ¨¡" -"å¼é»˜è®¤å¼€å¯ã€‚" +"在 <gui>èŠå¤©å®¤</gui> 文本框ä¸ï¼Œè¾“入您想è¦åŠ 入的频é“çš„å称。IRC 频é“å称以井å·" +"(<sys>#</sys>)开头。" -#: C/geolocation-privacy.page:71(title) -msgid "Privacy overview" -msgstr "éšç§æ¦‚è¿°" +#: C/irc-join-room.page:57(item/p) +msgid "Click <gui>Join</gui> to enter the room." +msgstr "点击<gui>åŠ å…¥</gui>æ¥è¿›å…¥æˆ¿é—´ã€‚" -#: C/geolocation-privacy.page:72(p) +#: C/irc-join-room.page:64(note/p) msgid "" -"Overview of the various geolocation privacy settings in <app>Empathy</app>." -msgstr "<app>Empathy</app> ä¸ä¸€äº›å…³äºŽåœ°ç†ä½ç½®éšç§çš„选项的概况。" +"To join multiple rooms, you need to repeat the steps above for each room." +msgstr "è¦åŠ 入多个房间，您需è¦å¯¹æ¯ä¸ªæˆ¿é—´é‡å¤ä¸Šé¢çš„æ¥éª¤ã€‚" -#: C/geolocation-privacy.page:77(p) -msgid "Geolocation is not enabled by default." -msgstr "地ç†ä½ç½®é»˜è®¤ä¸å¼€å¯ã€‚" +#: C/irc-manage.page:9(info/desc) +msgid "How to use IRC with <app>Empathy</app>." +msgstr "如何在 <app>Empathy</app> ä¸ä½¿ç”¨ IRC。" -#: C/geolocation-privacy.page:82(p) -msgid "Privacy mode is enabled by default." -msgstr "éšç§æ¨¡å¼é»˜è®¤è¢«æ¿€æ´»" +#: C/irc-manage.page:23(credit/name) +msgid "Sindhu S" +msgstr "" -#: C/geolocation-privacy.page:87(p) +#: C/irc-manage.page:39(page/title) +msgid "Internet Relay Chat (IRC)" +msgstr "互è”网ä¸ç»§èŠå¤©(IRC)" + +#: C/irc-manage.page:47(when/p) msgid "" -"Privacy mode prevails even when using external and more precise devices." -msgstr "å³ä½¿åœ¨ä½¿ç”¨ç²¾åº¦æ›´é«˜çš„外部设备，éšç§æ¨¡å¼ä¹Ÿä¼šå‘挥作用。" +"<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-" +"idle</link>" +msgstr "" -#: C/geolocation-privacy.page:92(p) -msgid "Only your contacts can see your position." -msgstr "åªæœ‰æ‚¨çš„è”系人å¯ä»¥çœ‹åˆ°æ‚¨çš„ä½ç½®ã€‚" +#: C/irc-manage.page:55(info/title) +#, fuzzy +#| msgid "IRC Chat Rooms and Conversations" +msgctxt "link" +msgid "IRC Chat Rooms and Conversations" +msgstr "IRC èŠå¤©å®¤å’Œä¼šè¯" -#: C/geolocation-not-showing.page:8(desc) -msgid "<app>Empathy</app> does not publish my geographical position." -msgstr "<app>Empathy</app> 没有å‘布我的地ç†ä½ç½®ã€‚" +#: C/irc-manage.page:57(section/title) +msgid "Chat Rooms and Conversations" +msgstr "èŠå¤©å®¤å’Œä¼šè¯" -#: C/geolocation-not-showing.page:32(title) -msgid "Geographical position not published" -msgstr "地ç†ä½ç½®æ²¡æœ‰è¢«å…¬å¸ƒã€‚" +#: C/irc-manage.page:62(info/title) +#, fuzzy +#| msgid "Common IRC Problems" +msgctxt "link" +msgid "Common IRC Problems" +msgstr "å¸¸è§ IRC 问题" -#: C/geolocation-not-showing.page:34(p) +#: C/irc-nick-password.page:10(info/desc) +msgid "Protect your nickname to prevent other IRC users from using it." +msgstr "ä¿æŠ¤æ‚¨çš„昵称，以防其他 IRC 用户使用。" + +#: C/irc-nick-password.page:33(page/title) +msgid "Use a nickname password on IRC" +msgstr "在 IRC ä¸ä½¿ç”¨æ˜µç§°å’Œå¯†ç " + +#: C/irc-nick-password.page:35(page/p) msgid "" -"If your contacts cannot see your location, <app>Empathy</app> might not be " -"able to discover with a good margin of precision your geographical position." +"On some IRC networks, you can register your nickname with a service called " +"NickServ. By sending special messages to NickServ, you can set your password " +"and identify yourself. Some IRC chat rooms may not allow you to join without " +"a registered nickname." msgstr "" -"如果您的è”系人ä¸èƒ½çœ‹åˆ°æ‚¨çš„ä½ç½®ï¼Œå¯èƒ½æ˜¯å› 为 <app>Empathy</app> æ— æ³•å‘现有一定" -"精度的您的地ç†ä½ç½®ä¿¡æ¯ã€‚" +"在æŸäº› IRC 网络上，您å¯ä»¥é€šè¿‡ NickServ æœåŠ¡æ³¨å†Œæ‚¨çš„æ˜µç§°ã€‚é€šè¿‡å‘ NickServ å‘é€" +"特殊的消æ¯ï¼Œæ‚¨å¯ä»¥è®¾ç½®å¯†ç æ¥è®¤è¯æ‚¨è‡ªå·±ã€‚一些 IRC èŠå¤©å®¤å¯èƒ½ä¸å…è®¸æ‚¨åŠ å…¥ï¼Œé™¤éž" +"您有注册过的昵称。" -#: C/geolocation-not-showing.page:38(p) +#: C/irc-nick-password.page:40(page/p) msgid "" -"In this case, your position will not be published, but you are still able to " -"see the location of your contacts." +"<app>Empathy</app> does not currently support nickname registration. Some " +"IRC networks, however, will automatically forward a <em>server password</em> " +"to NickServ. On these networks, you can use the IRC password in " +"<app>Empathy</app> to identify yourself to NickServ. The popular freenode " +"network is known to have this feature." msgstr "" -"在这ç§æƒ…况下，您的ä½ç½®ä¿¡æ¯ä¸ä¼šè¢«å…¬å¸ƒï¼Œä½†æ‚¨ä»å¯ä»¥çœ‹åˆ°æ‚¨çš„è”系人的ä½ç½®ä¿¡æ¯ã€‚" +"<app>Empathy</app> ç›®å‰è¿˜ä¸æ”¯æŒæ˜µç§°æ³¨å†Œã€‚但一些 IRC ç½‘ç»œä¼šè‡ªåŠ¨å‘ NickServ å‘" +"é€ä¸€ä¸ª <em>æœåŠ¡å™¨å¯†ç </em>ã€‚åœ¨è¿™æ ·çš„ç½‘ç»œä¸Šï¼Œæ‚¨å¯ä»¥åœ¨ <app>Empathy</app> ä¸ä½¿" +"ç”¨è¿™æ ·çš„å¯†ç å‘ NickServ 认è¯æ‚¨è‡ªå·±ã€‚æµè¡Œçš„ freenode 网络就有这个功能。" + +#: C/irc-nick-password.page:46(page/p) +msgid "To set an IRC server password:" +msgstr "设置一个 IRC 密ç ：" -#: C/geolocation-not-showing.page:42(p) +#: C/irc-nick-password.page:54(item/p) +msgid "Select the IRC account from the list on the left of the dialog." +msgstr "在左侧的对è¯æ¡†ä¸é€‰æ‹©ä¸€ä¸ª IRC å¸å·" + +#: C/irc-nick-password.page:57(item/p) msgid "" -"If you want to publish your geographical position, you can try to use an " -"external device such as a GPS." -msgstr "如果您想è¦å…¬å¸ƒæ‚¨çš„地ç†ä½ç½®ï¼Œæ‚¨å¯ä»¥è¯•ä¸€è¯•ä½¿ç”¨ GPS ç‰å¤–部设备。" +"In the <gui>Password</gui> field, type the password you used to register " +"your nikcname." +msgstr "在 <gui>密ç </gui> 一æ ä¸ï¼Œè¾“入您注册您的昵称时使用的密ç 。" -#: C/geolocation-not-showing.page:48(p) +#: C/irc-nick-password.page:69(note/p) msgid "" -"In order to publish your geographical location, your Jabber server needs to " -"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://" -"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support " -"PEP</link> is maintained online. Google Talk does not support this feature " -"at this time." +"These instructions only allow you to use a password-protected nickname on " +"certain IRC networks. It is not currently possible to register an IRC " +"nickname or change your nickname password using <app>Empathy</app>." msgstr "" -"è¦å‘布您的地ç†ä½ç½®ï¼Œæ‚¨çš„ Jabber æœåŠ¡å™¨å¿…é¡»æ”¯æŒ Personal Eventing Protocal " -"(PEP)。互è”网上有人维护ç€ä¸€ä»½<link href=\"http://coccinella.im/servers/" -"servers_by_pubsub_pep.html\">æ”¯æŒ PEP çš„æœåŠ¡å™¨åˆ—表</link>。Google Talk ç›®å‰ä¸" -"æ”¯æŒ PEP。" - -#: C/geolocation.page:8(desc) -msgid "Use and understand geolocation in <app>Empathy</app>." -msgstr "使用和了解 <app>Empathy</app> ä¸çš„地ç†ä½ç½®ã€‚" - -#: C/geolocation.page:32(title) -msgid "Geographical position" -msgstr "地ç†ä½ç½®" +"这些说明åªæ˜¯å…许您在特定的 IRC 网络上使用密ç ä¿æŠ¤çš„昵称。目å‰åœ¨ " +"<app>Empathy</app> ä¸è¿˜ä¸èƒ½æ³¨å†Œ IRC 昵称或修改密ç 。" -#: C/geolocation.page:35(title) -msgid "Geolocation" -msgstr "地ç†ä½ç½®" +#: C/irc-send-file.page:9(info/desc) +msgid "<app>Empathy</app> does not currently support sending files using IRC." +msgstr "<app>Empathy</app> ç›®å‰ä¸æ”¯æŒ IRC ä¼ æ–‡ä»¶ã€‚" -#: C/geolocation.page:39(title) -msgid "Fix common problems" -msgstr "ä¿®å¤å¸¸è§é—®é¢˜" +#: C/irc-send-file.page:31(page/title) +msgid "Send files over IRC" +msgstr "通过 IRC ä¼ é€æ–‡ä»¶" -#: C/favorite-rooms.page:10(desc) -msgid "Set, join and manage favorite rooms." -msgstr "è®¾ç«‹ï¼ŒåŠ å…¥æˆ–ç®¡ç†èŠå¤©å®¤æ”¶è—。" +#: C/irc-send-file.page:33(page/p) +msgid "It is not currently possible to send files using IRC." +msgstr "ç›®å‰æ— 法用 IRC ä¼ é€æ–‡ä»¶ã€‚" -#: C/favorite-rooms.page:29(title) -msgid "Favorite rooms" -msgstr "èŠå¤©å®¤æ”¶è—" +#: C/irc-start-conversation.page:8(info/desc) +msgid "Start a conversation with an IRC contact." +msgstr "å‘ä¸€ä½ IRC è”系人å‘起会è¯ã€‚" -#: C/favorite-rooms.page:32(title) -msgid "Set a room as a favorite" -msgstr "收è—一个èŠå¤©å®¤" +#: C/irc-start-conversation.page:30(page/title) +msgid "Chat with somebody on IRC" +msgstr "与 IRC ä¸æŸäººèŠå¤©" -#: C/favorite-rooms.page:35(p) -msgid "Join a room." -msgstr "åŠ å…¥ä¸€ä¸ªèŠå¤©å®¤ã€‚" +#: C/irc-start-conversation.page:32(page/p) +msgid "" +"You can hold private conversations with other IRC users, outside of the " +"public IRC chat rooms. To start a conversation with another IRC user:" +msgstr "" +"您å¯ä»¥åœ¨å…¬å…±çš„ IRC èŠå¤©å®¤ä¹‹å¤–与其他的 IRC 用户进行ç§äººèŠå¤©ã€‚è¦ä¸Žå¦ä¸€ä½ IRC 用" +"户进行会è¯ï¼š" -#: C/favorite-rooms.page:40(p) +#: C/irc-start-conversation.page:37(item/p) msgid "" -"See <link xref=\"irc-join-room\"/> for more information on how to join an " -"IRC room." -msgstr "å…³äºŽå¦‚ä½•åŠ å…¥ IRC èŠå¤©å®¤ï¼Œå‚è§ <link xref=\"irc-join-room\"/>。" +"In the contact list for an IRC chat room, double click the name of the user " +"you want to chat with. Alternatively, right click the name of the user and " +"choose <gui>Chat</gui>." +msgstr "" +"在一个 IRC èŠå¤©å®¤çš„è”系人列表ä¸ï¼ŒåŒå‡»æ‚¨æƒ³è¦èŠå¤©çš„用户。或者，å³é”®ç‚¹å‡»ç”¨æˆ·çš„姓" +"å并选择 <gui>èŠå¤©</gui>" -#: C/favorite-rooms.page:46(p) +#: C/irc-start-conversation.page:45(item/p) msgid "" -"See <link xref=\"group-conversations\"/> for more information on how to " -"start or join a group conversation." +"The IRC room contact list is not the same as <app>Empathy</app> contact " +"list. It contains a list of users in the IRC chat room you joined. Different " +"rooms can have different contacts listed." msgstr "" -"关于如何å‘èµ·æˆ–åŠ å…¥ç¾¤ç»„èŠå¤©ï¼Œå‚è§ <link xref=\"group-conversations\"/>。" +"IRC èŠå¤©å®¤çš„è”系人列表与 <app>Empathy</app> çš„è”系人列表ä¸åŒã€‚它包å«äº†æ‚¨åŠ å…¥" +"的这个 IRC èŠå¤©å®¤ä¸çš„用户列表。ä¸åŒçš„èŠå¤©å®¤å¯èƒ½æœ‰ä¸åŒçš„è”系人列表。" -#: C/favorite-rooms.page:54(p) +#: C/irc-start-conversation.page:52(item/p) msgid "" -"From the conversation window, choose <guiseq><gui>Conversation</" -"gui><gui>Favorite Chat Room</gui></guiseq>." +"The IRC room contact list is usually on the right side of the IRC room " +"window. If you do not see it, choose <guiseq><gui>Conversation</" +"gui><gui>Show Contact List</gui></guiseq>." msgstr "" -"在会è¯çª—å£ï¼Œé€‰æ‹© <guiseq><gui>会è¯</gui><gui>收è—èŠå¤©å®¤</gui></guiseq>。" +"IRC èŠå¤©å®¤çš„è”系人列表通常ä½äºŽçª—å£å³ä¾§ã€‚如果您没有看到它，选择 <guiseq><gui>" +"对è¯</gui><gui>显示è”系人列表</gui></guiseq>。" -#: C/favorite-rooms.page:63(title) -msgid "Join favorite rooms" -msgstr "åŠ å…¥æ”¶è—çš„èŠå¤©å®¤" +#: C/license.page:8(info/desc) +msgid "Legal information." +msgstr "法律信æ¯ã€‚" -#: C/favorite-rooms.page:71(p) -msgid "Press <key>F5</key>." -msgstr "按 <key>F5</key> 键。" +#: C/license.page:11(page/title) +msgid "License" +msgstr "许å¯" -#: C/favorite-rooms.page:76(p) +#: C/license.page:12(page/p) msgid "" -"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join " -"all your favorite rooms." +"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 " +"Unported license." msgstr "" -"选择 <guiseq><gui>èŠå¤©å®¤</gui><gui>åŠ å…¥å·²æ”¶è—çš„èŠå¤©å®¤</gui></guiseq>ï¼Œä»¥åŠ å…¥" -"您之å‰æ”¶è—çš„èŠå¤©å®¤ã€‚" +"本作å“在 CreativeCommons Attribution-Share Alike 3.0 Unported license下å‘布。" -#: C/favorite-rooms.page:82(p) -msgid "Choose <gui>Room</gui>, and select the favorite room you want to join." -msgstr "选择 <gui>èŠå¤©å®¤</gui>，并选择您è¦åŠ 入的已收è—çš„èŠå¤©å®¤ã€‚" +#: C/license.page:20(page/p) +msgid "You are free:" +msgstr "您å¯ä»¥è‡ªç”±ï¼š" -#: C/favorite-rooms.page:90(p) -msgid "" -"To join a favorite room, you need to be connected to the Internet and to " -"your account." -msgstr "è¦åŠ 入一个已收è—çš„èŠå¤©å®¤ï¼Œæ‚¨å¿…须连接互è”网和您的账户。" +#: C/license.page:25(item/title) +#, fuzzy +#| msgid "To share" +msgid "<em>To share</em>" +msgstr "分享" -#: C/favorite-rooms.page:98(title) -msgid "Manage favorite rooms" -msgstr "管ç†èŠå¤©å®¤æ”¶è—" +#: C/license.page:26(item/p) +msgid "To copy, distribute and transmit the work." +msgstr "å¤åˆ¶ã€åˆ†å‘æˆ–è€…ä¼ æ’作å“。" -#: C/favorite-rooms.page:101(p) -msgid "" -"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</" -"gui><gui>Manage Favorites</gui></guiseq>." -msgstr "" -"在 <gui>è”系人列表</gui> 窗å£ï¼Œé€‰æ‹© <guiseq><gui>èŠå¤©å®¤</gui><gui>管ç†æ”¶è—夹" -"</gui></guiseq>。" +#: C/license.page:29(item/title) +#, fuzzy +#| msgid "To remix" +msgid "<em>To remix</em>" +msgstr "å†åˆ›ä½œ" -#: C/favorite-rooms.page:107(p) -msgid "" -"From the <gui>Account</gui> drop-down list, select the account you want to " -"manage the favorite rooms of." -msgstr "在 <gui>账户</gui> 下拉列表ä¸ï¼Œé€‰æ‹©æ‚¨è¦ç®¡ç†èŠå¤©å®¤æ”¶è—的账户。" +#: C/license.page:30(item/p) +msgid "To adapt the work." +msgstr "修改作å“。" -#: C/favorite-rooms.page:111(p) -msgid "Select <gui>All</gui> to see all you favorite rooms." -msgstr "选择 <gui>全部</gui> 以看到æœæœ‰æ‚¨æ”¶è—çš„èŠå¤©å®¤ã€‚" +#: C/license.page:33(page/p) +msgid "Under the following conditions:" +msgstr "需éµå®ˆä¸€ä¸‹æ¡ä»¶ï¼š" -#: C/favorite-rooms.page:116(p) -msgid "Select the favorite room you want to manage:" -msgstr "选择您è¦ç®¡ç†çš„收è—：" +#: C/license.page:38(item/title) +#, fuzzy +#| msgid "Attribution" +msgid "<em>Attribution</em>" +msgstr "ç½²å" -#: C/favorite-rooms.page:121(p) +#: C/license.page:39(item/p) msgid "" -"Select the <gui>Auto-Connect</gui> check-box in order to automatically join " -"that room when you connect to your account." -msgstr "选择 <gui>自动连接</gui>，则您连接到您的账户åŽï¼Œä¼šè‡ªåŠ¨åŠ 入这个èŠå¤©å®¤ã€‚" - -#: C/favorite-rooms.page:127(p) -msgid "Click on <gui>Remove</gui> to remove the room from your favorites." -msgstr "点击 <gui>åˆ é™¤</gui> 以从收è—夹ä¸åˆ 除这个èŠå¤©å®¤ã€‚" - -#: C/favorite-rooms.page:134(p) -msgid "When done, click <gui>Close</gui>." -msgstr "完æˆåŽï¼Œç‚¹å‡» <gui>å…³é—</gui>。" +"You must attribute the work in the manner specified by the author or " +"licensor (but not in any way that suggests that they endorse you or your use " +"of the work)." +msgstr "" +"您必须按照作者或许å¯äººæŒ‡å®šçš„æ–¹å¼å¯¹ä½œå“ç½²å(但ä¸èƒ½ä»¥ä»»ä½•æ–¹å¼æš—示他们认å¯æ‚¨æˆ–者" +"您对作å“的使用)。" -#: C/disable-account.page:9(desc) -msgid "Prevent <app>Empathy</app> from automatically logging in to an account." -msgstr "使 <app>Empathy</app> ä¸è¦è‡ªåŠ¨ç™»å½•ä¸€ä¸ªè´¦æˆ·ã€‚" +#: C/license.page:46(item/title) +#, fuzzy +#| msgid "Share Alike" +msgid "<em>Share Alike</em>" +msgstr "相åŒæ–¹å¼å…±äº«" -#: C/disable-account.page:39(title) -msgid "Disable an account" -msgstr "ç¦ç”¨ä¸€ä¸ªè´¦æˆ·" +#: C/license.page:47(item/p) +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 "" +"如果您改å˜ã€è½¬æ¢æœ¬ä½œå“或者以本作å“为基础进行å†åˆ›ä½œï¼Œæ‚¨åº”以相åŒã€ç›¸ä¼¼æˆ–者兼容" +"çš„åè®®å‘布修改åŽçš„作å“。" -#: C/disable-account.page:41(p) +#: C/license.page:53(page/p) msgid "" -"You can disable an account to prevent <app>Empathy</app> from logging in to " -"it without removing the account entirely. You may wish to disable and re-" -"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." +"For the full text of the license, see the <link href=\"http://" +"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</" +"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-" +"sa/3.0/\">Commons Deed</link>." msgstr "" -"您å¯ä»¥ç¦ç”¨ä¸€ä¸ªè´¦æˆ·ä»¥é˜»æ¢ <app>Empathy</app> 自动登录这个账户而ä¸å¿…å°†å…¶å½»åº•åˆ " -"除。您å¯èƒ½æƒ³è¦ç¦ç”¨ã€å¯ç”¨æŸä¸ªè´¦æˆ·å¦‚果您åªæƒ³å¶å°”登录这个账户，但åˆæƒ³ä½¿ç”¨ " -"<app>Empathy</app> ä¸çš„其他账户。" +"许å¯çš„全文å‚è§ <link href=\"http://creativecommons.org/licenses/by-sa/3.0/" +"legalcode\">CreativeCommons 网站</link>，或者阅读完整的<link href=\"http://" +"creativecommons.org/licenses/by-sa/3.0/\">通俗åè®®</link>。" + +#: C/link-contacts.page:11(info/desc) +msgid "Merge and separate different contacts into a single one." +msgstr "å°†ä¸åŒçš„è”系人åˆå¹¶åˆ†å‰²ä¸ºä¸€ä¸ªè”系人。" -#: C/disable-account.page:52(p) +#: C/link-contacts.page:25(page/title) +msgid "Combine and separate contacts" +msgstr "åˆå¹¶å’Œåˆ†å‰²è”系人" + +#: C/link-contacts.page:26(page/p) msgid "" -"Select the account you wish to disable from the accounts list on the left " -"side of the window." -msgstr "在窗å£å·¦ä¾§çš„账户列表ä¸ï¼Œé€‰æ‹©æ‚¨æƒ³è¦ç¦ç”¨çš„账户。" +"If one, or more, of your contacts has multiple accounts with different " +"messaging services, you can combine these contacts into a single one." +msgstr "如果您的è”系人有多个èŠå¤©æœåŠ¡çš„多个å¸å·ï¼Œæ‚¨å¯ä»¥å°†ä»–们åˆå¹¶æˆä¸€ä¸ªè”系人。" -#: C/disable-account.page:56(p) +#: C/link-contacts.page:30(page/p) msgid "" -"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the " -"window." -msgstr "在窗å£å³ä¾§ï¼Œå–消选择 <gui style=\"checkbox\">å¯ç”¨</gui>。" +"The resulting contact is called a <em>meta-contact</em>: a contact composed " +"from different single contacts." +msgstr "产生的è”系人称为一个<em>å…ƒè”系人</em>：由多个ä¸åŒè”系人组æˆçš„è”系人。" -#: C/disable-account.page:62(p) +#: C/link-contacts.page:34(page/p) msgid "" -"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</" -"gui>." -msgstr "è¦é‡æ–°å¯ç”¨è¿™ä¸ªè´¦æˆ·ï¼Œåªéœ€é€‰æ‹© <gui style=\"checkbox\">å¯ç”¨</gui>。" +"If you have a Jane Smith contact that is using three different messaging " +"services like:" +msgstr "如果您有一个å«åš Jane Smith çš„è”系人，她使用三ç§ä¸åŒçš„èŠå¤©æœåŠ¡ï¼š" -#: C/create-account.page:9(desc) -msgid "Register for an account with one of the supported messaging services." -msgstr "为æŸç§æ”¯æŒçš„æœåŠ¡æ³¨å†Œè´¦æˆ·ã€‚" +#: C/link-contacts.page:40(item/p) +msgid "janes@facebook" +msgstr "janes@facebook" -#: C/create-account.page:34(title) -msgid "Register for a new account" -msgstr "注册一个新账户" +#: C/link-contacts.page:45(item/p) +msgid "jane.smith@gmail" +msgstr "jane.smith@gmail" + +#: C/link-contacts.page:50(item/p) +msgid "jane_smith@hotmail" +msgstr "jane_smith@hotmail" + +#: C/link-contacts.page:55(page/p) +msgid "You can combine these contacts into a single Jane Smith one." +msgstr "您å¯ä»¥å°†è¿™äº›è”系人åˆå¹¶æˆä¸€ä¸ª Jane Smith." -#: C/create-account.page:36(p) +#: C/link-contacts.page:60(section/title) +msgid "Combining contacts" +msgstr "åˆå¹¶è”系人" + +#: C/link-contacts.page:63(item/p) msgid "" -"Most account types require you to create an account with a account provider " -"before you can connect using instant messaging applications like " -"<app>Empathy</app>. With some account providers, you can use <app>Empathy</" -"app> to register for a new account, using the same steps as you would to " -"<link xref=\"add-account\">add an account</link>." +"From the <gui>Contact List</gui> window, right-click one of the contact that " +"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</" +"gui>." msgstr "" -"大多账户类型需è¦æ‚¨åœ¨ä½¿ç”¨ <app>Empathy</app> è¿™æ ·çš„å³æ—¶é€šè®¯è½¯ä»¶è¿žæŽ¥ä¹‹å‰å…ˆå»ºç«‹" -"账户。但对于æŸäº›è´¦æˆ·æ供商，您å¯ä»¥ä½¿ç”¨ <app>Empathy</app> æ¥æ³¨å†Œæ–°è´¦æˆ·ï¼Œä½¿ç”¨" -"与 <link xref=\"add-account\">æ·»åŠ è´¦æˆ·</link> 相åŒçš„æ¥éª¤ã€‚" +"在 <gui>è”系人列表</gui> 窗å£ï¼Œå³é”®ç‚¹å‡»æœ‰ä¸åŒå¸å·çš„è”系人，并选择 <gui style=" +"\"menuitem\">绑定è”系人…</gui>" -#: C/create-account.page:42(p) +#: C/link-contacts.page:70(item/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 "" -"这一页是关于建立å„ç§ç±»åž‹çš„账户的。您应当已ç»ä»Žæ‚¨çš„账户æ供商那里得到了登录 " -"ID 和密ç ，以åŠå…¶ä»–使用 <app>Empathy</app> 连接这个账户需è¦çš„ä¿¡æ¯ã€‚" +"From the left pane in the <gui>Link Contacts</gui> window, select the " +"contacts you want to combine." +msgstr "在 <gui>绑定è”系人</gui> 窗å£çš„å·¦çª—æ ¼ï¼Œé€‰æ‹©æ‚¨æƒ³è¦å…³è”èµ·æ¥çš„è”系人。" -#: C/create-account.page:47(title) -msgid "Facebook" -msgstr "Facebook" +#: C/link-contacts.page:76(item/p) +msgid "Click <gui style=\"button\">Link</gui>." +msgstr "点击 <gui style=\"button\">绑定</gui>." -#: C/create-account.page:48(p) +#: C/link-contacts.page:82(note/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." +"When a meta-contact has been created, the default contact that will be used " +"to have a conversation with when you double-click on it, is the contact with " +"the highest presence on-line." msgstr "" -"Facebook 是最常用的社交网络之一。它å…许用户对自己进行个性化的æ述并与朋å‹ä»¬äº¤" -"æµã€‚" +"当一个元è”系人被创建åŽï¼Œæ‚¨åŒå‡»è¯¥è”系人时默认使用的è”系人是有最高的在线状æ€çš„" +"è”系人。" -#: C/create-account.page:52(p) +#: C/link-contacts.page:91(section/title) +msgid "Separating contacts" +msgstr "分割è”系人" + +#: C/link-contacts.page:94(item/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." -"facebook.com</link>." +"From the <gui>Contact List</gui>, right-click the contact to separate, and " +"select <gui style=\"menuitem\">Link Contacts...</gui>." msgstr "" -"è¦ä½¿ç”¨ Facebook 与您的朋å‹ä»¬äº¤æµï¼Œæ‚¨éœ€è¦åœ¨å…¶ç½‘站上建立一个新账户：<link href=" -"\"http://www.facebook.com\">www.facebook.com</link>。" +"在 <gui>è”系人列表</gui> 窗å£ä¸ï¼Œå³é”®ç‚¹å‡»è¦åˆ†å‰²çš„è”系人，并选择 <gui style=" +"\"menuitem\">绑定è”系人…</gui>" -#: C/create-account.page:60(title) C/audio-video.page:170(p) -msgid "Jabber" -msgstr "Jabber" +#: C/link-contacts.page:100(item/p) +msgid "Click <gui style=\"button\">Unlink</gui>." +msgstr "点击 <gui style=\"button\">解除绑定</gui>。" -#: C/create-account.page:62(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/overview.page:37(media) +msgctxt "_" 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, " -"regardless of their account provider." +"external ref='figures/video_overview.png' " +"md5='6cfcfbd833bf2234537d402185c40596'" msgstr "" -"Jabber 是一ç§å¼€æ”¾çš„å³æ—¶é€šè®¯ç³»ç»Ÿã€‚åƒ email ä¸€æ ·ï¼ŒJabber å…许您选择账户æ供商，" -"并与其他 Jabber 用户交æµï¼Œæ— 论他们使用哪里账户æ供商。" -#: C/create-account.page:66(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/overview.page:38(media) +msgctxt "_" 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." -"org/\">Jabber.org</link>." +"external ref='figures/conf_overview.png' " +"md5='74c58668fe89c84060f12f6b70a6b903'" msgstr "" -"您需è¦åœ¨æŸä¸ª Jabber æœåŠ¡æ供商那里建立账户。有许多 Jabber æœåŠ¡æ供商，<link " -"href=\"http://register.jabber.org/\">Jabber.org</link> 是很æµè¡Œçš„一个。" -#: C/create-account.page:71(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/overview.page:39(media) +msgctxt "_" 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 " -"password in <app>Empathy</app> to connect." +"external ref='figures/croom_overview.png' " +"md5='e9619d2c8420bc48a880c03dbc1ae084'" msgstr "" -"如果您使用 Google Mail 或者 Google Talk，那么您已ç»æ‹¥æœ‰ Jabber 账户了。" -"Google Talk 就是一个 Jabber æœåŠ¡ã€‚您åªéœ€è¦ä½¿ç”¨æ‚¨çš„ Google Mail 地å€å’Œå¯†ç 在 " -"<app>Empathy</app> ä¸è¿žæŽ¥ã€‚" -#: C/create-account.page:78(title) C/audio-video.page:190(p) -msgid "People Nearby" -msgstr "附近的人" - -#: 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, " -"such as a wireless hotspot. It automatically finds all other users on the " -"network who are also using this service." +#: C/overview.page:8(info/desc) +msgid "What instant messaging is and how you can use it." msgstr "" -"è¦ä½¿ç”¨è¿™ä¸ªæœåŠ¡ï¼Œæ‚¨å¹¶ä¸éœ€è¦åœ¨æŸä¸ªæœåŠ¡æ供商那里创建账户，åªéœ€è¦è¿žæŽ¥åˆ°ä¸€ä¸ªæœ¬åœ°" -"ç½‘ç»œï¼Œæ¯”å¦‚ä¸€ä¸ªæ— çº¿çƒç‚¹ã€‚它会自动å‘现网络ä¸ä½¿ç”¨è¿™ä¸ªæœåŠ¡çš„其他用户。" - -#: C/create-account.page:85(p) -msgid "For more information, see <link xref=\"salut-protocol\"/>." -msgstr "更多信æ¯å‚è§<link xref=\"salut-protocol\"/>。" -#: C/create-account.page:89(title) C/audio-video.page:205(p) -msgid "SIP" -msgstr "SIP" +#: C/overview.page:12(credit/name) +msgid "Aruna S" +msgstr "" -#: 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." +#: C/overview.page:24(page/title) +msgid "Overview of instant messaging" msgstr "" -"SIP 是一ç§å…许用户通过互è”网进行è¯éŸ³å’Œè§†é¢‘会è¯çš„开放系统。您需è¦åœ¨æŸä¸ª SIP æœ" -"务æ供商处创建账户。您å¯ä»¥å’Œå…¶ä»–çš„ SIP 用户交æµï¼Œæ— 论他们的 SIP æœåŠ¡æ供商与" -"您是å¦ç›¸åŒã€‚" -#: C/create-account.page:97(p) +#: C/overview.page:26(page/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>." +"Instant messaging, sometimes abbreviated to IM, is a text-based means to " +"communicate instantly over the internet and the local network. While some IM " +"applications work with only one type of account, others, including <link " +"xref=\"introduction\">Empathy</link>, provide IM facilities by using <link " +"xref=\"add-account\">accounts</link> from different service providers. Some " +"of these even support audio and video calling." msgstr "" -"由于技术上的差别，å…费的 <link href=\"https://www.ekiga.net/index.php?" -"page=register\">Ekiga.net</link> æœåŠ¡ç›®å‰åœ¨ <app>Empathy</app> ä¸è¿˜ä¸èƒ½ä½¿ç”¨ã€‚" -#: 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." +#: C/overview.page:42(td/p) +msgid "Video Conference" msgstr "" -"有些 SIP æœåŠ¡æ供商å…许用您的计算机呼å«ä¸€èˆ¬çš„电è¯ã€‚通常，您需è¦è®¢é˜…æŸç§ä»˜è´¹æœ" -"务æ‰èƒ½ä½¿ç”¨è¿™ä¸ªåŠŸèƒ½ã€‚" -#: C/create-account.page:107(title) C/audio-video.page:165(p) -msgid "IRC" -msgstr "IRC" +#: C/overview.page:43(td/p) +#, fuzzy +#| msgid "Group conversations" +msgid "Group chats" +msgstr "群组èŠå¤©" -#: C/create-account.page:109(p) +#: C/overview.page:44(td/p) +#, fuzzy +#| msgid "Favorite rooms" +msgid "Chat rooms" +msgstr "èŠå¤©å®¤æ”¶è—" + +#: C/overview.page:48(page/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." +"Some instant messaging applications can be used to connect to chat rooms, " +"online places where like-minded people meet to talk. One popular means to " +"connect to several chat rooms is the Internet Relay Chat, also known as " +"<link xref=\"irc-manage\">IRC</link>. IRC provides <link xref=\"irc-join-room" +"\">public</link> chat rooms, which are open to anyone who creates an account " +"on the IRC Server, and private chat rooms, which are <link xref=\"irc-join-" +"pwd\">password protected</link> and open only to a select few." msgstr "" -"您ä¸éœ€è¦æ³¨å†Œè´¦æˆ·å°±å¯ä»¥ä½¿ç”¨ IRC。尽管您在 <app>Empathy</app> ä¸æ·»åŠ IRC 账户时" -"指定了一个昵称，这个昵称åªæ˜¯æ‚¨æ¯æ¬¡è¿žæŽ¥æ—¶æ‰å»ºç«‹ã€‚如果有其他用户在使用这个昵" -"称，您需è¦é€‰æ‹©ä¸€ä¸ªå…¶ä»–昵称。" -#: C/create-account.page:114(p) +#: C/prev-conv.page:8(info/desc) +msgid "Browse or search your previous conversations." +msgstr "æµè§ˆæˆ–æœç´¢æ‚¨ä¹‹å‰çš„会è¯ã€‚" + +#: C/prev-conv.page:36(page/title) +msgid "View previous conversations" +msgstr "查看之å‰çš„会è¯" + +#: C/prev-conv.page:38(page/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." +"<app>Empathy</app> automatically saves all your text conversations you have " +"with your contacts. You can <link xref=\"#search\">search through all of " +"your previous conversations</link> or <link xref=\"#browse\">browse previous " +"conversations</link> by contact and date." msgstr "" -"有些 IRC 网络上有一ç§å«åš NickServ çš„æœåŠ¡ï¼Œå…许用户ä¿æŠ¤ä»–们的昵称。更多信æ¯å‚" -"è§<link xref=\"irc-nick-password\"/>。" +"<app>Empathy</app> 自动ä¿å˜æ‚¨å’Œè”系人的所有文å—会è¯ã€‚您å¯ä»¥<link xref=" +"\"#search\">æœç´¢ä¹‹å‰å…¨éƒ¨çš„会è¯</link>æˆ–è€…æ ¹æ®è”系人和日期<link xref=\"#browse" +"\">æµè§ˆä¹‹å‰çš„会è¯</link>。" -#: C/create-account.page:117(p) +#: C/prev-conv.page:46(note/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 "" -"有些 IRC æœåŠ¡å™¨æ˜¯è¢«å¯†ç ä¿æŠ¤çš„。您需è¦çŸ¥é“密ç æ‰èƒ½è¿žæŽ¥åˆ°è¿™äº›æœåŠ¡å™¨ã€‚é€šå¸¸ï¼Œè¿™æ ·" -"çš„æœåŠ¡å™¨æ˜¯ç§æœ‰çš„。" +"You do not need to be connected to the Internet to view and search your " +"previous conversations." +msgstr "您ä¸éœ€è¦è¿žæŽ¥åˆ°ç½‘络æ¥æŸ¥çœ‹å’Œæœç´¢æ‚¨ä¹‹å‰çš„会è¯ã€‚" -#: C/create-account.page:122(title) -msgid "Proprietary Services" -msgstr "专有的æœåŠ¡" +#: C/prev-conv.page:53(section/title) +msgid "Search previous conversations" +msgstr "æœç´¢ä¹‹å‰çš„会è¯" -#: C/create-account.page:124(p) +#: C/prev-conv.page:55(section/p) msgid "" -"There are many proprietary instant messaging services that have been " -"developed by different companies or organizations. <app>Empathy</app> allows " -"you to connect to an existing account for most popular services. To create a " -"new account with one of these services, you will need to visit the service’s " -"web site and agree to its terms of use." -msgstr "" -"许多ä¸åŒçš„å…¬å¸æˆ–组织开å‘了一些专è¥çš„å³æ—¶æ¶ˆæ¯æœåŠ¡ã€‚<app>Empathy</app> å…许您连" -"接大多常è§æœåŠ¡çš„æ—¢å˜è´¦æˆ·ã€‚è¦ä¸ºè¿™æ ·çš„æœåŠ¡åˆ›å»ºè´¦æˆ·ï¼Œæ‚¨éœ€è¦è®¿é—®å…¶ç½‘站并åŒæ„其使" -"用æ¡æ¬¾ã€‚" +"You can perform a full-text search through all of your previous " +"conversations." +msgstr "您å¯ä»¥åœ¨ä¹‹å‰çš„所有会è¯ä¸è¿›è¡Œå…¨æ–‡æœç´¢ã€‚" -#: C/create-account.page:133(link) C/audio-video.page:135(p) -msgid "AIM" -msgstr "AIM" +#: C/prev-conv.page:59(item/p) C/prev-conv.page:87(item/p) +#, fuzzy +#| msgid "" +#| "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</" +#| "gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press " +#| "<key>F3</key>." +msgid "" +"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> " +"<gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</" +"key>." +msgstr "" +"从<gui>è”系人列表</gui>窗å£ï¼Œé€‰æ‹©<guiseq><gui>查看</gui><gui>最近会è¯</gui></" +"guiseq>。或者å¯ä»¥æŒ‰<key>F3</key>键。" -#: C/create-account.page:138(link) C/audio-video.page:160(p) -msgid "ICQ" -msgstr "ICQ" +#: C/prev-conv.page:63(item/p) +msgid "" +"Select an account from the drop-down list in the top. A list of contacts and " +"chat room for that account will be shown below." +msgstr "在顶部的下拉列表ä¸é€‰æ‹©ä¸€ä¸ªå¸å·ã€‚下方显示该å¸å·çš„è”系人列表和èŠå¤©å®¤ã€‚" -#: C/create-account.page:143(link) C/audio-video.page:175(p) -msgid "MSN" -msgstr "MSN" +#: C/prev-conv.page:67(item/p) +msgid "" +"Type the text you want to search for in the <gui>Search</gui> text field." +msgstr "在<gui>æœç´¢</gui>文本框输入您è¦æœç´¢çš„文本。" -#: C/create-account.page:148(link) C/audio-video.page:210(p) -msgid "Yahoo!" -msgstr "Yahoo!" +#: C/prev-conv.page:71(item/p) +msgid "" +"Any conversations that matched your search terms will be shown. By default, " +"conversations are ordered by date." +msgstr "符åˆæœç´¢æ¡ä»¶çš„会è¯ä¼šæ˜¾ç¤ºåœ¨ä¸‹é¢çš„列表ä¸ã€‚会è¯é»˜è®¤æŒ‰æ—¥æœŸæŽ’åºã€‚" -#: C/change-status.page:9(desc) -msgid "Change your status to advertise your availability to your contacts." -msgstr "改å˜æ‚¨çš„状æ€ä»¥å‘您的è”系人表明您是å¦é—²æš‡ã€‚" +#: C/prev-conv.page:80(section/title) +msgid "Browse previous conversations" +msgstr "æµè§ˆä¹‹å‰çš„会è¯" -#: C/change-status.page:34(title) -msgid "Change your status" -msgstr "改å˜æ‚¨çš„状æ€" +#: C/prev-conv.page:82(section/p) +msgid "" +"You can browse your previous conversations with your contacts or in chat " +"rooms by date." +msgstr "您å¯ä»¥æŒ‰æ—¶é—´é¡ºåºæµè§ˆä¹‹å‰å’Œè”系人或在èŠå¤©å®¤ä¸çš„会è¯ã€‚" -#: C/change-status.page:36(p) +#: C/prev-conv.page:91(item/p) msgid "" -"You can set your status to indicate your availability to your contacts. " -"<app>Empathy</app> allows you to select from a list of defined statuses." +"Select an account from the drop-down list in the top left. A list of " +"contacts and chat room for that account will be shown below." msgstr "" -"您å¯ä»¥æ”¹å˜æ‚¨çš„状æ€ï¼Œä»Žè€Œå‘è”系人表明您现在是å¦é—²æš‡ã€‚<app>Empathy</app> å…许您" -"从一些定义好的状æ€ä¸é€‰æ‹©ä¸€ä¸ªã€‚" +"在左上的下拉列表ä¸é€‰æ‹©ä¸€ä¸ªå¸å·ã€‚下方会显示这个å¸å·çš„è”系人和èŠå¤©å®¤åˆ—表。" -#: C/change-status.page:41(p) +#: C/prev-conv.page:95(item/p) msgid "" -"Click on the drop-down list at the top of the <gui>Contact List</gui> window." -msgstr "点击 <gui>è”系人列表</gui> 窗å£é¡¶éƒ¨çš„下拉列表。" - -#: C/change-status.page:46(p) -msgid "Select a status from the list." -msgstr "从列表ä¸é€‰æ‹©ä¸€ä¸ªçŠ¶æ€ã€‚" +"Select a contact or chat room to view your previous conversations from. By " +"default the most recent conversation will be shown." +msgstr "选择一个è”系人或èŠå¤©å®¤ä»¥æŸ¥çœ‹ä¹‹å‰çš„会è¯ã€‚默认显示的是最近的会è¯ã€‚" -#: C/change-status.page:52(p) +#: C/prev-conv.page:99(item/p) msgid "" -"See <link xref=\"status-icons\"/> for a list of the built-in statuses and " -"what they mean. You can also <link xref=\"set-custom-message\">add custom " -"status messages</link> to provide more information about your availability " -"to your contacts." +"You can browse your conversations by date. Days on which you had a " +"conversation with the selected contact will be shown in bold text. Click a " +"date to select it. Click the arrows next to the month and year to browse " +"earlier dates." msgstr "" -"内置的状æ€å’Œå®ƒä»¬çš„å«ä¹‰å‚è§<link xref=\"status-icons\"/>。您也å¯ä»¥<link xref=" -"\"set-custom-message\">æ·»åŠ è‡ªå®šä¹‰çš„çŠ¶æ€ä¿¡æ¯</link>æ¥å‘您的è”系人æ供更多有关" -"您当å‰çŠ¶æ€çš„ä¿¡æ¯ã€‚" +"您å¯ä»¥æŒ‰æ—¥æœŸæµè§ˆæ‚¨çš„会è¯ã€‚如果在æŸæ—¥æ‚¨æ‰€é€‰æ‹©çš„å¸å·æœ‰è¿‡ä¼šè¯ï¼Œè¯¥æ—¥ä¼šä»¥ç²—体显" +"示。点击一个日期以选择它。点击月和年æ—çš„ç®å¤´ä»¥æµè§ˆæ›´æ—©çš„日期。" -#: C/change-status.page:58(p) +#: C/prev-conv.page:105(section/p) msgid "" -"If you do not use your computer for a while, or if the screensaver is on, " -"the status will be automatically set to Away." +"You can search for text in the conversations by typing into the search field " +"at the top. The matching conversations will be showed." msgstr "" -"如果您一段时间ä¸ä½¿ç”¨è®¡ç®—机，或å±å¹•ä¿æŠ¤å¼€å§‹è¿è¡Œï¼Œæ‚¨çš„状æ€ä¼šè‡ªåŠ¨å˜ä¸ºâ€œç¦»å¼€â€ã€‚" +"您å¯ä»¥åœ¨é¡¶éƒ¨çš„æœç´¢æ ä¸è¾“入文å—，以在会è¯ä¸æœç´¢æ–‡å—。匹é…的会è¯ä¼šæ˜¾ç¤ºå‡ºæ¥ã€‚" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/audio-video.page:58(None) +#: C/prev-conv.page:111(note/p) msgid "" -"@@image: 'figures/audio-input-microphone.png'; " -"md5=8d89026b66a263a3bc5b1f0665948567" +"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>Previous Conversations</gui>. The <gui>Previous Conversations</" +"gui> window will open with that contact already selected." msgstr "" -"@@image: 'figures/audio-input-microphone.png'; " -"md5=8d89026b66a263a3bc5b1f0665948567" +"在 <gui>è”系人列表</gui> 窗å£ä¸ï¼Œæ‚¨å¯ä»¥å¿«é€ŸæŸ¥çœ‹ä¸ŽæŸä¸ªè”系人之å‰è¿›è¡Œè¿‡çš„会è¯ã€‚" +"å³é”®ç‚¹å‡»è¯¥è”系人，选择 <gui>最近回è¯</gui>。与该è”系人的<gui>最近会è¯</gui>窗" +"å£å°†ä¼šæ‰“开，并且选ä¸è¯¥è”系人。" -#: C/audio-video.page:8(desc) +#: C/prob-conn-acctdisabled.page:7(info/desc) msgid "" -"Information on when it is possible to have an audio or video conversation." -msgstr "è¯éŸ³æˆ–视频会è¯çš„æ¡ä»¶ã€‚" +"The instant messaging account that you want to use is not enabled in the " +"list of accounts." +msgstr "您è¦è¿žæŽ¥çš„å³æ—¶é€šä¿¡å¸å·æ²¡æœ‰åœ¨å¸å·åˆ—表ä¸å¯ç”¨ã€‚" -#: C/audio-video.page:32(title) -msgid "Audio and video support" -msgstr "è¯éŸ³å’Œè§†é¢‘支æŒ" +#: C/prob-conn-acctdisabled.page:34(page/title) +msgid "My account is not enabled" +msgstr "我的å¸å·æ²¡æœ‰å¯ç”¨" -#: C/audio-video.page:34(p) +#: C/prob-conn-acctdisabled.page:36(page/p) msgid "" -"You can only have audio and video conversation with contacts who are using " -"an application which also supports this feature. When your contacts support " -"audio or video conversations, you will see the following icons next to their " -"names in the contact list:" +"If the instant messaging account that you want to use is not enabled in the " +"drop-down account list when you try to start a new conversation or join a " +"room, your account details may not be correct." msgstr "" -"您的è”系人也在使用支æŒè¯éŸ³å’Œè§†é¢‘会è¯çš„程åºæ—¶ï¼Œæ‚¨æ‰å¯ä»¥å’Œä»–们进行è¯éŸ³ã€è§†é¢‘会" -"è¯ã€‚如果您的è”系人å¯ä»¥è¿›è¡Œè¯éŸ³æˆ–视频会è¯ï¼Œæ‚¨å°†åœ¨è”系人列表ä¸ä»–们的姓åæ—看到" -"ä¸‹åˆ—å›¾æ ‡ï¼š" - -#: C/audio-video.page:43(p) -msgid "Icon" -msgstr "å›¾æ ‡" - -#: C/audio-video.page:48(p) -msgid "Description" -msgstr "æè¿°" - -#: C/audio-video.page:58(media) -msgid "Icon for audio conversation" -msgstr "è¯éŸ³èŠå¤©çš„å›¾æ ‡" +"如果当您å°è¯•å¼€å§‹ä¸€ä¸ªæ–°ä¼šè¯æˆ–è€…åŠ å…¥æˆ¿é—´æ—¶ï¼Œè¦ä½¿ç”¨çš„å³æ—¶èŠå¤©å¸å·æ²¡æœ‰åœ¨ä¸‹æ‹‰çš„è´¦" +"户列表ä¸å¯ç”¨ï¼Œæ‚¨çš„å¸å·ä¿¡æ¯å¯èƒ½ä¸æ£ç¡®ã€‚" -#: C/audio-video.page:64(p) -msgid "The contact is able to have an audio conversation." -msgstr "è”系人å¯ä»¥è¿›è¡Œè¯éŸ³èŠå¤©ã€‚" +#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p) +#: C/prob-conn-neterror.page:53(item/p) +msgid "" +"Make sure that you are connected to the Internet, or to a local area network." +msgstr "ç¡®ä¿æ‚¨å·²ç»è¿žæŽ¥åˆ°äº’è”网，或者一个本地网络。" -#: C/audio-video.page:70(media) -msgid "Icon for video conversation" -msgstr "视频èŠå¤©çš„å›¾æ ‡" +#: C/prob-conn-acctdisabled.page:49(item/p) +msgid "" +"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the " +"account that is not working." +msgstr "" +"选择<guiseq><gui>编辑</gui><gui>å¸å·</gui></guiseq>，å†é€‰æ‹©ä¸å·¥ä½œçš„å¸å·ã€‚" -#: C/audio-video.page:76(p) -msgid "The contact is able to have a video conversation." -msgstr "è”系人å¯ä»¥è¿›è¡Œè§†é¢‘èŠå¤©ã€‚" +#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p) +msgid "" +"Type your username and password again to make sure that they are correct." +msgstr "å†æ¬¡è¾“入您的用户å和密ç ，以确ä¿å®ƒä»¬æ˜¯æ£ç¡®çš„。" -#: C/audio-video.page:83(p) +#: C/prob-conn-acctdisabled.page:60(item/p) +#: C/prob-conn-neterror.page:64(item/p) msgid "" -"In order to have an audio conversation, you need to have a sound card that " -"is supported by your operating system, and a working microphone." +"Check in the <gui>Advanced</gui> section that all the details are correct. " +"You should be able to find these details from the website of the messaging " +"service." msgstr "" -"è¦è¿›è¡Œè¯éŸ³èŠå¤©ï¼Œæ‚¨éœ€è¦æœ‰ä¸€å—声å¡ï¼Œä¸”您的æ“作系统必需支æŒå®ƒï¼Œè¿˜éœ€è¦ä¸€ä¸ªèƒ½æ£å¸¸" -"工作的麦克风。" +"检查<gui>高级</gui>选项å¡ä¸çš„所有细节是å¦æ£ç¡®ã€‚您应当å¯ä»¥ä»Žå³æ—¶é€šè®¯æœåŠ¡å•†çš„网" +"站上找到这些信æ¯ã€‚" -#: C/audio-video.page:87(p) +#: C/prob-conn-acctdisabled.page:66(item/p) +msgid "Check that the account is switched on." +msgstr "检查å¸å·æ˜¯å¦å¼€å¯ã€‚" + +#: C/prob-conn-auth.page:8(info/desc) msgid "" -"In order to have a video conversation, you need to have a webcam that is " -"supported by your operating system, and a working microphone." -msgstr "è¦è¿›è¡Œè§†é¢‘èŠå¤©ï¼Œæ‚¨éœ€è¦æ“作系统支æŒçš„æ‘„åƒå¤´ï¼ŒåŠå¯ä»¥æ£å¸¸å·¥ä½œçš„麦克风。" +"An error message which says “<gui>Authentication failed</gui>†appears in " +"the main window." +msgstr "主窗å£ä¸æ˜¾ç¤ºäº†ä¸€ä¸ªé”™è¯¯æ示信æ¯ï¼Œâ€œ<gui>验è¯å¤±è´¥</gui>â€ã€‚" -#: C/audio-video.page:95(title) -msgid "Supported Account Types" -msgstr "支æŒçš„账户类型" +#: C/prob-conn-auth.page:36(page/title) +msgid "I get a message that says “Authentication failedâ€" +msgstr "我收到“验è¯å¤±è´¥â€çš„错误æ示信æ¯" -#: C/audio-video.page:97(p) +#: C/prob-conn-auth.page:38(page/p) msgid "" -"You can only have audio and video conversations using accounts on certain " -"supported services. The following table lists whether audio and video is " -"supported for each type of account." +"This kind of error happens when your instant messaging service is not " +"allowing you to connect because it does not recognize your username or " +"password for some reason." msgstr "" -"åªæœ‰ä¸€äº›ç‰¹å®šç±»åž‹çš„账户支æŒè¯éŸ³æˆ–视频èŠå¤©ã€‚下表列出了æ¯ç§ç±»åž‹çš„账户的è¯éŸ³ã€è§†" -"频支æŒæƒ…况。" +"è¿™ç§é”™è¯¯å‘生在您的å³æ—¶é€šä¿¡æœåŠ¡å™¨æ— 法确认您的身份，ä¸å…è®¸æ‚¨è¿žæŽ¥æ—¶ã€‚æ¯”å¦‚ï¼Œå› ä¸º" +"æŸç§åŽŸå› ï¼Œå®ƒæ— æ³•è¯†åˆ«æ‚¨çš„ç”¨æˆ·å或者密ç 。" -#: C/audio-video.page:102(p) +#: C/prob-conn-auth.page:50(item/p) msgid "" -"Account types are provided by plugins. Your system may not have all of the " -"following types available, or it may have types not listed here. Updated " -"plugins may make audio or video conversations possible on account types that " -"are listed as unsupported here." +"Make sure that you have registered an account with the service you are " +"trying to connect to. If you do not have an account, most services will not " +"allow you to connect." msgstr "" -"账户类型是由æ’件æ供的。您的系统上ä¸ä¸€å®šæœ‰ä»¥ä¸‹åˆ—出的全部类型，也å¯èƒ½æœ‰ä¸€äº›ç±»" -"型没有在下é¢åˆ—出。æ’件的å‡çº§å¯èƒ½ä½¿ä¸‹è¡¨ä¸ä¸æ”¯æŒè¯éŸ³æˆ–视频的账户类型获得支æŒã€‚" +"ç¡®ä¿æ‚¨å·²ç»åœ¨è¦è¿žæŽ¥çš„æœåŠ¡ä¸Šæ³¨å†Œäº†å¸å·ã€‚如果没有å¸å·ï¼Œå¤šæ•°æœåŠ¡éƒ½ä¸ä¼šå…许您连" +"接。" -#: C/audio-video.page:110(p) +#: C/prob-conn-auth.page:57(item/p) C/prob-conn-name.page:43(item/p) +#: C/prob-conn-neterror.page:58(item/p) msgid "" -"I'd like to do tables like this using nothing for No and ✔ for Yes, but we " -"need to look at the accessibility impact. I've <link href=\"http://mail." -"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the " -"accessibility team</link> for input." +"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png" +"\">edit</media> icon in the error message." msgstr "" +"点击错误æ示信æ¯ä¸Šçš„<media type=\"image\" mime=\"image/png\" src=\"figures/" +"gtk-edit.png\">编辑</media>å›¾æ ‡ã€‚" -#: C/audio-video.page:118(p) +#: C/prob-conn-auth.page:68(item/p) msgid "" -"There's recent work on telepathy-butterfly and papyon to support audio and " -"video for MSN. It might be released in time for 2.28, but since it doesn't " -"follow the Gnome release schedule, I can't be sure. If it looks like it's " -"going to ship, let's mark it Yes." -msgstr "" +"Deselect the <gui>Enabled</gui>, and then select it again to try to " +"reconnect to the service." +msgstr "å–消选择<gui>å·²å¯ç”¨</gui>，然åŽå†æ¬¡é€‰ä¸ä»¥é‡æ–°è¿žæŽ¥åˆ°æœåŠ¡å™¨ã€‚" -#: C/audio-video.page:128(p) -msgid "Service" -msgstr "æœåŠ¡" +#: C/prob-conn-name.page:9(info/title) +#, fuzzy +#| msgid "“Name in useâ€" +msgctxt "link:error-msg" +msgid "“Name in useâ€" +msgstr "“用户åå·²ç»è¢«å 用â€" -#: C/audio-video.page:129(p) -msgid "Audio" -msgstr "è¯éŸ³" +#: C/prob-conn-name.page:10(info/desc) +msgid "" +"An error message which says “<gui>Name in use</gui>†appears in the main " +"window." +msgstr "主窗å£ä¸æ˜¾ç¤ºäº†ä¸€ä¸ªé”™è¯¯æ示信æ¯ï¼Œâ€œ<gui>用户å已被å 用</gui>â€ã€‚" -#: C/audio-video.page:130(p) -msgid "Video" -msgstr "视频" +#: C/prob-conn-name.page:33(page/title) +msgid "I get a message that says “Name in useâ€" +msgstr "我收到“用户åå·²ç»è¢«å 用â€çš„错误æ示信æ¯" -#: C/audio-video.page:136(p) C/audio-video.page:137(p) -#: C/audio-video.page:141(p) C/audio-video.page:142(p) -#: C/audio-video.page:146(p) C/audio-video.page:147(p) -#: C/audio-video.page:156(p) C/audio-video.page:157(p) -#: C/audio-video.page:161(p) C/audio-video.page:162(p) -#: C/audio-video.page:166(p) C/audio-video.page:167(p) -#: C/audio-video.page:181(p) C/audio-video.page:182(p) -#: C/audio-video.page:186(p) C/audio-video.page:187(p) -#: C/audio-video.page:191(p) C/audio-video.page:192(p) -#: C/audio-video.page:196(p) C/audio-video.page:197(p) -#: C/audio-video.page:201(p) C/audio-video.page:202(p) -#: C/audio-video.page:211(p) C/audio-video.page:212(p) -#: C/audio-video.page:216(p) C/audio-video.page:217(p) -msgid "No" -msgstr "å¦" +#: C/prob-conn-name.page:35(page/p) +msgid "" +"This kind of error happens when you try to connect to your IRC account and " +"you are using a nickname that is already being used by someone else on that " +"particular network." +msgstr "" +"è¿™ç§é”™è¯¯å‡ºçŽ°åœ¨æ‚¨å°è¯•è¿žæŽ¥åˆ° IRC å¸å·ï¼Œç„¶è€Œæ‚¨ä½¿ç”¨çš„昵称æ£åœ¨è¢«è¯¥ç½‘络上其他人使用" +"的情况下。" -#: C/audio-video.page:140(p) -msgid "Facebook Chat" -msgstr "Facebook èŠå¤©" +#: C/prob-conn-name.page:51(item/p) +msgid "In the <gui>Nickname</gui> text box, type a new nickname." +msgstr "在<gui>昵称</gui>文本框ä¸ï¼Œè¾“入一个新昵称。" -#: C/audio-video.page:145(p) -msgid "gadugadu" -msgstr "gadugadu" +#: C/prob-conn-name.page:56(item/p) +msgid "" +"If you have registered that nickname within the network you are using, set " +"the password for that nickname. For more information, see <link xref=\"irc-" +"nick-password\"/>." +msgstr "" +"如果您在所用的网路ä¸æ³¨å†Œäº†è¿™ä¸ªæ˜µç§°ï¼Œè¯·ä¸ºè¯¥æ˜µç§°è®¾ç½®å¯†ç 。更多信æ¯å‚è§<link " +"xref=\"irc-nick-password\"/>。" -#: C/audio-video.page:150(p) -msgid "Google Talk" -msgstr "Google Talk" +#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p) +msgid "" +"Switch the account off, and then switch it on to try to reconnect to the " +"service." +msgstr "å…³é—å¸å·ï¼Œç„¶åŽå¼€å¯è¯¥å¸å·å¹¶å°è¯•é‡æ–°è¿žæŽ¥åˆ°æœåŠ¡ã€‚" -#: C/audio-video.page:151(p) C/audio-video.page:152(p) -#: C/audio-video.page:171(p) C/audio-video.page:172(p) -#: C/audio-video.page:176(p) C/audio-video.page:177(p) -#: C/audio-video.page:206(p) C/audio-video.page:207(p) -msgid "Yes" -msgstr "是" +#: C/prob-conn-neterror.page:7(info/desc) +msgid "" +"An error message which says “<gui>Network error</gui>†appears in the main " +"window." +msgstr "主窗å£ä¸æ˜¾ç¤ºäº†ä¸€ä¸ªé”™è¯¯æ示信æ¯ï¼Œâ€œ<gui>网络错误</gui>â€ã€‚" -#: C/audio-video.page:155(p) -msgid "Groupwise" -msgstr "Groupwise" +#: C/prob-conn-neterror.page:34(page/title) +msgid "I get a message that says “Network errorâ€" +msgstr "我收到“网络错误â€çš„错误æ示信æ¯" -#: C/audio-video.page:180(p) -msgid "myspace" -msgstr "myspace" +#: C/prob-conn-neterror.page:42(page/p) +msgid "" +"This kind of error happens when <app>Empathy</app> cannot communicate with " +"the instant messaging service for some reason." +msgstr "" +"è¿™ç§é”™è¯¯åœ¨ <app>Empathy</app> 由于æŸç§åŽŸå› è€Œæ— æ³•å’Œå³æ—¶é€šè®¯æœåŠ¡å™¨è¿žä¸Šæ—¶å‡ºçŽ°ã€‚" -#: C/audio-video.page:185(p) -msgid "qq" -msgstr "qq" +#: C/prob-conn-neterror.page:46(page/p) +msgid "" +"Also, this kind of error happens when you try to use an IRC account without " +"setting a nickname." +msgstr "æ¤å¤–，这ç§é”™è¯¯ä¹Ÿåœ¨æ‚¨è¯•å›¾ä¸è®¾ç½®æ˜µç§°è€Œä½¿ç”¨ IRC å¸å·æ—¶å‡ºçŽ°ã€‚" -#: C/audio-video.page:195(p) -msgid "sametime" -msgstr "sametime" +#: C/prob-conn-neterror.page:87(section/title) +msgid "Proxy support" +msgstr "代ç†æ”¯æŒ" -#: C/audio-video.page:200(p) -msgid "silc" -msgstr "silc" +#: C/prob-conn-neterror.page:88(section/p) +msgid "" +"At the moment <app>Empathy</app> can not be configured to work with a proxy." +msgstr "ç›®å‰ <app>Empathy</app> æ— æ³•åœ¨ä»£ç†ä¸‹å·¥ä½œã€‚" -#: C/audio-video.page:215(p) -msgid "zephyr" -msgstr "zephyr" +#: C/prob-conn.page:7(info/desc) +msgid "Diagnose common problems connecting to an instant messaging service." +msgstr "诊æ–连接到一个å³æ—¶æ¶ˆæ¯æœåŠ¡çš„常è§é—®é¢˜ã€‚" -#: C/audio-call.page:9(desc) -msgid "Call your contacts over the Internet." -msgstr "通过互è”网呼å«æ‚¨çš„è”系人。" +#: C/prob-conn.page:29(page/title) +msgid "Problems connecting to an instant messaging service" +msgstr "连接到å³æ—¶æ¶ˆæ¯æœåŠ¡æ—¶çš„问题" -#: C/audio-call.page:27(title) -msgid "Start an audio conversation" -msgstr "开始è¯éŸ³èŠå¤©" +#: C/remove-account.page:8(info/desc) +msgid "Completely remove an account from <app>Empathy</app>." +msgstr "从 <app>Empathy</app> ä¸å®Œå…¨åœ°åˆ 除一个å¸å·ã€‚" -#: C/audio-call.page:29(p) -msgid "" -"You can call your contacts and have an audio conversation with them. This " -"features only works with certain types of accounts, and it requires the " -"other person to have an application that supports audio calls." -msgstr "" -"您å¯ä»¥å‘¼å«æ‚¨çš„è”系人，与他们进行è¯éŸ³èŠå¤©ã€‚这个功能仅对于一些特定类型的账户å¯" -"用，并且需è¦å¦ä¸€ä¸ªäººä½¿ç”¨çš„应用程åºä¹Ÿæ”¯æŒè¯éŸ³å‘¼å«ã€‚" +#: C/remove-account.page:34(page/title) +msgid "Remove an account" +msgstr "åˆ é™¤å¸å·" -#: C/audio-call.page:34(p) +#: C/remove-account.page:36(page/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\">Audio Call</gui>." +"You can completely remove an account from <app>Empathy</app> if you no " +"longer wish to use the account. If you wish to use the account in " +"<app>Empathy</app> again in the future, you will have to add your account " +"details again." msgstr "" -"在 <gui>è”系人列表</gui> 窗å£ï¼Œç‚¹å‡»æ‚¨æƒ³å‘¼å«çš„è”系人的åå—æ—çš„ <media type=" -"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼å«</media> " -"å›¾æ ‡å¹¶é€‰æ‹© <gui style=\"menuitem\">è¯éŸ³å‘¼å«</gui>。" +"å¦‚æžœä½ ä¸æƒ³å†ä½¿ç”¨æŸä¸ªå¸å·ï¼Œæ‚¨å¯ä»¥ä»Ž <app>Empathy</app> ä¸å®Œå…¨åœ°åˆ 除这个å¸å·ã€‚" +"如果您将æ¥åˆå¸Œæœ›åœ¨ <app>Empathy</app> ä¸ä½¿ç”¨è¿™ä¸ªå¸å·äº†ï¼Œæ‚¨å¯ä»¥å†æ·»åŠ 这个账" +"户。" -#: C/audio-call.page:55(p) +#: C/remove-account.page:47(item/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>." -msgstr "" -"è¦å°†è¯éŸ³ä¼šè¯è½¬ä¸ºè§†é¢‘会è¯ï¼Œé€‰æ‹© <guiseq><gui style=\"menu\">视频</gui><gui " -"style=\"menuitem\">视频开å¯</gui></guiseq>。" +"Select the account you wish to remove from the accounts list on the left " +"side of the window." +msgstr "在窗å£å·¦ä¾§çš„å¸å·åˆ—表ä¸é€‰æ‹©æ‚¨æƒ³è¦åˆ 除的å¸å·ã€‚" -#: C/audio-call.page:63(title) -msgid "Start an audio conversation with a meta-contact" -msgstr "å‘一ä½å…ƒè”系人å‘èµ·è¯éŸ³ä¼šè¯" +# 有个"-"çš„æŒ‰é’®å›¾æ ‡ï¼Œå¯ä»¥ä¿æŒ - ä¸å˜ã€‚ +#: C/remove-account.page:51(item/p) +msgid "Click <gui style=\"button\">-</gui>." +msgstr "点击<gui style=\"button\">-</gui>。" -#: C/audio-call.page:71(p) +#: C/remove-account.page:54(item/p) msgid "" -"Select the contact you want to have the conversation, and from the menu " -"select <gui style=\"menuitem\">Audio Call</gui>." +"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> " +"button to permanently remove the account." msgstr "" -"选择您想è¦äº¤è°ˆçš„è”系人，然åŽåœ¨èœå•ä¸é€‰æ‹©<gui style=\"menuitem\">è¯éŸ³å‘¼å«</" -"gui>。" +"一个弹出对è¯æ¡†ä¼šè¦æ±‚æ‚¨ç¡®è®¤åˆ é™¤ã€‚ç‚¹å‡»<gui>åˆ é™¤</gui>按钮æ¥æ°¸ä¹…çš„åˆ é™¤è¿™ä¸ªå¸å·ã€‚" -#: C/add-contact.page:9(desc) -msgid "Add someone to the contact list." -msgstr "æ·»åŠ æŸäººåˆ°è”系人列表。" +#: C/remove-account.page:60(note/p) +msgid "" +"Even after removing an account, <app>Empathy</app> does not delete your " +"conversation history for that account." +msgstr "å³ä½¿åˆ 除了å¸å·ï¼Œ<app>Empathy</app> 也ä¸ä¼šåˆ 除这个å¸å·çš„èŠå¤©è®°å½•ã€‚" -#: C/add-contact.page:33(title) -msgid "Add someone to your list of contacts" -msgstr "æ·»åŠ æŸäººåˆ°æ‚¨çš„è”系人列表" +#: C/salut-protocol.page:8(info/desc) +msgid "Understanding the People Nearby feature." +msgstr "ç†è§£é™„近的人(People Nearby)功能" -#: C/add-contact.page:37(p) -msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>." -msgstr "选择<guiseq><gui>èŠå¤©</gui><gui>æ·»åŠ è”系人</gui></guiseq>。" +#: C/salut-protocol.page:33(page/title) +msgid "What is People Nearby?" +msgstr "什么是“附近的人â€ï¼Ÿ" -#: C/add-contact.page:40(p) +#: C/salut-protocol.page:40(page/p) msgid "" -"From the <gui>Account</gui> drop-down list, select the account you wish to " -"use to connect to your contact. Your contact will need to be using the same " -"service as the account you select." +"The People Nearby service is a serverless communication service: you do not " +"need to connect and authenticate to a central server in order to use it." msgstr "" -"在 <gui>账户</gui> 下拉列表ä¸ï¼Œé€‰æ‹©æ‚¨ç”¨æ¥ä¸Žæ‚¨çš„è”系人è”系的账户。您的è”系人需" -"è¦ä½¿ç”¨ä¸Žæ‚¨é€‰æ‹©çš„账户相åŒçš„æœåŠ¡ã€‚" +"附近的人(People Nearby)æœåŠ¡æ˜¯ä¸€ä¸ªæ— æœåŠ¡å™¨çš„通讯æœåŠ¡ï¼šæ‚¨ä¸éœ€è¦è¿žæŽ¥å¹¶è®¤è¯åˆ°ä¸€ä¸ª" +"ä¸å¤®æœåŠ¡å™¨æ¥ä½¿ç”¨è¿™ä¸ªåŠŸèƒ½ã€‚" -#: C/add-contact.page:45(p) +#: C/salut-protocol.page:45(page/p) msgid "" -"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, " -"screen name, or other appropriate identifier for the service type." -msgstr "" -"在 <gui>æ ‡è¯†ç¬¦</gui> 一æ ä¸ï¼Œè¾“入这ç§æœåŠ¡ä¸æ‚¨çš„è”系人的登录 ID，用户å，显示" -"å或其他åˆé€‚çš„æ ‡è¯†ç¬¦ã€‚" +"This kind of serverless messaging system is restricted to a local area " +"network and an active Internet connection is not necessary." +msgstr "è¿™ç±»æ— æœåŠ¡å™¨çš„通讯系统åªå±€é™äºŽæœ¬åœ°å±€åŸŸç½‘，并且ä¸éœ€è¦äº’è”网链接。" -#: C/add-contact.page:49(p) +#: C/salut-protocol.page:49(page/p) msgid "" -"In the <gui>Alias</gui> field, type your contact’s name as you would like it " -"to appear in your contact list." -msgstr "在 <gui>别å</gui> ä¸ï¼Œè¾“入您希望这个è”系人显示在è”系人列表ä¸çš„åå—。" - -#: C/add-contact.page:53(p) -msgid "Click <gui>Add</gui> to add the person to your list of contacts." -msgstr "点击<gui>æ·»åŠ </gui>å°†æ¤äººæ·»åŠ 到您的è”系人列表。" +"The people that use this service inside the same local area network will be " +"auto-discovered, and it will be possible to send them messages and files as " +"with other services." +msgstr "" +"会自动的å‘现在åŒä¸€ä¸ªå±€åŸŸç½‘ä¸ä½¿ç”¨è¿™ä¸ªæœåŠ¡çš„人，并且å¯ä»¥ç»™ä»–们å‘é€æ¶ˆæ¯ç”šè‡³æ–‡" +"件，想其它æœåŠ¡ä¸€æ ·ã€‚" -#: C/add-contact.page:61(p) +#: C/salut-protocol.page:54(page/p) msgid "" -"To add a new person to your list of contacts, you need to be connected to " -"the Internet and to your account." -msgstr "è¦æ·»åŠ è”系人到您的è”系人列表，您需è¦è¿žæŽ¥å› 特网和您的账户。" +"All the modern local area networks should be able to support this kind of " +"service." +msgstr "所有现代的本地局域网都应该å¯ä»¥æ”¯æŒè¿™ç±»æœåŠ¡ã€‚" -#: C/add-account.page:9(desc) -msgid "Add a new account to <app>Empathy</app>." -msgstr "å‘ <app>Empathy</app> æ·»åŠ æ–°è´¦æˆ·ã€‚" +#: C/send-file.page:8(info/desc) +msgid "Send a file from your computer to one of your contacts." +msgstr "从您的计算机å‘é€æ–‡ä»¶ç»™æ‚¨çš„è”系人。" -#: C/add-account.page:39(title) -msgid "Add a new account" -msgstr "æ·»åŠ ä¸€ä¸ªæ–°è´¦æˆ·" +#: C/send-file.page:36(page/title) +msgid "Send files" +msgstr "å‘é€æ–‡ä»¶" -#: C/add-account.page:41(p) +#: C/send-file.page:45(item/p) msgid "" -"You can add instant messaging accounts from any supported service to " -"communicate with all of your contacts in <app>Empathy</app>. For some " -"account providers, these steps will also allow you to register for a new " -"account. For more details, see <link xref=\"create-account\"/>." +"Right click on the contact you want to send a file to, and choose <gui>Send " +"file</gui>." +msgstr "å³é”®ç‚¹å‡»è¦å‘å…¶å‘é€æ–‡ä»¶çš„è”系人，然åŽé€‰æ‹©<gui>å‘é€æ–‡ä»¶</gui>。" + +#: C/send-file.page:50(item/p) +#, fuzzy +#| msgid "" +#| "Click on the contact you want to send a file, and choose " +#| "<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Send file</gui></guiseq>." +msgid "" +"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</" +"gui> <gui>Contact</gui><gui>Send file</gui></guiseq>." msgstr "" -"您å¯ä»¥æ·»åŠ 任何支æŒçš„æœåŠ¡çš„å³æ—¶æ¶ˆæ¯è´¦æˆ·ï¼Œä»¥åœ¨ <app>Empathy</app> ä¸ä¸Žæ‚¨çš„è”ç³»" -"人交æµã€‚对于æŸäº›è´¦æˆ·æ供商，这些æ¥éª¤ä¹Ÿå…许您注册新账户。更多细节å‚è§<link " -"xref=\"create-account\"/>。" +"点击è¦å‘å…¶å‘é€æ–‡ä»¶çš„è”系人，然åŽé€‰æ‹©<guiseq><gui>编辑</gui><gui>è”系人</" +"gui><gui>å‘é€æ–‡ä»¶</gui></guiseq>。" + +#: C/send-file.page:58(item/p) +msgid "Select the file to send, and click on <gui>Send</gui>." +msgstr "选择è¦å‘é€çš„文件，并点击<gui>å‘é€</gui>。" -#: C/add-account.page:52(p) -msgid "Click <gui style=\"button\">Add</gui>." -msgstr "点击<gui style=\"button\">æ·»åŠ </gui>。" +#: C/send-file.page:63(item/p) +msgid "The <gui>File Transfers</gui> window will appear." +msgstr "<gui>æ–‡ä»¶ä¼ è¾“</gui>窗å£ä¼šè¢«æ˜¾ç¤ºã€‚" -#: C/add-account.page:57(p) +#: C/send-file.page:66(item/p) msgid "" -"From the <gui>Protocol</gui> drop-down list, select the type of account you " -"wish to add." -msgstr "在<gui>åè®®</gui>下拉列表，选择您è¦åˆ›å»ºçš„账户类型。" +"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> " +"to halt the transfer." +msgstr "请ç‰å¾…您的è”系人接å—æ–‡ä»¶ä¼ è¾“ï¼Œæˆ–ç‚¹å‡»<gui>åœæ¢</gui>æ¥ç»ˆæ¢ä¼ 输。" -#: C/add-account.page:61(p) +#: C/send-file.page:72(item/p) msgid "" -"If you do not already have a registered account, select <gui>Create a new " -"account on the server</gui>. This feature is not available for all account " -"types, and may not work with some account providers. See <link xref=\"create-" -"account\"/> for more information." -msgstr "" -"如果您还没有注册账户，选择<gui>在æœåŠ¡å™¨ä¸Šåˆ›å»ºæ–°çš„账户</gui>。这个功能并ä¸æ˜¯å¯¹" -"于æ¯ä¸€ç§è´¦æˆ·éƒ½å¯ç”¨ï¼Œä¹Ÿå¯èƒ½å¯¹äºŽæŸäº›è´¦æˆ·æ供商ä¸å¯ç”¨ã€‚更多信æ¯å‚è§<link xref=" -"\"create-account\"/>。" +"Once the transfer is finished, it is possible to close the <gui>File " +"Transfers</gui> window." +msgstr "ä¼ è¾“ç»“æŸä¹‹åŽï¼Œå°±å¯ä»¥å…³é—<gui>æ–‡ä»¶ä¼ è¾“</gui>窗å£äº†ã€‚" -#: C/add-account.page:66(p) +#: C/send-file.page:80(note/p) msgid "" -"Enter the required information. For most accounts, you will only need a " -"login ID and a password. Some accounts may require additional information. " -"See <link xref=\"accounts-window#details\"/> for more information." +"If you have multiple finished transfers listed in the window, click on " +"<gui>Clear</gui> to empty the list. This will only remove the files from the " +"list and will not delete them from your computer." msgstr "" -"输入必è¦çš„ä¿¡æ¯ã€‚对于大多数账户，您åªéœ€è¦è¾“入登录 ID 和密ç 。有些账户å¯èƒ½éœ€è¦" -"更多信æ¯ã€‚å‚è§<link xref=\"accounts-window#details\"/>。" - -#: C/add-account.page:71(p) -msgid "Click <gui style=\"button\">Log in</gui>." -msgstr "点击<gui style=\"button\">登入</gui>。" +"如果窗å£ä¸åˆ—出了很多已ç»å®Œæˆçš„ä¼ è¾“ï¼Œç‚¹å‡»<gui>清除</gui>å¯ä»¥æ¸…空列表。这åªä¼šå°†" +"列表清空，而ä¸ä¼šä»Žæ‚¨çš„è®¡ç®—æœºä¸Šåˆ é™¤è¿™äº›æ–‡ä»¶ã€‚" -#: C/add-account.page:78(p) +#: C/send-file.page:87(note/p) msgid "" -"To change the name that identifies the account in the <gui>Accounts</gui> " -"window, select the account from the list on the left and either click on the " -"name or press the space bar. Edit the account name and press <key>Enter</" -"key> when you’re finished." +"It is possible to send files only using the following services: <em>Jabber</" +"em>, <em>Google Talk</em> and <em>People Nearby</em>." msgstr "" -"è¦æ”¹å˜è´¦æˆ·åœ¨<gui>账户</gui>窗å£ä¸çš„ä½œä¸ºæ ‡è¯†çš„åå—，在左侧的列表ä¸é€‰æ‹©è´¦æˆ·ï¼Œç„¶" -"åŽç‚¹å‡»åå—æˆ–è€…æŒ‰ç©ºæ ¼é”®ã€‚ç¼–è¾‘è´¦æˆ·çš„åå—，完æˆåŽæŒ‰<key>Enter</key>。" +"åªæœ‰ä½¿ç”¨ä¸‹åˆ—æœåŠ¡æ‰èƒ½å‘é€æ–‡ä»¶ï¼š<em>Jabber</em>ã€<em>Google Talk</em>å’Œ<em>附近" +"的人</em>。" -#: C/accounts-window.page:11(desc) -msgid "Add, modify, and delete accounts." -msgstr "æ·»åŠ ã€ä¿®æ”¹å’Œåˆ 除账户。" +#: C/send-file.page:93(note/p) +msgid "" +"In order to send a file to someone, you need to be connected to the " +"Internet, or to a local area network." +msgstr "è¦å‘别人å‘é€æ–‡ä»¶ï¼Œæ‚¨éœ€è¦è¿žæŽ¥åˆ°äº’è”网，或本地局域网。" -#: C/accounts-window.page:33(title) -msgid "Accounts Window" -msgstr "账户窗å£" +#: C/send-message.page:8(info/desc) +msgid "Send a message to one of your contacts." +msgstr "å‘é€æ¶ˆæ¯ç»™ä¸€ä¸ªæ‚¨çš„è”系人。" -#: C/accounts-window.page:35(p) +#: C/send-message.page:32(page/title) +msgid "Send a message to someone" +msgstr "å‘æŸäººå‘é€æ¶ˆæ¯" + +#: C/send-message.page:36(item/p) msgid "" -"The <gui>Accounts</gui> window allows you to add, modify, and delete " -"accounts." -msgstr "<gui>账户</gui>窗å£å…è®¸æ‚¨æ·»åŠ ã€ä¿®æ”¹å’Œåˆ 除账户。" +"From the <gui>Contact List</gui> window, double-click the name of the " +"contact that you want to have a conversation with." +msgstr "在<gui>è”系人列表</gui>窗å£ä¸ï¼ŒåŒå‡»è¦ä¸Žä¹‹èŠå¤©çš„è”系人的åå—。" -#: C/accounts-window.page:43(title) -msgid "Account Details" -msgstr "账户详细信æ¯" +#: C/send-message.page:42(item/p) +msgid "" +"A new window will open. Type a message into the box at the bottom of the " +"window and press <key>Enter</key> to send it." +msgstr "" +"一个新窗å£ä¼šè¢«æ‰“开。在窗å£åº•éƒ¨çš„文本框ä¸è¾“入一æ¡æ¶ˆæ¯ï¼Œç„¶åŽæŒ‰<key>Enter</key>" +"å‘é€ã€‚" -#: C/accounts-window.page:44(p) +#: C/send-message.page:50(section/title) +msgid "Send a message to a meta-contact" +msgstr "å‘一ä½å…ƒè”系人å‘é€æ¶ˆæ¯" + +#: C/send-message.page:58(item/p) msgid "" -"For most types of accounts, you can simply enter a login ID and a password. " -"Certain accounts or account types, however, may require additional " -"information." +"Select the contact you want to have the conversation, and from the menu " +"select <gui style=\"menuitem\">Chat</gui>." msgstr "" -"对于大多数的账户，您åªéœ€è¦è¾“入登录 ID 和密ç 。但有些账户或有些类型的账户å¯èƒ½" -"需è¦é¢å¤–çš„ä¿¡æ¯ã€‚" +"选择您想è¦ä¸Žä¹‹èŠå¤©çš„è”系人，并在èœå•ä¸é€‰æ‹© <gui style=\"menuitem\">èŠå¤©</" +"gui>。" -#: C/account-jabber.page:7(desc) -msgid "Advanced options for Jabber and Google Talk accounts." -msgstr "Jabber å’Œ Google Talk 账户的高级选项。" +#: C/set-custom-status.page:9(info/desc) +msgid "Add, edit or delete personal messages for your status." +msgstr "为您的状æ€æ·»åŠ ã€ç¼–è¾‘æˆ–åˆ é™¤ä¸ªäººæ¶ˆæ¯ã€‚" -#: C/account-jabber.page:29(title) -msgid "Jabber account details" -msgstr "Jabber 账户详情" +#: C/set-custom-status.page:15(credit/name) +msgid "Jim Campbell" +msgstr "Jim Campbell" -#: C/account-jabber.page:31(p) +#: C/set-custom-status.page:34(page/title) +msgid "Set a custom message" +msgstr "设置一个自定义消æ¯" + +#: C/set-custom-status.page:36(page/p) msgid "" -"Most Jabber accounts will require only a login ID and a password to connect. " -"For some accounts or on certain types of networks, you may need to enter " -"additional information in the <gui>Advanced</gui> section. Normally, you " -"will not need to use the advanced options below. For general instructions on " -"adding an account, see <link xref=\"add-account\"/>." +"Sometimes you may want to set a custom message for your status, for example " +"to let people know that you will be unavailable for a certain period of time." msgstr "" -"大多 Jabber 账户åªéœ€è¦ç™»å½• ID 和密ç å°±å¯ä»¥è¿žæŽ¥ã€‚但对于æŸäº›è´¦æˆ·æˆ–æŸäº›ç½‘络，您" -"å¯èƒ½éœ€è¦åœ¨<gui>高级</gui>选项å¡ä¸è¾“入一些é¢å¤–çš„ä¿¡æ¯ã€‚通常，您ä¸éœ€è¦ä½¿ç”¨ä¸‹é¢çš„" -"è¿™äº›é«˜çº§é€‰é¡¹ã€‚æ·»åŠ è´¦æˆ·çš„ä¸€èˆ¬æŒ‡å¯¼å‚è§<link xref=\"add-account\"/>。" +"有时您也许想è¦ä¸ºæ‚¨çš„状æ€è®¾ç½®ä¸€ä¸ªè‡ªå®šä¹‰æ¶ˆæ¯ï¼Œä¾‹å¦‚，让别人知é“您å¯èƒ½åœ¨ä¸€æ®µæ—¶é—´" +"内ä¸åœ¨ã€‚" -#: C/account-jabber.page:39(p) +#: C/set-custom-status.page:40(page/p) msgid "" -"Google Talk is a type of Jabber account. These instructions hold for Google " -"Talk accounts as well." -msgstr "Google Talk æ˜¯ä¸€ç§ Jabber 账户。这些指å—对 Google Talk 账户åŒæ ·é€‚用。" - -#: C/account-jabber.page:45(gui) -msgid "Encryption required (TLS/SSL)" -msgstr "需è¦åŠ 密(TLS/SSL)" +"It is possible to set a custom message based on the different statuses " +"available." +msgstr "å¯ä»¥æ ¹æ®ä¸åŒçš„状æ€æ¥è®¾ç½®è‡ªå®šä¹‰æ¶ˆæ¯ã€‚" -#: C/account-jabber.page:46(gui) -msgid "Ignore SSL certificate errors" -msgstr "忽略 SSL è¯ä¹¦é”™è¯¯" +#: C/set-custom-status.page:46(item/p) C/set-custom-status.page:82(item/p) +msgid "" +"From the <gui>Contact List</gui> window, click on the drop-down list at the " +"top." +msgstr "在<gui>è”系人列表</gui>窗å£ï¼Œç‚¹å‡»é¡¶éƒ¨çš„下拉列表。" -#: C/account-jabber.page:47(p) +#: C/set-custom-status.page:52(item/p) msgid "" -"Whenever possible, communication between <app>Empathy</app> and the Jabber " -"server is encrypted. If encrypted communication is not possible, messages " -"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent " -"<app>Empathy</app> from communicating with the Jabber server when encryption " -"is not possible." +"Select the status you want to add a custom message to. You have to select " +"the one identified with the label <gui>Custom Message</gui>." msgstr "" -"åªè¦æœ‰å¯èƒ½ï¼Œ<app>Empathy</app> 与 Jabber æœåŠ¡å™¨ä¹‹é—´çš„é€šè®¯å°±ä¼šè¢«åŠ å¯†ã€‚å¦‚æžœä¸å¯" -"èƒ½åŠ å¯†ï¼Œæ¶ˆæ¯å°±å¯èƒ½è¢«æ˜Žæ–‡å‘é€ã€‚选择<gui>需è¦åŠ 密</gui>以阻æ¢ä¸èƒ½åŠ 密时 " -"<app>Empathy</app> 与 Jabber æœåŠ¡å™¨è¿›è¡Œæ˜Žæ–‡é€šè®¯ã€‚" +"é€‰æ‹©æ‚¨å¸Œæœ›æ·»åŠ è‡ªå®šä¹‰æ¶ˆæ¯çš„状æ€ã€‚您必须选择有<gui>自定义消æ¯</gui>æ ‡ç¾æ ‡è®°çš„状" +"æ€ã€‚" -#: C/account-jabber.page:52(p) +#: C/set-custom-status.page:58(item/p) msgid "" -"Some Jabber servers may encrypt data using invalid certificates, or using " -"certificates from unknown authorities. If you trust the server you are " -"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to " -"allow encrypted communication with invalid certificates." +"Enter your custom message in the text box at the top of the window, and " +"press <key>Enter</key> to set the message." msgstr "" -"有些 Jabber æœåŠ¡å™¨å¯èƒ½ä½¿ç”¨ä¸åˆæ³•çš„è¯ä¹¦åŠ 密数æ®ï¼Œæˆ–者使用æ¥è‡ªæœªçŸ¥çš„è¯ä¹¦è®¤è¯æœº" -"æž„çš„è¯ä¹¦ã€‚如果您信任您的æœåŠ¡å™¨ï¼Œæ‚¨å¯ä»¥é€‰æ‹©<gui>忽略 SSL è¯ä¹¦é”™è¯¯</gui>以å…许" -"使用ä¸åˆæ³•çš„è¯ä¹¦è¿›è¡ŒåŠ 密通讯。" - -#: C/account-jabber.page:59(gui) -msgid "Resource" -msgstr "资æº" - -#: C/account-jabber.page:60(gui) -msgid "Priority" -msgstr "优先级" +"在窗å£é¡¶éƒ¨çš„文本框ä¸è¾“入您的自定义消æ¯ï¼Œç„¶åŽæŒ‰<key>Enter</key>æ¥è®¾å®šè¿™ä¸ªæ¶ˆ" +"æ¯ã€‚" -#: C/account-jabber.page:61(p) +#: C/set-custom-status.page:64(item/p) msgid "" -"If you have multiple applications (for instance, on separate computers) " -"connected to your account at the same time, you can set a resource to " -"uniquely identify each one. By default, <app>Empathy</app> will use " -"<input>Telepathy</input> as the resource." +"If you want to set the custom message as a favorite, saving it in order to " +"use it again, click on the little heart on the right of the text box where " +"you wrote your custom message." msgstr "" -"如果您有多个应用程åº(比如，在å¦ä¸€å°è®¡ç®—机上)åŒæ—¶è¿žæŽ¥äº†æ‚¨çš„账户，您å¯ä»¥è®¾ç½®â€œèµ„" -"æºâ€ä»¥å”¯ä¸€åœ°æ ‡è¯†æ¯ä¸€ä¸ªè¿žæŽ¥çš„程åºã€‚默认地，<app>Empathy</app> 会使用 " -"<input>Telepathy</input> 作为“资æºâ€ã€‚" +"如果您希望收è—一个自定义消æ¯ï¼Œå³å°†å®ƒä¿å˜ä¸‹æ¥æ–¹ä¾¿æ—¥åŽä½¿ç”¨ï¼Œè¯·ç‚¹å‡»æ‚¨æ’°å†™è‡ªå®šä¹‰" +"消æ¯çš„文本框å³ä¾§çš„心形符å·ã€‚" -#: C/account-jabber.page:65(p) +#: C/set-custom-status.page:69(item/p) msgid "" -"You can set the priority to specify which application should receive " -"incoming messages from your contacts. New messages will be sent to the " -"application with the highest priority." +"If you do not do it, the custom message will not be available the next time " +"you use <app>Empathy</app>. It will be saved only for the current session." msgstr "" -"您å¯ä»¥è®¾ç½®ä¼˜å…ˆçº§ä»¥æŒ‡å®šå“ªä¸€ä¸ªç¨‹åºä¼˜å…ˆæ”¶åˆ°æ‚¨çš„è”系人å‘é€æ¥çš„消æ¯ã€‚新的消æ¯ä¼šè¢«" -"å‘é€ç»™ä¼˜å…ˆçº§æœ€é«˜çš„程åºã€‚" +"如果您ä¸è¿™ä¹ˆåšï¼Œé‚£ä¹ˆä¸‹æ¬¡æ‚¨ä½¿ç”¨ <app>Empathy</app> 的时候，这个自定义消æ¯å°±ä¸" +"会å†å‡ºçŽ°ã€‚它åªåœ¨ <app>Empathy</app> 本次è¿è¡ŒæœŸé—´è¢«ä¿ç•™ã€‚" -#: C/account-jabber.page:70(gui) -msgid "Override server settings" -msgstr "覆盖æœåŠ¡å™¨è®¾ç½®" +#: C/set-custom-status.page:78(section/title) +msgid "Edit and remove a custom message" +msgstr "ç¼–è¾‘å’Œåˆ é™¤è‡ªå®šä¹‰æ¶ˆæ¯" + +#: C/set-custom-status.page:88(item/p) +msgid "Select <gui>Edit Custom Message</gui>." +msgstr "选择<gui>编辑自定义消æ¯</gui>。" -#: C/account-jabber.page:71(p) +#: C/set-custom-status.page:95(item/p) +msgid "To edit a custom message:" +msgstr "è¦ç¼–辑自定义消æ¯ï¼š" + +#: C/set-custom-status.page:100(item/p) msgid "" -"<app>Empathy</app> will use default settings to connect to the Jabber server " -"based on your login ID. For some Jabber servers, you will need to enter " -"custom server settings manually. These settings should be provided for you " -"by your Jabber provider." -msgstr "" -"<app>Empathy</app> ä¼šæ ¹æ®æ‚¨çš„登录 ID 以默认的设置连接 Jabber æœåŠ¡å™¨ã€‚对æŸäº› " -"Jabber æœåŠ¡å™¨ï¼Œæ‚¨éœ€è¦äººå·¥è¾“入一些æœåŠ¡å™¨è®¾ç½®ã€‚这些设置应该由您的 Jabber æœåŠ¡æ" -"供商æ供。" +"From the <gui>Saved Presets</gui> box, select the status message you want to " +"edit and double-click on it." +msgstr "在<gui>å·²ä¿å˜çš„自定义状æ€</gui>ä¸ï¼Œé€‰æ‹©æ‚¨æƒ³è¦ç¼–辑的状æ€æ¶ˆæ¯å¹¶åŒå‡»å®ƒã€‚" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/account-irc.page:106(None) -msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d" -msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d" +#: C/set-custom-status.page:106(item/p) +msgid "Type the new custom message and press <key>Enter</key> to modify it." +msgstr "输入新的自定义消æ¯å¹¶ä¸”按<key>Enter</key>æ¥ä¿®æ”¹å®ƒã€‚" -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/account-irc.page:112(None) -msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6" -msgstr "" -"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6" +#: C/set-custom-status.page:113(item/p) +msgid "To remove a custom message:" +msgstr "è¦åˆ 除自定义消æ¯ï¼š" -#: C/account-irc.page:8(desc) -msgid "Additional information necessary for connecting to IRC networks." -msgstr "连接 IRC 网络需è¦çš„é¢å¤–ä¿¡æ¯ã€‚" +#: C/set-custom-status.page:118(item/p) +msgid "" +"From the <gui>Saved Presets</gui> box, select the status message you want to " +"remove." +msgstr "在<gui>å·²ä¿å˜çš„自定义状æ€</gui>ä¸ï¼Œé€‰æ‹©è¦åˆ 除的状æ€æ¶ˆæ¯ã€‚" -#: C/account-irc.page:31(title) -msgid "IRC account details" -msgstr "IRC 账户详情" +#: C/set-custom-status.page:124(item/p) +msgid "Click on the <gui>Remove</gui> button." +msgstr "点击<gui>åˆ é™¤</gui>按钮。" + +#: C/set-custom-status.page:133(item/p) +msgid "When finished, click on <gui>Close</gui>." +msgstr "完æˆåŽï¼Œç‚¹å‡»<gui>å…³é—</gui>。" -#: C/account-irc.page:33(p) +#: C/set-custom-status.page:140(note/p) msgid "" -"IRC accounts require different information than many other types of " -"accounts. To create an IRC account, you must specify at least an IRC network " -"and a nickname. This page details the information you can provide for an IRC " -"account." +"When you edit a custom message, it will not be set as the current status " +"message. You will need to select it from the <gui>Contact List</gui> window." msgstr "" -"IRC 账户需è¦ä¸Žå…¶ä»–类型的账户ä¸åŒçš„ä¿¡æ¯ã€‚è¦åˆ›å»º IRC 账户，您至少需è¦æŒ‡å®šä¸€ä¸ª " -"IRC 网络和一个昵称。本页详细介ç»äº†æ‚¨å¯ä»¥ä¸ºä¸€ä¸ª IRC 账户æ供的信æ¯ã€‚" +"当您编辑自定义消æ¯æ—¶ï¼Œå®ƒä¸ä¼šè¢«è®¾ä¸ºå½“å‰çŠ¶æ€æ¶ˆæ¯ã€‚您需è¦åœ¨<gui>è”系人列表</gui>" +"窗å£ä¸é€‰ä¸å®ƒã€‚" -#: C/account-irc.page:45(gui) C/account-irc.page:120(gui) -msgid "Network" -msgstr "网络" +#: C/share-desktop.page:7(info/desc) +msgid "Show your desktop to your contacts." +msgstr "å‘您的è”系人展示您的桌é¢ã€‚" + +#: C/share-desktop.page:33(page/title) +msgid "Share your desktop" +msgstr "共享您的桌é¢" -#: C/account-irc.page:46(p) +#: C/share-desktop.page:35(page/p) msgid "" -"IRC is an open system that allows people to run separate IRC networks. Each " -"network is distinct and has its own users and chat rooms. <app>Empathy</app> " -"lists the most popular networks in the <gui>Network</gui> drop-down list. " -"You can add additional networks. See <link xref=\"#networks\"/> below." +"It is possible to share your desktop with some of your contacts. You can use " +"this functionality to show your desktop to your contacts to, for example, " +"ask for help or help your contacts resolve a problem." msgstr "" -"IRC 是一ç§å¼€æ”¾çš„系统，它å…许人们è¿è¡Œå„自的 IRC 网络。æ¯ä¸ªç½‘络是独立的，有特有" -"的用户和èŠå¤©å®¤ã€‚<app>Empathy</app> 在 <gui>网络</gui> 下拉列表ä¸åˆ—出了一些最" -"æµè¡Œçš„网络。您å¯ä»¥æ·»åŠ 其他的网络。å‚看下é¢çš„<link xref=\"#networks\"/>。" - -#: C/account-irc.page:53(gui) -msgid "Nickname" -msgstr "昵称" +"您å¯ä»¥å’Œè”系人共享桌é¢ã€‚使用这个功能，您å¯ä»¥å‘è”系人展示您的桌é¢ï¼Œæ¥å¯»æ±‚帮助" +"或帮助è”系人解决问题。" -#: C/account-irc.page:54(p) +#: C/share-desktop.page:42(note/p) msgid "" -"Your nickname is your unique name on the IRC network. Only one person on a " -"network may use a given nickname. If you get an error message that says " -"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change " -"your nickname." +"To be able to share your desktop, you need to have a VNC server, which has " +"support for the feature, installed on your system. <app>Vino</app>, the " +"GNOME VNC server, has the required support." msgstr "" -"您的昵称是您在 IRC 网络上的唯一性的åå—。åªæœ‰ä¸€ä¸ªäººå¯ä»¥ä½¿ç”¨æŸä¸ªç‰¹å®šçš„昵称。如" -"果您得到<link xref=\"prob-conn-name\" role=\"error-msg\"/>错误信æ¯ï¼Œæ‚¨éœ€è¦æ”¹å˜" -"您的昵称。" +"è¦å…±äº«æ‚¨çš„æ¡Œé¢ï¼Œæ‚¨çš„系统ä¸å¿…须安装支æŒæ¤åŠŸèƒ½çš„ VNC æœåŠ¡å™¨ã€‚<app>Vino</app>，" +"GNOME çš„ VNC æœåŠ¡å™¨ï¼Œå°±æœ‰è¿™é¡¹åŠŸèƒ½ã€‚" -#: C/account-irc.page:60(gui) -msgid "Password" -msgstr "密ç " +#: C/share-desktop.page:51(item/p) +msgid "From the <gui>Contact List</gui> window, do one of the following:" +msgstr "在<gui>è”系人列表</gui>窗å£ï¼Œæ‰§è¡Œä¸‹åˆ—æ“作之一：" -#: C/account-irc.page:61(p) +#: C/share-desktop.page:56(item/p) +#, fuzzy +#| msgid "" +#| "Select the contact you want to share your desktop with and choose " +#| "<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></" +#| "guiseq>." msgid "" -"Some servers, particularly those on private networks, require a password to " -"connect. If you are authorized to use the network, the network " -"administrators should provide you with a password." +"Select the contact you want to share your desktop with and choose " +"<guiseq><gui>Edit</gui><gui>Contact</gui> <gui>Share My Desktop</gui></" +"guiseq>." msgstr "" -"一些æœåŠ¡å™¨ï¼Œå°¤å…¶æ˜¯é‚£äº›ç§æœ‰ç½‘络，需è¦å¯†ç æ‰èƒ½è¿žæŽ¥ã€‚如果您被授æƒä½¿ç”¨ï¼Œç½‘络的管" -"ç†å‘˜åº”当为您æ供了密ç 。" +"选择您想è¦å…±äº«æ‚¨çš„æ¡Œé¢çš„è”系人，并选择 <guiseq><gui>编辑</gui><gui>è”系人</" +"gui><gui>共享我的桌é¢</gui></guiseq>。" -#: C/account-irc.page:65(title) -msgid "NickServ Passwords" -msgstr "NickServ 密ç " +#: C/share-desktop.page:63(item/p) +msgid "" +"Right-click on the name of the contact you want to share your desktop with " +"and select <gui>Share My Desktop</gui>." +msgstr "" +"å³é”®ç‚¹å‡»æ‚¨æƒ³è¦å…±äº«æ‚¨æ¡Œé¢çš„è”系人的åå—，然åŽé€‰æ‹©<gui>共享我的桌é¢</gui>。" -#: C/account-irc.page:66(p) +#: C/share-desktop.page:71(item/p) msgid "" -"On some networks, nicknames can be registered using a service known as " -"NickServ. <app>Empathy</app> does not directly support nickname passwords. " -"On some networks, including the popular freenode network, server passwords " -"are automatically forwarded to NickServ, allowing you to set this field to " -"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for " -"more details." +"An invitation to view your desktop will be sent to the contact you have " +"selected. To view your desktop, they will need to accept it." msgstr "" -"在æŸäº›ç½‘络上，昵称å¯ä»¥é€šè¿‡ä¸€ç§å«åš NickServ çš„æœåŠ¡è¢«æ³¨å†Œã€‚<app>Empathy</app> " -"并ä¸ç›´æŽ¥æ”¯æŒæ˜µç§°å¯†ç 。在æŸäº›ç½‘络上，包括æµè¡Œçš„ freenode 网络，æœåŠ¡å™¨å¯†ç 会被" -"自动转å‘ç»™ NickServ，从而å…许您设置æ¤é¡¹å‘ NickServ è¯æ˜Žæ‚¨è‡ªå·±ã€‚更多信æ¯å‚è§" -"<link xref=\"irc-nick-password\"/>。" +"您选择的è”系人会收到一个查看您桌é¢çš„邀请。è¦æŸ¥çœ‹æ‚¨çš„æ¡Œé¢ï¼Œä»–们需è¦æŽ¥å—邀请。" -#: C/account-irc.page:76(gui) -msgid "Real name" -msgstr "真实姓å" +#: C/share-desktop.page:77(item/p) +msgid "" +"You can disconnect the contact from your computer using your desktop sharing " +"application." +msgstr "在您的桌é¢å…±äº«ç¨‹åºä¸ï¼Œæ‚¨å¯ä»¥æ–开您的è”系人到您的计算机的连接。" -#: C/account-irc.page:77(p) +#: C/share-desktop.page:82(note/p) msgid "" -"You can provide your real name in addition to your nickname. Other users " -"will be able to see this when they view your information." -msgstr "" -"除了昵称，您还å¯ä»¥æ供您的真实姓å。其他用户查看您的信æ¯æ—¶å¯ä»¥çœ‹åˆ°æ‚¨çš„真实姓" -"å。" +"For more information about how to use the remote desktop sharing " +"application, refer to its help." +msgstr "如果需è¦æ›´å¤šå…³äºŽå¦‚何使用远程桌é¢æŸ¥å…±äº«ç¨‹åºçš„ä¿¡æ¯ï¼Œè¯·å‚看其帮助。" -#: C/account-irc.page:81(gui) -msgid "Quit message" -msgstr "退出消æ¯" +#: C/share-desktop.page:90(page/p) +msgid "" +"When you share your desktop with someone else, it is possible to experience " +"system performance slowdown and low Internet speed." +msgstr "" +"当您与其他人共享您的桌é¢çš„时候，å¯èƒ½ä¼šå‡ºçŽ°ç³»ç»Ÿæ€§èƒ½é™ä½Žå’Œç½‘络速度下é™çš„现象。" -#: C/account-irc.page:82(p) +#: C/share-desktop.page:96(note/p) msgid "" -"When you go offline, a quit message is sent to all the chat rooms you’re in " -"and to all the users you’re having a private conversation with. Use this " -"field to provide a custom quit message." +"Some of your contacts may not be able to use this feature. It is necessary " +"for them to have version 2.28, or newer, of <app>Empathy</app> and a " +"compatible remote desktop viewer application installed in their system." msgstr "" -"当您离线时，一个退出消æ¯ä¼šè¢«å‘é€ç»™æ‰€æœ‰æ‚¨åŠ 入的èŠå¤©å®¤å’Œæ£åœ¨ä¸Žæ‚¨è¿›è¡Œç§äººèŠå¤©çš„" -"用户。设置æ¤é¡¹ä»¥æ供自定义的退出消æ¯ã€‚" +"并éžæ‚¨çš„所有è”系人都å¯ä»¥ä½¿ç”¨è¿™ä¸ªåŠŸèƒ½ã€‚他们必须使用 2.28 或更新版本的 " +"<app>Empathy</app> 并且在安装了兼容的远程桌é¢æŸ¥çœ‹å™¨ç¨‹åºã€‚" -#: C/account-irc.page:94(title) -msgid "IRC Networks" -msgstr "IRC 网络" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/status-icons.page:39(media) +#, fuzzy +#| msgid "" +#| "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947" +msgctxt "_" +msgid "" +"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'" +msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947" -#: C/account-irc.page:97(title) -msgid "Networks" -msgstr "网络" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/status-icons.page:45(media) +#, fuzzy +#| msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a" +msgctxt "_" +msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'" +msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a" + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/status-icons.page:53(media) +#, fuzzy +#| msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33" +msgctxt "_" +msgid "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'" +msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33" -#: C/account-irc.page:99(p) +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#. +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/status-icons.page:62(media) C/status-icons.page:69(media) +#, fuzzy +#| msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964" +msgctxt "_" msgid "" -"<app>Empathy</app> includes a list of popular IRC networks. If you wish to " -"another IRC network, you can add it to the list. You can also modify " -"networks and remove them from the list." +"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'" +msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964" + +#: C/status-icons.page:7(info/desc) +msgid "Understanding the various statuses and status icons." +msgstr "ç†è§£å„ç§çŠ¶æ€å’ŒçŠ¶æ€å›¾æ ‡ã€‚" + +#: C/status-icons.page:35(page/title) +msgid "Status Types and Icons" +msgstr "状æ€çš„类别åŠå…¶å›¾æ ‡" + +#: C/status-icons.page:39(item/title) +#, fuzzy +#| msgid "" +#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit." +#| "png\">edit</media> icon in the error message." +msgid "" +"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png" +"\">Available icon</media> <gui>Available</gui>" msgstr "" -"<app>Empathy</app> 包括了一份常用 IRC 网络的列表。如果您想使用其他的 IRC 网" -"络，您å¯ä»¥å°†å…¶æ·»åŠ 到这个列表ä¸ã€‚您也å¯ä»¥ä¿®æ”¹ç½‘络或从列表ä¸åˆ 除网络。" +"点击错误æ示信æ¯ä¸Šçš„<media type=\"image\" mime=\"image/png\" src=\"figures/" +"gtk-edit.png\">编辑</media>å›¾æ ‡ã€‚" -#: C/account-irc.page:104(p) +#: C/status-icons.page:41(item/p) msgid "" -"To add a network to the list, click <media type=\"image\" mime=\"image/png\" " -"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>." +"Use the <em>Available</em> status when you are at your computer and able to " +"chat with your contacts. You can set a custom message for this status." msgstr "" -"è¦æƒ³åˆ—表ä¸æ·»åŠ 网络，点击<media type=\"image\" mime=\"image/png\" src=" -"\"figures/gtk-add.png\" width=\"16\" height=\"16\">æ·»åŠ </media>。" +"当您在电脑æ—并且有空和您的è”系人èŠå¤©æ—¶ï¼Œä½¿ç”¨<em>在线</em>状æ€ã€‚您å¯ä»¥ä¸ºæ¤çŠ¶æ€" +"自定一æ¡æ¶ˆæ¯ã€‚" -#: C/account-irc.page:107(p) +#: C/status-icons.page:45(item/title) +#, fuzzy +#| msgid "" +#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit." +#| "png\">edit</media> icon in the error message." msgid "" -"To modify a network in the list, select the network and click <media type=" -"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" " -"height=\"16\">Edit</media>." +"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Busy icon</" +"media> <gui>Busy</gui>" msgstr "" -"è¦ä¿®æ”¹åˆ—表ä¸çš„网络，选择那个网络并点击<media type=\"image\" mime=\"image/png" -"\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">编辑</media>。" +"点击错误æ示信æ¯ä¸Šçš„<media type=\"image\" mime=\"image/png\" src=\"figures/" +"gtk-edit.png\">编辑</media>å›¾æ ‡ã€‚" -#: C/account-irc.page:110(p) +#: C/status-icons.page:47(item/p) msgid "" -"To remove a network from the list, select the network and click <media type=" -"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" " -"height=\"16\">Remove</media>." +"Use the <em>Busy</em> status to let your contacts know that you don’t want " +"to chat right now. They can still contact you, for instance if they have " +"something urgent they need to discuss. By default, <app>Empathy</app> will " +"not use notification bubbles and sounds when you are busy. You can set a " +"custom message for this status." msgstr "" -"è¦ä»Žåˆ—表ä¸åˆ 除网络，选择è¦åˆ 除的网络并点击<media type=\"image\" mime=\"image/" -"png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">åˆ é™¤</" -"media>。" +"使用<em>忙碌</em>以让您的è”系人知é“您当å‰ä¸æƒ³èŠå¤©ã€‚他们ä»ç„¶å¯ä»¥è”系您，比如他" +"们å¯èƒ½æœ‰æ€¥äº‹éœ€è¦è®¨è®ºã€‚默认地，当您忙碌时，<app>Empathy</app> ä¸ä¼šä½¿ç”¨æ°”泡æ示" +"和声音æ示。您å¯ä»¥ä¸ºæ¤çŠ¶æ€è‡ªå®šä¸€æ¡æ¶ˆæ¯ã€‚" -#: C/account-irc.page:115(p) +#: C/status-icons.page:53(item/title) +#, fuzzy +#| msgid "" +#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit." +#| "png\">edit</media> icon in the error message." msgid "" -"When adding or modifying a network, you can enter the following information:" -msgstr "åœ¨æ·»åŠ æˆ–ä¿®æ”¹ä¸€ä¸ªç½‘ç»œæ—¶ï¼Œæ‚¨å¯ä»¥è¾“入下列信æ¯ï¼š" +"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Away icon</" +"media> <gui>Away</gui>" +msgstr "" +"点击错误æ示信æ¯ä¸Šçš„<media type=\"image\" mime=\"image/png\" src=\"figures/" +"gtk-edit.png\">编辑</media>å›¾æ ‡ã€‚" -#: C/account-irc.page:121(p) +#: C/status-icons.page:55(item/p) msgid "" -"This is the name of the network as you want it to appear in the list of " -"networks." -msgstr "这是您希望网络显示在网络列表ä¸çš„åå—。" +"Use the <em>Away</em> status when you are going away from your computer. " +"<app>Empathy</app> automatically sets your status to Away if you do not use " +"your computer for a while, or if your screensaver is on. By default, " +"<app>Empathy</app> will not use notification bubbles and sounds when you are " +"away. You can set a custom message for this status." +msgstr "" +"当您ä¸åœ¨ç”µè„‘æ—时，使用<em>离开</em>状æ€ã€‚如果您一段时间内ä¸ä½¿ç”¨ç”µè„‘，或者å±å¹•" +"ä¿æŠ¤æ‰“开了，<app>Empathy</app> 将自动设置您的状æ€ä¸ºç¦»å¼€ã€‚默认地，当您离开时，" +"<app>Empathy</app> ä¸ä¼šä½¿ç”¨æ°”泡æ示和声音æ示。您å¯ä»¥ä¸ºæ¤çŠ¶æ€è‡ªå®šä¸€æ¡æ¶ˆæ¯ã€‚" -#: C/account-irc.page:125(gui) -msgid "Charset" -msgstr "å—符集" +#: C/status-icons.page:62(item/title) +#, fuzzy +#| msgid "" +#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit." +#| "png\">edit</media> icon in the error message." +msgid "" +"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline " +"icon</media> <gui>Invisible</gui>" +msgstr "" +"点击错误æ示信æ¯ä¸Šçš„<media type=\"image\" mime=\"image/png\" src=\"figures/" +"gtk-edit.png\">编辑</media>å›¾æ ‡ã€‚" -#: C/account-irc.page:126(p) +#: C/status-icons.page:64(item/p) msgid "" -"This specifies the character encoding that is typically used on this " -"network. A character encoding is a specific way of recording characters " -"internally in a computer. There are many character encodings, and you need " -"to use the same character encoding as other users to see their messages " -"correctly." +"When you set your status to <em>Invisible</em>, you will appear as offline " +"to your contacts. You will still be connected to your accounts, and you " +"still see your contacts’ statuses and start conversations with them." msgstr "" -"这指明了网络上常用的å—符编ç 。å—符编ç 是计算机内部记录å—符的一ç§ç‰¹å®šæ–¹å¼ã€‚有" -"许多ä¸åŒçš„å—符编ç ，您需è¦ä¸Žå…¶ä»–用户使用åŒæ ·çš„å—符编ç æ‰èƒ½æ£ç¡®åœ°çœ‹åˆ°ä»–们的信" -"æ¯ã€‚" +"当您将状æ€è®¾ç½®ä¸º<em>éšèº«</em>时，您的è”系人会看到您已离线。但您ä»ç„¶è¿žæŽ¥ç€æ‚¨çš„" +"å¸å·ï¼Œå¹¶ä¸”å¯ä»¥çœ‹åˆ°æ‚¨çš„è”系人的状æ€ï¼Œæˆ–者和他们èŠå¤©ã€‚" -#. Translators: Recommend character encodings that are common -#. for your language. -#: C/account-irc.page:135(p) +#: C/status-icons.page:69(item/title) +#, fuzzy +#| msgid "" +#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit." +#| "png\">edit</media> icon in the error message." msgid "" -"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that " -"can handle text from most of the world's languages. Another common encoding " -"for English and some other Western languages is ISO-8859-1." +"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline " +"icon</media> <gui>Offline</gui>" msgstr "" -"默认地，<app>Empathy</app> 使用 UTF-8，一ç§èƒ½å¤Ÿå¤„ç†ä¸–界上大多数è¯è¨€çš„现代化的" -"å—符编ç 。简体ä¸æ–‡å¸¸ç”¨çš„ç¼–ç 还有 GB18030，GBK å’Œ GB2312。" +"点击错误æ示信æ¯ä¸Šçš„<media type=\"image\" mime=\"image/png\" src=\"figures/" +"gtk-edit.png\">编辑</media>å›¾æ ‡ã€‚" -#: C/account-irc.page:141(gui) -msgid "Servers" -msgstr "æœåŠ¡å™¨" +#: C/status-icons.page:71(item/p) +msgid "" +"Setting your status to <em>Offline</em> disconnects you from all of your " +"accounts." +msgstr "将状æ€è®¾ç½®ä¸º<em>离线</em>将会æ–开您所有å¸å·çš„连接。" + +#: C/video-call.page:11(info/desc) +msgid "Start a video conversation with one of your contacts." +msgstr "åŒæ‚¨çš„è”系人进行视频èŠå¤©ã€‚" -#: C/account-irc.page:142(p) +#: C/video-call.page:37(page/title) +msgid "Start a video conversation" +msgstr "开始视频èŠå¤©" + +#: C/video-call.page:39(page/p) msgid "" -"An IRC network may have many servers you can connect to. When you are " -"connected to a server on a particular network, you can communicate with all " -"users on all other servers on that network. You can add and remove servers " -"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons." +"If you have a webcam, you can call your contacts and have a video " +"conversation with them. This feature only works with certain types of " +"accounts, and it requires the other person to have an application that " +"supports video calls." msgstr "" -"一个 IRC 网络å¯èƒ½æœ‰è®¸å¤šæœåŠ¡å™¨ä¾›æ‚¨è¿žæŽ¥ã€‚当您连接到一个特定网络的æœåŠ¡å™¨åŽï¼Œæ‚¨å¯" -"以和åŒä¸€ç½‘络ä¸æ‰€æœ‰æœåŠ¡å™¨çš„用户交æµã€‚您å¯ä»¥ä¸ºä¸€ä¸ªç½‘ç»œæ·»åŠ æˆ–åˆ é™¤æœåŠ¡å™¨ï¼Œä½¿ç”¨" -"<gui>æ·»åŠ </gui>或<gui>åˆ é™¤</gui>按钮。" +"如果您有网络摄åƒå¤´ï¼Œæ‚¨å¯ä»¥å‘¼å«æ‚¨çš„è”系人并和他们进行视频èŠå¤©ã€‚æ¤åŠŸèƒ½ä»…特定类" +"åž‹çš„å¸å·å¯ç”¨ï¼Œå¹¶éœ€è¦å¯¹æ–¹ä½¿ç”¨çš„程åºæ”¯æŒè§†é¢‘呼å«ã€‚" -#: C/account-irc.page:147(p) +#: C/video-call.page:46(item/p) +#, fuzzy +#| msgid "" +#| "Select the contact you want to have the conversation, and from the menu " +#| "select <gui style=\"menuitem\">Video Call</gui>." msgid "" -"When a server is selected, click the field under <gui>Server</gui> or " -"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys " -"to focus the field, and press the space bar to begin editing." +"Right-click on the contact that you want to call and select <gui style=" +"\"menuitem\">Video Call</gui>." msgstr "" -"当一个æœåŠ¡å™¨è¢«é€‰æ‹©åŽï¼Œç‚¹å‡»<gui>æœåŠ¡å™¨</gui>或<gui>端å£</gui>下方的å—段æ¥ç¼–辑" -"它。或者，使用左å³æ–¹å‘é”®æ¥èšç„¦æŸä¸ªå—æ®µï¼Œå¹¶æŒ‰ç©ºæ ¼é”®å¼€å§‹ç¼–è¾‘ã€‚" +"选择è¦èŠå¤©çš„è”系人，然åŽåœ¨èœå•ä¸é€‰æ‹©<gui style=\"menuitem\">视频呼å«</gui>" -#: C/account-irc.page:151(p) +#: C/video-call.page:54(item/p) +#, fuzzy +#| msgid "" +#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>." msgid "" -"Select the check box in the <gui>SSL</gui> column to encrypt all " -"communication with a server. Note that this does not prevent other users on " -"the network from seeing what you write on public chat rooms." +"To end the conversation, click on the <gui style=\"button\">hang up</gui> " +"button." +msgstr "点击<gui style=\"button\">挂æ–</gui>以结æŸä¼šè¯ã€‚" + +#: C/video-call.page:60(note/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>." msgstr "" -"选择 <gui>SSL</gui> 列ä¸çš„å¤é€‰æ¡†ä»¥åŠ 密与æœåŠ¡å™¨é—´çš„所有通讯。注æ„这并ä¸èƒ½æ„味" -"ç€å…¶ä»–用户ä¸èƒ½çœ‹åˆ°æ‚¨åœ¨å…¬å…±èŠå¤©å®¤ä¸çš„å‘言。" +"è¦å°†è§†é¢‘会è¯è½¬ä¸ºè¯éŸ³ä¼šè¯ï¼Œé€‰æ‹© <guiseq><gui style=\"menu\">视频</gui><gui " +"style=\"menuitem\">视频关é—</gui></guiseq>。" -#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2 -#: C/index.page:0(None) -msgid "translator-credits" +#: C/video-call.page:65(section/title) +msgid "Start a video conversation with a meta-contact" +msgstr "和一ä½å…ƒè”系人进行视频èŠå¤©ã€‚" + +#: C/video-call.page:73(item/p) +msgid "" +"Select the contact you want to have the conversation, and from the menu " +"select <gui style=\"menuitem\">Video Call</gui>." msgstr "" -"Lavande <lavande@thislove.cz.cc>, 2010\n" -"Tao Wang <dancefire@gmail.com>, 2010\n" -"lainme <lainme993@gmail.com>, 2011\n" -"Guanhao Yin <yinguanhao@gmail.com>, 2011" +"选择è¦èŠå¤©çš„è”系人，然åŽåœ¨èœå•ä¸é€‰æ‹©<gui style=\"menuitem\">视频呼å«</gui>" + +#~ msgid "" +#~ "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" +#~ msgstr "" +#~ "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5" + +#~ msgid "milo@ubuntu.com" +#~ msgstr "milo@ubuntu.com" + +#~ 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>." +#~ msgstr "" +#~ "在<gui>è”系人列表</gui>窗å£ï¼Œç‚¹å‡»æ‚¨æƒ³å‘¼å«çš„è”系人的åå—æ—çš„<media type=" +#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼å«</" +#~ "media>å›¾æ ‡å¹¶é€‰æ‹©<gui style=\"menuitem\">视频呼å«</gui>。" + +#~ msgid "shaunm@gnome.org" +#~ msgstr "shaunm@gnome.org" + +#~ msgid "Available icon" +#~ msgstr "åœ¨çº¿å›¾æ ‡" + +#~ msgid "Available" +#~ msgstr "在线" + +#~ msgid "Busy icon" +#~ msgstr "å¿™ç¢Œå›¾æ ‡" + +#~ msgid "Busy" +#~ msgstr "忙碌" + +#~ msgid "Away icon" +#~ msgstr "ç¦»å¼€å›¾æ ‡" + +#~ msgid "Away" +#~ msgstr "离开" + +#~ msgid "Offline icon" +#~ msgstr "ç¦»çº¿å›¾æ ‡" + +#~ msgid "Invisible" +#~ msgstr "éšèº«" + +#~ msgid "Offline" +#~ msgstr "离线" + +#~ msgid "kittykat3756@gmail.com" +#~ msgstr "kittykat3756@gmail.com" + +#~ msgid "jwcampbell@gmail.com" +#~ msgstr "jwcampbell@gmail.com" + +#~ msgid "philbull@gmail.com" +#~ msgstr "philbull@gmail.com" + +#~ msgid "I'd like to see this played up a bit more." +#~ msgstr "我希望看到更多的人æ¥ç”¨è¿™ä¸ªã€‚" + +#~ msgid "shaunm" +#~ msgstr "shaunm" + +#~ msgid "" +#~ "Empathy no longer allows you to create an IRC account without a valid " +#~ "nick. I've removed the guide link. Remove the text." +#~ msgstr "" +#~ "没有有效昵称，Empathy ä¸å…许您创建 IRC å¸å·ã€‚软件已ç»ç§»é™¤æŒ‡å—链接。请移除" +#~ "文本。" + +#~ msgid "Install telepathy-idle" +#~ msgstr "安装 telepathy-idle" + +#~ msgid "" +#~ "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2" +#~ msgstr "" +#~ "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2" + +#~ msgid "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png" +#~ "\"> Empathy Internet Messenger logo </media> Empathy Internet Messenger" +#~ msgstr "" +#~ "<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png" +#~ "\"> Empathy 网络èŠå¤©å·¥å…·æ ‡è¯†</media> Empathy 网络èŠå¤©å·¥å…·" + +#~ msgid "peter.haslam@freenet.de" +#~ msgstr "peter.haslam@freenet.de" + +#~ msgid "" +#~ "@@image: 'figures/audio-input-microphone.png'; " +#~ "md5=8d89026b66a263a3bc5b1f0665948567" +#~ msgstr "" +#~ "@@image: 'figures/audio-input-microphone.png'; " +#~ "md5=8d89026b66a263a3bc5b1f0665948567" + +#~ msgid "Icon for audio conversation" +#~ msgstr "è¯éŸ³èŠå¤©çš„å›¾æ ‡" + +#~ msgid "Icon for video conversation" +#~ msgstr "视频èŠå¤©çš„å›¾æ ‡" + +#~ msgid "" +#~ "I'd like to do tables like this using nothing for No and ✔ for Yes, but " +#~ "we need to look at the accessibility impact. I've <link href=\"http://" +#~ "mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html" +#~ "\">asked the accessibility team</link> for input." +#~ msgstr "" +#~ "我喜欢åšè¡¨æ ¼æ—¶ï¼Œç”¨ç©ºç™½ä»£æ›¿ No，✔ 代表 Yes，但还是è¦çœ‹é€šç”¨æ€§å¦‚何。我已ç»" +#~ "<link href=\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/" +#~ "msg00006.html\">咨询通用性团队</link>å‘出请求。" + +#, fuzzy +#~ msgid "" +#~ "There's recent work on telepathy-butterfly and papyon to support audio " +#~ "and video for MSN. It might be released in time for 2.28, but since it " +#~ "doesn't follow the Gnome release schedule, I can't be sure. If it looks " +#~ "like it's going to ship, let's mark it Yes." +#~ msgstr "" +#~ "最近 telepathy-butterfly å’Œ papyon å·²ç»æ”¯æŒ MSN 音频呼å«å’Œè§†é¢‘呼å«ã€‚有å¯èƒ½" +#~ "它们在2月28æ—¥å‰åŠæ—¶å‘布，但该时间没有éµå¾ª Gnome å‘å¸ƒè®¡åˆ’ï¼Œå› æ¤æˆ‘ä¸å¤ªç¡®å®šã€‚" +#~ "如果八æˆèƒ½æ载的è¯ï¼Œå°±æ ‡ä¸º Yes。" + +#~ 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\">Audio Call</gui>." +#~ msgstr "" +#~ "在 <gui>è”系人列表</gui> 窗å£ï¼Œç‚¹å‡»æ‚¨æƒ³å‘¼å«çš„è”系人的åå—æ—çš„ <media type=" +#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼å«</" +#~ "media> å›¾æ ‡å¹¶é€‰æ‹© <gui style=\"menuitem\">è¯éŸ³å‘¼å«</gui>。" + +#~ msgid "Resource" +#~ msgstr "资æº" + +#~ msgid "Priority" +#~ msgstr "优先级" + +#~ msgid "Network" +#~ msgstr "网络" + +#~ msgid "Nickname" +#~ msgstr "昵称" + +#~ msgid "Password" +#~ msgstr "密ç " + +#~ msgid "Quit message" +#~ msgstr "退出消æ¯" + +#~ msgid "Charset" +#~ msgstr "å—符集" + +#~ msgid "Servers" +#~ msgstr "æœåŠ¡å™¨" + +#~ msgid "Edit, remove and add a custom message" +#~ msgstr "编辑ã€åˆ é™¤å’Œæ·»åŠ è‡ªå®šä¹‰æ¶ˆæ¯" + +#~ msgid "" +#~ "To add a new custom message, from the <gui>Add New Preset</gui> section:" +#~ msgstr "è¦æ·»åŠ 一æ¡æ–°çš„自定义消æ¯ï¼Œåœ¨<gui>æ·»åŠ æ–°è‡ªå®šä¹‰çŠ¶æ€</gui>选项å¡ï¼š" + +#~ msgid "" +#~ "Click on the drop-down list to select the status you want to set a custom " +#~ "message to." +#~ msgstr "点击下拉列表选择您想è¦è®¾å®šè‡ªå®šä¹‰æ¶ˆæ¯çš„状æ€ã€‚" + +#~ msgid "Click on the text box, and type the new custom message." +#~ msgstr "点击文本框，输入新的自定义消æ¯ã€‚" + +#~ msgid "Click on <gui>Add</gui> to add the new message to the presets ones." +#~ msgstr "点击<gui>æ·»åŠ </gui>将新消æ¯æ·»åŠ 到已ä¿å˜çš„的自定义消æ¯åˆ—表ä¸ã€‚" + +#~ msgid "Click on <gui style=\"button\">Remove</gui>." +#~ msgstr "点击<gui style=\"button\">åˆ é™¤</gui>。" + +#~ msgid "" +#~ "Deselect the <gui>Enabled</gui> check-box next to the name of your " +#~ "account, and then select it again to try to reconnect to the service." +#~ msgstr "" +#~ "å–消选择å¸å·æ—边的<gui>å·²å¯ç”¨</gui>å¤é€‰æ¡†ï¼Œç„¶åŽå†æ¬¡é€‰ä¸ä»¥é‡æ–°è¿žæŽ¥åˆ°æœåŠ¡" +#~ "器。" + +#~ msgid "" +#~ "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is " +#~ "selected. If it is not, select the check-box to enable the account." +#~ msgstr "" +#~ "检查<gui style=\"checkbox\">å·²å¯ç”¨</gui>选框是å¦å‹¾é€‰ã€‚没有的勾选它已å¯ç”¨è´¦" +#~ "户。" + +#~ msgid "Select the <gui>Search</gui> tab." +#~ msgstr "选择<gui>æœç´¢</gui>æ ‡ç¾ã€‚" + +#~ msgid "" +#~ "In the <gui>For</gui> field, type the text you want to search for. Click " +#~ "<gui>Find</gui> or press <key>Enter</key>." +#~ msgstr "" +#~ "在<gui>关键è¯</gui>ä¸ï¼Œè¾“入您想è¦æœç´¢çš„æ–‡å—。点击<gui>查找</gui>或按" +#~ "<key>Enter</key>。" + +#~ msgid "" +#~ "Click on a conversation to view it. <app>Empathy</app> will select the " +#~ "text in the conversation that matched your search terms." +#~ msgstr "" +#~ "点击一个会è¯ä»¥æŸ¥çœ‹ã€‚<app>Empathy</app> 会选择这个会è¯ä¸ç¬¦åˆæ‚¨æœç´¢æ¡ä»¶çš„æ–‡" +#~ "å—。" + +#~ msgid "Select the <gui>Conversations</gui> tab." +#~ msgstr "选择<gui>会è¯</gui>æ ‡ç¾ã€‚" + +#~ msgid "" +#~ "Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the " +#~ "window." +#~ msgstr "在窗å£å³ä¾§ï¼Œå–消选择 <gui style=\"checkbox\">å¯ç”¨</gui>。" + +#~ msgid "Click <gui style=\"button\">Log in</gui>." +#~ msgstr "点击<gui style=\"button\">登入</gui>。" diff --git a/libempathy-gtk/.gitignore b/libempathy-gtk/.gitignore index 3e3f6f051..3e651d7f4 100644 --- a/libempathy-gtk/.gitignore +++ b/libempathy-gtk/.gitignore @@ -1,2 +1,3 @@ +empathy-account-widgets-resources.[ch] empathy-gtk-marshal.* *.gladep diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 902a5e57f..72c27b4b2 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -4,8 +4,8 @@ include $(top_srcdir)/tools/flymake.mk AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I. \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/extensions \ -DDATADIR=\""$(datadir)"\" \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ -DGCR_API_SUBJECT_TO_CHANGE \ @@ -22,6 +22,8 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED) BUILT_SOURCES = \ + empathy-account-widgets-resources.c \ + empathy-account-widgets-resources.h \ empathy-gtk-enum-types.h \ empathy-gtk-enum-types.c @@ -209,10 +211,7 @@ check_c_sources = \ include $(top_srcdir)/tools/check-coding-style.mk check-local: check-coding-style -uidir = $(datadir)/empathy -ui_DATA = \ - empathy-contact-widget.ui \ - empathy-contact-blocking-dialog.ui \ +account_widgets_ui_files = \ empathy-account-widget-generic.ui \ empathy-account-widget-jabber.ui \ empathy-account-widget-msn.ui \ @@ -223,6 +222,12 @@ ui_DATA = \ empathy-account-widget-yahoo.ui \ empathy-account-widget-groupwise.ui \ empathy-account-widget-aim.ui \ + $(NULL) + +uidir = $(datadir)/empathy +ui_DATA = \ + empathy-contact-widget.ui \ + empathy-contact-blocking-dialog.ui \ empathy-status-preset-dialog.ui \ empathy-log-window.ui \ empathy-chat.ui \ @@ -240,7 +245,7 @@ stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers) --fhead "G_BEGIN_DECLS\n\n" \ --ftail "G_END_DECLS\n\n" \ --ftail "#endif /* __LIBEMPATHY_GTK_ENUM_TYPES_H__ */\n" \ - --fprod "#include <libempathy-gtk/@filename@>\n" \ + --fprod '#include "@filename@"\n' \ --eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ --eprod "GType @enum_name@_get_type (void);\n" \ $(libempathy_gtk_headers) ) > xgen-gth \ @@ -267,7 +272,17 @@ empathy-gtk-enum-types.c: Makefile $(libempathy_gtk_headers) && cp xgen-gtc $(@F) \ && rm -f xgen-gtc -EXTRA_DIST = \ +account_widgets_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-account-widgets.gresource.xml) + +empathy-account-widgets-resources.c: empathy-account-widgets.gresource.xml $(account_widgets_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< + +empathy-account-widgets-resources.h: empathy-account-widgets.gresource.xml $(account_widgets_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $< + +EXTRA_DIST = \ + empathy-account-widgets.gresource.xml \ + $(account_widgets_ui_files) \ $(ui_DATA) if HAVE_GEOCLUE diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index 03aeacf71..e6f4367c9 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -22,14 +22,14 @@ */ #include "config.h" +#include "empathy-account-chooser.h" #include <glib/gi18n-lib.h> #include "empathy-ui-utils.h" -#include "empathy-account-chooser.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /** * SECTION:empathy-account-chooser diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h index d58fcf12f..5302ad702 100644 --- a/libempathy-gtk/empathy-account-chooser.h +++ b/libempathy-gtk/empathy-account-chooser.h @@ -25,7 +25,6 @@ #define __EMPATHY_ACCOUNT_CHOOSER_H__ #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-selector-dialog.c b/libempathy-gtk/empathy-account-selector-dialog.c index 72a7b2ffd..0dd67ea7c 100644 --- a/libempathy-gtk/empathy-account-selector-dialog.c +++ b/libempathy-gtk/empathy-account-selector-dialog.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-account-selector-dialog.h" enum diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c index c027fb250..e86cec417 100644 --- a/libempathy-gtk/empathy-account-widget-irc.c +++ b/libempathy-gtk/empathy-account-widget-irc.c @@ -19,13 +19,13 @@ */ #include "config.h" +#include "empathy-account-widget-irc.h" #include "empathy-account-widget-private.h" -#include "empathy-account-widget-irc.h" #include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" typedef struct { EmpathyAccountWidget *self; @@ -142,7 +142,7 @@ empathy_account_widget_irc_build (EmpathyAccountWidget *self, settings = g_slice_new0 (EmpathyAccountWidgetIrc); settings->self = self; - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "table_irc_settings", table_common_settings, "vbox_irc", box, "table_irc_settings", &settings->vbox_settings, @@ -209,7 +209,7 @@ empathy_account_widget_irc_build_simple (EmpathyAccountWidget *self, settings = g_slice_new0 (EmpathyAccountWidgetIrc); settings->self = self; - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_irc_simple", box, "alignment_network_simple", &alignment, NULL); diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h index bcd45b76a..c102d6ea6 100644 --- a/libempathy-gtk/empathy-account-widget-irc.h +++ b/libempathy-gtk/empathy-account-widget-irc.h @@ -21,9 +21,8 @@ #ifndef __EMPATHY_ACCOUNT_WIDGET_IRC_H__ #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__ -#include <gtk/gtk.h> -#include <libempathy-gtk/empathy-account-widget.h> -#include <libempathy-gtk/empathy-irc-network-chooser.h> +#include "empathy-account-widget.h" +#include "empathy-irc-network-chooser.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h index 988b09883..044e3a991 100644 --- a/libempathy-gtk/empathy-account-widget-private.h +++ b/libempathy-gtk/empathy-account-widget-private.h @@ -22,9 +22,7 @@ #ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__ #define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__ -#include <libempathy-gtk/empathy-account-widget.h> -#include <glib.h> -#include <gtk/gtk.h> +#include "empathy-account-widget.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c index 4568cf175..b76078d5c 100644 --- a/libempathy-gtk/empathy-account-widget-sip.c +++ b/libempathy-gtk/empathy-account-widget-sip.c @@ -20,11 +20,11 @@ */ #include "config.h" +#include "empathy-account-widget-sip.h" #include <glib/gi18n-lib.h> #include "empathy-account-widget-private.h" -#include "empathy-account-widget-sip.h" #include "empathy-ui-utils.h" typedef struct { @@ -113,7 +113,7 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self, if (is_simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_sip_simple", &vbox_settings, NULL); @@ -133,7 +133,7 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self, settings = g_slice_new0 (EmpathyAccountWidgetSip); settings->self = self; - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", grid_common_settings, "grid_advanced_sip_settings", &grid_advanced, "vbox_sip_settings", &vbox_settings, diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h index 84e96e7b6..4fed35ec9 100644 --- a/libempathy-gtk/empathy-account-widget-sip.h +++ b/libempathy-gtk/empathy-account-widget-sip.h @@ -21,8 +21,7 @@ #ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_H__ #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__ -#include <gtk/gtk.h> -#include <libempathy-gtk/empathy-account-widget.h> +#include "empathy-account-widget.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 794e7d524..0751b24a4 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -25,20 +25,20 @@ */ #include "config.h" +#include "empathy-account-widget.h" +#include "empathy-account-widget-private.h" #include <glib/gi18n-lib.h> - -#include <libempathy/empathy-utils.h> - #include <dbus/dbus-protocol.h> +#include "empathy-account-widget-irc.h" #include "empathy-account-widget-private.h" #include "empathy-account-widget-sip.h" -#include "empathy-account-widget-irc.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyAccountWidget, empathy_account_widget, GTK_TYPE_BOX) @@ -1060,7 +1060,7 @@ account_widget_build_generic (EmpathyAccountWidget *self, { GtkWidget *expander_advanced, *box; - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_generic_settings", &box, "expander_advanced_settings", &expander_advanced, @@ -1086,7 +1086,7 @@ account_widget_build_salut (EmpathyAccountWidget *self, { GtkWidget *expander_advanced, *box; - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_salut_settings", &box, "expander_advanced_settings", &expander_advanced, @@ -1167,7 +1167,7 @@ account_widget_build_msn (EmpathyAccountWidget *self, if (self->priv->simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_msn_simple", &box, NULL); @@ -1184,7 +1184,7 @@ account_widget_build_msn (EmpathyAccountWidget *self, } else { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_msn_settings", &self->priv->grid_common_settings, "vbox_msn_settings", &box, NULL); @@ -1323,7 +1323,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self, if (self->priv->simple && service == NO_SERVICE) { /* Simple widget for XMPP */ - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_jabber_simple", &box, "label_id_simple", &label_id, "label_id_create", &label_id_create, @@ -1354,7 +1354,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self, else if (self->priv->simple && service == GTALK_SERVICE) { /* Simple widget for Google Talk */ - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_gtalk_simple", &box, NULL); @@ -1372,7 +1372,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self, else if (self->priv->simple && service == FACEBOOK_SERVICE) { /* Simple widget for Facebook */ - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_fb_simple", &box, "entry_id_fb_simple", &entry_id, NULL); @@ -1394,7 +1394,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self, ServiceInfo info = services_infos[service]; /* Full widget for XMPP, Google Talk and Facebook*/ - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_jabber_settings", &box, "spinbutton_port", &spinbutton_port, @@ -1474,7 +1474,7 @@ account_widget_build_icq (EmpathyAccountWidget *self, if (self->priv->simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_icq_simple", &box, NULL); @@ -1491,7 +1491,7 @@ account_widget_build_icq (EmpathyAccountWidget *self, } else { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_icq_settings", &box, "spinbutton_port", &spinbutton_port, @@ -1522,7 +1522,7 @@ account_widget_build_aim (EmpathyAccountWidget *self, if (self->priv->simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_aim_simple", &box, NULL); @@ -1539,7 +1539,7 @@ account_widget_build_aim (EmpathyAccountWidget *self, } else { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_aim_settings", &box, "spinbutton_port", &spinbutton_port, @@ -1572,7 +1572,7 @@ account_widget_build_yahoo (EmpathyAccountWidget *self, if (self->priv->simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_yahoo_simple", &box, NULL); @@ -1589,7 +1589,7 @@ account_widget_build_yahoo (EmpathyAccountWidget *self, } else { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_yahoo_settings", &box, NULL); @@ -1620,7 +1620,7 @@ account_widget_build_groupwise (EmpathyAccountWidget *self, if (self->priv->simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_groupwise_simple", &box, NULL); @@ -1637,7 +1637,7 @@ account_widget_build_groupwise (EmpathyAccountWidget *self, } else { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_groupwise_settings", &self->priv->grid_common_settings, "vbox_groupwise_settings", &box, NULL); @@ -1808,7 +1808,7 @@ out: } #define WIDGET(cm, proto) \ - { #cm, #proto, "empathy-account-widget-"#proto".ui", \ + { #cm, #proto, ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-"#proto".ui", \ account_widget_build_##proto } static void @@ -1904,7 +1904,7 @@ do_constructed (GObject *obj) const char *file; GtkWidget * (*func)(EmpathyAccountWidget *self, const gchar *filename); } widgets [] = { - { "salut", "local-xmpp", "empathy-account-widget-local-xmpp.ui", + { "salut", "local-xmpp", ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-local-xmpp.ui", account_widget_build_salut }, WIDGET (gabble, jabber), WIDGET (haze, msn), @@ -1928,23 +1928,15 @@ do_constructed (GObject *obj) if (!tp_strdiff (widgets[i].cm_name, cm_name) && !tp_strdiff (widgets[i].protocol, protocol)) { - gchar *filename; - - filename = empathy_file_lookup (widgets[i].file, - "libempathy-gtk"); - box = widgets[i].func (self, filename); - g_free (filename); - + box = widgets[i].func (self, widgets[i].file); break; } } if (i == G_N_ELEMENTS (widgets)) { - gchar *filename = empathy_file_lookup ( - "empathy-account-widget-generic.ui", "libempathy-gtk"); + gchar *filename = ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-generic.ui"; box = account_widget_build_generic (self, filename); - g_free (filename); } gtk_container_add (GTK_CONTAINER (self), box); diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h index 2f7d54431..65de952c7 100644 --- a/libempathy-gtk/empathy-account-widget.h +++ b/libempathy-gtk/empathy-account-widget.h @@ -26,7 +26,7 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-account-settings.h> +#include "empathy-account-settings.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-widgets.gresource.xml b/libempathy-gtk/empathy-account-widgets.gresource.xml new file mode 100644 index 000000000..093cb2a93 --- /dev/null +++ b/libempathy-gtk/empathy-account-widgets.gresource.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<gresources> + <gresource prefix="/org/gnome/AccountWidgets"> + <file compressed="true">empathy-account-widget-generic.ui</file> + <file compressed="true">empathy-account-widget-jabber.ui</file> + <file compressed="true">empathy-account-widget-msn.ui</file> + <file compressed="true">empathy-account-widget-sip.ui</file> + <file compressed="true">empathy-account-widget-local-xmpp.ui</file> + <file compressed="true">empathy-account-widget-irc.ui</file> + <file compressed="true">empathy-account-widget-icq.ui</file> + <file compressed="true">empathy-account-widget-yahoo.ui</file> + <file compressed="true">empathy-account-widget-groupwise.ui</file> + <file compressed="true">empathy-account-widget-aim.ui</file> + </gresource> +</gresources> + diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 553dd4f6e..4c58a1aa5 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -21,23 +21,22 @@ */ #include "config.h" +#include "empathy-avatar-chooser.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-utils.h> - -#include "empathy-avatar-chooser.h" -#include "empathy-images.h" -#include "empathy-ui-utils.h" - #ifdef HAVE_CHEESE #include <cheese-avatar-chooser.h> #endif /* HAVE_CHEESE */ +#include "empathy-camera-monitor.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /** * SECTION:empathy-avatar-chooser @@ -854,7 +853,7 @@ avatar_chooser_update_preview_cb (GtkFileChooser *file_chooser, else { gtk_image_set_from_stock (GTK_IMAGE (image), - "gtk-dialog-question", + "dialog-question", GTK_ICON_SIZE_DIALOG); } diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h index dc82c0571..1636e2896 100644 --- a/libempathy-gtk/empathy-avatar-chooser.h +++ b/libempathy-gtk/empathy-avatar-chooser.h @@ -26,6 +26,7 @@ #include <gio/gio.h> #include <gtk/gtk.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index acb0903e4..f61c1b236 100644 --- a/libempathy-gtk/empathy-avatar-image.c +++ b/libempathy-gtk/empathy-avatar-image.c @@ -22,13 +22,13 @@ */ #include "config.h" +#include "empathy-avatar-image.h" #include <glib/gi18n-lib.h> #include <gdk/gdkx.h> -#include <libempathy/empathy-utils.h> -#include "empathy-avatar-image.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" /** * SECTION:empathy-avatar-image diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h index 9429a2874..65f088ecd 100644 --- a/libempathy-gtk/empathy-avatar-image.h +++ b/libempathy-gtk/empathy-avatar-image.h @@ -26,6 +26,8 @@ #include <gtk/gtk.h> +#include "empathy-contact.h" + G_BEGIN_DECLS #define EMPATHY_TYPE_AVATAR_IMAGE (empathy_avatar_image_get_type ()) diff --git a/libempathy-gtk/empathy-bad-password-dialog.c b/libempathy-gtk/empathy-bad-password-dialog.c index a6938b3e5..5cdb90d1e 100644 --- a/libempathy-gtk/empathy-bad-password-dialog.c +++ b/libempathy-gtk/empathy-bad-password-dialog.c @@ -18,13 +18,12 @@ */ #include "config.h" - #include "empathy-bad-password-dialog.h" #include <glib/gi18n-lib.h> #define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyBadPasswordDialog, empathy_bad_password_dialog, EMPATHY_TYPE_BASE_PASSWORD_DIALOG) diff --git a/libempathy-gtk/empathy-bad-password-dialog.h b/libempathy-gtk/empathy-bad-password-dialog.h index ad5179806..a7d0a6f8c 100644 --- a/libempathy-gtk/empathy-bad-password-dialog.h +++ b/libempathy-gtk/empathy-bad-password-dialog.h @@ -20,10 +20,7 @@ #ifndef __EMPATHY_BAD_PASSWORD_DIALOG_H__ #define __EMPATHY_BAD_PASSWORD_DIALOG_H__ -#include <glib-object.h> -#include <gtk/gtk.h> - -#include <libempathy-gtk/empathy-base-password-dialog.h> +#include "empathy-base-password-dialog.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c index 20238343d..9cbb178f0 100644 --- a/libempathy-gtk/empathy-base-password-dialog.c +++ b/libempathy-gtk/empathy-base-password-dialog.c @@ -18,14 +18,14 @@ */ #include "config.h" - #include "empathy-base-password-dialog.h" #include <glib/gi18n-lib.h> +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog, GTK_TYPE_MESSAGE_DIALOG) diff --git a/libempathy-gtk/empathy-base-password-dialog.h b/libempathy-gtk/empathy-base-password-dialog.h index 3f4cfdd5e..0c8ff5251 100644 --- a/libempathy-gtk/empathy-base-password-dialog.h +++ b/libempathy-gtk/empathy-base-password-dialog.h @@ -20,7 +20,6 @@ #ifndef __EMPATHY_BASE_PASSWORD_DIALOG_H__ #define __EMPATHY_BASE_PASSWORD_DIALOG_H__ -#include <glib-object.h> #include <gtk/gtk.h> #include <telepathy-glib/telepathy-glib.h> diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c index f4c82eb4e..ca96a423a 100644 --- a/libempathy-gtk/empathy-calendar-button.c +++ b/libempathy-gtk/empathy-calendar-button.c @@ -18,13 +18,12 @@ */ #include "config.h" +#include "empathy-calendar-button.h" #include <glib/gi18n-lib.h> -#include "empathy-calendar-button.h" - #define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyCalendarButton, empathy_calendar_button, GTK_TYPE_BOX) diff --git a/libempathy-gtk/empathy-calendar-button.h b/libempathy-gtk/empathy-calendar-button.h index 3f1aed1f1..ecc8c78c5 100644 --- a/libempathy-gtk/empathy-calendar-button.h +++ b/libempathy-gtk/empathy-calendar-button.h @@ -20,7 +20,6 @@ #ifndef __EMPATHY_CALENDAR_BUTTON_H__ #define __EMPATHY_CALENDAR_BUTTON_H__ -#include <glib-object.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 9f72ce9bb..ebf320471 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -19,19 +19,15 @@ */ #include "config.h" +#include "empathy-call-utils.h" #include <glib/gi18n-lib.h> - #include <gtk/gtk.h> -#include <telepathy-glib/telepathy-glib.h> - -#include "empathy-call-utils.h" - -#include <libempathy/empathy-request-util.h> +#include "empathy-request-util.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" static const gchar * get_error_display_message (GError *error) diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h index 12fca684e..788d828f5 100644 --- a/libempathy-gtk/empathy-call-utils.h +++ b/libempathy-gtk/empathy-call-utils.h @@ -21,6 +21,8 @@ #ifndef __EMPATHY_CALL_UTILS_H__ #define __EMPATHY_CALL_UTILS_H__ +#include <telepathy-glib/telepathy-glib.h> + G_BEGIN_DECLS /* Calls */ diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c index 3db350935..bdbf1cb09 100644 --- a/libempathy-gtk/empathy-cell-renderer-activatable.c +++ b/libempathy-gtk/empathy-cell-renderer-activatable.c @@ -21,11 +21,10 @@ */ #include "config.h" - -#include <libempathy/empathy-utils.h> - #include "empathy-cell-renderer-activatable.h" +#include "empathy-utils.h" + enum { PATH_ACTIVATED, LAST_SIGNAL diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c index f7c873617..8653fae80 100644 --- a/libempathy-gtk/empathy-cell-renderer-expander.c +++ b/libempathy-gtk/empathy-cell-renderer-expander.c @@ -21,9 +21,11 @@ * Authors: Kristian Rietveld <kris@imendio.com> */ -#include <libempathy/empathy-utils.h> +#include "config.h" #include "empathy-cell-renderer-expander.h" +#include "empathy-utils.h" + #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander) typedef struct { GtkExpanderStyle expander_style; diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c index 0afd89748..44bbd7eab 100644 --- a/libempathy-gtk/empathy-cell-renderer-text.c +++ b/libempathy-gtk/empathy-cell-renderer-text.c @@ -22,10 +22,10 @@ */ #include "config.h" - -#include <libempathy/empathy-utils.h> #include "empathy-cell-renderer-text.h" +#include "empathy-utils.h" + #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText) typedef struct { gchar *name; diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index ffd92b1cd..63364b3a2 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -26,33 +26,33 @@ * Xavier Claessens <xclaesse@gmail.com> */ -#include "config.h" /* for GCompletion */ #define GLIB_DISABLE_DEPRECATION_WARNINGS 1 -#include <glib/gi18n-lib.h> +#include "config.h" +#include "empathy-chat.h" -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-keyring.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-client-factory.h> +#include <glib/gi18n-lib.h> -#include "empathy-chat.h" -#include "empathy-spell.h" +#include "empathy-client-factory.h" +#include "empathy-gsettings.h" #include "empathy-individual-information-dialog.h" #include "empathy-individual-store-channel.h" #include "empathy-individual-view.h" #include "empathy-input-text-view.h" +#include "empathy-keyring.h" +#include "empathy-request-util.h" #include "empathy-search-bar.h" -#include "empathy-theme-manager.h" #include "empathy-smiley-manager.h" -#include "empathy-ui-utils.h" +#include "empathy-spell.h" #include "empathy-string-parser.h" -#include "extensions/extensions.h" +#include "empathy-theme-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter) #define COMPOSING_STOP_TIMEOUT 5 @@ -3855,14 +3855,8 @@ provide_password_cb (GObject *tp_chat, return; } - if (empathy_keyring_is_available ()) { - /* ask whether they want to save the password */ - chat_prompt_to_save_password (self, data); - } else { - /* Get rid of the password info bar finally */ - gtk_widget_destroy (data->info_bar); - g_slice_free (PasswordData, data); - } + /* ask whether they want to save the password */ + chat_prompt_to_save_password (self, data); /* Room joined */ gtk_widget_set_sensitive (priv->hpaned, TRUE); diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h index 269b00596..2a983622b 100644 --- a/libempathy-gtk/empathy-chat.h +++ b/libempathy-gtk/empathy-chat.h @@ -30,10 +30,9 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-contact.h> -#include <libempathy/empathy-tp-chat.h> - -#include <libempathy-gtk/empathy-theme-adium.h> +#include "empathy-contact.h" +#include "empathy-theme-adium.h" +#include "empathy-tp-chat.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c index 9a0498c5a..ddcbcf315 100644 --- a/libempathy-gtk/empathy-contact-blocking-dialog.c +++ b/libempathy-gtk/empathy-contact-blocking-dialog.c @@ -21,19 +21,18 @@ * * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk> */ + #include "config.h" +#include "empathy-contact-blocking-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-account-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> - -#include "empathy-contact-blocking-dialog.h" +#include "empathy-account-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define GET_PRIVATE(o) (EMPATHY_CONTACT_BLOCKING_DIALOG (o)->priv) #define DECLARE_CALLBACK(func) \ diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c index 80ea9765a..dd81dde41 100644 --- a/libempathy-gtk/empathy-contact-chooser.c +++ b/libempathy-gtk/empathy-contact-chooser.c @@ -10,15 +10,13 @@ */ #include "config.h" - #include "empathy-contact-chooser.h" -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-client-factory.h> - -#include <libempathy-gtk/empathy-individual-store-manager.h> -#include <libempathy-gtk/empathy-individual-view.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-client-factory.h" +#include "empathy-individual-store-manager.h" +#include "empathy-individual-view.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyContactChooser, empathy_contact_chooser, GTK_TYPE_BOX); diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c index 0b01bf88d..2696f5abb 100644 --- a/libempathy-gtk/empathy-contact-search-dialog.c +++ b/libempathy-gtk/empathy-contact-search-dialog.c @@ -22,21 +22,22 @@ * Danielle Madeley <danielle.madeley@collabora.co.uk> * Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> */ + #include "config.h" +#include "empathy-contact-search-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-client-factory.h> - -#include <libempathy-gtk/empathy-account-chooser.h> -#include <libempathy-gtk/empathy-cell-renderer-text.h> -#include <libempathy-gtk/empathy-cell-renderer-activatable.h> -#include <libempathy-gtk/empathy-individual-information-dialog.h> -#include <libempathy-gtk/empathy-images.h> +#include "empathy-account-chooser.h" +#include "empathy-cell-renderer-activatable.h" +#include "empathy-cell-renderer-text.h" +#include "empathy-client-factory.h" +#include "empathy-images.h" +#include "empathy-individual-information-dialog.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #include "empathy-contact-search-dialog.h" diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index cef06d309..80a1aafb4 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -20,20 +20,19 @@ */ #include "config.h" +#include "empathy-contact-widget.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-client-factory.h> - -#include "empathy-contact-widget.h" #include "empathy-avatar-image.h" +#include "empathy-client-factory.h" #include "empathy-groups-widget.h" -#include "empathy-ui-utils.h" #include "empathy-string-parser.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /** * SECTION:empathy-contact-widget diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h index 6f8045d3e..5f44adb6b 100644 --- a/libempathy-gtk/empathy-contact-widget.h +++ b/libempathy-gtk/empathy-contact-widget.h @@ -24,8 +24,8 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-contact.h> #include "empathy-account-chooser.h" +#include "empathy-contact.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c index 7ec61310d..38f64375a 100644 --- a/libempathy-gtk/empathy-contactinfo-utils.c +++ b/libempathy-gtk/empathy-contactinfo-utils.c @@ -21,14 +21,13 @@ */ #include "config.h" +#include "empathy-contactinfo-utils.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-time.h> -#include <libempathy/empathy-request-util.h> - -#include "empathy-contactinfo-utils.h" +#include "empathy-request-util.h" #include "empathy-string-parser.h" +#include "empathy-time.h" #include "empathy-ui-utils.h" static gchar * diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h index 80c18ffae..64514f09d 100644 --- a/libempathy-gtk/empathy-contactinfo-utils.h +++ b/libempathy-gtk/empathy-contactinfo-utils.h @@ -21,9 +21,7 @@ #ifndef __EMPATHY_CONTACTINFO_UTILS_H__ #define __EMPATHY_CONTACTINFO_UTILS_H__ -#include <glib.h> #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-dialpad-button.c b/libempathy-gtk/empathy-dialpad-button.c index bddf42bf2..792241fd8 100644 --- a/libempathy-gtk/empathy-dialpad-button.c +++ b/libempathy-gtk/empathy-dialpad-button.c @@ -20,9 +20,7 @@ * Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> */ - #include "config.h" - #include "empathy-dialpad-button.h" G_DEFINE_TYPE (EmpathyDialpadButton, empathy_dialpad_button, GTK_TYPE_BUTTON) diff --git a/libempathy-gtk/empathy-dialpad-button.h b/libempathy-gtk/empathy-dialpad-button.h index cca96f3b2..cd312bda1 100644 --- a/libempathy-gtk/empathy-dialpad-button.h +++ b/libempathy-gtk/empathy-dialpad-button.h @@ -25,7 +25,6 @@ #define __EMPATHY_DIALPAD_BUTTON_H__ #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-dialpad-widget.c b/libempathy-gtk/empathy-dialpad-widget.c index 8fd65bdb2..6c85c7971 100644 --- a/libempathy-gtk/empathy-dialpad-widget.c +++ b/libempathy-gtk/empathy-dialpad-widget.c @@ -20,10 +20,9 @@ */ #include "config.h" - #include "empathy-dialpad-widget.h" -#include <libempathy-gtk/empathy-dialpad-button.h> +#include "empathy-dialpad-button.h" G_DEFINE_TYPE (EmpathyDialpadWidget, empathy_dialpad_widget, GTK_TYPE_BOX); diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c index d171f72fc..452952bb8 100644 --- a/libempathy-gtk/empathy-geometry.c +++ b/libempathy-gtk/empathy-geometry.c @@ -22,15 +22,15 @@ */ #include "config.h" +#include "empathy-geometry.h" #include <sys/stat.h> -#include "libempathy/empathy-utils.h" -#include "empathy-geometry.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define GEOMETRY_DIR_CREATE_MODE (S_IRUSR | S_IWUSR | S_IXUSR) #define GEOMETRY_FILE_CREATE_MODE (S_IRUSR | S_IWUSR) diff --git a/libempathy-gtk/empathy-geometry.h b/libempathy-gtk/empathy-geometry.h index f9f85c1c9..e1412ab8a 100644 --- a/libempathy-gtk/empathy-geometry.h +++ b/libempathy-gtk/empathy-geometry.h @@ -24,7 +24,6 @@ #ifndef __EMPATHY_GEOMETRY_H__ #define __EMPATHY_GEOMETRY_H__ -#include <glib.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c index 6b6a0d0dc..d1a6febfa 100644 --- a/libempathy-gtk/empathy-groups-widget.c +++ b/libempathy-gtk/empathy-groups-widget.c @@ -20,13 +20,12 @@ */ #include "config.h" +#include "empathy-groups-widget.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-connection-aggregator.h> - -#include "empathy-groups-widget.h" +#include "empathy-utils.h" +#include "empathy-connection-aggregator.h" /** * SECTION:empathy-groups-widget diff --git a/libempathy-gtk/empathy-groups-widget.h b/libempathy-gtk/empathy-groups-widget.h index 1085fac4f..2b59db62c 100644 --- a/libempathy-gtk/empathy-groups-widget.h +++ b/libempathy-gtk/empathy-groups-widget.h @@ -23,7 +23,6 @@ #define __EMPATHY_GROUPS_WIDGET_H__ #include <gtk/gtk.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index 03874c905..ce03d0a28 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -20,14 +20,13 @@ */ #include "config.h" +#include "empathy-individual-dialogs.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-individual-manager.h> -#include <libempathy/empathy-utils.h> - -#include "empathy-individual-dialogs.h" #include "empathy-contact-widget.h" +#include "empathy-individual-manager.h" +#include "empathy-utils.h" #define BULLET_POINT "\342\200\242" diff --git a/libempathy-gtk/empathy-individual-dialogs.h b/libempathy-gtk/empathy-individual-dialogs.h index e07105676..b603c5765 100644 --- a/libempathy-gtk/empathy-individual-dialogs.h +++ b/libempathy-gtk/empathy-individual-dialogs.h @@ -24,7 +24,6 @@ #define __EMPATHY_INDIVIDUAL_DIALOGS_H__ #include <gtk/gtk.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c index bd43adeb8..dbd01c970 100644 --- a/libempathy-gtk/empathy-individual-edit-dialog.c +++ b/libempathy-gtk/empathy-individual-edit-dialog.c @@ -21,13 +21,12 @@ */ #include "config.h" +#include "empathy-individual-edit-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - -#include "empathy-individual-edit-dialog.h" #include "empathy-individual-widget.h" +#include "empathy-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualEditDialog) diff --git a/libempathy-gtk/empathy-individual-edit-dialog.h b/libempathy-gtk/empathy-individual-edit-dialog.h index 4f580fb03..747e6824f 100644 --- a/libempathy-gtk/empathy-individual-edit-dialog.h +++ b/libempathy-gtk/empathy-individual-edit-dialog.h @@ -23,7 +23,6 @@ #define __EMPATHY_INDIVIDUAL_EDIT_DIALOG_H__ #include <gtk/gtk.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c index cd6392a9b..2b8d64bd3 100644 --- a/libempathy-gtk/empathy-individual-information-dialog.c +++ b/libempathy-gtk/empathy-individual-information-dialog.c @@ -22,19 +22,18 @@ */ #include "config.h" +#include "empathy-individual-information-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-individual-manager.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-pkg-kit.h> - -#include "empathy-individual-information-dialog.h" +#include "empathy-individual-manager.h" #include "empathy-individual-widget.h" +#include "empathy-pkg-kit.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog) typedef struct { diff --git a/libempathy-gtk/empathy-individual-information-dialog.h b/libempathy-gtk/empathy-individual-information-dialog.h index cdba07a61..58c229577 100644 --- a/libempathy-gtk/empathy-individual-information-dialog.h +++ b/libempathy-gtk/empathy-individual-information-dialog.h @@ -24,7 +24,6 @@ #define __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__ #include <gtk/gtk.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 4cadf22a2..e70146bf7 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -21,30 +21,30 @@ */ #include "config.h" +#include "empathy-individual-menu.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-individual-manager.h> -#include <libempathy/empathy-chatroom-manager.h> -#include <libempathy/empathy-utils.h> - #include "empathy-account-selector-dialog.h" +#include "empathy-call-utils.h" +#include "empathy-camera-monitor.h" +#include "empathy-chatroom-manager.h" +#include "empathy-gtk-enum-types.h" #include "empathy-images.h" -#include "empathy-log-window.h" #include "empathy-individual-dialogs.h" -#include "empathy-gtk-enum-types.h" #include "empathy-individual-dialogs.h" #include "empathy-individual-edit-dialog.h" -#include "empathy-ui-utils.h" -#include "empathy-share-my-desktop.h" -#include "empathy-call-utils.h" -#include "empathy-individual-store-channel.h" #include "empathy-individual-information-dialog.h" +#include "empathy-individual-manager.h" +#include "empathy-individual-store-channel.h" +#include "empathy-log-window.h" +#include "empathy-request-util.h" +#include "empathy-share-my-desktop.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualMenu) diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c index 0fefb9c85..16134a61c 100644 --- a/libempathy-gtk/empathy-individual-store-channel.c +++ b/libempathy-gtk/empathy-individual-store-channel.c @@ -24,13 +24,12 @@ */ #include "config.h" - -#include <libempathy/empathy-utils.h> - #include "empathy-individual-store-channel.h" +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" struct _EmpathyIndividualStoreChannelPriv { diff --git a/libempathy-gtk/empathy-individual-store-channel.h b/libempathy-gtk/empathy-individual-store-channel.h index 468effe21..07cc096ee 100644 --- a/libempathy-gtk/empathy-individual-store-channel.h +++ b/libempathy-gtk/empathy-individual-store-channel.h @@ -27,8 +27,9 @@ #define __EMPATHY_INDIVIDUAL_STORE_CHANNEL_H__ #include <gtk/gtk.h> +#include <telepathy-glib/telepathy-glib.h> -#include <libempathy-gtk/empathy-individual-store.h> +#include "empathy-individual-store.h" G_BEGIN_DECLS #define EMPATHY_TYPE_INDIVIDUAL_STORE_CHANNEL (empathy_individual_store_channel_get_type ()) diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c index ea872b1d1..d080242ea 100644 --- a/libempathy-gtk/empathy-individual-store-manager.c +++ b/libempathy-gtk/empathy-individual-store-manager.c @@ -24,11 +24,10 @@ */ #include "config.h" - #include "empathy-individual-store-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" struct _EmpathyIndividualStoreManagerPriv { diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h index 7656b50ea..d442e7ca5 100644 --- a/libempathy-gtk/empathy-individual-store-manager.h +++ b/libempathy-gtk/empathy-individual-store-manager.h @@ -26,11 +26,10 @@ #ifndef __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__ #define __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__ -#include <gtk/gtk.h> +#include <glib-object.h> -#include <libempathy/empathy-individual-manager.h> - -#include <libempathy-gtk/empathy-individual-store.h> +#include "empathy-individual-manager.h" +#include "empathy-individual-store.h" G_BEGIN_DECLS #define EMPATHY_TYPE_INDIVIDUAL_STORE_MANAGER (empathy_individual_store_manager_get_type ()) diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index ddaea26b4..3ebe35a6b 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -25,16 +25,16 @@ */ #include "config.h" +#include "empathy-individual-store.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - -#include "empathy-ui-utils.h" #include "empathy-gtk-enum-types.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /* Active users are those which have recently changed state * (e.g. online, offline or from normal to a busy state). diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 7e36fe19a..87fa3d966 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -25,25 +25,25 @@ */ #include "config.h" +#include "empathy-individual-view.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-connection-aggregator.h> -#include <libempathy/empathy-individual-manager.h> -#include <libempathy/empathy-contact-groups.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-utils.h> - -#include "empathy-individual-edit-dialog.h" -#include "empathy-images.h" +#include "empathy-cell-renderer-activatable.h" #include "empathy-cell-renderer-expander.h" #include "empathy-cell-renderer-text.h" -#include "empathy-cell-renderer-activatable.h" -#include "empathy-ui-utils.h" +#include "empathy-connection-aggregator.h" +#include "empathy-contact-groups.h" #include "empathy-gtk-enum-types.h" +#include "empathy-images.h" +#include "empathy-individual-edit-dialog.h" +#include "empathy-individual-manager.h" +#include "empathy-request-util.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /* Active users are those which have recently changed state * (e.g. online, offline or from normal to a busy state). diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h index baac701ed..e942a42b5 100644 --- a/libempathy-gtk/empathy-individual-view.h +++ b/libempathy-gtk/empathy-individual-view.h @@ -28,12 +28,11 @@ #define __EMPATHY_INDIVIDUAL_VIEW_H__ #include <gtk/gtk.h> - #include <folks/folks.h> -#include "empathy-live-search.h" #include "empathy-individual-menu.h" #include "empathy-individual-store.h" +#include "empathy-live-search.h" G_BEGIN_DECLS #define EMPATHY_TYPE_INDIVIDUAL_VIEW (empathy_individual_view_get_type ()) diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 12093b577..a267a7d79 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "empathy-individual-widget.h" #include <glib/gi18n-lib.h> @@ -28,18 +29,17 @@ #include <champlain-gtk/champlain-gtk.h> #endif -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-location.h> -#include <libempathy/empathy-time.h> - #include "empathy-avatar-image.h" #include "empathy-contactinfo-utils.h" #include "empathy-groups-widget.h" #include "empathy-gtk-enum-types.h" +#include "empathy-location.h" +#include "empathy-time.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /** * SECTION:empathy-individual-widget diff --git a/libempathy-gtk/empathy-individual-widget.h b/libempathy-gtk/empathy-individual-widget.h index b8156c48a..fd63377f2 100644 --- a/libempathy-gtk/empathy-individual-widget.h +++ b/libempathy-gtk/empathy-individual-widget.h @@ -22,7 +22,6 @@ #define __EMPATHY_INDIVIDUAL_WIDGET_H__ #include <gtk/gtk.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-input-text-view.c b/libempathy-gtk/empathy-input-text-view.c index 78502ef83..d7c24a68d 100644 --- a/libempathy-gtk/empathy-input-text-view.c +++ b/libempathy-gtk/empathy-input-text-view.c @@ -25,6 +25,7 @@ * Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> */ +#include "config.h" #include "empathy-input-text-view.h" G_DEFINE_TYPE (EmpathyInputTextView, empathy_input_text_view, diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c index 00e9bf0eb..60945aed6 100644 --- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c +++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c @@ -20,17 +20,17 @@ */ #include "config.h" +#include "empathy-irc-network-chooser-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-irc-network-manager.h> - #include "empathy-irc-network-dialog.h" +#include "empathy-irc-network-manager.h" #include "empathy-live-search.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #include "empathy-irc-network-chooser-dialog.h" diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.h b/libempathy-gtk/empathy-irc-network-chooser-dialog.h index 0d4f24e7f..1e4654916 100644 --- a/libempathy-gtk/empathy-irc-network-chooser-dialog.h +++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.h @@ -24,8 +24,8 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-account-settings.h> -#include <libempathy/empathy-irc-network.h> +#include "empathy-account-settings.h" +#include "empathy-irc-network.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c index e19b3e8ab..fab6a3a3f 100644 --- a/libempathy-gtk/empathy-irc-network-chooser.c +++ b/libempathy-gtk/empathy-irc-network-chooser.c @@ -20,17 +20,15 @@ */ #include "config.h" +#include "empathy-irc-network-chooser.h" -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-irc-network-manager.h> - -#include "empathy-ui-utils.h" #include "empathy-irc-network-chooser-dialog.h" +#include "empathy-irc-network-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC -#include <libempathy/empathy-debug.h> - -#include "empathy-irc-network-chooser.h" +#include "empathy-debug.h" #define DEFAULT_IRC_NETWORK "irc.gimp.org" #define DEFAULT_IRC_PORT 6667 diff --git a/libempathy-gtk/empathy-irc-network-chooser.h b/libempathy-gtk/empathy-irc-network-chooser.h index 3b6125050..f4c603288 100644 --- a/libempathy-gtk/empathy-irc-network-chooser.h +++ b/libempathy-gtk/empathy-irc-network-chooser.h @@ -24,8 +24,8 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-account-settings.h> -#include <libempathy/empathy-irc-network.h> +#include "empathy-account-settings.h" +#include "empathy-irc-network.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c index aedb5dc79..35457f592 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.c +++ b/libempathy-gtk/empathy-irc-network-dialog.c @@ -19,16 +19,13 @@ */ #include "config.h" +#include "empathy-irc-network-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - #include "empathy-ui-utils.h" #include "totem-subtitle-encoding.h" -#include "empathy-irc-network-dialog.h" - typedef struct { EmpathyIrcNetwork *network; @@ -453,7 +450,6 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, GtkAdjustment *adjustment; GtkTreeSelection *selection; GtkTreeViewColumn *column; - gchar *filename; GtkWidget *sw, *toolbar; GtkStyleContext *context; @@ -472,9 +468,7 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, dialog->network = network; g_object_ref (dialog->network); - filename = empathy_file_lookup ("empathy-account-widget-irc.ui", - "libempathy-gtk"); - gui = empathy_builder_get_file (filename, + gui = empathy_builder_get_resource (ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-irc.ui", "irc_network_dialog", &dialog->dialog, "button_close", &dialog->button_close, "entry_network", &dialog->entry_network, @@ -487,7 +481,6 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, "scrolledwindow_network_server", &sw, "toolbar_network_server", &toolbar, NULL); - g_free (filename); store = gtk_list_store_new (4, G_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_BOOLEAN); diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/libempathy-gtk/empathy-irc-network-dialog.h index df4a8b152..a49c63da9 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.h +++ b/libempathy-gtk/empathy-irc-network-dialog.h @@ -23,7 +23,7 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-irc-network.h> +#include "empathy-irc-network.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c index e65adbe4c..51f6a2e07 100644 --- a/libempathy-gtk/empathy-live-search.c +++ b/libempathy-gtk/empathy-live-search.c @@ -22,11 +22,10 @@ */ #include "config.h" - -#include <libempathy/empathy-utils.h> - #include "empathy-live-search.h" +#include "empathy-utils.h" + G_DEFINE_TYPE (EmpathyLiveSearch, empathy_live_search, GTK_TYPE_HBOX) #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLiveSearch) diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c index b714fa499..f0f6aefec 100644 --- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c +++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c @@ -23,13 +23,12 @@ #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-account-widget.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-account-widget.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyLocalXmppAssistantWidget, empathy_local_xmpp_assistant_widget, GTK_TYPE_GRID) diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h index dafd7fb2a..efea64d29 100644 --- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h +++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h @@ -22,7 +22,6 @@ #define __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__ #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index ab72fff7d..3a97c94cf 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -20,17 +20,16 @@ */ #include "config.h" +#include "empathy-location-manager.h" #include <geoclue/geoclue-master.h> -#include "empathy-location-manager.h" - -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-location.h" -#include "libempathy/empathy-time.h" +#include "empathy-gsettings.h" +#include "empathy-location.h" +#include "empathy-time.h" #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" /* Seconds before updating the location */ #define TIMEOUT 10 diff --git a/libempathy-gtk/empathy-location-manager.h b/libempathy-gtk/empathy-location-manager.h index 525e490bb..6ea8b7bf9 100644 --- a/libempathy-gtk/empathy-location-manager.h +++ b/libempathy-gtk/empathy-location-manager.h @@ -25,7 +25,6 @@ #include <glib-object.h> - G_BEGIN_DECLS #define EMPATHY_TYPE_LOCATION_MANAGER (empathy_location_manager_get_type ()) diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 471d80c5f..a815c45fe 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -23,32 +23,28 @@ */ #include "config.h" +#include "empathy-log-window.h" #include <glib/gi18n-lib.h> -#include <webkit/webkit.h> - #include <telepathy-glib/proxy-subclass.h> -#include <extensions/extensions.h> - -#include <libempathy/action-chain-internal.h> -#include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-utils.h> - -#include "empathy-log-window.h" +#include "action-chain-internal.h" #include "empathy-account-chooser.h" #include "empathy-call-utils.h" -#include "empathy-individual-information-dialog.h" +#include "empathy-camera-monitor.h" +#include "empathy-geometry.h" +#include "empathy-gsettings.h" #include "empathy-images.h" +#include "empathy-individual-information-dialog.h" +#include "empathy-request-util.h" #include "empathy-theme-manager.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #include "empathy-webkit-utils.h" -#include "empathy-geometry.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define EMPATHY_NS "http://live.gnome.org/Empathy" diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h index f8f76905a..48554fc3e 100644 --- a/libempathy-gtk/empathy-log-window.h +++ b/libempathy-gtk/empathy-log-window.h @@ -25,6 +25,7 @@ #ifndef __EMPATHY_LOG_WINDOW_H__ #define __EMPATHY_LOG_WINDOW_H__ +#include <gtk/gtk.h> #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c index c36cfcfce..6d13d15e3 100644 --- a/libempathy-gtk/empathy-new-account-dialog.c +++ b/libempathy-gtk/empathy-new-account-dialog.c @@ -22,11 +22,11 @@ #include <glib/gi18n-lib.h> -#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> +#include "empathy-account-widget.h" +#include "empathy-protocol-chooser.h" -#include <libempathy-gtk/empathy-account-widget.h> -#include <libempathy-gtk/empathy-protocol-chooser.h> +#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \ GTK_TYPE_DIALOG) @@ -148,7 +148,7 @@ empathy_new_account_dialog_init (EmpathyNewAccountDialog *self) /* trigger show the first account widget */ protocol_changed_cb (GTK_COMBO_BOX (self->priv->chooser), self); - gtk_window_set_title (GTK_WINDOW (self), _("Adding new account")); + gtk_window_set_title (GTK_WINDOW (self), _("Add new account")); } static void diff --git a/libempathy-gtk/empathy-new-account-dialog.h b/libempathy-gtk/empathy-new-account-dialog.h index 07fc22f98..6a5d5c2d5 100644 --- a/libempathy-gtk/empathy-new-account-dialog.h +++ b/libempathy-gtk/empathy-new-account-dialog.h @@ -22,7 +22,7 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-account-settings.h> +#include "empathy-account-settings.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c index d770d6d98..7dda2f9e8 100644 --- a/libempathy-gtk/empathy-new-call-dialog.c +++ b/libempathy-gtk/empathy-new-call-dialog.c @@ -19,21 +19,19 @@ */ #include "config.h" +#include "empathy-new-call-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-utils.h> +#include "empathy-call-utils.h" +#include "empathy-camera-monitor.h" +#include "empathy-contact-chooser.h" +#include "empathy-images.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> - -#include <libempathy-gtk/empathy-contact-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-images.h> - -#include "empathy-new-call-dialog.h" -#include "empathy-call-utils.h" +#include "empathy-debug.h" static EmpathyNewCallDialog *dialog_singleton = NULL; diff --git a/libempathy-gtk/empathy-new-call-dialog.h b/libempathy-gtk/empathy-new-call-dialog.h index d3f05e64e..e7413568c 100644 --- a/libempathy-gtk/empathy-new-call-dialog.h +++ b/libempathy-gtk/empathy-new-call-dialog.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_NEW_CALL_DIALOG_H__ #define __EMPATHY_NEW_CALL_DIALOG_H__ -#include <glib-object.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index c38a1c75b..366147259 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -19,19 +19,17 @@ */ #include "config.h" +#include "empathy-new-message-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-request-util.h> +#include "empathy-request-util.h" +#include "empathy-contact-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-images.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> - -#include <libempathy-gtk/empathy-contact-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-images.h> - -#include "empathy-new-message-dialog.h" +#include "empathy-debug.h" static EmpathyNewMessageDialog *dialog_singleton = NULL; diff --git a/libempathy-gtk/empathy-new-message-dialog.h b/libempathy-gtk/empathy-new-message-dialog.h index 390101a2b..5adc4cf9e 100644 --- a/libempathy-gtk/empathy-new-message-dialog.h +++ b/libempathy-gtk/empathy-new-message-dialog.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_NEW_MESSAGE_DIALOG_H__ #define __EMPATHY_NEW_MESSAGE_DIALOG_H__ -#include <glib-object.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c index d142b7fa3..033557e81 100644 --- a/libempathy-gtk/empathy-notify-manager.c +++ b/libempathy-gtk/empathy-notify-manager.c @@ -18,18 +18,16 @@ */ #include "config.h" +#include "empathy-notify-manager.h" #include <libnotify/notify.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-gsettings.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> - -#include "empathy-notify-manager.h" +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyNotifyManager) diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h index 923ab4a54..7c2fa8c4a 100644 --- a/libempathy-gtk/empathy-notify-manager.h +++ b/libempathy-gtk/empathy-notify-manager.h @@ -21,12 +21,10 @@ #ifndef __EMPATHY_NOTIFY_MANAGER_H__ #define __EMPATHY_NOTIFY_MANAGER_H__ -#include <glib-object.h> - -#include <libempathy/empathy-contact.h> - #include <libnotify/notification.h> +#include "empathy-contact.h" + G_BEGIN_DECLS #define EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS "actions" diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c index 07fb69fc0..ef03061a6 100644 --- a/libempathy-gtk/empathy-password-dialog.c +++ b/libempathy-gtk/empathy-password-dialog.c @@ -18,13 +18,12 @@ */ #include "config.h" - #include "empathy-password-dialog.h" #include <glib/gi18n-lib.h> #define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyPasswordDialog, empathy_password_dialog, EMPATHY_TYPE_BASE_PASSWORD_DIALOG) diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h index ee1c993b4..1b19375a3 100644 --- a/libempathy-gtk/empathy-password-dialog.h +++ b/libempathy-gtk/empathy-password-dialog.h @@ -20,12 +20,10 @@ #ifndef __EMPATHY_PASSWORD_DIALOG_H__ #define __EMPATHY_PASSWORD_DIALOG_H__ -#include <glib-object.h> #include <gtk/gtk.h> -#include <libempathy/empathy-server-sasl-handler.h> - -#include <libempathy-gtk/empathy-base-password-dialog.h> +#include "empathy-base-password-dialog.h" +#include "empathy-server-sasl-handler.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c index ddaa97b7f..e1113a073 100644 --- a/libempathy-gtk/empathy-plist.c +++ b/libempathy-gtk/empathy-plist.c @@ -19,13 +19,12 @@ */ #include "config.h" +#include "empathy-plist.h" #include <string.h> #include <libxml/tree.h> #include <telepathy-glib/telepathy-glib.h> -#include "empathy-plist.h" - static GValue *empathy_plist_parse_node (xmlNode *a_node); static GValue * diff --git a/libempathy-gtk/empathy-plist.h b/libempathy-gtk/empathy-plist.h index a15ad6a01..216896b42 100644 --- a/libempathy-gtk/empathy-plist.h +++ b/libempathy-gtk/empathy-plist.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_PLIST_H__ #define __EMPATHY_PLIST_H__ -#include <glib.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index a047890bb..445f79b63 100644 --- a/libempathy-gtk/empathy-presence-chooser.c +++ b/libempathy-gtk/empathy-presence-chooser.c @@ -25,15 +25,16 @@ */ #include "config.h" +#include "empathy-presence-chooser.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-presence-manager.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-status-presets.h> +#include "empathy-presence-manager.h" +#include "empathy-status-presets.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #include "empathy-ui-utils.h" #include "empathy-presence-chooser.h" diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c index d5b0de7c1..a060d9f7e 100644 --- a/libempathy-gtk/empathy-protocol-chooser.c +++ b/libempathy-gtk/empathy-protocol-chooser.c @@ -21,17 +21,16 @@ */ #include "config.h" +#include "empathy-protocol-chooser.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-connection-managers.h> - -#include "empathy-protocol-chooser.h" +#include "empathy-connection-managers.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /** * SECTION:empathy-protocol-chooser diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h index eeaab60c0..2ae8017ef 100644 --- a/libempathy-gtk/empathy-protocol-chooser.h +++ b/libempathy-gtk/empathy-protocol-chooser.h @@ -23,12 +23,10 @@ #ifndef __EMPATHY_PROTOCOL_CHOOSER_H__ #define __EMPATHY_PROTOCOL_CHOOSER_H__ -#include <glib-object.h> #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> -#include <libempathy/empathy-account-settings.h> +#include "empathy-account-settings.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c index d8410b5e6..2db024a3d 100644 --- a/libempathy-gtk/empathy-roster-contact.c +++ b/libempathy-gtk/empathy-roster-contact.c @@ -1,13 +1,11 @@ #include "config.h" - -#include <glib/gi18n-lib.h> - #include "empathy-roster-contact.h" -#include <libempathy/empathy-utils.h> +#include <glib/gi18n-lib.h> -#include <libempathy-gtk/empathy-images.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-images.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT) diff --git a/libempathy-gtk/empathy-roster-group.c b/libempathy-gtk/empathy-roster-group.c index 643fed526..9ca53a8e9 100644 --- a/libempathy-gtk/empathy-roster-group.c +++ b/libempathy-gtk/empathy-roster-group.c @@ -1,5 +1,4 @@ #include "config.h" - #include "empathy-roster-group.h" #include <telepathy-glib/telepathy-glib.h> diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c index a81b2c254..b82fd1620 100644 --- a/libempathy-gtk/empathy-roster-model-aggregator.c +++ b/libempathy-gtk/empathy-roster-model-aggregator.c @@ -22,11 +22,10 @@ */ #include "config.h" +#include "empathy-roster-model-aggregator.h" #include <folks/folks-telepathy.h> -#include "empathy-roster-model-aggregator.h" - /** * SECTION: empathy-roster-model-aggregator * @title: EmpathyRosterModelAggregator diff --git a/libempathy-gtk/empathy-roster-model-aggregator.h b/libempathy-gtk/empathy-roster-model-aggregator.h index e29e36eb0..3b9c0202b 100644 --- a/libempathy-gtk/empathy-roster-model-aggregator.h +++ b/libempathy-gtk/empathy-roster-model-aggregator.h @@ -23,7 +23,6 @@ #define __EMPATHY_ROSTER_MODEL_AGGREGATOR_H__ #include <glib-object.h> - #include <folks/folks.h> #include "empathy-roster-model.h" diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c index 859edb7a9..e0fff03e9 100644 --- a/libempathy-gtk/empathy-roster-model-manager.c +++ b/libempathy-gtk/empathy-roster-model-manager.c @@ -22,14 +22,12 @@ */ #include "config.h" - #include "empathy-roster-model-manager.h" -#include "empathy-roster-model.h" - #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> +#include "empathy-roster-model.h" +#include "empathy-utils.h" static void roster_model_iface_init (EmpathyRosterModelInterface *iface); diff --git a/libempathy-gtk/empathy-roster-model-manager.h b/libempathy-gtk/empathy-roster-model-manager.h index f7ce1f4e5..a38e6593a 100644 --- a/libempathy-gtk/empathy-roster-model-manager.h +++ b/libempathy-gtk/empathy-roster-model-manager.h @@ -23,7 +23,7 @@ #include <glib-object.h> -#include <libempathy/empathy-individual-manager.h> +#include "empathy-individual-manager.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-roster-model.c b/libempathy-gtk/empathy-roster-model.c index 3fd84b7fc..994ab9896 100644 --- a/libempathy-gtk/empathy-roster-model.c +++ b/libempathy-gtk/empathy-roster-model.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "config.h" - #include "empathy-roster-model.h" G_DEFINE_INTERFACE (EmpathyRosterModel, empathy_roster_model, G_TYPE_OBJECT) diff --git a/libempathy-gtk/empathy-roster-model.h b/libempathy-gtk/empathy-roster-model.h index 27c5482f3..1b35f1a1c 100644 --- a/libempathy-gtk/empathy-roster-model.h +++ b/libempathy-gtk/empathy-roster-model.h @@ -20,8 +20,6 @@ #ifndef __EMPATHY_ROSTER_MODEL_H__ #define __EMPATHY_ROSTER_MODEL_H__ -#include <glib-object.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c index ed57be3d4..657deaa96 100644 --- a/libempathy-gtk/empathy-roster-view.c +++ b/libempathy-gtk/empathy-roster-view.c @@ -1,14 +1,12 @@ #include "config.h" - #include "empathy-roster-view.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-contact-groups.h> - -#include <libempathy-gtk/empathy-roster-contact.h> -#include <libempathy-gtk/empathy-roster-group.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-contact-groups.h" +#include "empathy-roster-contact.h" +#include "empathy-roster-group.h" +#include "empathy-ui-utils.h" G_DEFINE_TYPE (EmpathyRosterView, empathy_roster_view, EGG_TYPE_LIST_BOX) diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h index 0077b6843..c09d09c3a 100644 --- a/libempathy-gtk/empathy-roster-view.h +++ b/libempathy-gtk/empathy-roster-view.h @@ -2,10 +2,9 @@ #ifndef __EMPATHY_ROSTER_VIEW_H__ #define __EMPATHY_ROSTER_VIEW_H__ -#include <libempathy-gtk/egg-list-box/egg-list-box.h> -#include <libempathy-gtk/empathy-live-search.h> - -#include <libempathy-gtk/empathy-roster-model.h> +#include "egg-list-box/egg-list-box.h" +#include "empathy-live-search.h" +#include "empathy-roster-model.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c index 018a068ab..dce1bdd1b 100644 --- a/libempathy-gtk/empathy-search-bar.c +++ b/libempathy-gtk/empathy-search-bar.c @@ -18,13 +18,12 @@ */ #include "config.h" +#include "empathy-search-bar.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - -#include "empathy-search-bar.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathySearchBar) diff --git a/libempathy-gtk/empathy-search-bar.h b/libempathy-gtk/empathy-search-bar.h index afda250b2..a710965b5 100644 --- a/libempathy-gtk/empathy-search-bar.h +++ b/libempathy-gtk/empathy-search-bar.h @@ -20,8 +20,7 @@ #ifndef __EMPATHY_SEARCH_BAR_H__ #define __EMPATHY_SEARCH_BAR_H__ -#include <glib.h> -#include <glib-object.h> +#include <gtk/gtk.h> #include "empathy-theme-adium.h" diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c index 8b0845048..9c29533c7 100644 --- a/libempathy-gtk/empathy-share-my-desktop.c +++ b/libempathy-gtk/empathy-share-my-desktop.c @@ -19,11 +19,10 @@ */ #include "config.h" +#include "empathy-share-my-desktop.h" #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP -#include <libempathy/empathy-debug.h> - -#include "empathy-share-my-desktop.h" +#include "empathy-debug.h" static void create_tube_channel_cb (GObject *source, diff --git a/libempathy-gtk/empathy-share-my-desktop.h b/libempathy-gtk/empathy-share-my-desktop.h index 3efeecc14..5953e15e8 100644 --- a/libempathy-gtk/empathy-share-my-desktop.h +++ b/libempathy-gtk/empathy-share-my-desktop.h @@ -21,7 +21,7 @@ #ifndef __EMPATHY_SHARE_MY_DESKTOP_H__ #define __EMPATHY_SHARE_MY_DESKTOP_H__ -#include <libempathy/empathy-contact.h> +#include "empathy-contact.h" void empathy_share_my_desktop_share_with_contact (EmpathyContact *contact); diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c index 99caa51d7..2e8ef3aa5 100644 --- a/libempathy-gtk/empathy-smiley-manager.c +++ b/libempathy-gtk/empathy-smiley-manager.c @@ -21,10 +21,10 @@ */ #include "config.h" - -#include <libempathy/empathy-utils.h> #include "empathy-smiley-manager.h" + #include "empathy-ui-utils.h" +#include "empathy-utils.h" typedef struct _SmileyManagerTree SmileyManagerTree; diff --git a/libempathy-gtk/empathy-smiley-manager.h b/libempathy-gtk/empathy-smiley-manager.h index 1d6eaac54..b9e753bf6 100644 --- a/libempathy-gtk/empathy-smiley-manager.h +++ b/libempathy-gtk/empathy-smiley-manager.h @@ -23,7 +23,6 @@ #ifndef __EMPATHY_SMILEY_MANAGER__H__ #define __EMPATHY_SMILEY_MANAGER_H__ -#include <glib-object.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c index 3291a9a92..600816f67 100644 --- a/libempathy-gtk/empathy-sound-manager.c +++ b/libempathy-gtk/empathy-sound-manager.c @@ -18,15 +18,15 @@ */ #include "config.h" - #include "empathy-sound-manager.h" #include <glib/gi18n-lib.h> +#include "empathy-gsettings.h" +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-utils.h> +#include "empathy-debug.h" typedef struct { EmpathySound sound_id; diff --git a/libempathy-gtk/empathy-sound-manager.h b/libempathy-gtk/empathy-sound-manager.h index 99e96c571..b2fd0d291 100644 --- a/libempathy-gtk/empathy-sound-manager.h +++ b/libempathy-gtk/empathy-sound-manager.h @@ -21,8 +21,6 @@ #ifndef __EMPATHY_SOUND_MANAGER_H__ #define __EMPATHY_SOUND_MANAGER_H__ -#include <gtk/gtk.h> - #include <canberra-gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c index 4242b5738..27f27f902 100644 --- a/libempathy-gtk/empathy-spell.c +++ b/libempathy-gtk/empathy-spell.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "empathy-spell.h" #include <glib/gi18n-lib.h> @@ -29,11 +30,10 @@ #include <enchant.h> #endif -#include "empathy-spell.h" +#include "empathy-gsettings.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-gsettings.h> +#include "empathy-debug.h" #ifdef HAVE_ENCHANT diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c index 19f1fee6a..b122f287e 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.c +++ b/libempathy-gtk/empathy-status-preset-dialog.c @@ -35,17 +35,16 @@ */ #include "config.h" +#include "empathy-status-preset-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-status-presets.h> +#include "empathy-status-presets.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> - -#include "empathy-ui-utils.h" -#include "empathy-status-preset-dialog.h" +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStatusPresetDialog) diff --git a/libempathy-gtk/empathy-status-preset-dialog.h b/libempathy-gtk/empathy-status-preset-dialog.h index 5cf0e3397..625547fe5 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.h +++ b/libempathy-gtk/empathy-status-preset-dialog.h @@ -28,7 +28,7 @@ #ifndef __EMPATHY_STATUS_PRESET_DIALOG_H__ #define __EMPATHY_STATUS_PRESET_DIALOG_H__ -#include <glib.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c index cb7d3c3e1..7cbd290f3 100644 --- a/libempathy-gtk/empathy-string-parser.c +++ b/libempathy-gtk/empathy-string-parser.c @@ -19,8 +19,8 @@ */ #include "config.h" - #include "empathy-string-parser.h" + #include "empathy-smiley-manager.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c index 04fae6d18..878832657 100644 --- a/libempathy-gtk/empathy-subscription-dialog.c +++ b/libempathy-gtk/empathy-subscription-dialog.c @@ -19,14 +19,13 @@ */ #include "config.h" - #include "empathy-subscription-dialog.h" -#include <libempathy/empathy-utils.h> -#include <libempathy-gtk/empathy-individual-widget.h> - #include <glib/gi18n-lib.h> +#include "empathy-individual-widget.h" +#include "empathy-utils.h" + G_DEFINE_TYPE (EmpathySubscriptionDialog, empathy_subscription_dialog, GTK_TYPE_MESSAGE_DIALOG) enum diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 67ec4d08f..31715c305 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -20,22 +20,21 @@ */ #include "config.h" +#include "empathy-theme-adium.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-time.h> -#include <libempathy/empathy-utils.h> - -#include "empathy-theme-adium.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" +#include "empathy-plist.h" #include "empathy-smiley-manager.h" +#include "empathy-time.h" #include "empathy-ui-utils.h" -#include "empathy-plist.h" -#include "empathy-images.h" +#include "empathy-utils.h" #include "empathy-webkit-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define BORING_DPI_DEFAULT 96 diff --git a/libempathy-gtk/empathy-theme-adium.h b/libempathy-gtk/empathy-theme-adium.h index 880667615..698d2846c 100644 --- a/libempathy-gtk/empathy-theme-adium.h +++ b/libempathy-gtk/empathy-theme-adium.h @@ -23,7 +23,7 @@ #include <webkit/webkitwebview.h> -#include <libempathy/empathy-message.h> +#include "empathy-message.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c index f3d8d67bc..81361c1ef 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -21,17 +21,12 @@ */ #include "config.h" - -#include <string.h> - -#include <gtk/gtk.h> - -#include <libempathy/empathy-gsettings.h> - #include "empathy-theme-manager.h" +#include "empathy-gsettings.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" struct _EmpathyThemeManagerPriv { diff --git a/libempathy-gtk/empathy-theme-manager.h b/libempathy-gtk/empathy-theme-manager.h index 812b02616..590c343f3 100644 --- a/libempathy-gtk/empathy-theme-manager.h +++ b/libempathy-gtk/empathy-theme-manager.h @@ -23,7 +23,6 @@ #ifndef __EMPATHY_THEME_MANAGER_H__ #define __EMPATHY_THEME_MANAGER_H__ -#include <glib-object.h> #include "empathy-theme-adium.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c index 82244403a..def31d224 100644 --- a/libempathy-gtk/empathy-tls-dialog.c +++ b/libempathy-gtk/empathy-tls-dialog.c @@ -19,15 +19,15 @@ */ #include "config.h" - #include "empathy-tls-dialog.h" #include <glib/gi18n-lib.h> #include <gcr/gcr.h> +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyTLSDialog, empathy_tls_dialog, GTK_TYPE_MESSAGE_DIALOG) diff --git a/libempathy-gtk/empathy-tls-dialog.h b/libempathy-gtk/empathy-tls-dialog.h index a9c37ad5e..b85e7d097 100644 --- a/libempathy-gtk/empathy-tls-dialog.h +++ b/libempathy-gtk/empathy-tls-dialog.h @@ -21,9 +21,7 @@ #ifndef __EMPATHY_TLS_DIALOG_H__ #define __EMPATHY_TLS_DIALOG_H__ -#include <glib-object.h> #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 9f4300840..86edb3b0a 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -30,20 +30,20 @@ */ #include "config.h" +#include "empathy-ui-utils.h" #include <X11/Xatom.h> #include <gdk/gdkx.h> #include <glib/gi18n-lib.h> #include <gio/gdesktopappinfo.h> -#include "empathy-ui-utils.h" +#include "empathy-ft-factory.h" #include "empathy-images.h" #include "empathy-live-search.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-ft-factory.h> +#include "empathy-debug.h" void empathy_gtk_init (void) @@ -75,8 +75,15 @@ empathy_gtk_init (void) initialized = TRUE; } +enum _BuilderSource +{ + BUILDER_SOURCE_FILE, + BUILDER_SOURCE_RESOURCE +}; + static GtkBuilder * -builder_get_file_valist (const gchar *filename, +builder_get_valist (const gchar *sourcename, + enum _BuilderSource source, const gchar *first_object, va_list args) { @@ -84,16 +91,29 @@ builder_get_file_valist (const gchar *filename, const gchar *name; GObject **object_ptr; GError *error = NULL; + gboolean success; - DEBUG ("Loading file %s", filename); + DEBUG ("Loading %s '%s'", source == BUILDER_SOURCE_FILE ? "file" : "resource", sourcename); gui = gtk_builder_new (); gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE); - if (!gtk_builder_add_from_file (gui, filename, &error)) + switch (source) + { + case BUILDER_SOURCE_FILE: + success = gtk_builder_add_from_file (gui, sourcename, &error); + break; + case BUILDER_SOURCE_RESOURCE: + success = gtk_builder_add_from_resource (gui, sourcename, &error); + break; + default: + g_assert_not_reached (); + } + + if (!success) { g_critical ("GtkBuilder Error (%s): %s", - filename, error->message); + sourcename, error->message); g_clear_error (&error); g_object_unref (gui); @@ -134,7 +154,22 @@ empathy_builder_get_file (const gchar *filename, va_list args; va_start (args, first_object); - gui = builder_get_file_valist (filename, first_object, args); + gui = builder_get_valist (filename, BUILDER_SOURCE_FILE, first_object, args); + va_end (args); + + return gui; +} + +GtkBuilder * +empathy_builder_get_resource (const gchar *resourcename, + const gchar *first_object, + ...) +{ + GtkBuilder *gui; + va_list args; + + va_start (args, first_object); + gui = builder_get_valist (resourcename, BUILDER_SOURCE_RESOURCE, first_object, args); va_end (args); return gui; diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index 73232cf52..baf250e32 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -33,14 +33,15 @@ #define __EMPATHY_UI_UTILS_H__ #include <gtk/gtk.h> - #include <folks/folks.h> -#include <libempathy/empathy-contact.h> -#include <libempathy/empathy-ft-handler.h> +#include "empathy-contact.h" +#include "empathy-ft-handler.h" G_BEGIN_DECLS +#define ACCOUNT_WIDGETS_RESOURCES_PREFIX "/org/gnome/AccountWidgets" + #define EMPATHY_RECT_IS_ON_SCREEN(x,y,w,h) ((x) + (w) > 0 && \ (y) + (h) > 0 && \ (x) < gdk_screen_width () && \ @@ -57,6 +58,9 @@ void empathy_gtk_init (void); GtkBuilder * empathy_builder_get_file (const gchar *filename, const gchar *first_object, ...); +GtkBuilder * empathy_builder_get_resource (const gchar *resourcename, + const gchar *first_object, + ...); void empathy_builder_connect (GtkBuilder *gui, gpointer user_data, const gchar *first_object, diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c index 77b0798f2..451caec8e 100644 --- a/libempathy-gtk/empathy-user-info.c +++ b/libempathy-gtk/empathy-user-info.c @@ -22,14 +22,14 @@ #include <glib/gi18n-lib.h> -#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-time.h> -#include <libempathy/empathy-utils.h> - #include "empathy-avatar-chooser.h" #include "empathy-calendar-button.h" #include "empathy-contactinfo-utils.h" +#include "empathy-time.h" +#include "empathy-utils.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyUserInfo, empathy_user_info, GTK_TYPE_GRID) diff --git a/libempathy-gtk/empathy-user-info.h b/libempathy-gtk/empathy-user-info.h index 117bfd325..a06c72911 100644 --- a/libempathy-gtk/empathy-user-info.h +++ b/libempathy-gtk/empathy-user-info.h @@ -21,7 +21,6 @@ #define __EMPATHY_USER_INFO_H__ #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-webkit-utils.c b/libempathy-gtk/empathy-webkit-utils.c index d221e5f98..0fc319088 100644 --- a/libempathy-gtk/empathy-webkit-utils.c +++ b/libempathy-gtk/empathy-webkit-utils.c @@ -19,13 +19,13 @@ */ #include "config.h" +#include "empathy-webkit-utils.h" #include <glib/gi18n-lib.h> -#include "empathy-webkit-utils.h" #include "empathy-smiley-manager.h" -#include "empathy-ui-utils.h" #include "empathy-theme-adium.h" +#include "empathy-ui-utils.h" #define BORING_DPI_DEFAULT 96 diff --git a/libempathy/.gitignore b/libempathy/.gitignore index 8617dcbd0..5cc6b3397 100644 --- a/libempathy/.gitignore +++ b/libempathy/.gitignore @@ -1,4 +1,5 @@ empathy-chandler-glue.h +empathy-dtd-resources.[ch] empathy-marshal.* empathy-filter-glue.h tp-stream-engine-gen.h diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 36de4d6c2..5f4059f20 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -2,8 +2,7 @@ include $(top_srcdir)/tools/flymake.mk AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I. \ - -I$(top_srcdir) \ + -I$(top_srcdir)/extensions \ -I$(top_builddir) \ -DDATADIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(datadir)/locale"\" \ @@ -21,6 +20,8 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED) BUILT_SOURCES = \ + empathy-dtd-resources.c \ + empathy-dtd-resources.h \ empathy-enum-types.h \ empathy-enum-types.c @@ -134,8 +135,7 @@ libempathy_la_LIBADD = \ $(UOA_LIBS) \ $(LIBM) -dtddir = $(datadir)/empathy -dtd_DATA = \ +dtd_resources_files = \ empathy-status-presets.dtd \ empathy-contact-groups.dtd \ empathy-chatroom-manager.dtd \ @@ -145,8 +145,17 @@ ircnetworksdir = $(datadir)/empathy ircnetworks_DATA = \ irc-networks.xml -EXTRA_DIST = \ - $(dtd_DATA) \ +dtd_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/empathy-dtd.gresource.xml) + +empathy-dtd-resources.c: empathy-dtd.gresource.xml $(dtd_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< + +empathy-dtd-resources.h: empathy-dtd.gresource.xml $(dtd_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $< + +EXTRA_DIST = \ + empathy-dtd.gresource.xml \ + $(dtd_resources_files) \ $(ircnetworks_DATA) CLEANFILES = \ @@ -189,7 +198,7 @@ stamp-empathy-enum-types.h: $(libempathy_headers) Makefile --fhead "G_BEGIN_DECLS\n\n" \ --ftail "G_END_DECLS\n\n" \ --ftail "#endif /* __LIBEMPATHY_ENUM_TYPES_H__ */\n" \ - --fprod "#include <libempathy/@filename@>\n" \ + --fprod '#include "@filename@"\n' \ --eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ --eprod "GType @enum_name@_get_type (void);\n" \ $(libempathy_headers) ) > xgen-gth \ diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c index 3b937ce9a..0e868f2b6 100644 --- a/libempathy/cheese-camera-device-monitor.c +++ b/libempathy/cheese-camera-device-monitor.c @@ -69,7 +69,7 @@ G_DEFINE_TYPE (EmpathyCameraDeviceMonitor, empathy_camera_device_monitor, G_TYPE #define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark () #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" enum EmpathyCameraDeviceMonitorError { diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 12b28b8ba..064d4d215 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -19,15 +19,15 @@ */ #include "config.h" - #include "empathy-account-settings.h" + #include "empathy-connection-managers.h" #include "empathy-keyring.h" -#include "empathy-utils.h" #include "empathy-presence-manager.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountSettings) diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h index 162def48c..6e4713c4c 100644 --- a/libempathy/empathy-account-settings.h +++ b/libempathy/empathy-account-settings.h @@ -23,7 +23,6 @@ #include <glib-object.h> #include <gio/gio.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c index b2f2b802f..cba4607a3 100644 --- a/libempathy/empathy-auth-factory.c +++ b/libempathy/empathy-auth-factory.c @@ -19,11 +19,8 @@ */ #include "config.h" - #include "empathy-auth-factory.h" -#define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include "empathy-debug.h" #include "empathy-keyring.h" #include "empathy-sasl-mechanisms.h" #include "empathy-server-sasl-handler.h" @@ -38,7 +35,10 @@ #include "empathy-uoa-auth-handler.h" #endif /* HAVE_UOA */ -#include "extensions/extensions.h" +#include "extensions.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_TLS +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT); diff --git a/libempathy/empathy-auth-factory.h b/libempathy/empathy-auth-factory.h index 16d6ad34f..73e905782 100644 --- a/libempathy/empathy-auth-factory.h +++ b/libempathy/empathy-auth-factory.h @@ -22,7 +22,6 @@ #define __EMPATHY_AUTH_FACTORY_H__ #include <glib-object.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c index 1e603e989..6e6691120 100644 --- a/libempathy/empathy-camera-monitor.c +++ b/libempathy/empathy-camera-monitor.c @@ -19,8 +19,8 @@ */ #include "config.h" - #include "empathy-camera-monitor.h" + #include "cheese-camera-device-monitor.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c index ebdc50433..3f1828612 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -22,18 +22,18 @@ */ #include "config.h" +#include "empathy-chatroom-manager.h" #include <sys/stat.h> #include "empathy-client-factory.h" -#include "empathy-chatroom-manager.h" #include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" #define CHATROOMS_XML_FILENAME "chatrooms.xml" -#define CHATROOMS_DTD_FILENAME "empathy-chatroom-manager.dtd" +#define CHATROOMS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-chatroom-manager.dtd" #define SAVE_TIMER 4 static EmpathyChatroomManager *chatroom_manager_singleton = NULL; @@ -320,7 +320,7 @@ chatroom_manager_file_parse (EmpathyChatroomManager *manager, return FALSE; } - if (!empathy_xml_validate (doc, CHATROOMS_DTD_FILENAME)) + if (!empathy_xml_validate_from_resource (doc, CHATROOMS_DTD_RESOURCENAME)) { g_warning ("Failed to validate file:'%s'", filename); xmlFreeDoc (doc); diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h index b8232dc64..498d225ad 100644 --- a/libempathy/empathy-chatroom-manager.h +++ b/libempathy/empathy-chatroom-manager.h @@ -25,7 +25,6 @@ #define __EMPATHY_CHATROOM_MANAGER_H__ #include <glib-object.h> - #include <telepathy-glib/telepathy-glib.h> #include "empathy-chatroom.h" diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c index dcc72d5f7..32bb4ce30 100644 --- a/libempathy/empathy-chatroom.c +++ b/libempathy/empathy-chatroom.c @@ -20,8 +20,8 @@ */ #include "config.h" - #include "empathy-chatroom.h" + #include "empathy-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom) diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h index 57ca685cb..98ed04b96 100644 --- a/libempathy/empathy-chatroom.h +++ b/libempathy/empathy-chatroom.h @@ -23,10 +23,9 @@ #define __EMPATHY_CHATROOM_H__ #include <glib-object.h> - #include <telepathy-glib/telepathy-glib.h> -#include <libempathy/empathy-tp-chat.h> +#include "empathy-tp-chat.h" G_BEGIN_DECLS diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c index 1c8fc58cf..39760998c 100644 --- a/libempathy/empathy-client-factory.c +++ b/libempathy/empathy-client-factory.c @@ -20,7 +20,6 @@ */ #include "config.h" - #include "empathy-client-factory.h" #include "empathy-tp-chat.h" diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c index 83e15f15d..763715f9e 100644 --- a/libempathy/empathy-connection-aggregator.c +++ b/libempathy/empathy-connection-aggregator.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-connection-aggregator.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER diff --git a/libempathy/empathy-connection-aggregator.h b/libempathy/empathy-connection-aggregator.h index 71e6e4392..267b20937 100644 --- a/libempathy/empathy-connection-aggregator.h +++ b/libempathy/empathy-connection-aggregator.h @@ -22,7 +22,6 @@ #define __EMPATHY_CONNECTION_AGGREGATOR_H__ #include <glib-object.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c index abf862bca..b94ac1253 100644 --- a/libempathy/empathy-connection-managers.c +++ b/libempathy/empathy-connection-managers.c @@ -19,12 +19,12 @@ */ #include "config.h" - #include "empathy-connection-managers.h" + #include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" static GObject *managers = NULL; diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h index d8bcb390a..0ed20c934 100644 --- a/libempathy/empathy-connection-managers.h +++ b/libempathy/empathy-connection-managers.h @@ -23,7 +23,6 @@ #include <glib-object.h> #include <gio/gio.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c index 8d49f0519..81a1b3133 100644 --- a/libempathy/empathy-contact-groups.c +++ b/libempathy/empathy-contact-groups.c @@ -21,17 +21,17 @@ */ #include "config.h" +#include "empathy-contact-groups.h" #include <sys/stat.h> #include "empathy-utils.h" -#include "empathy-contact-groups.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include "empathy-debug.h" #define CONTACT_GROUPS_XML_FILENAME "contact-groups.xml" -#define CONTACT_GROUPS_DTD_FILENAME "empathy-contact-groups.dtd" +#define CONTACT_GROUPS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-contact-groups.dtd" typedef struct { gchar *name; @@ -91,7 +91,7 @@ contact_groups_file_parse (const gchar *filename) return; } - if (!empathy_xml_validate (doc, CONTACT_GROUPS_DTD_FILENAME)) { + if (!empathy_xml_validate_from_resource (doc, CONTACT_GROUPS_DTD_RESOURCENAME)) { g_warning ("Failed to validate file:'%s'", filename); xmlFreeDoc (doc); xmlFreeParserCtxt (ctxt); diff --git a/libempathy/empathy-contact-groups.h b/libempathy/empathy-contact-groups.h index 181b28753..0be1c81b3 100644 --- a/libempathy/empathy-contact-groups.h +++ b/libempathy/empathy-contact-groups.h @@ -23,10 +23,10 @@ #ifndef __EMPATHY_CONTACT_GROUPS_H__ #define __EMPATHY_CONTACT_GROUPS_H__ -G_BEGIN_DECLS - #include <glib.h> +G_BEGIN_DECLS + void empathy_contact_groups_get_all (void); gboolean empathy_contact_group_get_expanded (const gchar *group); diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 3c91e6319..356104434 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "empathy-contact.h" #ifdef HAVE_GEOCODE #include <geocode-glib/geocode-glib.h> diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h index 14c3f6440..e7ce10e4b 100644 --- a/libempathy/empathy-contact.h +++ b/libempathy/empathy-contact.h @@ -23,7 +23,6 @@ #define __EMPATHY_CONTACT_H__ #include <glib-object.h> - #include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/telepathy-logger.h> #include <folks/folks.h> diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c index 09573c39a..75900f4ad 100644 --- a/libempathy/empathy-debug.c +++ b/libempathy/empathy-debug.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-debug.h" #ifdef ENABLE_DEBUG diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h index e6b93cc7a..5a600602b 100644 --- a/libempathy/empathy-debug.h +++ b/libempathy/empathy-debug.h @@ -21,9 +21,6 @@ #ifndef __EMPATHY_DEBUG_H__ #define __EMPATHY_DEBUG_H__ -#include "config.h" - - #include <glib.h> #include <telepathy-glib/telepathy-glib.h> diff --git a/libempathy/empathy-dtd.gresource.xml b/libempathy/empathy-dtd.gresource.xml new file mode 100644 index 000000000..76cc81702 --- /dev/null +++ b/libempathy/empathy-dtd.gresource.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<gresources> + <gresource prefix="/org/gnome/Empathy"> + <file>empathy-status-presets.dtd</file> + <file>empathy-contact-groups.dtd</file> + <file>empathy-chatroom-manager.dtd</file> + <file>empathy-irc-networks.dtd</file> + </gresource> +</gresources> + diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c index 9cf90014b..855ddb98f 100644 --- a/libempathy/empathy-ft-factory.c +++ b/libempathy/empathy-ft-factory.c @@ -21,7 +21,9 @@ /* empathy-ft-factory.c */ +#include "config.h" #include "empathy-ft-factory.h" + #include "empathy-request-util.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 30711c7d1..96c8e47f5 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -22,10 +22,10 @@ /* empathy-ft-handler.c */ #include "config.h" +#include "empathy-ft-handler.h" #include <glib/gi18n-lib.h> -#include "empathy-ft-handler.h" #include "empathy-time.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h index a120f241b..2fc1b609f 100644 --- a/libempathy/empathy-ft-handler.h +++ b/libempathy/empathy-ft-handler.h @@ -26,7 +26,6 @@ #include <glib-object.h> #include <gio/gio.h> - #include <telepathy-glib/telepathy-glib.h> #include "empathy-contact.h" diff --git a/libempathy/empathy-goa-auth-handler.c b/libempathy/empathy-goa-auth-handler.c index 3659b3728..379730004 100644 --- a/libempathy/empathy-goa-auth-handler.c +++ b/libempathy/empathy-goa-auth-handler.c @@ -19,14 +19,15 @@ */ #include "config.h" +#include "empathy-goa-auth-handler.h" #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */ #include <goa/goa.h> +#include "empathy-sasl-mechanisms.h" + #define DEBUG_FLAG EMPATHY_DEBUG_SASL #include "empathy-debug.h" -#include "empathy-goa-auth-handler.h" -#include "empathy-sasl-mechanisms.h" struct _EmpathyGoaAuthHandlerPriv { diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index f3c7565a1..71960b5d2 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -21,8 +21,8 @@ */ #include "config.h" - #include "empathy-individual-manager.h" + #include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c index 7f6ed9df8..3f53a49ad 100644 --- a/libempathy/empathy-irc-network-manager.c +++ b/libempathy/empathy-irc-network-manager.c @@ -19,16 +19,16 @@ */ #include "config.h" +#include "empathy-irc-network-manager.h" #include <sys/stat.h> #include "empathy-utils.h" -#include "empathy-irc-network-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_IRC #include "empathy-debug.h" -#define IRC_NETWORKS_DTD_FILENAME "empathy-irc-networks.dtd" +#define IRC_NETWORKS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-irc-networks.dtd" #define IRC_NETWORKS_FILENAME "irc-networks.xml" #define SAVE_TIMER 4 @@ -632,7 +632,7 @@ irc_network_manager_file_parse (EmpathyIrcNetworkManager *self, return FALSE; } - if (!empathy_xml_validate (doc, IRC_NETWORKS_DTD_FILENAME)) { + if (!empathy_xml_validate_from_resource (doc, IRC_NETWORKS_DTD_RESOURCENAME)) { g_warning ("Failed to validate file:'%s'", filename); xmlFreeDoc (doc); xmlFreeParserCtxt (ctxt); diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c index e0bc84f7d..e01116e96 100644 --- a/libempathy/empathy-irc-network.c +++ b/libempathy/empathy-irc-network.c @@ -20,8 +20,8 @@ */ #include "config.h" - #include "empathy-irc-network.h" + #include "empathy-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetwork) diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c index 5457f23a1..75eb016dd 100644 --- a/libempathy/empathy-irc-server.c +++ b/libempathy/empathy-irc-server.c @@ -19,8 +19,8 @@ */ #include "config.h" - #include "empathy-irc-server.h" + #include "empathy-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcServer) diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c index 837b2d519..40667342f 100644 --- a/libempathy/empathy-keyring.c +++ b/libempathy/empathy-keyring.c @@ -17,11 +17,9 @@ */ #include "config.h" - -#include <glib/gi18n-lib.h> - #include "empathy-keyring.h" +#include <glib/gi18n-lib.h> #include <libsecret/secret.h> #ifdef HAVE_UOA @@ -51,12 +49,6 @@ static const SecretSchema room_keyring_schema = { "room-id", SECRET_SCHEMA_ATTRIBUTE_STRING }, { NULL } } }; -gboolean -empathy_keyring_is_available (void) -{ - return TRUE; -} - /* get */ static void diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h index 7e945dc02..8a426a037 100644 --- a/libempathy/empathy-keyring.h +++ b/libempathy/empathy-keyring.h @@ -20,13 +20,10 @@ #define __EMPATHY_KEYRING_H__ #include <gio/gio.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS -gboolean empathy_keyring_is_available (void); - void empathy_keyring_get_account_password_async (TpAccount *account, GAsyncReadyCallback callback, gpointer user_data); diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index e19f69b09..1115eddda 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -23,11 +23,11 @@ */ #include "config.h" +#include "empathy-message.h" #include <glib/gi18n-lib.h> #include "empathy-client-factory.h" -#include "empathy-message.h" #include "empathy-time.h" #include "empathy-utils.h" #include "empathy-enum-types.h" diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c index 1d01b931d..21f703b68 100644 --- a/libempathy/empathy-pkg-kit.c +++ b/libempathy/empathy-pkg-kit.c @@ -19,8 +19,7 @@ */ #include "config.h" - -#include <libempathy/empathy-pkg-kit.h> +#include "empathy-pkg-kit.h" typedef struct { diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c index cdc45fbe9..1c288fb98 100644 --- a/libempathy/empathy-presence-manager.c +++ b/libempathy/empathy-presence-manager.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-presence-manager.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-presence-manager.h b/libempathy/empathy-presence-manager.h index 6357aeecd..f616647ad 100644 --- a/libempathy/empathy-presence-manager.h +++ b/libempathy/empathy-presence-manager.h @@ -22,7 +22,6 @@ #define __EMPATHY_PRESENCE_MANAGER_H__ #include <glib.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c index 8532da57b..c5f693f04 100644 --- a/libempathy/empathy-request-util.c +++ b/libempathy/empathy-request-util.c @@ -20,11 +20,10 @@ */ #include "config.h" - #include "empathy-request-util.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" void empathy_chat_with_contact (EmpathyContact *contact, diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h index 497c65ee5..9c168d7a3 100644 --- a/libempathy/empathy-request-util.h +++ b/libempathy/empathy-request-util.h @@ -23,7 +23,6 @@ #include <glib.h> #include <gio/gio.h> - #include <telepathy-glib/telepathy-glib.h> #include "empathy-contact.h" diff --git a/libempathy/empathy-sasl-mechanisms.c b/libempathy/empathy-sasl-mechanisms.c index 303bf9e3e..a6829c450 100644 --- a/libempathy/empathy-sasl-mechanisms.c +++ b/libempathy/empathy-sasl-mechanisms.c @@ -19,13 +19,13 @@ */ #include "config.h" +#include "empathy-sasl-mechanisms.h" #include <libsoup/soup.h> #define DEBUG_FLAG EMPATHY_DEBUG_SASL #include "empathy-debug.h" #include "empathy-utils.h" -#include "empathy-sasl-mechanisms.h" #define MECH_FACEBOOK "X-FACEBOOK-PLATFORM" #define MECH_WLM "X-MESSENGER-OAUTH2" diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c index bdca7b623..b18d1a735 100644 --- a/libempathy/empathy-server-sasl-handler.c +++ b/libempathy/empathy-server-sasl-handler.c @@ -18,15 +18,14 @@ */ #include "config.h" - #include "empathy-server-sasl-handler.h" -#include <extensions/extensions.h> +#include "empathy-keyring.h" +#include "empathy-sasl-mechanisms.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_SASL #include "empathy-debug.h" -#include "empathy-keyring.h" -#include "empathy-sasl-mechanisms.h" enum { PROP_CHANNEL = 1, diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h index d25d90ab7..8bf7e3b7f 100644 --- a/libempathy/empathy-server-sasl-handler.h +++ b/libempathy/empathy-server-sasl-handler.h @@ -22,7 +22,6 @@ #include <glib-object.h> #include <gio/gio.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c index d58155f58..34c3147a3 100644 --- a/libempathy/empathy-server-tls-handler.c +++ b/libempathy/empathy-server-tls-handler.c @@ -19,14 +19,13 @@ */ #include "config.h" - #include "empathy-server-tls-handler.h" -#define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include "empathy-debug.h" #include "empathy-utils.h" +#include "extensions.h" -#include "extensions/extensions.h" +#define DEBUG_FLAG EMPATHY_DEBUG_TLS +#include "empathy-debug.h" static void async_initable_iface_init (GAsyncInitableIface *iface); diff --git a/libempathy/empathy-server-tls-handler.h b/libempathy/empathy-server-tls-handler.h index f4caf3539..ed19c72ff 100644 --- a/libempathy/empathy-server-tls-handler.h +++ b/libempathy/empathy-server-tls-handler.h @@ -23,7 +23,6 @@ #include <glib-object.h> #include <gio/gio.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c index d8faa4fe9..0e651f074 100644 --- a/libempathy/empathy-status-presets.c +++ b/libempathy/empathy-status-presets.c @@ -21,17 +21,17 @@ */ #include "config.h" +#include "empathy-status-presets.h" #include <sys/stat.h> #include "empathy-utils.h" -#include "empathy-status-presets.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" #define STATUS_PRESETS_XML_FILENAME "status-presets.xml" -#define STATUS_PRESETS_DTD_FILENAME "empathy-status-presets.dtd" +#define STATUS_PRESETS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-status-presets.dtd" #define STATUS_PRESETS_MAX_EACH 15 typedef struct { @@ -92,7 +92,7 @@ status_presets_file_parse (const gchar *filename) return; } - if (!empathy_xml_validate (doc, STATUS_PRESETS_DTD_FILENAME)) { + if (!empathy_xml_validate_from_resource (doc, STATUS_PRESETS_DTD_RESOURCENAME)) { g_warning ("Failed to validate file:'%s'", filename); xmlFreeDoc (doc); xmlFreeParserCtxt (ctxt); diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c index cbb6b3bdb..d14f2c4cc 100644 --- a/libempathy/empathy-time.c +++ b/libempathy/empathy-time.c @@ -20,11 +20,10 @@ */ #include "config.h" +#include "empathy-time.h" #include <glib/gi18n-lib.h> -#include "empathy-time.h" - /* Note: EmpathyTime is always in UTC. */ gint64 diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h index 59bd9269b..fc7af28e3 100644 --- a/libempathy/empathy-time.h +++ b/libempathy/empathy-time.h @@ -24,7 +24,6 @@ #define __USE_XOPEN #endif #include <time.h> - #include <glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c index 00447cc40..fcbc559b3 100644 --- a/libempathy/empathy-tls-verifier.c +++ b/libempathy/empathy-tls-verifier.c @@ -20,14 +20,14 @@ */ #include "config.h" - #include "empathy-tls-verifier.h" #include <gcr/gcr.h> +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_TLS #include "empathy-debug.h" -#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyTLSVerifier, empathy_tls_verifier, G_TYPE_OBJECT) diff --git a/libempathy/empathy-tls-verifier.h b/libempathy/empathy-tls-verifier.h index 2f66acb9c..c25d9756c 100644 --- a/libempathy/empathy-tls-verifier.h +++ b/libempathy/empathy-tls-verifier.h @@ -23,7 +23,6 @@ #include <glib-object.h> #include <gio/gio.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index e15a8c41b..4711affcb 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -19,8 +19,8 @@ */ #include "config.h" - #include "empathy-tp-chat.h" + #include "empathy-request-util.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index d8d4ac31d..20fb4e1e0 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -22,7 +22,6 @@ #define __EMPATHY_TP_CHAT_H__ #include <glib.h> - #include <telepathy-glib/telepathy-glib.h> #include "empathy-message.h" diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c index a57dd6335..7e17b7089 100644 --- a/libempathy/empathy-uoa-auth-handler.c +++ b/libempathy/empathy-uoa-auth-handler.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-uoa-auth-handler.h" #include <libaccounts-glib/ag-account.h> #include <libaccounts-glib/ag-account-service.h> @@ -29,14 +30,14 @@ #include <libsignon-glib/signon-identity.h> #include <libsignon-glib/signon-auth-session.h> -#define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include "empathy-debug.h" #include "empathy-keyring.h" #include "empathy-utils.h" -#include "empathy-uoa-auth-handler.h" #include "empathy-uoa-utils.h" #include "empathy-sasl-mechanisms.h" +#define DEBUG_FLAG EMPATHY_DEBUG_SASL +#include "empathy-debug.h" + struct _EmpathyUoaAuthHandlerPriv { AgManager *manager; diff --git a/libempathy/empathy-uoa-utils.c b/libempathy/empathy-uoa-utils.c index f63a15193..6032d36bd 100644 --- a/libempathy/empathy-uoa-utils.c +++ b/libempathy/empathy-uoa-utils.c @@ -19,10 +19,10 @@ */ #include "config.h" +#include "empathy-uoa-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT #include "empathy-debug.h" -#include "empathy-uoa-utils.h" static AgManager *singleton = NULL; diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index b8f54baa4..0efe3a180 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -27,17 +27,15 @@ */ #include "config.h" +#include "empathy-utils.h" #include <glib/gi18n-lib.h> - -#include <libxml/uri.h> #include <dbus/dbus-protocol.h> +#include <math.h> #include "empathy-client-factory.h" -#include "empathy-utils.h" #include "empathy-presence-manager.h" - -#include <extensions/extensions.h> +#include "extensions.h" #include <math.h> @@ -111,36 +109,36 @@ empathy_init (void) } gboolean -empathy_xml_validate (xmlDoc *doc, - const gchar *dtd_filename) +empathy_xml_validate_from_resource (xmlDoc *doc, + const gchar *dtd_resourcename) { - gchar *path; - xmlChar *escaped; + GBytes *resourcecontents; + gconstpointer resourcedata; + gsize resourcesize; + xmlParserInputBufferPtr buffer; xmlValidCtxt cvp; xmlDtd *dtd; + GError *error = NULL; gboolean ret; - path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "libempathy", - dtd_filename, NULL); - if (!g_file_test (path, G_FILE_TEST_EXISTS)) + DEBUG ("Loading dtd resource %s", dtd_resourcename); + + resourcecontents = g_resources_lookup_data (dtd_resourcename, G_RESOURCE_LOOKUP_FLAGS_NONE, &error); + if (error != NULL) { - g_free (path); - path = g_build_filename (DATADIR, "empathy", dtd_filename, NULL); + g_warning ("Unable to load dtd resource '%s': %s", dtd_resourcename, error->message); + g_error_free (error); + return FALSE; } - - DEBUG ("Loading dtd file %s", path); - - /* The list of valid chars is taken from libxml. */ - escaped = xmlURIEscapeStr ((const xmlChar *) path, - (const xmlChar *)":@&=+$,/?;"); - g_free (path); + resourcedata = g_bytes_get_data (resourcecontents, &resourcesize); + buffer = xmlParserInputBufferCreateStatic (resourcedata, resourcesize, XML_CHAR_ENCODING_UTF8); memset (&cvp, 0, sizeof (cvp)); - dtd = xmlParseDTD (NULL, escaped); + dtd = xmlIOParseDTD (NULL, buffer, XML_CHAR_ENCODING_UTF8); ret = xmlValidateDtd (&cvp, doc, dtd); - xmlFree (escaped); xmlFreeDtd (dtd); + g_bytes_unref (resourcecontents); return ret; } diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index 5fe79e9ee..440fe8350 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -27,7 +27,6 @@ #include <glib.h> #include <glib-object.h> - #include <gnutls/x509.h> #include <libxml/tree.h> #include <folks/folks.h> @@ -44,8 +43,8 @@ G_BEGIN_DECLS void empathy_init (void); /* XML */ -gboolean empathy_xml_validate (xmlDoc *doc, - const gchar *dtd_filename); +gboolean empathy_xml_validate_from_resource (xmlDoc *doc, + const gchar *dtd_resourcename); xmlNodePtr empathy_xml_node_get_child (xmlNodePtr node, const gchar *child_name); xmlChar * empathy_xml_node_get_child_content (xmlNodePtr node, diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am index 171ba2ed2..a28415cc1 100644 --- a/nautilus-sendto-plugin/Makefile.am +++ b/nautilus-sendto-plugin/Makefile.am @@ -2,7 +2,8 @@ plugindir = $(libdir)/nautilus-sendto/plugins INCLUDES = \ -I$(top_builddir) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DLOCALEDIR=\""$(datadir)/locale"\" \ $(NST_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c index 8b1bafb78..de7923858 100644 --- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c +++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c @@ -22,24 +22,16 @@ #include "config.h" -#include <glib.h> #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> -#include <gio/gio.h> - -#include <telepathy-glib/telepathy-glib.h> - -#include <libempathy/empathy-contact.h> -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-ft-factory.h> -#include <libempathy/empathy-ft-handler.h> - -#include <libempathy-gtk/empathy-roster-model.h> -#include <libempathy-gtk/empathy-roster-model-manager.h> -#include <libempathy-gtk/empathy-contact-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-roster-view.h> -#include <libempathy-gtk/empathy-roster-contact.h> + + +#include "empathy-debug.h" +#include "empathy-ft-factory.h" + +#include "empathy-roster-model-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-roster-view.h" +#include "empathy-roster-contact.h" #include "nautilus-sendto-plugin.h" @@ -12,24 +12,24 @@ # Jiri Eischmann <jiri@eischmann.cz>, 2010. # Pavel Å efránek <pavel@sefranek2.cz>, 2011. # Petr Kovar <pknbe@volny.cz>, 2008, 2009, 2010, 2011. -# Marek ÄŒernocký <marek@manet.cz>, 2010, 2011, 2012. # Adam MatouÅ¡ek <adamatousek@gmail.com>, 2013. +# Marek ÄŒernocký <marek@manet.cz>, 2010, 2011, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2013-01-09 14:05+0000\n" -"PO-Revision-Date: 2013-02-21 22:24+0100\n" -"Last-Translator: Adam MatouÅ¡ek <adamatousek@gmail.com>\n" +"POT-Creation-Date: 2013-05-16 11:29+0000\n" +"PO-Revision-Date: 2013-05-29 01:53+0200\n" +"Last-Translator: Marek ÄŒernocký <marek@manet.cz>\n" "Language-Team: Czech <gnome-cs-list@gnome.org>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../data/empathy.desktop.in.in.h:1 msgid "Empathy" @@ -49,7 +49,8 @@ msgstr "Diskutovat na serverech Google Talk, Facebook, MSN a mnoha dalÅ¡Ãch" #: ../data/empathy.desktop.in.in.h:5 msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;" -msgstr "chat;diskuse;pokec;im;rychlé zprávy;zpráva;irc;voip;gtalk;facebook;jabber;" +msgstr "" +"chat;diskuse;pokec;im;rychlé zprávy;zpráva;irc;voip;gtalk;facebook;jabber;" #: ../data/org.gnome.Empathy.gschema.xml.h:1 msgid "Connection managers should be used" @@ -506,81 +507,81 @@ msgid "" msgstr "" "Jestli má Empathy omezit pÅ™esnost polohy pro lepÅ¡Ã ochranu vaÅ¡eho soukromÃ." -#: ../libempathy/empathy-ft-handler.c:733 +#: ../libempathy/empathy-ft-handler.c:732 msgid "No reason was specified" msgstr "Nebyl udán žádný důvod" -#: ../libempathy/empathy-ft-handler.c:736 +#: ../libempathy/empathy-ft-handler.c:735 msgid "The change in state was requested" msgstr "Byla vyžádána zmÄ›na stavu" -#: ../libempathy/empathy-ft-handler.c:739 +#: ../libempathy/empathy-ft-handler.c:738 msgid "You canceled the file transfer" msgstr "ZruÅ¡ili jste pÅ™enos souboru" -#: ../libempathy/empathy-ft-handler.c:742 +#: ../libempathy/empathy-ft-handler.c:741 msgid "The other participant canceled the file transfer" msgstr "Protistrana zruÅ¡ila pÅ™enos souboru" -#: ../libempathy/empathy-ft-handler.c:745 +#: ../libempathy/empathy-ft-handler.c:744 msgid "Error while trying to transfer the file" msgstr "Chyba pÅ™i pokusu o odeslánà souboru" -#: ../libempathy/empathy-ft-handler.c:748 +#: ../libempathy/empathy-ft-handler.c:747 msgid "The other participant is unable to transfer the file" msgstr "Protistrana nenà schopna pÅ™enosu souborů" -#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:295 msgid "Unknown reason" msgstr "Neznámý důvod" -#: ../libempathy/empathy-ft-handler.c:914 +#: ../libempathy/empathy-ft-handler.c:913 msgid "File transfer completed, but the file was corrupted" msgstr "PÅ™enos souboru byl dokonÄen, ale soubor byl poÅ¡kozen" -#: ../libempathy/empathy-ft-handler.c:1200 +#: ../libempathy/empathy-ft-handler.c:1199 msgid "File transfer not supported by remote contact" msgstr "PÅ™enos souborů nenà podporován vzdálenou stranou" -#: ../libempathy/empathy-ft-handler.c:1256 +#: ../libempathy/empathy-ft-handler.c:1255 msgid "The selected file is not a regular file" msgstr "Vybraný soubor nenà běžným souborem" -#: ../libempathy/empathy-ft-handler.c:1265 +#: ../libempathy/empathy-ft-handler.c:1264 msgid "The selected file is empty" msgstr "Vybraný soubor je prázdný" -#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194 +#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184 msgid "Password not found" msgstr "Heslo nenalezeno" -#: ../libempathy/empathy-keyring.c:594 +#: ../libempathy/empathy-keyring.c:584 #, c-format msgid "IM account password for %s (%s)" msgstr "Heslo úÄtu rychlé komunikace pro %s (%s)" -#: ../libempathy/empathy-keyring.c:631 +#: ../libempathy/empathy-keyring.c:621 #, c-format msgid "Password for chatroom '%s' on account %s (%s)" msgstr "Heslo pro diskuznà mÃstnost „%s“ u úÄtu %s (%s)" -#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116 +#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107 #, c-format msgid "Missed call from %s" msgstr "ZmeÅ¡kaný hovor od kontaktu %s" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:407 +#: ../libempathy/empathy-message.c:406 #, c-format msgid "Called %s" msgstr "Hovor s kontaktem %s" -#: ../libempathy/empathy-message.c:410 +#: ../libempathy/empathy-message.c:409 #, c-format msgid "Call from %s" msgstr "PÅ™Ãchozà hovor od kontaktu %s" -#: ../libempathy/empathy-time.c:90 +#: ../libempathy/empathy-time.c:86 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" @@ -588,7 +589,7 @@ msgstr[0] "pÅ™ed %d sekundou" msgstr[1] "pÅ™ed %d sekundami" msgstr[2] "pÅ™ed %d sekundami" -#: ../libempathy/empathy-time.c:96 +#: ../libempathy/empathy-time.c:92 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -596,7 +597,7 @@ msgstr[0] "pÅ™ed minutou" msgstr[1] "pÅ™ed %d minutami" msgstr[2] "pÅ™ed %d minutami" -#: ../libempathy/empathy-time.c:102 +#: ../libempathy/empathy-time.c:98 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -604,7 +605,7 @@ msgstr[0] "pÅ™ed hodinou" msgstr[1] "pÅ™ed %d hodinami" msgstr[2] "pÅ™ed %d hodinami" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:104 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -612,7 +613,7 @@ msgstr[0] "vÄera" msgstr[1] "pÅ™ed %d dny" msgstr[2] "pÅ™ed %d dny" -#: ../libempathy/empathy-time.c:114 +#: ../libempathy/empathy-time.c:110 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -620,7 +621,7 @@ msgstr[0] "pÅ™ed týdnem" msgstr[1] "pÅ™ed %d týdny" msgstr[2] "pÅ™ed %d týdny" -#: ../libempathy/empathy-time.c:120 +#: ../libempathy/empathy-time.c:116 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -628,143 +629,143 @@ msgstr[0] "pÅ™ed mÄ›sÃcem" msgstr[1] "pÅ™ed %d mÄ›sÃci" msgstr[2] "pÅ™ed %d mÄ›sÃci" -#: ../libempathy/empathy-time.c:142 +#: ../libempathy/empathy-time.c:138 msgid "in the future" msgstr "v budoucnosti" -#: ../libempathy/empathy-utils.c:226 +#: ../libempathy/empathy-utils.c:215 msgid "Available" msgstr "PÅ™Ãtomen" -#: ../libempathy/empathy-utils.c:228 +#: ../libempathy/empathy-utils.c:217 msgid "Busy" msgstr "ZaneprázdnÄ›n" -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:220 msgid "Away" msgstr "NepÅ™Ãtomen" -#: ../libempathy/empathy-utils.c:233 +#: ../libempathy/empathy-utils.c:222 msgid "Invisible" msgstr "Skrytý" -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:224 msgid "Offline" msgstr "Odpojen" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:238 +#: ../libempathy/empathy-utils.c:227 msgctxt "presence" msgid "Unknown" msgstr "Neznámo" -#: ../libempathy/empathy-utils.c:278 +#: ../libempathy/empathy-utils.c:267 msgid "No reason specified" msgstr "Neudán žádný důvod" -#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:269 ../libempathy/empathy-utils.c:325 msgid "Status is set to offline" msgstr "Stav nastaven na „Odhlášen“" -#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316 -#: ../libempathy-gtk/empathy-call-utils.c:47 -#: ../libempathy-gtk/empathy-new-message-dialog.c:80 +#: ../libempathy/empathy-utils.c:271 ../libempathy/empathy-utils.c:305 +#: ../libempathy-gtk/empathy-call-utils.c:41 +#: ../libempathy-gtk/empathy-new-message-dialog.c:70 msgid "Network error" msgstr "Chyba sÃtÄ›" -#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307 msgid "Authentication failed" msgstr "Autentizace selhala" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309 msgid "Encryption error" msgstr "Chyba Å¡ifrovánÃ" -#: ../libempathy/empathy-utils.c:288 +#: ../libempathy/empathy-utils.c:277 msgid "Name in use" msgstr "Jméno použÃváno" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311 msgid "Certificate not provided" msgstr "Certifikát nebyl poskytnut" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313 msgid "Certificate untrusted" msgstr "NedůvÄ›ryhodný certifikát" -#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315 msgid "Certificate expired" msgstr "Platnost certifikátu vyprÅ¡ela" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317 msgid "Certificate not activated" msgstr "Certifikát nenà aktivován" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:319 msgid "Certificate hostname mismatch" msgstr "Certifikát názvu poÄÃtaÄe nesouhlasÃ" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:321 msgid "Certificate fingerprint mismatch" msgstr "Certifikát otisku prstu nesouhlasÃ" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:323 msgid "Certificate self-signed" msgstr "Certifikát je podepsán sám sebou" -#: ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:293 msgid "Certificate error" msgstr "Chyba certifikátu" -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption is not available" msgstr "Å ifrovánà nenà dostupné" -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate is invalid" msgstr "Certifikát je neplatný" -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:331 msgid "Connection has been refused" msgstr "Spojenà bylo odmÃtnuto" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:333 msgid "Connection can't be established" msgstr "Spojenà nemohlo být navázáno" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:335 msgid "Connection has been lost" msgstr "Spojenà bylo ztraceno" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:337 msgid "This account is already connected to the server" msgstr "Tento úÄet je již pÅ™ipojen k serveru" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:339 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "Spojenà bylo nahrazeno novým spojenÃm, které použÃvá stejný zdroj" -#: ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:342 msgid "The account already exists on the server" msgstr "Takový úÄet již na serveru existuje" -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:344 msgid "Server is currently too busy to handle the connection" msgstr "Server je právÄ› pÅ™ÃliÅ¡ zaneprázdnÄ›n na to, aby obsloužil spojenÃ" -#: ../libempathy/empathy-utils.c:357 +#: ../libempathy/empathy-utils.c:346 msgid "Certificate has been revoked" msgstr "Certifikát byl odvolán" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:348 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "Certifikát použÃvá nepÅ™ÃliÅ¡ bezpeÄný Å¡ifrovacà algoritmus nebo je z " "kryptografického hlediska slabý" -#: ../libempathy/empathy-utils.c:362 +#: ../libempathy/empathy-utils.c:351 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -772,32 +773,32 @@ msgstr "" "Délka certifikátu serveru nebo délka zÅ™etÄ›zených certifikátů serveru " "pÅ™esáhla omezenà dané kryptografickou knihovnou" -#: ../libempathy/empathy-utils.c:366 +#: ../libempathy/empathy-utils.c:355 msgid "Your software is too old" msgstr "Váš software je pÅ™ÃliÅ¡ zastaralý" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:357 msgid "Internal error" msgstr "Internà chyba" -#: ../libempathy/empathy-utils.c:497 -#: ../libempathy-gtk/empathy-roster-model.h:30 +#: ../libempathy/empathy-utils.c:486 +#: ../libempathy-gtk/empathy-roster-model.h:28 msgid "People Nearby" msgstr "Lidé v okolÃ" -#: ../libempathy/empathy-utils.c:502 +#: ../libempathy/empathy-utils.c:491 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672 +#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:539 +#: ../libempathy/empathy-utils.c:528 msgid "Facebook Chat" msgstr "Facebook Chat" -#: ../libempathy-gtk/empathy-account-chooser.c:689 +#: ../libempathy-gtk/empathy-account-chooser.c:684 msgid "All accounts" msgstr "VÅ¡echny úÄty" @@ -876,56 +877,56 @@ msgstr "Jaké je vaÅ¡e heslo k AIM?" msgid "Remember Password" msgstr "Zapamatovat heslo" -#: ../libempathy-gtk/empathy-account-widget.c:675 +#: ../libempathy-gtk/empathy-account-widget.c:668 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -#: ../src/empathy-import-widget.c:322 +#: ../src/empathy-import-widget.c:316 msgid "Account" msgstr "ÚÄet" -#: ../libempathy-gtk/empathy-account-widget.c:676 +#: ../libempathy-gtk/empathy-account-widget.c:669 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Password" msgstr "Heslo" -#: ../libempathy-gtk/empathy-account-widget.c:677 +#: ../libempathy-gtk/empathy-account-widget.c:670 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:511 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:498 msgid "Server" msgstr "Server" -#: ../libempathy-gtk/empathy-account-widget.c:678 +#: ../libempathy-gtk/empathy-account-widget.c:671 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:532 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:519 msgid "Port" msgstr "Port" -#: ../libempathy-gtk/empathy-account-widget.c:762 +#: ../libempathy-gtk/empathy-account-widget.c:755 #, c-format msgid "%s" msgstr "%s" -#: ../libempathy-gtk/empathy-account-widget.c:817 +#: ../libempathy-gtk/empathy-account-widget.c:810 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1429 +#: ../libempathy-gtk/empathy-account-widget.c:1422 msgid "Username:" msgstr "Uživatelské jméno:" -#: ../libempathy-gtk/empathy-account-widget.c:1746 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "A_pply" msgstr "_PoužÃt" -#: ../libempathy-gtk/empathy-account-widget.c:1775 +#: ../libempathy-gtk/empathy-account-widget.c:1768 msgid "L_og in" msgstr "PÅ™ip_ojit" -#: ../libempathy-gtk/empathy-account-widget.c:1845 +#: ../libempathy-gtk/empathy-account-widget.c:1838 msgid "This account already exists on the server" msgstr "Takový úÄet již existuje" -#: ../libempathy-gtk/empathy-account-widget.c:1849 +#: ../libempathy-gtk/empathy-account-widget.c:1842 msgid "Create a new account on the server" msgstr "VytvoÅ™it nový úÄet na serveru" @@ -934,19 +935,19 @@ msgstr "VytvoÅ™it nový úÄet na serveru" #. * 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:2270 +#: ../libempathy-gtk/empathy-account-widget.c:2255 #, c-format msgid "%1$s on %2$s" msgstr "%1$s na %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:2296 +#: ../libempathy-gtk/empathy-account-widget.c:2281 #, c-format msgid "%s Account" msgstr "ÚÄet služby %s" -#: ../libempathy-gtk/empathy-account-widget.c:2300 +#: ../libempathy-gtk/empathy-account-widget.c:2285 msgid "New account" msgstr "Nový úÄet" @@ -1170,32 +1171,32 @@ msgstr "Jaké je ID pro Windows Live?" msgid "What is your Windows Live password?" msgstr "Jaké je vaÅ¡e heslo k Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:207 -#: ../libempathy-gtk/empathy-account-widget-sip.c:240 +#: ../libempathy-gtk/empathy-account-widget-sip.c:198 +#: ../libempathy-gtk/empathy-account-widget-sip.c:231 msgid "Auto" msgstr "Automaticky" -#: ../libempathy-gtk/empathy-account-widget-sip.c:210 +#: ../libempathy-gtk/empathy-account-widget-sip.c:201 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:213 +#: ../libempathy-gtk/empathy-account-widget-sip.c:204 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:216 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 msgid "TLS" msgstr "TLS" -#: ../libempathy-gtk/empathy-account-widget-sip.c:245 +#: ../libempathy-gtk/empathy-account-widget-sip.c:236 msgid "Register" msgstr "Zaregistrovat" -#: ../libempathy-gtk/empathy-account-widget-sip.c:250 +#: ../libempathy-gtk/empathy-account-widget-sip.c:241 msgid "Options" msgstr "Volby" -#: ../libempathy-gtk/empathy-account-widget-sip.c:253 +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 msgid "None" msgstr "Žádný" @@ -1307,55 +1308,55 @@ msgstr "Jaké je vaÅ¡e Yahoo! ID?" msgid "What is your Yahoo! password?" msgstr "Jaké je vaÅ¡e heslo k Yahoo?" -#: ../libempathy-gtk/empathy-avatar-chooser.c:545 -#: ../libempathy-gtk/empathy-avatar-chooser.c:630 +#: ../libempathy-gtk/empathy-avatar-chooser.c:539 +#: ../libempathy-gtk/empathy-avatar-chooser.c:624 msgid "Couldn't convert image" msgstr "Nelze konvertovat obrázek" -#: ../libempathy-gtk/empathy-avatar-chooser.c:546 +#: ../libempathy-gtk/empathy-avatar-chooser.c:540 msgid "None of the accepted image formats are supported on your system" msgstr "Váš systém neobsahuje žádný z podporovaných formátů obrázku" -#: ../libempathy-gtk/empathy-avatar-chooser.c:906 +#: ../libempathy-gtk/empathy-avatar-chooser.c:900 msgid "Couldn't save picture to file" msgstr "Nelze uložit obrázek do souboru" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1030 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1024 msgid "Select Your Avatar Image" msgstr "Vyberte si obrázek avataru" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1038 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1032 msgid "Take a picture..." msgstr "Vyfotografovat…" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1051 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1045 msgid "No Image" msgstr "Žádný obrázek" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1108 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1102 msgid "Images" msgstr "Obrázky" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1112 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1106 msgid "All Files" msgstr "VÅ¡echny soubory" -#: ../libempathy-gtk/empathy-avatar-image.c:322 +#: ../libempathy-gtk/empathy-avatar-image.c:319 msgid "Click to enlarge" msgstr "KliknutÃm zvÄ›tÅ¡Ãte" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:128 #, c-format msgid "Authentication failed for account <b>%s</b>" msgstr "Autentizace selhala pro úÄet <b>%s</b>" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 -#: ../libempathy-gtk/empathy-chat.c:3724 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:140 +#: ../libempathy-gtk/empathy-chat.c:3844 msgid "Retry" msgstr "Opakovat" #: ../libempathy-gtk/empathy-base-password-dialog.c:224 -#: ../libempathy-gtk/empathy-password-dialog.c:134 +#: ../libempathy-gtk/empathy-password-dialog.c:132 #, c-format msgid "" "Enter your password for account\n" @@ -1364,72 +1365,72 @@ msgstr "" "Zadejte své heslo pro úÄet\n" "<b>%s</b>" -#: ../libempathy-gtk/empathy-calendar-button.c:66 +#: ../libempathy-gtk/empathy-calendar-button.c:63 msgid "Select..." msgstr "Vybrat…" -#: ../libempathy-gtk/empathy-calendar-button.c:154 +#: ../libempathy-gtk/empathy-calendar-button.c:151 msgid "_Select" msgstr "_Vybrat" -#: ../libempathy-gtk/empathy-call-utils.c:42 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:36 +#: ../libempathy-gtk/empathy-call-utils.c:54 msgid "There was an error starting the call" msgstr "NepodaÅ™ilo se navázat spojenÃ" -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:43 msgid "The specified contact doesn't support calls" msgstr "Tento kontakt nepodporuje volánÃ" -#: ../libempathy-gtk/empathy-call-utils.c:51 +#: ../libempathy-gtk/empathy-call-utils.c:45 msgid "The specified contact is offline" msgstr "Vybraný kontakt je odpojen" -#: ../libempathy-gtk/empathy-call-utils.c:53 +#: ../libempathy-gtk/empathy-call-utils.c:47 msgid "The specified contact is not valid" msgstr "Vybraný kontakt nenà platný" -#: ../libempathy-gtk/empathy-call-utils.c:55 +#: ../libempathy-gtk/empathy-call-utils.c:49 msgid "Emergency calls are not supported on this protocol" msgstr "Tento protokol nepodporuje tÃsňová volánÃ" -#: ../libempathy-gtk/empathy-call-utils.c:57 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "You don't have enough credit in order to place this call" msgstr "Nemáte dostateÄný kredit k provedenà tohoto volánÃ" -#: ../libempathy-gtk/empathy-chat.c:727 +#: ../libempathy-gtk/empathy-chat.c:731 msgid "Failed to open private chat" msgstr "Nepovedlo se otevÅ™Ãt soukromou konverzaci" -#: ../libempathy-gtk/empathy-chat.c:785 +#: ../libempathy-gtk/empathy-chat.c:789 msgid "Topic not supported on this conversation" msgstr "Tato konverzace toto téma nepodporuje" -#: ../libempathy-gtk/empathy-chat.c:791 +#: ../libempathy-gtk/empathy-chat.c:795 msgid "You are not allowed to change the topic" msgstr "Nemáte oprávnÄ›nà potÅ™ebná pro zmÄ›nu tématu" -#: ../libempathy-gtk/empathy-chat.c:967 +#: ../libempathy-gtk/empathy-chat.c:971 msgid "Invalid contact ID" msgstr "Neplatné ID kontaktu" -#: ../libempathy-gtk/empathy-chat.c:1054 +#: ../libempathy-gtk/empathy-chat.c:1058 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: vymazat vÅ¡echny zprávy z této konverzace" -#: ../libempathy-gtk/empathy-chat.c:1057 +#: ../libempathy-gtk/empathy-chat.c:1061 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <téma>: nastavit téma aktuálnà konverzace" -#: ../libempathy-gtk/empathy-chat.c:1060 +#: ../libempathy-gtk/empathy-chat.c:1064 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <ID mÃstnosti>: vstoupit do nové mÃstnosti" -#: ../libempathy-gtk/empathy-chat.c:1063 +#: ../libempathy-gtk/empathy-chat.c:1067 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <ID mÃstnosti>: vstoupit do nové mÃstnosti" -#: ../libempathy-gtk/empathy-chat.c:1067 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" @@ -1437,23 +1438,23 @@ msgstr "" "/part [<ID mÃstnosti>] [<důvod>]: opustit mÃstnost, bez udánà tu právÄ› " "aktuálnÃ" -#: ../libempathy-gtk/empathy-chat.c:1071 +#: ../libempathy-gtk/empathy-chat.c:1075 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <ID kontaktu> [<zpráva>]: otevÅ™Ãt novou soukromou konverzaci" -#: ../libempathy-gtk/empathy-chat.c:1074 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <ID kontaktu> <zpráva>: otevÅ™Ãt novou soukromou konverzaci" -#: ../libempathy-gtk/empathy-chat.c:1077 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <pÅ™ezdÃvka>: zmÄ›nit svoji pÅ™ezdÃvku na aktuálnÃm serveru" -#: ../libempathy-gtk/empathy-chat.c:1080 +#: ../libempathy-gtk/empathy-chat.c:1084 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <zpráva>: zaslat zprávu AKCE do aktuálnà konverzace" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1087 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 " @@ -1463,11 +1464,11 @@ msgstr "" "posÃlánà zpráv zaÄÃnajÃcÃch s „/“. NapÅ™Ãklad: „/say /join je použito pro " "pÅ™ipojenà do mÃstnosti“" -#: ../libempathy-gtk/empathy-chat.c:1088 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/whois <contact ID>: display information about a contact" msgstr "/whois <ID kontaktu>: zobrazit informace o kontaktu" -#: ../libempathy-gtk/empathy-chat.c:1091 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1475,126 +1476,126 @@ msgstr "" "/help [<pÅ™Ãkaz>]: vypsat seznam podporovaných pÅ™Ãkazů. Pokud je zadán " "<pÅ™Ãkaz>, vypsat jeho použitÃ." -#: ../libempathy-gtk/empathy-chat.c:1110 +#: ../libempathy-gtk/empathy-chat.c:1114 #, c-format msgid "Usage: %s" msgstr "PoužitÃ: %s" -#: ../libempathy-gtk/empathy-chat.c:1155 +#: ../libempathy-gtk/empathy-chat.c:1159 msgid "Unknown command" msgstr "Neznámý pÅ™Ãkaz" -#: ../libempathy-gtk/empathy-chat.c:1281 +#: ../libempathy-gtk/empathy-chat.c:1285 msgid "Unknown command; see /help for the available commands" msgstr "Neznámý pÅ™Ãkaz, pro výpis dostupných pÅ™Ãkazů použijte /help" -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1542 msgid "insufficient balance to send message" msgstr "Nemáte dostateÄný kredit k poslánà zprávy" -#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556 -#: ../libempathy-gtk/empathy-chat.c:1619 +#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560 +#: ../libempathy-gtk/empathy-chat.c:1623 #, c-format msgid "Error sending message '%s': %s" msgstr "Chyba pÅ™i odesÃlánà zprávy „%s“: %s" -#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561 -#: ../libempathy-gtk/empathy-chat.c:1623 +#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1627 #, c-format msgid "Error sending message: %s" msgstr "Chyba pÅ™i odesÃlánà zprávy: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1550 +#: ../libempathy-gtk/empathy-chat.c:1554 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "nedostateÄný zůstatek k zaslánà zprávy. <a href='%s'>DobÃt.</a>." -#: ../libempathy-gtk/empathy-chat.c:1590 +#: ../libempathy-gtk/empathy-chat.c:1594 msgid "not capable" msgstr "nenà k dispozici" -#: ../libempathy-gtk/empathy-chat.c:1597 +#: ../libempathy-gtk/empathy-chat.c:1601 msgid "offline" msgstr "odpojen" -#: ../libempathy-gtk/empathy-chat.c:1600 +#: ../libempathy-gtk/empathy-chat.c:1604 msgid "invalid contact" msgstr "neplatný kontakt" -#: ../libempathy-gtk/empathy-chat.c:1603 +#: ../libempathy-gtk/empathy-chat.c:1607 msgid "permission denied" msgstr "oprávnÄ›nà odepÅ™eno" -#: ../libempathy-gtk/empathy-chat.c:1606 +#: ../libempathy-gtk/empathy-chat.c:1610 msgid "too long message" msgstr "pÅ™ÃliÅ¡ dlouhá zpráva" -#: ../libempathy-gtk/empathy-chat.c:1609 +#: ../libempathy-gtk/empathy-chat.c:1613 msgid "not implemented" msgstr "neimplementováno" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1617 msgid "unknown" msgstr "neznámý" -#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979 +#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967 msgid "Topic:" msgstr "Téma:" -#: ../libempathy-gtk/empathy-chat.c:1695 +#: ../libempathy-gtk/empathy-chat.c:1699 #, c-format msgid "Topic set to: %s" msgstr "Nastavit téma na: %s" -#: ../libempathy-gtk/empathy-chat.c:1697 +#: ../libempathy-gtk/empathy-chat.c:1701 #, c-format msgid "Topic set by %s to: %s" msgstr "Téma nastavil %s na: %s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1702 +#: ../libempathy-gtk/empathy-chat.c:1706 msgid "No topic defined" msgstr "Nestanoveno žádné téma" -#: ../libempathy-gtk/empathy-chat.c:2218 +#: ../libempathy-gtk/empathy-chat.c:2222 msgid "(No Suggestions)" msgstr "(Žádné návrhy)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2286 +#: ../libempathy-gtk/empathy-chat.c:2290 #, c-format msgid "Add '%s' to Dictionary" msgstr "PÅ™idat „%s“ do slovnÃku" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2323 +#: ../libempathy-gtk/empathy-chat.c:2327 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "PÅ™idat „%s“ do slovnÃku %s" -#: ../libempathy-gtk/empathy-chat.c:2393 +#: ../libempathy-gtk/empathy-chat.c:2397 msgid "Insert Smiley" msgstr "Vložit smajlÃka" #. send button -#: ../libempathy-gtk/empathy-chat.c:2411 -#: ../libempathy-gtk/empathy-ui-utils.c:1180 +#: ../libempathy-gtk/empathy-chat.c:2415 +#: ../libempathy-gtk/empathy-ui-utils.c:1208 msgid "_Send" msgstr "_Odeslat" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2468 +#: ../libempathy-gtk/empathy-chat.c:2472 msgid "_Spelling Suggestions" msgstr "Návrhy pravopi_sných oprav" -#: ../libempathy-gtk/empathy-chat.c:2574 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Nepovedlo se zÃskat záznam nedávné historie" -#: ../libempathy-gtk/empathy-chat.c:2718 +#: ../libempathy-gtk/empathy-chat.c:2826 #, c-format msgid "%s has disconnected" msgstr "%s se odpojil" @@ -1602,12 +1603,12 @@ msgstr "%s se odpojil" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2725 +#: ../libempathy-gtk/empathy-chat.c:2833 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s byl vyhozen uživatelem %2$s" -#: ../libempathy-gtk/empathy-chat.c:2728 +#: ../libempathy-gtk/empathy-chat.c:2836 #, c-format msgid "%s was kicked" msgstr "%s byl vyhozen" @@ -1615,17 +1616,17 @@ msgstr "%s byl vyhozen" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2736 +#: ../libempathy-gtk/empathy-chat.c:2844 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s byl zakázán uživatelem %2$s" -#: ../libempathy-gtk/empathy-chat.c:2739 +#: ../libempathy-gtk/empathy-chat.c:2847 #, c-format msgid "%s was banned" msgstr "%s byl zakázán" -#: ../libempathy-gtk/empathy-chat.c:2743 +#: ../libempathy-gtk/empathy-chat.c:2851 #, c-format msgid "%s has left the room" msgstr "%s opustil mÃstnost" @@ -1635,17 +1636,17 @@ msgstr "%s opustil mÃstnost" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2752 +#: ../libempathy-gtk/empathy-chat.c:2860 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2777 +#: ../libempathy-gtk/empathy-chat.c:2885 #, c-format msgid "%s has joined the room" msgstr "%s se pÅ™ipojil do mÃstnosti" -#: ../libempathy-gtk/empathy-chat.c:2802 +#: ../libempathy-gtk/empathy-chat.c:2910 #, c-format msgid "%s is now known as %s" msgstr "%s je teÄ znám jako %s" @@ -1653,82 +1654,82 @@ msgstr "%s je teÄ znám jako %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1537 -#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662 -#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166 +#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516 +#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2641 +#: ../src/empathy-call-window.c:2948 ../src/empathy-event-manager.c:1158 msgid "Disconnected" msgstr "Odpojen" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3664 +#: ../libempathy-gtk/empathy-chat.c:3784 msgid "Would you like to store this password?" msgstr "PÅ™ejete si uchovat toto heslo?" -#: ../libempathy-gtk/empathy-chat.c:3670 +#: ../libempathy-gtk/empathy-chat.c:3790 msgid "Remember" msgstr "Zapamatovat" -#: ../libempathy-gtk/empathy-chat.c:3680 +#: ../libempathy-gtk/empathy-chat.c:3800 msgid "Not now" msgstr "Nynà ne" -#: ../libempathy-gtk/empathy-chat.c:3728 +#: ../libempathy-gtk/empathy-chat.c:3848 msgid "Wrong password; please try again:" msgstr "Å patné heslo, zkuste to prosÃm znovu:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3858 +#: ../libempathy-gtk/empathy-chat.c:3972 msgid "This room is protected by a password:" msgstr "Tato mÃstnost je chránÄ›na heslem:" -#: ../libempathy-gtk/empathy-chat.c:3885 -#: ../src/empathy-new-chatroom-dialog.c:780 +#: ../libempathy-gtk/empathy-chat.c:3999 +#: ../src/empathy-new-chatroom-dialog.c:770 msgid "Join" msgstr "PÅ™ipojit" -#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187 +#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1179 msgid "Connected" msgstr "PÅ™ipojen" -#: ../libempathy-gtk/empathy-chat.c:4132 +#: ../libempathy-gtk/empathy-chat.c:4246 msgid "Conversation" msgstr "Konverzace" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4137 +#: ../libempathy-gtk/empathy-chat.c:4251 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261 msgid "Unknown or invalid identifier" msgstr "Neznámý nebo neplatný identifikátor" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263 msgid "Contact blocking temporarily unavailable" msgstr "Blokovánà kontaktů nenà doÄasnÄ› k dispozici" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 msgid "Contact blocking unavailable" msgstr "Blokovánà kontaktů nenà k dispozici" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 msgid "Permission Denied" msgstr "OprávnÄ›nà odepÅ™eno" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 msgid "Could not block contact" msgstr "Nelze blokovat kontakt" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610 msgid "Edit Blocked Contacts" msgstr "Upravit blokované kontakty" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 -#: ../libempathy-gtk/empathy-individual-widget.c:1483 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:528 +#: ../libempathy-gtk/empathy-individual-widget.c:1473 #: ../src/empathy-chatrooms-window.ui.h:2 #: ../src/empathy-new-chatroom-dialog.ui.h:6 msgid "Account:" @@ -1738,120 +1739,120 @@ msgstr "ÚÄet:" msgid "Blocked Contacts" msgstr "Blokované kontakty" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:98 msgid "Full name" msgstr "Celé jméno" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:99 msgid "Phone number" msgstr "Telefonnà ÄÃslo" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:100 msgid "E-mail address" msgstr "E-mailová adresa" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:101 msgid "Website" msgstr "Webové stránky" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 msgid "Birthday" msgstr "Narozeniny" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Last seen:" msgstr "Naposledy spatÅ™en:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Server:" msgstr "Server:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:109 msgid "Connected from:" msgstr "PÅ™ipojen z:" #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Away message:" msgstr "Zpráva v nepÅ™Ãtomnosti:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:126 msgid "work" msgstr "pracovnÃ" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:127 msgid "home" msgstr "domů" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:128 msgid "mobile" msgstr "mobilnÃ" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:129 msgid "voice" msgstr "hlasový" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 msgid "preferred" msgstr "upÅ™ednostňovaný" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 msgid "postal" msgstr "poÅ¡tovnÃ" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "parcel" msgstr "doruÄovacÃ" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:522 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:521 msgid "Search contacts" msgstr "Hledat kontakty" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:552 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:551 msgid "Search: " msgstr "Hledat: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:610 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:609 msgid "_Add Contact" msgstr "PÅ™id_at kontakt" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:628 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 msgid "No contacts found" msgstr "Nenalezen žádný kontakt" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:644 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:643 msgid "Your message introducing yourself:" msgstr "VaÅ¡e zpráva, kterou se pÅ™edstavujete:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:652 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:651 msgid "Please let me see when you're online. Thanks!" msgstr "Dejte mi prosÃm vÄ›dÄ›t, až budete pÅ™ipojen. DÄ›kuji!" -#: ../libempathy-gtk/empathy-contact-widget.c:168 -#: ../libempathy-gtk/empathy-individual-widget.c:898 +#: ../libempathy-gtk/empathy-contact-widget.c:156 +#: ../libempathy-gtk/empathy-individual-widget.c:888 msgid "Save Avatar" msgstr "Uložit avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:224 -#: ../libempathy-gtk/empathy-individual-widget.c:956 +#: ../libempathy-gtk/empathy-contact-widget.c:212 +#: ../libempathy-gtk/empathy-individual-widget.c:946 msgid "Unable to save avatar" msgstr "Nelze uložit avatar" #. Identifier to connect to Instant Messaging network #. Setup id label #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-user-info.c:444 +#: ../libempathy-gtk/empathy-user-info.c:455 msgid "Identifier" msgstr "Identifikátor" #. Setup nickname entry #: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -#: ../libempathy-gtk/empathy-user-info.c:449 +#: ../libempathy-gtk/empathy-user-info.c:460 msgid "Alias" msgstr "PÅ™ezdÃvka" @@ -1885,11 +1886,11 @@ msgstr "Verze" msgid "Client" msgstr "Klient" -#: ../libempathy-gtk/empathy-groups-widget.c:327 +#: ../libempathy-gtk/empathy-groups-widget.c:317 msgid "Groups" msgstr "Skupiny" -#: ../libempathy-gtk/empathy-groups-widget.c:339 +#: ../libempathy-gtk/empathy-groups-widget.c:329 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -1897,77 +1898,77 @@ msgstr "" "Vyberte skupiny, do kterých má kontakt patÅ™it. Můžete vybrat vÃce než jednu " "skupinu, ale také nevybrat žádnou skupinu." -#: ../libempathy-gtk/empathy-groups-widget.c:358 +#: ../libempathy-gtk/empathy-groups-widget.c:348 msgid "_Add Group" msgstr "_PÅ™idat skupinu" -#: ../libempathy-gtk/empathy-groups-widget.c:393 +#: ../libempathy-gtk/empathy-groups-widget.c:383 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Vybrat" -#: ../libempathy-gtk/empathy-groups-widget.c:403 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgid "Group" msgstr "Skupina" -#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +#: ../libempathy-gtk/empathy-individual-dialogs.c:108 msgid "New Contact" msgstr "Nový kontakt" -#: ../libempathy-gtk/empathy-individual-dialogs.c:193 -#: ../libempathy-gtk/empathy-subscription-dialog.c:121 +#: ../libempathy-gtk/empathy-individual-dialogs.c:183 +#: ../libempathy-gtk/empathy-subscription-dialog.c:120 #, c-format msgid "Block %s?" msgstr "Blokovat %s?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:248 -#: ../libempathy-gtk/empathy-subscription-dialog.c:125 +#: ../libempathy-gtk/empathy-individual-dialogs.c:238 +#: ../libempathy-gtk/empathy-subscription-dialog.c:124 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "Opravdu chcete blokovat „%s“, aby vás znovu nekontaktoval?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-individual-dialogs.c:243 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "NásledujÃcà identita bude blokována:" msgstr[1] "NásledujÃcà identity budou blokovány:" msgstr[2] "NásledujÃcà identity budou blokovány:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:250 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "NásledujÃcà identitu nelze blokovat:" msgstr[1] "NásledujÃcà identity nelze blokovat:" msgstr[2] "NásledujÃcà identity nelze blokovat:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:270 -#: ../libempathy-gtk/empathy-subscription-dialog.c:130 -#: ../libempathy-gtk/empathy-subscription-dialog.c:275 +#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-subscription-dialog.c:129 +#: ../libempathy-gtk/empathy-subscription-dialog.c:274 msgid "_Block" msgstr "_Blokovat" -#: ../libempathy-gtk/empathy-individual-dialogs.c:279 -#: ../libempathy-gtk/empathy-subscription-dialog.c:150 +#: ../libempathy-gtk/empathy-individual-dialogs.c:269 +#: ../libempathy-gtk/empathy-subscription-dialog.c:149 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "Na_hlásit tento kontakt jako obtěžujÃcÃ" msgstr[1] "Na_hlásit tyto kontakty jako obtěžujÃcÃ" msgstr[2] "Na_hlásit tyto kontakty jako obtěžujÃcÃ" -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237 msgid "Edit Contact Information" msgstr "Upravit informace o kontaktu" #. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:293 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:283 msgid "Linked Contacts" msgstr "Pospojované kontakty" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:332 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:322 msgid "gnome-contacts not installed" msgstr "Kontakty Gnome (gnome-contacts) nejsou nainstalovány" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:335 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:325 msgid "Please install gnome-contacts to access contacts details." msgstr "" "Nainstalujte si prosÃm aplikaci Kontakty Gnome (gnome-contacts), abyste mÄ›li " @@ -1976,47 +1977,47 @@ 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:177 +#: ../libempathy-gtk/empathy-individual-menu.c:168 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:353 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "VýbÄ›r úÄtu pro umÃstÄ›nà volánÃ" -#: ../libempathy-gtk/empathy-individual-menu.c:357 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-call-window.ui.h:20 msgid "Call" msgstr "Hovor" -#: ../libempathy-gtk/empathy-individual-menu.c:422 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "MobilnÃ" -#: ../libempathy-gtk/empathy-individual-menu.c:424 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "PracovnÃ" -#: ../libempathy-gtk/empathy-individual-menu.c:426 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "Soukromý" -#: ../libempathy-gtk/empathy-individual-menu.c:669 +#: ../libempathy-gtk/empathy-individual-menu.c:660 msgid "_Block Contact" msgstr "_Blokovat kontakt" -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:716 msgid "Delete and _Block" msgstr "Smazat a _blokovat" -#: ../libempathy-gtk/empathy-individual-menu.c:787 +#: ../libempathy-gtk/empathy-individual-menu.c:778 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Opravdu chcete odstranit kontakt „%s“?" -#: ../libempathy-gtk/empathy-individual-menu.c:796 +#: ../libempathy-gtk/empathy-individual-menu.c:787 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2025,218 +2026,218 @@ msgstr "" "Opravdu chcete odstranit pospojovaný kontakt „%s“? UvÄ›domte si, že tÃm se " "odstranà vÅ¡echny kontakty, které tento pospojovaný kontakt tvoÅ™Ã." -#: ../libempathy-gtk/empathy-individual-menu.c:807 +#: ../libempathy-gtk/empathy-individual-menu.c:798 msgid "Removing contact" msgstr "Kontakt se odstraňuje" -#: ../libempathy-gtk/empathy-individual-menu.c:871 -#: ../libempathy-gtk/empathy-individual-view.c:2453 +#: ../libempathy-gtk/empathy-individual-menu.c:862 +#: ../libempathy-gtk/empathy-individual-view.c:2440 msgid "_Remove" msgstr "_Odstranit" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1234 -#: ../libempathy-gtk/empathy-new-message-dialog.c:318 +#: ../libempathy-gtk/empathy-individual-menu.c:1225 +#: ../libempathy-gtk/empathy-new-message-dialog.c:308 msgid "_Chat" msgstr "_Diskuze" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1269 -#: ../libempathy-gtk/empathy-new-message-dialog.c:312 +#: ../libempathy-gtk/empathy-individual-menu.c:1260 +#: ../libempathy-gtk/empathy-new-message-dialog.c:302 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1302 +#: ../libempathy-gtk/empathy-individual-menu.c:1293 msgctxt "menu item" msgid "_Audio Call" msgstr "_Audiohovor" -#: ../libempathy-gtk/empathy-individual-menu.c:1335 +#: ../libempathy-gtk/empathy-individual-menu.c:1326 msgctxt "menu item" msgid "_Video Call" msgstr "_Videohovor" -#: ../libempathy-gtk/empathy-individual-menu.c:1376 +#: ../libempathy-gtk/empathy-individual-menu.c:1367 #: ../src/empathy-roster-window-menubar.ui.h:11 msgid "_Previous Conversations" msgstr "_PÅ™edchozà konverzace" -#: ../libempathy-gtk/empathy-individual-menu.c:1405 +#: ../libempathy-gtk/empathy-individual-menu.c:1396 msgid "Send File" msgstr "Odeslat soubor" -#: ../libempathy-gtk/empathy-individual-menu.c:1435 +#: ../libempathy-gtk/empathy-individual-menu.c:1426 msgid "Share My Desktop" msgstr "SdÃlet moji plochu" -#: ../libempathy-gtk/empathy-individual-menu.c:1461 -#: ../libempathy-gtk/empathy-individual-widget.c:1366 +#: ../libempathy-gtk/empathy-individual-menu.c:1452 +#: ../libempathy-gtk/empathy-individual-widget.c:1356 msgid "Favorite" msgstr "OblÃbený" -#: ../libempathy-gtk/empathy-individual-menu.c:1490 +#: ../libempathy-gtk/empathy-individual-menu.c:1481 msgid "Infor_mation" msgstr "Infor_mace" -#: ../libempathy-gtk/empathy-individual-menu.c:1539 +#: ../libempathy-gtk/empathy-individual-menu.c:1530 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Upravit" #. send invitation -#: ../libempathy-gtk/empathy-individual-menu.c:1655 -#: ../src/empathy-chat-window.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1646 +#: ../src/empathy-chat-window.c:1233 msgid "Inviting you to this room" msgstr "Pozvánà do mÃstnosti" -#: ../libempathy-gtk/empathy-individual-menu.c:1701 +#: ../libempathy-gtk/empathy-individual-menu.c:1692 msgid "_Invite to Chat Room" msgstr "Pozvat do diskuznà mÃstnost_i" -#: ../libempathy-gtk/empathy-individual-menu.c:1897 +#: ../libempathy-gtk/empathy-individual-menu.c:1888 msgid "_Add Contact…" msgstr "_PÅ™idat kontakt…" -#: ../libempathy-gtk/empathy-individual-view.c:2373 +#: ../libempathy-gtk/empathy-individual-view.c:2360 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Opravdu chcete odstranit skupinu „%s“?" -#: ../libempathy-gtk/empathy-individual-view.c:2376 +#: ../libempathy-gtk/empathy-individual-view.c:2363 msgid "Removing group" msgstr "Skupina se odstraňuje" -#: ../libempathy-gtk/empathy-individual-view.c:2444 +#: ../libempathy-gtk/empathy-individual-view.c:2431 msgid "Re_name" msgstr "PÅ™ejme_novat" -#: ../libempathy-gtk/empathy-individual-widget.c:304 +#: ../libempathy-gtk/empathy-individual-widget.c:294 msgid "Channels:" msgstr "Kanály:" -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-individual-widget.c:445 msgid "Country ISO Code:" msgstr "Kód zemÄ› ISO:" -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-individual-widget.c:447 msgid "Country:" msgstr "ZemÄ›:" -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-individual-widget.c:449 msgid "State:" msgstr "Kraj:" -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-individual-widget.c:451 msgid "City:" msgstr "MÄ›sto:" -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-individual-widget.c:453 msgid "Area:" msgstr "Oblast:" -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Postal Code:" msgstr "PSÄŒ:" -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Street:" msgstr "Ulice:" -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "Building:" msgstr "Budova:" -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "Floor:" msgstr "PodlažÃ:" -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Room:" msgstr "MÃstnost:" -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Text:" msgstr "Text:" -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Description:" msgstr "Popis:" -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Accuracy Level:" msgstr "Úroveň pÅ™esnosti:" -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Error:" msgstr "Chyba:" -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Vertical Error (meters):" msgstr "Vertikálnà chyba (v metrech):" -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Horizontal Error (meters):" msgstr "Horizontálnà chyba (v metrech):" -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "Speed:" msgstr "Rychlost:" -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Bearing:" msgstr "Azimut:" -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Climb Speed:" msgstr "Rychlost stoupánÃ:" -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Last Updated on:" msgstr "Poslednà aktualizace:" -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Longitude:" msgstr "ZemÄ›pisná délka:" -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Latitude:" msgstr "ZemÄ›pisná Å¡ÃÅ™ka:" -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Altitude:" msgstr "NadmoÅ™ská výška:" -#: ../libempathy-gtk/empathy-individual-widget.c:593 -#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../libempathy-gtk/empathy-individual-widget.c:583 +#: ../libempathy-gtk/empathy-individual-widget.c:598 #: ../src/empathy-preferences.ui.h:39 msgid "Location" msgstr "Poloha" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-individual-widget.c:610 +#: ../libempathy-gtk/empathy-individual-widget.c:600 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-individual-widget.c:659 +#: ../libempathy-gtk/empathy-individual-widget.c:649 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y v %R UTC" #. Alias -#: ../libempathy-gtk/empathy-individual-widget.c:1302 +#: ../libempathy-gtk/empathy-individual-widget.c:1292 msgid "Alias:" msgstr "Alias:" #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-individual-widget.c:1511 +#: ../libempathy-gtk/empathy-individual-widget.c:1501 msgid "Identifier:" msgstr "Identifikátor:" -#: ../libempathy-gtk/empathy-individual-widget.c:1650 +#: ../libempathy-gtk/empathy-individual-widget.c:1640 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2252,32 +2253,32 @@ msgstr "<b>Poloha</b> (dne)\t" msgid "Online from a phone or mobile device" msgstr "On-line z telefonu nebo mobilnÃho zaÅ™ÃzenÃ" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329 msgid "New Network" msgstr "Nová sÃÅ¥" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532 msgid "Choose an IRC network" msgstr "VýbÄ›r sÃtÄ› IRC" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615 msgid "Reset _Networks List" msgstr "Vymazat sez_nam sÃtÃ" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Vybrat" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:271 msgid "new server" msgstr "nový server" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:547 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:534 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80 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 " @@ -2288,11 +2289,11 @@ msgstr "" "uvedené údaje jsou správné. Kdykoliv pozdÄ›ji to můžete snadno zmÄ›nit nebo " "tuto funkci vypnout v dialogovém oknÄ› úÄtů." -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100 msgid "People nearby" msgstr "Lidé v okolÃ" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115 msgid "" "You can change these details later or disable this feature by choosing <span " "style=\"italic\">Edit → Accounts</span> in the Contact List." @@ -2300,48 +2301,48 @@ msgstr "" "Tyto údaje můžete zmÄ›nit pozdÄ›ji nebo tuto funkci zakázat pomocà <span style=" "\"italic\">Upravit → ÚÄty</span> v seznamu kontaktů." -#: ../libempathy-gtk/empathy-log-window.c:622 +#: ../libempathy-gtk/empathy-log-window.c:607 msgid "History" msgstr "Historie" -#: ../libempathy-gtk/empathy-log-window.c:677 +#: ../libempathy-gtk/empathy-log-window.c:662 msgid "Show" msgstr "Zobrazit" -#: ../libempathy-gtk/empathy-log-window.c:699 +#: ../libempathy-gtk/empathy-log-window.c:684 msgid "Search" msgstr "Hledat" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1135 #, c-format msgid "Chat in %s" msgstr "Konverzace v mÃstnosti %s" -#: ../libempathy-gtk/empathy-log-window.c:1152 +#: ../libempathy-gtk/empathy-log-window.c:1137 #, c-format msgid "Chat with %s" msgstr "Konverzace s kontaktem %s" -#: ../libempathy-gtk/empathy-log-window.c:1202 -#: ../libempathy-gtk/empathy-log-window.c:1351 +#: ../libempathy-gtk/empathy-log-window.c:1187 +#: ../libempathy-gtk/empathy-log-window.c:1336 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e. %B %Y, %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1292 +#: ../libempathy-gtk/empathy-log-window.c:1277 #, c-format msgid "<i>* %s %s</i>" msgstr "<i>* %s %s</i>" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1298 +#: ../libempathy-gtk/empathy-log-window.c:1283 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1375 +#: ../libempathy-gtk/empathy-log-window.c:1360 #, c-format msgid "%s second" msgid_plural "%s seconds" @@ -2349,7 +2350,7 @@ msgstr[0] "%s sekunda" msgstr[1] "%s sekundy" msgstr[2] "%s sekund" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1367 #, c-format msgid "%s minute" msgid_plural "%s minutes" @@ -2357,80 +2358,80 @@ msgstr[0] "%s minuta" msgstr[1] "%s minuty" msgstr[2] "%s minut" -#: ../libempathy-gtk/empathy-log-window.c:1390 +#: ../libempathy-gtk/empathy-log-window.c:1375 #, c-format msgid "Call took %s, ended at %s" msgstr "Hovor trval %s, skonÄil %s" -#: ../libempathy-gtk/empathy-log-window.c:1721 +#: ../libempathy-gtk/empathy-log-window.c:1706 msgid "Today" msgstr "Dnes" -#: ../libempathy-gtk/empathy-log-window.c:1725 +#: ../libempathy-gtk/empathy-log-window.c:1710 msgid "Yesterday" msgstr "VÄera" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1740 +#: ../libempathy-gtk/empathy-log-window.c:1725 msgid "%e %B %Y" msgstr "%e. %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1844 -#: ../libempathy-gtk/empathy-log-window.c:3467 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3452 msgid "Anytime" msgstr "Kdykoli" -#: ../libempathy-gtk/empathy-log-window.c:1943 -#: ../libempathy-gtk/empathy-log-window.c:2402 +#: ../libempathy-gtk/empathy-log-window.c:1928 +#: ../libempathy-gtk/empathy-log-window.c:2387 msgid "Anyone" msgstr "Kdokoli" -#: ../libempathy-gtk/empathy-log-window.c:2715 +#: ../libempathy-gtk/empathy-log-window.c:2700 msgid "Who" msgstr "Kdo" -#: ../libempathy-gtk/empathy-log-window.c:2924 +#: ../libempathy-gtk/empathy-log-window.c:2909 msgid "When" msgstr "Kdy" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3027 msgid "Anything" msgstr "Cokoli" -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3029 msgid "Text chats" msgstr "Konverzace" -#: ../libempathy-gtk/empathy-log-window.c:3045 +#: ../libempathy-gtk/empathy-log-window.c:3030 #: ../src/empathy-preferences.ui.h:29 msgid "Calls" msgstr "Hovory" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3034 msgid "Incoming calls" msgstr "PÅ™Ãchozà hovory" -#: ../libempathy-gtk/empathy-log-window.c:3050 +#: ../libempathy-gtk/empathy-log-window.c:3035 msgid "Outgoing calls" msgstr "Odchozà hovory" -#: ../libempathy-gtk/empathy-log-window.c:3051 +#: ../libempathy-gtk/empathy-log-window.c:3036 msgid "Missed calls" msgstr "ZmeÅ¡kané hovory" -#: ../libempathy-gtk/empathy-log-window.c:3071 +#: ../libempathy-gtk/empathy-log-window.c:3056 msgid "What" msgstr "Co" -#: ../libempathy-gtk/empathy-log-window.c:3760 +#: ../libempathy-gtk/empathy-log-window.c:3745 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Opravdu chcete vymazat vÅ¡echny pÅ™edchozà konverzace?" -#: ../libempathy-gtk/empathy-log-window.c:3764 +#: ../libempathy-gtk/empathy-log-window.c:3749 msgid "Clear All" msgstr "Vymazat vÅ¡e" -#: ../libempathy-gtk/empathy-log-window.c:3771 +#: ../libempathy-gtk/empathy-log-window.c:3756 msgid "Delete from:" msgstr "Smazat z:" @@ -2452,7 +2453,7 @@ msgid "Profile" msgstr "Profil" #: ../libempathy-gtk/empathy-log-window.ui.h:5 -#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-chat-window.c:1426 ../src/empathy-preferences.ui.h:11 msgid "Chat" msgstr "Diskuze" @@ -2477,72 +2478,72 @@ msgstr "Jaký typ úÄtu chcete vytvoÅ™it?" msgid "Adding new account" msgstr "PÅ™idávánà nového úÄtu" -#: ../libempathy-gtk/empathy-new-call-dialog.c:199 -#: ../libempathy-gtk/empathy-new-message-dialog.c:289 +#: ../libempathy-gtk/empathy-new-call-dialog.c:189 +#: ../libempathy-gtk/empathy-new-message-dialog.c:279 msgid "Enter a contact identifier or phone number:" msgstr "Zadejte identifikátor kontaktu nebo telefonnà ÄÃslo:" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:222 +#: ../libempathy-gtk/empathy-new-call-dialog.c:212 msgid "_Video Call" msgstr "_Videohovor" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:232 +#: ../libempathy-gtk/empathy-new-call-dialog.c:222 msgid "_Audio Call" msgstr "Hl_asový hovor" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:242 +#: ../libempathy-gtk/empathy-new-call-dialog.c:232 msgid "New Call" msgstr "Nový hovor" -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:72 msgid "The contact is offline" msgstr "Kontakt je odpojen" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:74 msgid "The specified contact is either invalid or unknown" msgstr "Vybraný kontakt buÄ nenà platný nebo je neznámý" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:76 msgid "The contact does not support this kind of conversation" msgstr "Kontakt nepodporuje tento druh konverzace" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:78 msgid "The requested functionality is not implemented for this protocol" msgstr "Požadovaná funkcionalita nenà pro tento protokol implementována" -#: ../libempathy-gtk/empathy-new-message-dialog.c:94 +#: ../libempathy-gtk/empathy-new-message-dialog.c:84 msgid "Could not start a conversation with the given contact" msgstr "Nelze zaÄÃt konverzaci s daným kontaktem" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:86 msgid "You are banned from this channel" msgstr "Na tomto kanálu máte zákaz" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:88 msgid "This channel is full" msgstr "Tento kanál je plný" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:90 msgid "You must be invited to join this channel" msgstr "Abyste se mohl pÅ™ipojit k tomuto kanálu, musÃte mÃt pozvánÃ" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:92 msgid "Can't proceed while disconnected" msgstr "Nelze pokraÄovat bez pÅ™ipojenÃ" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:94 msgid "Permission denied" msgstr "OprávnÄ›nà odepÅ™eno" -#: ../libempathy-gtk/empathy-new-message-dialog.c:110 +#: ../libempathy-gtk/empathy-new-message-dialog.c:100 msgid "There was an error starting the conversation" msgstr "PÅ™i spouÅ¡tÄ›nà konverzace doÅ¡lo k chybÄ›" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:332 +#: ../libempathy-gtk/empathy-new-message-dialog.c:322 msgid "New Conversation" msgstr "Nová konverzace" @@ -2552,26 +2553,26 @@ msgstr "Nová konverzace" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:164 -#: ../libempathy-gtk/empathy-presence-chooser.c:200 +#: ../libempathy-gtk/empathy-presence-chooser.c:157 +#: ../libempathy-gtk/empathy-presence-chooser.c:193 msgid "Custom Message…" msgstr "Vlastnà zpráva…" -#: ../libempathy-gtk/empathy-presence-chooser.c:217 -#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:210 +#: ../libempathy-gtk/empathy-presence-chooser.c:212 msgid "Edit Custom Messages…" msgstr "Upravit vlastnà zprávy…" -#: ../libempathy-gtk/empathy-presence-chooser.c:341 +#: ../libempathy-gtk/empathy-presence-chooser.c:334 msgid "Click to remove this status as a favorite" msgstr "KliknutÃm odstranÃte stav z oblÃbených" -#: ../libempathy-gtk/empathy-presence-chooser.c:350 +#: ../libempathy-gtk/empathy-presence-chooser.c:343 msgid "Click to make this status a favorite" msgstr "KliknutÃm pÅ™idáte stav do oblÃbených" #. Translators: %s is a status message like 'At the pub' for example -#: ../libempathy-gtk/empathy-presence-chooser.c:384 +#: ../libempathy-gtk/empathy-presence-chooser.c:377 #, c-format msgid "" "<b>Current message: %s</b>\n" @@ -2581,12 +2582,12 @@ msgstr "" "<small><i>ZmáÄknutÃm Enter nastavte novou zprávu nebo zmáÄknutÃm Esc zruÅ¡te." "</i></small>" -#: ../libempathy-gtk/empathy-presence-chooser.c:393 +#: ../libempathy-gtk/empathy-presence-chooser.c:386 msgid "Set status" msgstr "Nastavit stav" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1101 +#: ../libempathy-gtk/empathy-presence-chooser.c:1094 msgid "Custom messages…" msgstr "Vlastnà zprávy…" @@ -2594,12 +2595,12 @@ msgstr "Vlastnà zprávy…" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../libempathy-gtk/empathy-protocol-chooser.c:608 +#: ../libempathy-gtk/empathy-protocol-chooser.c:603 #, c-format msgid "New %s account" msgstr "Nový úÄet %s" -#: ../libempathy-gtk/empathy-search-bar.c:243 +#: ../libempathy-gtk/empathy-search-bar.c:237 msgid "_Match case" msgstr "RozliÅ¡ovat velikost _znaků" @@ -2623,166 +2624,166 @@ msgstr "RozliÅ¡ovat v_elikost pÃsmen" msgid "Phrase not found" msgstr "Fráze nenalezena" -#: ../libempathy-gtk/empathy-sound-manager.c:51 +#: ../libempathy-gtk/empathy-sound-manager.c:49 msgid "Received an instant message" msgstr "PÅ™ijata rychlá zpráva" -#: ../libempathy-gtk/empathy-sound-manager.c:53 +#: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Sent an instant message" msgstr "Odeslána rychlá zpráva" -#: ../libempathy-gtk/empathy-sound-manager.c:55 +#: ../libempathy-gtk/empathy-sound-manager.c:53 msgid "Incoming chat request" msgstr "PÅ™Ãchozà žádost o diskuzi" -#: ../libempathy-gtk/empathy-sound-manager.c:57 +#: ../libempathy-gtk/empathy-sound-manager.c:55 msgid "Contact connected" msgstr "Kontakt je pÅ™ipojen" -#: ../libempathy-gtk/empathy-sound-manager.c:59 +#: ../libempathy-gtk/empathy-sound-manager.c:57 msgid "Contact disconnected" msgstr "Kontakt se odpojil" -#: ../libempathy-gtk/empathy-sound-manager.c:61 +#: ../libempathy-gtk/empathy-sound-manager.c:59 msgid "Connected to server" msgstr "PÅ™ipojeno k serveru" -#: ../libempathy-gtk/empathy-sound-manager.c:63 +#: ../libempathy-gtk/empathy-sound-manager.c:61 msgid "Disconnected from server" msgstr "Odpojeno od serveru" -#: ../libempathy-gtk/empathy-sound-manager.c:65 +#: ../libempathy-gtk/empathy-sound-manager.c:63 msgid "Incoming voice call" msgstr "PÅ™Ãchozà hovor" -#: ../libempathy-gtk/empathy-sound-manager.c:67 +#: ../libempathy-gtk/empathy-sound-manager.c:65 msgid "Outgoing voice call" msgstr "Odchozà hovor" -#: ../libempathy-gtk/empathy-sound-manager.c:69 +#: ../libempathy-gtk/empathy-sound-manager.c:67 msgid "Voice call ended" msgstr "Hovor ukonÄen" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:294 msgid "Edit Custom Messages" msgstr "Upravit vlastnà zprávy" -#: ../libempathy-gtk/empathy-subscription-dialog.c:234 +#: ../libempathy-gtk/empathy-subscription-dialog.c:233 msgid "Subscription Request" msgstr "Požadavek na pÅ™ihlášenÃ" -#: ../libempathy-gtk/empathy-subscription-dialog.c:240 -#: ../src/empathy-event-manager.c:1104 +#: ../libempathy-gtk/empathy-subscription-dialog.c:239 +#: ../src/empathy-event-manager.c:1096 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s by chtÄ›l oprávnÄ›nà vidÄ›t, když jste dostupný" -#: ../libempathy-gtk/empathy-subscription-dialog.c:281 -#: ../src/empathy-event-manager.c:729 +#: ../libempathy-gtk/empathy-subscription-dialog.c:280 +#: ../src/empathy-event-manager.c:721 msgid "_Decline" msgstr "O_dmÃtnout" -#: ../libempathy-gtk/empathy-subscription-dialog.c:282 +#: ../libempathy-gtk/empathy-subscription-dialog.c:281 msgid "_Accept" msgstr "_PÅ™ijmout" -#: ../libempathy-gtk/empathy-theme-adium.c:1124 +#: ../libempathy-gtk/empathy-theme-adium.c:1211 #, c-format msgid "Message edited at %s" msgstr "Zpráva upravena %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1824 +#: ../libempathy-gtk/empathy-theme-adium.c:1913 msgid "Normal" msgstr "NormálnÃ" -#: ../libempathy-gtk/empathy-tls-dialog.c:150 +#: ../libempathy-gtk/empathy-tls-dialog.c:147 msgid "The identity provided by the chat server cannot be verified." msgstr "Identitu poskytovanou tÃmto diskuznÃm serverem nelze prověřit." -#: ../libempathy-gtk/empathy-tls-dialog.c:157 +#: ../libempathy-gtk/empathy-tls-dialog.c:154 msgid "The certificate is not signed by a Certification Authority." msgstr "Certifikát nenà podepsán certifikaÄnà autoritou." -#: ../libempathy-gtk/empathy-tls-dialog.c:161 +#: ../libempathy-gtk/empathy-tls-dialog.c:158 msgid "The certificate has expired." msgstr "Platnost certifikátu vyprÅ¡ela." -#: ../libempathy-gtk/empathy-tls-dialog.c:164 +#: ../libempathy-gtk/empathy-tls-dialog.c:161 msgid "The certificate hasn't yet been activated." msgstr "Certifikát zatÃm nebyl aktivován." -#: ../libempathy-gtk/empathy-tls-dialog.c:167 +#: ../libempathy-gtk/empathy-tls-dialog.c:164 msgid "The certificate does not have the expected fingerprint." msgstr "Certifikát nemá oÄekávaný otisk." -#: ../libempathy-gtk/empathy-tls-dialog.c:170 +#: ../libempathy-gtk/empathy-tls-dialog.c:167 msgid "The hostname verified by the certificate doesn't match the server name." msgstr "Název poÄÃtaÄe ověřený certifikátem neodpovÃdá názvu serveru." -#: ../libempathy-gtk/empathy-tls-dialog.c:174 +#: ../libempathy-gtk/empathy-tls-dialog.c:171 msgid "The certificate is self-signed." msgstr "Certifikát je podepsán sám sebou." -#: ../libempathy-gtk/empathy-tls-dialog.c:177 +#: ../libempathy-gtk/empathy-tls-dialog.c:174 msgid "" "The certificate has been revoked by the issuing Certification Authority." msgstr "Certifikát byl odvolán vydávajÃcà certifikaÄnà autoritou." -#: ../libempathy-gtk/empathy-tls-dialog.c:181 +#: ../libempathy-gtk/empathy-tls-dialog.c:178 msgid "The certificate is cryptographically weak." msgstr "Certifikát je z kryptografického hlediska slabý." -#: ../libempathy-gtk/empathy-tls-dialog.c:184 +#: ../libempathy-gtk/empathy-tls-dialog.c:181 msgid "The certificate length exceeds verifiable limits." msgstr "Délka certifikátu pÅ™ekraÄuje prověřitelnou velikost." -#: ../libempathy-gtk/empathy-tls-dialog.c:188 +#: ../libempathy-gtk/empathy-tls-dialog.c:185 msgid "The certificate is malformed." msgstr "Certifikát je poÅ¡kozený." -#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#: ../libempathy-gtk/empathy-tls-dialog.c:203 #, c-format msgid "Expected hostname: %s" msgstr "OÄekávaný název poÄÃtaÄe: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#: ../libempathy-gtk/empathy-tls-dialog.c:206 #, c-format msgid "Certificate hostname: %s" msgstr "Název poÄÃtaÄe v certifikátu: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:281 +#: ../libempathy-gtk/empathy-tls-dialog.c:278 msgid "C_ontinue" msgstr "P_okraÄovat" -#: ../libempathy-gtk/empathy-tls-dialog.c:287 +#: ../libempathy-gtk/empathy-tls-dialog.c:284 msgid "Untrusted connection" msgstr "NedůvÄ›ryhodné pÅ™ipojenÃ" -#: ../libempathy-gtk/empathy-tls-dialog.c:288 +#: ../libempathy-gtk/empathy-tls-dialog.c:285 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Toto spojenà je nedůvÄ›ryhodné. PÅ™ejete si pokraÄovat dále?" -#: ../libempathy-gtk/empathy-tls-dialog.c:298 +#: ../libempathy-gtk/empathy-tls-dialog.c:295 msgid "Remember this choice for future connections" msgstr "Zapamatovat tuto volbu pro budoucà pÅ™ipojenÃ" -#: ../libempathy-gtk/empathy-tls-dialog.c:304 +#: ../libempathy-gtk/empathy-tls-dialog.c:301 msgid "Certificate Details" msgstr "Podrobnosti certifikátu" -#: ../libempathy-gtk/empathy-ui-utils.c:1050 +#: ../libempathy-gtk/empathy-ui-utils.c:1078 msgid "Unable to open URI" msgstr "Nelze otevÅ™Ãt URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1174 +#: ../libempathy-gtk/empathy-ui-utils.c:1202 msgid "Select a file" msgstr "Vybrat soubor" -#: ../libempathy-gtk/empathy-ui-utils.c:1248 +#: ../libempathy-gtk/empathy-ui-utils.c:1276 msgid "Insufficient free space to save file" msgstr "Nedostatek volného mÃsta pro uloženà souboru" -#: ../libempathy-gtk/empathy-ui-utils.c:1256 +#: ../libempathy-gtk/empathy-ui-utils.c:1284 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2791,16 +2792,16 @@ msgstr "" "Pro uloženà tohoto souboru je zapotÅ™ebà %s volného mÃsta, ale k dispozici je " "jen %s. Zvolte prosÃm jiné umÃstÄ›nÃ." -#: ../libempathy-gtk/empathy-ui-utils.c:1302 +#: ../libempathy-gtk/empathy-ui-utils.c:1330 #, c-format msgid "Incoming file from %s" msgstr "PÅ™Ãchozà soubor od %s" -#: ../libempathy-gtk/empathy-user-info.c:384 +#: ../libempathy-gtk/empathy-user-info.c:395 msgid "Go online to edit your personal information." msgstr "PÅ™ipojte se, abyste mohli upravovat své osobnà údaje." -#: ../libempathy-gtk/empathy-user-info.c:464 +#: ../libempathy-gtk/empathy-user-info.c:475 msgid "<b>Personal Details</b>" msgstr "<b>Osobnà údaje</b>" @@ -2819,197 +2820,197 @@ msgstr "_OtevÅ™Ãt odkaz" msgid "Inspect HTML" msgstr "Prozkoumat HTML" -#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +#: ../libempathy-gtk/totem-subtitle-encoding.c:157 msgid "Current Locale" msgstr "Aktuálnà národnà prostÅ™edÃ" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:160 +#: ../libempathy-gtk/totem-subtitle-encoding.c:162 +#: ../libempathy-gtk/totem-subtitle-encoding.c:164 +#: ../libempathy-gtk/totem-subtitle-encoding.c:166 msgid "Arabic" msgstr "arabské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +#: ../libempathy-gtk/totem-subtitle-encoding.c:169 msgid "Armenian" msgstr "arménské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:173 -#: ../libempathy-gtk/totem-subtitle-encoding.c:175 -#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +#: ../libempathy-gtk/totem-subtitle-encoding.c:172 +#: ../libempathy-gtk/totem-subtitle-encoding.c:174 +#: ../libempathy-gtk/totem-subtitle-encoding.c:176 msgid "Baltic" msgstr "baltské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +#: ../libempathy-gtk/totem-subtitle-encoding.c:179 msgid "Celtic" msgstr "keltské" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:182 +#: ../libempathy-gtk/totem-subtitle-encoding.c:184 +#: ../libempathy-gtk/totem-subtitle-encoding.c:186 +#: ../libempathy-gtk/totem-subtitle-encoding.c:188 msgid "Central European" msgstr "stÅ™edoevropské" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:191 +#: ../libempathy-gtk/totem-subtitle-encoding.c:193 +#: ../libempathy-gtk/totem-subtitle-encoding.c:195 +#: ../libempathy-gtk/totem-subtitle-encoding.c:197 msgid "Chinese Simplified" msgstr "ÄÃnské – zjednoduÅ¡ené" -#: ../libempathy-gtk/totem-subtitle-encoding.c:201 -#: ../libempathy-gtk/totem-subtitle-encoding.c:203 -#: ../libempathy-gtk/totem-subtitle-encoding.c:205 +#: ../libempathy-gtk/totem-subtitle-encoding.c:200 +#: ../libempathy-gtk/totem-subtitle-encoding.c:202 +#: ../libempathy-gtk/totem-subtitle-encoding.c:204 msgid "Chinese Traditional" msgstr "ÄÃnské – tradiÄnÃ" -#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +#: ../libempathy-gtk/totem-subtitle-encoding.c:207 msgid "Croatian" msgstr "chorvatské" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:210 +#: ../libempathy-gtk/totem-subtitle-encoding.c:212 +#: ../libempathy-gtk/totem-subtitle-encoding.c:214 +#: ../libempathy-gtk/totem-subtitle-encoding.c:216 +#: ../libempathy-gtk/totem-subtitle-encoding.c:218 +#: ../libempathy-gtk/totem-subtitle-encoding.c:220 msgid "Cyrillic" msgstr "cyrilice" -#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +#: ../libempathy-gtk/totem-subtitle-encoding.c:223 msgid "Cyrillic/Russian" msgstr "cyrilice – ruská" -#: ../libempathy-gtk/totem-subtitle-encoding.c:227 -#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +#: ../libempathy-gtk/totem-subtitle-encoding.c:226 +#: ../libempathy-gtk/totem-subtitle-encoding.c:228 msgid "Cyrillic/Ukrainian" msgstr "cyrilice – ukrajinská" -#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +#: ../libempathy-gtk/totem-subtitle-encoding.c:231 msgid "Georgian" msgstr "gruzÃnské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:235 -#: ../libempathy-gtk/totem-subtitle-encoding.c:237 -#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +#: ../libempathy-gtk/totem-subtitle-encoding.c:234 +#: ../libempathy-gtk/totem-subtitle-encoding.c:236 +#: ../libempathy-gtk/totem-subtitle-encoding.c:238 msgid "Greek" msgstr "Å™ecké" -#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +#: ../libempathy-gtk/totem-subtitle-encoding.c:241 msgid "Gujarati" msgstr "gudžarátské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +#: ../libempathy-gtk/totem-subtitle-encoding.c:244 msgid "Gurmukhi" msgstr "gurmuchské" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:247 +#: ../libempathy-gtk/totem-subtitle-encoding.c:249 +#: ../libempathy-gtk/totem-subtitle-encoding.c:251 +#: ../libempathy-gtk/totem-subtitle-encoding.c:253 msgid "Hebrew" msgstr "hebrejské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +#: ../libempathy-gtk/totem-subtitle-encoding.c:256 msgid "Hebrew Visual" msgstr "hebrejské – vizuálnÃ" -#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +#: ../libempathy-gtk/totem-subtitle-encoding.c:259 msgid "Hindi" msgstr "hindské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +#: ../libempathy-gtk/totem-subtitle-encoding.c:262 msgid "Icelandic" msgstr "islandské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:266 -#: ../libempathy-gtk/totem-subtitle-encoding.c:268 -#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +#: ../libempathy-gtk/totem-subtitle-encoding.c:265 +#: ../libempathy-gtk/totem-subtitle-encoding.c:267 +#: ../libempathy-gtk/totem-subtitle-encoding.c:269 msgid "Japanese" msgstr "japonské" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:272 +#: ../libempathy-gtk/totem-subtitle-encoding.c:274 +#: ../libempathy-gtk/totem-subtitle-encoding.c:276 +#: ../libempathy-gtk/totem-subtitle-encoding.c:278 msgid "Korean" msgstr "korejské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +#: ../libempathy-gtk/totem-subtitle-encoding.c:281 msgid "Nordic" msgstr "skandinávské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +#: ../libempathy-gtk/totem-subtitle-encoding.c:284 msgid "Persian" msgstr "perské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:288 -#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +#: ../libempathy-gtk/totem-subtitle-encoding.c:287 +#: ../libempathy-gtk/totem-subtitle-encoding.c:289 msgid "Romanian" msgstr "rumunské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +#: ../libempathy-gtk/totem-subtitle-encoding.c:292 msgid "South European" msgstr "jihoevropské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +#: ../libempathy-gtk/totem-subtitle-encoding.c:295 msgid "Thai" msgstr "thajské" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:298 +#: ../libempathy-gtk/totem-subtitle-encoding.c:300 +#: ../libempathy-gtk/totem-subtitle-encoding.c:302 +#: ../libempathy-gtk/totem-subtitle-encoding.c:304 msgid "Turkish" msgstr "turecké" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:307 +#: ../libempathy-gtk/totem-subtitle-encoding.c:309 +#: ../libempathy-gtk/totem-subtitle-encoding.c:311 +#: ../libempathy-gtk/totem-subtitle-encoding.c:313 +#: ../libempathy-gtk/totem-subtitle-encoding.c:315 msgid "Unicode" msgstr "Unicode" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:318 +#: ../libempathy-gtk/totem-subtitle-encoding.c:320 +#: ../libempathy-gtk/totem-subtitle-encoding.c:322 +#: ../libempathy-gtk/totem-subtitle-encoding.c:324 +#: ../libempathy-gtk/totem-subtitle-encoding.c:326 msgid "Western" msgstr "západnÃ" -#: ../libempathy-gtk/totem-subtitle-encoding.c:330 -#: ../libempathy-gtk/totem-subtitle-encoding.c:332 -#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +#: ../libempathy-gtk/totem-subtitle-encoding.c:329 +#: ../libempathy-gtk/totem-subtitle-encoding.c:331 +#: ../libempathy-gtk/totem-subtitle-encoding.c:333 msgid "Vietnamese" msgstr "vietnamské" -#: ../libempathy-gtk/empathy-roster-model.h:29 +#: ../libempathy-gtk/empathy-roster-model.h:27 msgid "Top Contacts" msgstr "NejdůležitÄ›jÅ¡Ã kontakty" -#: ../libempathy-gtk/empathy-roster-model.h:31 +#: ../libempathy-gtk/empathy-roster-model.h:29 msgid "Ungrouped" msgstr "Neseskupeno" #. Add a prefix explaining that something goes wrong when trying to #. * fetch contact's presence. -#: ../libempathy-gtk/empathy-roster-contact.c:205 +#: ../libempathy-gtk/empathy-roster-contact.c:201 #, c-format msgid "Server cannot find contact: %s" msgstr "Server nemůže nalézt kontakt: %s" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223 msgid "No error message" msgstr "Nenà dostupné chybové hlášenÃ" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296 msgid "Instant Message (Empathy)" msgstr "Rychlá zpráva (Empathy)" -#: ../src/empathy-about-dialog.c:81 +#: ../src/empathy-about-dialog.c:77 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 " @@ -3020,7 +3021,7 @@ msgstr "" "ustanovenà GNU General Public License vydané Free Software Foundation; buÄ " "verze 2 této licence nebo (dle vlastnÃho uváženÃ) kterékoliv pozdÄ›jÅ¡Ã verze." -#: ../src/empathy-about-dialog.c:85 +#: ../src/empathy-about-dialog.c:81 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 " @@ -3031,7 +3032,7 @@ msgstr "" "neposkytujà se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO URÄŒITà " "ÚČEL. DalÅ¡Ã podrobnosti hledejte v GNU General Public License." -#: ../src/empathy-about-dialog.c:89 +#: ../src/empathy-about-dialog.c:85 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 " @@ -3041,11 +3042,11 @@ msgstr "" "Empathy; pokud se tak nestalo, napiÅ¡te si o ni Free Software Foundation, " "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:109 +#: ../src/empathy-about-dialog.c:105 msgid "An Instant Messaging client for GNOME" msgstr "Klient rychlého zasÃlánà zpráv pro pracovnà prostÅ™edà GNOME" -#: ../src/empathy-about-dialog.c:115 +#: ../src/empathy-about-dialog.c:111 msgid "translator-credits" msgstr "" "Miloslav TrmaÄ <mitr@volny.cz>\n" @@ -3058,71 +3059,71 @@ msgstr "" "Jiri Eischmann <jiri@eischmann.cz>\n" "Marek ÄŒernocký <marek@manet.cz>" -#: ../src/empathy-accounts.c:182 +#: ../src/empathy-accounts.c:171 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "" "Nezobrazovat žádné dialogy; jednoduÅ¡e provést úlohu (napÅ™. import) a skonÄit" -#: ../src/empathy-accounts.c:186 +#: ../src/empathy-accounts.c:175 msgid "" "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "" "Nezobrazovat žádná dialogová okna, existujÃ-li úÄty jiného typu než „Lidé v " "okolÓ" -#: ../src/empathy-accounts.c:190 +#: ../src/empathy-accounts.c:179 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "Ze zaÄátku vybrat zadaný úÄet (napÅ™. gabble/jabber/foo_40example_2eorg0)" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:181 msgid "<account-id>" msgstr "<ID úÄtu>" -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:186 msgid "- Empathy Accounts" msgstr "– ÚÄty Empathy" -#: ../src/empathy-accounts.c:240 +#: ../src/empathy-accounts.c:239 msgid "Empathy Accounts" msgstr "ÚÄty Empathy" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:52 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "V úÄtu %s máte neuložené zmÄ›ny." #. 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:72 +#: ../src/empathy-accounts-dialog.c:56 msgid "Your new account has not been saved yet." msgstr "Váš nový úÄet jeÅ¡tÄ› nenà uložen." -#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279 +#: ../src/empathy-accounts-dialog.c:388 ../src/empathy-call-window.c:1258 msgid "Connecting…" msgstr "ProbÃhá pÅ™ipojovánÃ…" -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:429 #, c-format msgid "Offline — %s" msgstr "Odpojen — %s" -#: ../src/empathy-accounts-dialog.c:457 +#: ../src/empathy-accounts-dialog.c:441 #, c-format msgid "Disconnected — %s" msgstr "Odpojen — %s" -#: ../src/empathy-accounts-dialog.c:468 +#: ../src/empathy-accounts-dialog.c:452 msgid "Offline — No Network Connection" msgstr "Offline — Nenà k dispozici sÃÅ¥" -#: ../src/empathy-accounts-dialog.c:475 +#: ../src/empathy-accounts-dialog.c:459 msgid "Unknown Status" msgstr "Neznámý stav" -#: ../src/empathy-accounts-dialog.c:492 +#: ../src/empathy-accounts-dialog.c:476 msgid "" "This account has been disabled because it relies on an old, unsupported " "backend. Please install telepathy-haze and restart your session to migrate " @@ -3132,28 +3133,28 @@ msgstr "" "Äásti. Nainstalujte prosÃm telepathy-haze a restartujte své sezenÃ, úÄet se " "pÅ™evede." -#: ../src/empathy-accounts-dialog.c:502 +#: ../src/empathy-accounts-dialog.c:486 msgid "Offline — Account Disabled" msgstr "Offline — ÚÄet zakázán" -#: ../src/empathy-accounts-dialog.c:608 +#: ../src/empathy-accounts-dialog.c:592 msgid "Edit Connection Parameters" msgstr "Úprava parametrů pÅ™ipojenÃ" -#: ../src/empathy-accounts-dialog.c:735 +#: ../src/empathy-accounts-dialog.c:719 msgid "_Edit Connection Parameters..." msgstr "Upravit param_etry pÅ™ipojenÃ…" -#: ../src/empathy-accounts-dialog.c:1268 +#: ../src/empathy-accounts-dialog.c:1252 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Opravdu chcete odstranit z vaÅ¡eho poÄÃtaÄe „%s“?" -#: ../src/empathy-accounts-dialog.c:1272 +#: ../src/empathy-accounts-dialog.c:1256 msgid "This will not remove your account on the server." msgstr "Toto neodstranà váš úÄet na serveru." -#: ../src/empathy-accounts-dialog.c:1477 +#: ../src/empathy-accounts-dialog.c:1461 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3162,24 +3163,24 @@ msgstr "" "provedené zmÄ›ny. Jste si jisti, že chcete pokraÄovat?" #. Menu item: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1668 +#: ../src/empathy-accounts-dialog.c:1652 msgid "_Enabled" msgstr "_Povolit" #. Menu item: Rename -#: ../src/empathy-accounts-dialog.c:1691 +#: ../src/empathy-accounts-dialog.c:1675 msgid "Rename" msgstr "PÅ™ejmenovat" -#: ../src/empathy-accounts-dialog.c:2107 +#: ../src/empathy-accounts-dialog.c:2091 msgid "_Skip" msgstr "PÅ™e_skoÄit" -#: ../src/empathy-accounts-dialog.c:2111 +#: ../src/empathy-accounts-dialog.c:2095 msgid "_Connect" msgstr "_PÅ™ipojit" -#: ../src/empathy-accounts-dialog.c:2290 +#: ../src/empathy-accounts-dialog.c:2274 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3188,7 +3189,7 @@ msgstr "" "provedené zmÄ›ny. Jste si jisti, že chcete pokraÄovat?" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:2433 +#: ../src/empathy-accounts-dialog.c:2417 msgid "Messaging and VoIP Accounts" msgstr "ÚÄty IM a VoIP" @@ -3212,31 +3213,31 @@ msgstr "" msgid "No protocol backends installed" msgstr "Pro tento protokol nenà nainstalována žádná výkonná Äást" -#: ../src/empathy-auth-client.c:296 +#: ../src/empathy-auth-client.c:285 msgid " - Empathy authentication client" msgstr "– klient Empathy pro ověřenà totožnosti" -#: ../src/empathy-auth-client.c:312 +#: ../src/empathy-auth-client.c:301 msgid "Empathy authentication client" msgstr "Klient Empathy pro ověřenà totožnosti" -#: ../src/empathy.c:427 +#: ../src/empathy.c:407 msgid "Don't connect on startup" msgstr "NepÅ™ipojovat se po spuÅ¡tÄ›nÃ" -#: ../src/empathy.c:431 +#: ../src/empathy.c:411 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Nezobrazovat seznam kontaktů nebo žádné jiné dialogy po spuÅ¡tÄ›nÃ" -#: ../src/empathy.c:447 +#: ../src/empathy.c:440 msgid "- Empathy IM Client" msgstr "– komunikátor Empathy" -#: ../src/empathy.c:623 +#: ../src/empathy.c:626 msgid "Error contacting the Account Manager" msgstr "Chyba pÅ™i kontaktovánà správce úÄtu" -#: ../src/empathy.c:625 +#: ../src/empathy.c:628 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3249,105 +3250,105 @@ msgstr "" "\n" "%s" -#: ../src/empathy-call.c:124 +#: ../src/empathy-call.c:115 msgid "In a call" msgstr "ProbÃhá hovor" -#: ../src/empathy-call.c:224 +#: ../src/empathy-call.c:215 msgid "- Empathy Audio/Video Client" msgstr "– audio/videoklient Empathy" -#: ../src/empathy-call.c:248 +#: ../src/empathy-call.c:239 msgid "Empathy Audio/Video Client" msgstr "Audio/videoklient Empathy" -#: ../src/empathy-call-observer.c:119 +#: ../src/empathy-call-observer.c:110 #, c-format msgid "%s just tried to call you, but you were in another call." msgstr "%s vám právÄ› zkouÅ¡Ã volat, ale vy máte jiný hovor." -#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508 +#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500 msgid "Incoming call" msgstr "PÅ™Ãchozà hovor" -#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming video call from %s" msgstr "PÅ™Ãchozà videohovor od %s" -#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516 -#: ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming call from %s" msgstr "PÅ™Ãchozà hovor od %s" -#: ../src/empathy-call-window.c:1564 -#: ../src/empathy-notifications-approver.c:197 +#: ../src/empathy-call-window.c:1543 +#: ../src/empathy-notifications-approver.c:191 msgid "Reject" msgstr "OdmÃtnout" -#: ../src/empathy-call-window.c:1565 -#: ../src/empathy-notifications-approver.c:202 -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-call-window.c:1544 +#: ../src/empathy-notifications-approver.c:196 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer" msgstr "Zvednout" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:1934 +#: ../src/empathy-call-window.c:1913 #, c-format msgid "Call with %s" msgstr "Hovor s %s" -#: ../src/empathy-call-window.c:2186 +#: ../src/empathy-call-window.c:2165 msgid "The IP address as seen by the machine" msgstr "Adresa IP, jak ji vidà poÄÃtaÄ" -#: ../src/empathy-call-window.c:2188 +#: ../src/empathy-call-window.c:2167 msgid "The IP address as seen by a server on the Internet" msgstr "Adresa IP, jak ji vidà server v Internetu" -#: ../src/empathy-call-window.c:2190 +#: ../src/empathy-call-window.c:2169 msgid "The IP address of the peer as seen by the other side" msgstr "Adresa IP vzájemného spojenÃ, jak ji vidà druhá strana" -#: ../src/empathy-call-window.c:2192 +#: ../src/empathy-call-window.c:2171 msgid "The IP address of a relay server" msgstr "Adresa IP pÅ™enosového serveru" -#: ../src/empathy-call-window.c:2194 +#: ../src/empathy-call-window.c:2173 msgid "The IP address of the multicast group" msgstr "Adresa IP vysÃlacà skupiny" -#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606 -#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608 +#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585 +#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587 #: ../src/empathy-call-window.ui.h:28 msgid "Unknown" msgstr "Neznámo" -#: ../src/empathy-call-window.c:2966 +#: ../src/empathy-call-window.c:2946 msgid "On hold" msgstr "ÄŒeká na lince" -#: ../src/empathy-call-window.c:2970 +#: ../src/empathy-call-window.c:2950 msgid "Mute" msgstr "ZtiÅ¡it" -#: ../src/empathy-call-window.c:2972 +#: ../src/empathy-call-window.c:2952 msgid "Duration" msgstr "Doba" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2975 +#: ../src/empathy-call-window.c:2955 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:3071 +#: ../src/empathy-call-window.c:3051 msgid "Technical Details" msgstr "Technické podrobnosti" -#: ../src/empathy-call-window.c:3110 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3356,7 +3357,7 @@ msgstr "" "Software použÃvaný kontaktem „%s“ nerozumà žádnému z formátů zvuku, který je " "podporován na vaÅ¡em poÄÃtaÄi" -#: ../src/empathy-call-window.c:3115 +#: ../src/empathy-call-window.c:3095 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3365,7 +3366,7 @@ msgstr "" "Software použÃvaný kontaktem „%s“ nerozumà žádnému z formátů videa, který je " "podporován na vaÅ¡em poÄÃtaÄi" -#: ../src/empathy-call-window.c:3121 +#: ../src/empathy-call-window.c:3101 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3374,25 +3375,25 @@ msgstr "" "Nelze navázat spojenà s %s. NÄ›kdo z vás nenà nejspÃÅ¡ v sÃti, která podporuje " "pÅ™Ãmá spojenÃ." -#: ../src/empathy-call-window.c:3127 +#: ../src/empathy-call-window.c:3107 msgid "There was a failure on the network" msgstr "NÄ›kde na sÃti doÅ¡lo k selhánÃ" -#: ../src/empathy-call-window.c:3131 +#: ../src/empathy-call-window.c:3111 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "Nemáte nainstalovánu podporu žádného z formátů zvuku potÅ™ebného pro tento " "hovor" -#: ../src/empathy-call-window.c:3134 +#: ../src/empathy-call-window.c:3114 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Nemáte nainstalovánu podporu žádného z formátů videa potÅ™ebného pro tento " "hovor" -#: ../src/empathy-call-window.c:3146 +#: ../src/empathy-call-window.c:3126 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3403,32 +3404,32 @@ msgstr "" "prosÃm tuto chybu</a> a pÅ™iložte chybové zprávy zÃskané z odlaÄovacÃho okna " "v nabÃdce „NápovÄ›da“." -#: ../src/empathy-call-window.c:3155 +#: ../src/empathy-call-window.c:3135 msgid "There was a failure in the call engine" msgstr "Selhala funkce pro volánÃ" -#: ../src/empathy-call-window.c:3158 +#: ../src/empathy-call-window.c:3138 msgid "The end of the stream was reached" msgstr "Byl dosažen konec proudu" -#: ../src/empathy-call-window.c:3198 +#: ../src/empathy-call-window.c:3178 msgid "Can't establish audio stream" msgstr "Nelze navázat spojenà pro pÅ™enos zvuku" -#: ../src/empathy-call-window.c:3208 +#: ../src/empathy-call-window.c:3188 msgid "Can't establish video stream" msgstr "Nelze navázat spojenà pro pÅ™enos obrazu" -#: ../src/empathy-call-window.c:3245 +#: ../src/empathy-call-window.c:3225 #, c-format msgid "Your current balance is %s." msgstr "Váš aktuálnà zůstatek je %s." -#: ../src/empathy-call-window.c:3249 +#: ../src/empathy-call-window.c:3229 msgid "Sorry, you don’t have enough credit for that call." msgstr "Pro toto volánà nemáte bohužel dostateÄný kredit." -#: ../src/empathy-call-window.c:3251 +#: ../src/empathy-call-window.c:3231 msgid "Top Up" msgstr "Dobità kreditu" @@ -3544,19 +3545,19 @@ msgstr "MÃstnà úÄastnÃk:" msgid "Audio" msgstr "Zvuk" -#: ../src/empathy-chat.c:102 +#: ../src/empathy-chat.c:101 msgid "- Empathy Chat Client" msgstr "– komunikaÄnà klient Empathy" -#: ../src/empathy-chatrooms-window.c:251 +#: ../src/empathy-chatrooms-window.c:243 msgid "Name" msgstr "Jméno" -#: ../src/empathy-chatrooms-window.c:269 +#: ../src/empathy-chatrooms-window.c:261 msgid "Room" msgstr "MÃstnost" -#: ../src/empathy-chatrooms-window.c:277 +#: ../src/empathy-chatrooms-window.c:269 msgid "Auto-Connect" msgstr "Automaticky pÅ™ipojit" @@ -3564,11 +3565,11 @@ msgstr "Automaticky pÅ™ipojit" msgid "Manage Favorite Rooms" msgstr "Spravovat oblÃbené mÃstnosti" -#: ../src/empathy-chat-window.c:287 +#: ../src/empathy-chat-window.c:275 msgid "Close this window?" msgstr "ZavÅ™Ãt toto okno?" -#: ../src/empathy-chat-window.c:293 +#: ../src/empathy-chat-window.c:281 #, c-format msgid "" "Closing this window will leave %s. You will not receive any further messages " @@ -3577,7 +3578,7 @@ msgstr "" "ZavÅ™enÃm tohoto okna opustÃte „%s“. Nebudete již pÅ™ijÃmat žádné nové zprávy, " "dokud se znovu nepÅ™ipojÃte." -#: ../src/empathy-chat-window.c:306 +#: ../src/empathy-chat-window.c:294 #, c-format msgid "" "Closing this window will leave a chat room. You will not receive any further " @@ -3595,12 +3596,12 @@ msgstr[2] "" "ZavÅ™enÃm tohoto okna opustÃte %u diskuznÃch mÃstnostÃ. Nebudete již pÅ™ijÃmat " "žádné nové zprávy, dokud se znovu nepÅ™ipojÃte." -#: ../src/empathy-chat-window.c:317 +#: ../src/empathy-chat-window.c:305 #, c-format msgid "Leave %s?" msgstr "Opustit mÃstnost %s?" -#: ../src/empathy-chat-window.c:319 +#: ../src/empathy-chat-window.c:307 msgid "" "You will not receive any further messages from this chat room until you " "rejoin it." @@ -3608,15 +3609,15 @@ msgstr "" "Nebudete již pÅ™ijÃmat žádné nové zprávy z této diskuznà mÃstnosti, dokud se " "znovu nepÅ™ipojÃte." -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Close window" msgstr "ZavÅ™Ãt okno" -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Leave room" msgstr "Opustit mÃstnost" -#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700 +#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -3624,7 +3625,7 @@ msgstr[0] "%s (%d nepÅ™eÄtena)" msgstr[1] "%s (%d nepÅ™eÄtené)" msgstr[2] "%s (%d nepÅ™eÄtených)" -#: ../src/empathy-chat-window.c:692 +#: ../src/empathy-chat-window.c:680 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -3632,7 +3633,7 @@ msgstr[0] "%s (a %u dalÅ¡Ã)" msgstr[1] "%s (a %u dalÅ¡Ã)" msgstr[2] "%s (a %u dalÅ¡Ãch)" -#: ../src/empathy-chat-window.c:708 +#: ../src/empathy-chat-window.c:696 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -3640,7 +3641,7 @@ msgstr[0] "%s (%d nepÅ™eÄtená od ostatnÃch)" msgstr[1] "%s (%d nepÅ™eÄtené od ostatnÃch)" msgstr[2] "%s (%d nepÅ™eÄtených od ostatnÃch)" -#: ../src/empathy-chat-window.c:717 +#: ../src/empathy-chat-window.c:705 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -3648,11 +3649,11 @@ msgstr[0] "%s (%d nepÅ™eÄtená ode vÅ¡ech)" msgstr[1] "%s (%d nepÅ™eÄtené ode vÅ¡ech)" msgstr[2] "%s (%d nepÅ™eÄtených ode vÅ¡ech)" -#: ../src/empathy-chat-window.c:954 +#: ../src/empathy-chat-window.c:942 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:962 +#: ../src/empathy-chat-window.c:950 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3660,7 +3661,7 @@ msgstr[0] "OdesÃlá se zpráva" msgstr[1] "OdesÃlajà se %d zprávy" msgstr[2] "OdesÃlá se %d zpráv" -#: ../src/empathy-chat-window.c:982 +#: ../src/empathy-chat-window.c:970 msgid "Typing a message." msgstr "PÃÅ¡e zprávu." @@ -3724,76 +3725,76 @@ msgstr "Posunout kartu do_prava" msgid "_Detach Tab" msgstr "_OddÄ›lit kartu" -#: ../src/empathy-debugger.c:69 +#: ../src/empathy-debugger.c:77 msgid "Show a particular service" msgstr "Zobrazit konkrétnà službu" -#: ../src/empathy-debugger.c:74 +#: ../src/empathy-debugger.c:82 msgid "- Empathy Debugger" msgstr "– LadÄ›nà Empathy" -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:142 msgid "Empathy Debugger" msgstr "LadÄ›nà Empathy" -#: ../src/empathy-debug-window.c:1599 +#: ../src/empathy-debug-window.c:1588 msgid "Save" msgstr "Uložit" -#: ../src/empathy-debug-window.c:1659 +#: ../src/empathy-debug-window.c:1648 msgid "Pastebin link" msgstr "Odkaz na Pastebin" -#: ../src/empathy-debug-window.c:1668 +#: ../src/empathy-debug-window.c:1657 msgid "Pastebin response" msgstr "OdpovÄ›Ä z Pastebin" -#: ../src/empathy-debug-window.c:1675 +#: ../src/empathy-debug-window.c:1664 msgid "Data too large for a single paste. Please save logs to file." msgstr "" "Data jsou pÅ™ÃliÅ¡ rozsáhlá na jediné vloženÃ. Uložte prosÃm záznam do souboru." -#: ../src/empathy-debug-window.c:1857 +#: ../src/empathy-debug-window.c:1846 msgid "Debug Window" msgstr "LadÃcà okno" -#: ../src/empathy-debug-window.c:1917 +#: ../src/empathy-debug-window.c:1906 msgid "Send to pastebin" msgstr "Odeslat na Pastebin" -#: ../src/empathy-debug-window.c:1961 +#: ../src/empathy-debug-window.c:1950 msgid "Pause" msgstr "Pozastavit" -#: ../src/empathy-debug-window.c:1973 +#: ../src/empathy-debug-window.c:1962 msgid "Level " msgstr "Úroveň " -#: ../src/empathy-debug-window.c:1992 +#: ../src/empathy-debug-window.c:1981 msgid "Debug" msgstr "LadÄ›nÃ" -#: ../src/empathy-debug-window.c:1997 +#: ../src/empathy-debug-window.c:1986 msgid "Info" msgstr "Informace" -#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077 +#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066 msgid "Message" msgstr "Zpráva" -#: ../src/empathy-debug-window.c:2007 +#: ../src/empathy-debug-window.c:1996 msgid "Warning" msgstr "VarovánÃ" -#: ../src/empathy-debug-window.c:2012 +#: ../src/empathy-debug-window.c:2001 msgid "Critical" msgstr "Kritické" -#: ../src/empathy-debug-window.c:2017 +#: ../src/empathy-debug-window.c:2006 msgid "Error" msgstr "Chyba" -#: ../src/empathy-debug-window.c:2030 +#: ../src/empathy-debug-window.c:2019 msgid "" "Even if they don't display passwords, logs can contain sensitive information " "such as your list of contacts or the messages you recently sent or " @@ -3810,92 +3811,92 @@ msgstr "" "pokroÄilých polà pÅ™i podávánà <a href=\"https://bugzilla.gnome.org/enter_bug." "cgi?product=empathy\">hlášenà o chybÄ›</a>." -#: ../src/empathy-debug-window.c:2062 +#: ../src/empathy-debug-window.c:2051 msgid "Time" msgstr "ÄŒas" -#: ../src/empathy-debug-window.c:2065 +#: ../src/empathy-debug-window.c:2054 msgid "Domain" msgstr "Doména" -#: ../src/empathy-debug-window.c:2068 +#: ../src/empathy-debug-window.c:2057 msgid "Category" msgstr "Kategorie" -#: ../src/empathy-debug-window.c:2071 +#: ../src/empathy-debug-window.c:2060 msgid "Level" msgstr "Úroveň" -#: ../src/empathy-debug-window.c:2100 +#: ../src/empathy-debug-window.c:2089 msgid "" "The selected connection manager does not support the remote debugging " "extension." msgstr "Vybraný správce pÅ™ipojenà nepodporuje rozÅ¡ÃÅ™enà pro vzdálené ladÄ›nÃ." -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:500 msgid "Incoming video call" msgstr "PÅ™Ãchozà videohovor" -#: ../src/empathy-event-manager.c:512 +#: ../src/empathy-event-manager.c:504 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "Volá vám %s, chcete to zvednout?" -#: ../src/empathy-event-manager.c:513 +#: ../src/empathy-event-manager.c:505 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "Volá vám %s, chcete to zvednout?" -#: ../src/empathy-event-manager.c:541 +#: ../src/empathy-event-manager.c:533 msgid "_Reject" msgstr "O_dmÃtnout" -#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549 msgid "_Answer" msgstr "_Zvednout" -#: ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:549 msgid "_Answer with video" msgstr "_Videohovor" -#: ../src/empathy-event-manager.c:712 +#: ../src/empathy-event-manager.c:704 msgid "Room invitation" msgstr "Pozvánà do mÃstnosti" -#: ../src/empathy-event-manager.c:714 +#: ../src/empathy-event-manager.c:706 #, c-format msgid "Invitation to join %s" msgstr "Pozvánka na pÅ™ipojenà %s" -#: ../src/empathy-event-manager.c:721 +#: ../src/empathy-event-manager.c:713 #, c-format msgid "%s is inviting you to join %s" msgstr "%s vás zve do %s" -#: ../src/empathy-event-manager.c:734 +#: ../src/empathy-event-manager.c:726 msgid "_Join" msgstr "PÅ™ipo_jit" -#: ../src/empathy-event-manager.c:760 +#: ../src/empathy-event-manager.c:752 #, c-format msgid "%s invited you to join %s" msgstr "%s vás pozval do %s" -#: ../src/empathy-event-manager.c:766 +#: ../src/empathy-event-manager.c:758 #, c-format msgid "You have been invited to join %s" msgstr "Byli jste pozváni do %s" -#: ../src/empathy-event-manager.c:945 +#: ../src/empathy-event-manager.c:937 #, c-format msgid "Incoming file transfer from %s" msgstr "PÅ™Ãchozà pÅ™enos souboru od %s" -#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227 +#: ../src/empathy-event-manager.c:965 ../src/empathy-roster-window.c:212 msgid "Password required" msgstr "Požadováno heslo" -#: ../src/empathy-event-manager.c:1110 +#: ../src/empathy-event-manager.c:1102 #, c-format msgid "" "\n" @@ -3905,105 +3906,105 @@ msgstr "" "Zpráva: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:99 +#: ../src/empathy-ft-manager.c:93 #, 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 +#: ../src/empathy-ft-manager.c:96 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:178 +#: ../src/empathy-ft-manager.c:172 msgctxt "file transfer percent" msgid "Unknown" msgstr "Neznámo" -#: ../src/empathy-ft-manager.c:273 +#: ../src/empathy-ft-manager.c:267 #, c-format msgid "%s of %s at %s/s" msgstr "%s z %s pÅ™i %s/s" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:268 #, c-format msgid "%s of %s" msgstr "%s z %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:305 +#: ../src/empathy-ft-manager.c:299 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Stahovánà „%s“ od %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:308 +#: ../src/empathy-ft-manager.c:302 #, c-format msgid "Sending \"%s\" to %s" msgstr "OdesÃlánà „%s“ kontaktu %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:338 +#: ../src/empathy-ft-manager.c:332 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Nastala chyba pÅ™i stahovánà „%s“ od %s" -#: ../src/empathy-ft-manager.c:341 +#: ../src/empathy-ft-manager.c:335 msgid "Error receiving a file" msgstr "Chyba pÅ™i pÅ™ijÃmánà souboru" -#: ../src/empathy-ft-manager.c:346 +#: ../src/empathy-ft-manager.c:340 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Chyba pÅ™i odesÃlánà „%s“ kontaktu %s" -#: ../src/empathy-ft-manager.c:349 +#: ../src/empathy-ft-manager.c:343 msgid "Error sending a file" msgstr "Chyba pÅ™i odesÃlánà souboru" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:488 +#: ../src/empathy-ft-manager.c:482 #, c-format msgid "\"%s\" received from %s" msgstr "„%s“ obdrženo od kontaktu %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:493 +#: ../src/empathy-ft-manager.c:487 #, c-format msgid "\"%s\" sent to %s" msgstr "„%s“ odeslán kontaktu %s" -#: ../src/empathy-ft-manager.c:496 +#: ../src/empathy-ft-manager.c:490 msgid "File transfer completed" msgstr "PÅ™enos souboru byl dokonÄen" -#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 +#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773 msgid "Waiting for the other participant's response" msgstr "ÄŒeká se na odpovÄ›Ä ostatnÃch úÄastnÃků" -#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 +#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Ověřuje se neporuÅ¡enost „%s“" -#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 +#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676 #, c-format msgid "Hashing \"%s\"" msgstr "Vytvářà se kontrolnà souÄet „%s“" -#: ../src/empathy-ft-manager.c:1025 +#: ../src/empathy-ft-manager.c:1019 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1037 +#: ../src/empathy-ft-manager.c:1031 msgid "File" msgstr "Soubor" -#: ../src/empathy-ft-manager.c:1059 +#: ../src/empathy-ft-manager.c:1053 msgid "Remaining" msgstr "Zbývá" @@ -4015,11 +4016,11 @@ msgstr "PÅ™enosy souborů" msgid "Remove completed, canceled and failed file transfers from the list" msgstr "Odstranit ze seznamu dokonÄené, zruÅ¡ené a nepovedené pÅ™enosy" -#: ../src/empathy-import-dialog.c:76 +#: ../src/empathy-import-dialog.c:70 msgid "_Import" msgstr "_Importovat" -#: ../src/empathy-import-dialog.c:88 +#: ../src/empathy-import-dialog.c:82 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -4027,49 +4028,49 @@ msgstr "" "Nenalezeny žádné úÄty, které by bylo možno importovat. V souÄasnosti " "podporuje aplikace Empathy import úÄtů pouze z klienta Pidgin." -#: ../src/empathy-import-dialog.c:209 +#: ../src/empathy-import-dialog.c:203 msgid "Import Accounts" msgstr "Import úÄtů" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:302 +#: ../src/empathy-import-widget.c:296 msgid "Import" msgstr "Import" -#: ../src/empathy-import-widget.c:311 +#: ../src/empathy-import-widget.c:305 msgid "Protocol" msgstr "Protokol" -#: ../src/empathy-import-widget.c:335 +#: ../src/empathy-import-widget.c:329 msgid "Source" msgstr "Zdroj" -#: ../src/empathy-invite-participant-dialog.c:201 -#: ../src/empathy-invite-participant-dialog.c:229 +#: ../src/empathy-invite-participant-dialog.c:196 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite Participant" msgstr "PÅ™izvat úÄastnÃka" -#: ../src/empathy-invite-participant-dialog.c:202 +#: ../src/empathy-invite-participant-dialog.c:197 msgid "Choose a contact to invite into the conversation:" msgstr "Zvolte kontakt, který chcete pÅ™izvat do konverzace: " -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:220 msgid "Invite" msgstr "Pozvat" -#: ../src/empathy-new-chatroom-dialog.c:194 +#: ../src/empathy-new-chatroom-dialog.c:184 msgid "Chat Room" msgstr "Diskuznà mÃstnost" -#: ../src/empathy-new-chatroom-dialog.c:209 +#: ../src/empathy-new-chatroom-dialog.c:199 msgid "Members" msgstr "ÄŒlenové" -#: ../src/empathy-new-chatroom-dialog.c:410 +#: ../src/empathy-new-chatroom-dialog.c:400 msgid "Failed to list rooms" msgstr "Nepovedlo se zÃskat seznam mÃstnostÃ" -#: ../src/empathy-new-chatroom-dialog.c:439 +#: ../src/empathy-new-chatroom-dialog.c:429 #, c-format msgid "" "%s\n" @@ -4082,17 +4083,17 @@ msgstr "" "Je vyžadováno heslo: %s\n" "ÄŒlenové: %s" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "Yes" msgstr "Ano" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "No" msgstr "Ne" -#: ../src/empathy-new-chatroom-dialog.c:784 +#: ../src/empathy-new-chatroom-dialog.c:774 msgid "Join Room" msgstr "Vstoupit do mÃstnosti" @@ -4135,104 +4136,104 @@ msgstr "Nelze naÄÃst seznam mÃstnostÃ" msgid "Room List" msgstr "Seznam mÃstnostÃ" -#: ../src/empathy-notifications-approver.c:188 +#: ../src/empathy-notifications-approver.c:182 msgid "Respond" msgstr "OdpovÄ›dÄ›t" -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer with video" msgstr "Videohovor" -#: ../src/empathy-notifications-approver.c:215 -#: ../src/empathy-notifications-approver.c:225 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:219 msgid "Decline" msgstr "OdmÃtnout" -#: ../src/empathy-notifications-approver.c:219 -#: ../src/empathy-notifications-approver.c:230 +#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:224 msgid "Accept" msgstr "PÅ™ijmout" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:240 +#: ../src/empathy-notifications-approver.c:234 msgid "Provide" msgstr "Poskytnout" -#: ../src/empathy-preferences.c:143 +#: ../src/empathy-preferences.c:134 msgid "Message received" msgstr "Zpráva pÅ™ijata" -#: ../src/empathy-preferences.c:144 +#: ../src/empathy-preferences.c:135 msgid "Message sent" msgstr "Zpráva odeslána" -#: ../src/empathy-preferences.c:145 +#: ../src/empathy-preferences.c:136 msgid "New conversation" msgstr "Nová konverzace" -#: ../src/empathy-preferences.c:146 +#: ../src/empathy-preferences.c:137 msgid "Contact comes online" msgstr "Kontakt se pÅ™ipojil" -#: ../src/empathy-preferences.c:147 +#: ../src/empathy-preferences.c:138 msgid "Contact goes offline" msgstr "Kontakt se odpojil" -#: ../src/empathy-preferences.c:148 +#: ../src/empathy-preferences.c:139 msgid "Account connected" msgstr "ÚÄet pÅ™ipojen" -#: ../src/empathy-preferences.c:149 +#: ../src/empathy-preferences.c:140 msgid "Account disconnected" msgstr "ÚÄet odpojen" -#: ../src/empathy-preferences.c:386 +#: ../src/empathy-preferences.c:377 msgid "Language" msgstr "Jazyk" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:637 +#: ../src/empathy-preferences.c:628 msgid "Juliet" msgstr "Julie" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:644 +#: ../src/empathy-preferences.c:635 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:650 +#: ../src/empathy-preferences.c:641 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Ach Romeo, Romeo! ProÄ jsi Romeo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:654 +#: ../src/empathy-preferences.c:645 msgid "Deny thy father and refuse thy name;" msgstr "Své jméno zapÅ™i, odÅ™ekni se otce," #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:657 +#: ../src/empathy-preferences.c:648 msgid "Or if thou wilt not, be but sworn my love" msgstr "anebo, nechceÅ¡-li, zasvěť se mnÄ›," #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:660 +#: ../src/empathy-preferences.c:651 msgid "And I'll no longer be a Capulet." msgstr "a pÅ™estanu být Kapuletová." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:663 +#: ../src/empathy-preferences.c:654 msgid "Shall I hear more, or shall I speak at this?" msgstr "Mám jeÅ¡tÄ› poslouchat? ÄŒi odpovÃm?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:666 +#: ../src/empathy-preferences.c:657 msgid "Juliet has disconnected" msgstr "Julie se odpojila" -#: ../src/empathy-preferences.c:1032 +#: ../src/empathy-preferences.c:1023 msgid "Preferences" msgstr "NastavenÃ" @@ -4244,7 +4245,7 @@ msgstr "Zobrazovat skupiny" msgid "Show account balances" msgstr "Zobrazovat zůstatek úÄtu" -#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241 +#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2226 msgid "Contact List" msgstr "Seznam kontaktů" @@ -4410,85 +4411,85 @@ msgstr "Varianta:" msgid "Themes" msgstr "Motivy" -#: ../src/empathy-roster-window.c:244 +#: ../src/empathy-roster-window.c:229 msgid "Provide Password" msgstr "Poskytnout heslo" -#: ../src/empathy-roster-window.c:250 +#: ../src/empathy-roster-window.c:235 msgid "Disconnect" msgstr "Odpojit" -#: ../src/empathy-roster-window.c:493 -msgid "You need to setup an account to see contacts here." -msgstr "Abyste zde vidÄ›li kontakty, je nejdÅ™Ãve zapotÅ™ebà nastavit úÄet." +#: ../src/empathy-roster-window.c:478 +msgid "You need to set up an account to see contacts here." +msgstr "Abyste zde vidÄ›li kontakty, je nejdÅ™Ãve potÅ™eba nastavit úÄet." -#: ../src/empathy-roster-window.c:569 +#: ../src/empathy-roster-window.c:554 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" "ÚÄet %s nemůže být bohužel použit, dokud nebude váš software %s aktualizován." -#: ../src/empathy-roster-window.c:670 +#: ../src/empathy-roster-window.c:655 msgid "Windows Live" msgstr "Windows Live" -#: ../src/empathy-roster-window.c:674 +#: ../src/empathy-roster-window.c:659 msgid "Facebook" msgstr "Facebook" #. translators: %s is an account name like 'Facebook' or 'Google Talk' -#: ../src/empathy-roster-window.c:689 +#: ../src/empathy-roster-window.c:674 #, c-format msgid "%s account requires authorisation" msgstr "ÚÄet %s vyžaduje pÅ™ihlášenÃ" -#: ../src/empathy-roster-window.c:700 +#: ../src/empathy-roster-window.c:685 msgid "Online Accounts" msgstr "ÚÄty on-line" -#: ../src/empathy-roster-window.c:747 +#: ../src/empathy-roster-window.c:732 msgid "Update software..." msgstr "Aktualizovat software…" -#: ../src/empathy-roster-window.c:753 +#: ../src/empathy-roster-window.c:738 msgid "Reconnect" msgstr "Znovu pÅ™ipojit" -#: ../src/empathy-roster-window.c:757 +#: ../src/empathy-roster-window.c:742 msgid "Edit Account" msgstr "Upravit úÄet" -#: ../src/empathy-roster-window.c:762 +#: ../src/empathy-roster-window.c:747 msgid "Close" msgstr "ZavÅ™Ãt" -#: ../src/empathy-roster-window.c:904 +#: ../src/empathy-roster-window.c:889 msgid "Top up account" msgstr "DobÃt kredit úÄtu" -#: ../src/empathy-roster-window.c:1590 +#: ../src/empathy-roster-window.c:1575 msgid "You need to enable one of your accounts to see contacts here." msgstr "Abyste zde vidÄ›li kontakty, musÃte povolit nÄ›který ze svých úÄtů." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:1598 +#: ../src/empathy-roster-window.c:1583 #, c-format msgid "You need to enable %s to see contacts here." msgstr "Abyste zde vidÄ›li kontakty, musÃte povolit úÄet %s." -#: ../src/empathy-roster-window.c:1676 +#: ../src/empathy-roster-window.c:1661 msgid "Change your presence to see contacts here" msgstr "Abyste zde vidÄ›li kontakty, musÃte zmÄ›nit svůj stav" -#: ../src/empathy-roster-window.c:1685 +#: ../src/empathy-roster-window.c:1670 msgid "No match found" msgstr "Nic nenalezeno" -#: ../src/empathy-roster-window.c:1692 +#: ../src/empathy-roster-window.c:1677 msgid "You haven't added any contact yet" msgstr "ZatÃm jste nepÅ™idali žádný kontakt" -#: ../src/empathy-roster-window.c:1695 +#: ../src/empathy-roster-window.c:1680 msgid "No online contacts" msgstr "Žádné kontakty na pÅ™Ãjmu" @@ -4585,12 +4586,12 @@ msgstr "Nový _hovor…" msgid "Status" msgstr "Stav" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126 msgid "Done" msgstr "DokonÄit" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214 msgid "Please enter your account details" msgstr "Zadajte prosÃm údaje svého úÄtu" @@ -2,15 +2,15 @@ # Copyright (C) 2003 Free Software Foundation # This file is distributed under the same license as the Gossip package. # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011. -# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012. +# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: empathy.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2012-12-26 11:21+0000\n" -"PO-Revision-Date: 2012-12-26 12:21+0100\n" +"POT-Creation-Date: 2013-06-14 08:26+0000\n" +"PO-Revision-Date: 2013-06-17 17:22+0200\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "Language: \n" @@ -526,261 +526,261 @@ msgstr "" "Indica si Empathy deberÃa reducir la precisión de la ubicación por motivos " "de privacidad." -#: ../libempathy/empathy-ft-handler.c:733 +#: ../libempathy/empathy-ft-handler.c:732 msgid "No reason was specified" msgstr "No se especificó ninguna razón" -#: ../libempathy/empathy-ft-handler.c:736 +#: ../libempathy/empathy-ft-handler.c:735 msgid "The change in state was requested" msgstr "Se requirió un cambio en el estado" -#: ../libempathy/empathy-ft-handler.c:739 +#: ../libempathy/empathy-ft-handler.c:738 msgid "You canceled the file transfer" msgstr "Canceló la transferencia del archivo" -#: ../libempathy/empathy-ft-handler.c:742 +#: ../libempathy/empathy-ft-handler.c:741 msgid "The other participant canceled the file transfer" msgstr "El otro participante canceló la transferencia del archivo" -#: ../libempathy/empathy-ft-handler.c:745 +#: ../libempathy/empathy-ft-handler.c:744 msgid "Error while trying to transfer the file" msgstr "Error la intentar transferir el archivo" -#: ../libempathy/empathy-ft-handler.c:748 +#: ../libempathy/empathy-ft-handler.c:747 msgid "The other participant is unable to transfer the file" msgstr "El otro participante no puede transferir el archivo" -#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:295 msgid "Unknown reason" msgstr "Razón desconocida" -#: ../libempathy/empathy-ft-handler.c:914 +#: ../libempathy/empathy-ft-handler.c:913 msgid "File transfer completed, but the file was corrupted" msgstr "Se completó la transferencia de archivo pero el archivo está corrupto" -#: ../libempathy/empathy-ft-handler.c:1200 +#: ../libempathy/empathy-ft-handler.c:1199 msgid "File transfer not supported by remote contact" msgstr "El contacto remoto no soporta la transferencia de archivos" -#: ../libempathy/empathy-ft-handler.c:1256 +#: ../libempathy/empathy-ft-handler.c:1255 msgid "The selected file is not a regular file" msgstr "El archivo seleccionado no es un archivo regular" -#: ../libempathy/empathy-ft-handler.c:1265 +#: ../libempathy/empathy-ft-handler.c:1264 msgid "The selected file is empty" msgstr "El archivo seleccionado está vacÃo" -#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194 +#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184 msgid "Password not found" msgstr "No se encontró la contraseña" -#: ../libempathy/empathy-keyring.c:594 +#: ../libempathy/empathy-keyring.c:584 #, c-format msgid "IM account password for %s (%s)" msgstr "Contraseña de la cuenta IM para %s (%s)" -#: ../libempathy/empathy-keyring.c:631 +#: ../libempathy/empathy-keyring.c:621 #, c-format msgid "Password for chatroom '%s' on account %s (%s)" msgstr "Contraseña para la sala de chat «%s» en la cuenta %s (%s)" -#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116 +#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107 #, c-format msgid "Missed call from %s" msgstr "Llamada perdida de %s" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:407 +#: ../libempathy/empathy-message.c:406 #, c-format msgid "Called %s" msgstr "Llamó %s" -#: ../libempathy/empathy-message.c:410 +#: ../libempathy/empathy-message.c:409 #, c-format msgid "Call from %s" msgstr "Llamada de %s" -#: ../libempathy/empathy-time.c:90 +#: ../libempathy/empathy-time.c:86 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "hace %d segundo" msgstr[1] "hace %d segundos" -#: ../libempathy/empathy-time.c:96 +#: ../libempathy/empathy-time.c:92 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "hace %d minuto" msgstr[1] "hace %d minutos" -#: ../libempathy/empathy-time.c:102 +#: ../libempathy/empathy-time.c:98 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "hace %d hora" msgstr[1] "hace %d horas" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:104 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "hace %d dÃa" msgstr[1] "hace %d dÃas" -#: ../libempathy/empathy-time.c:114 +#: ../libempathy/empathy-time.c:110 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "hace %d semana" msgstr[1] "hace %d semanas" -#: ../libempathy/empathy-time.c:120 +#: ../libempathy/empathy-time.c:116 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "hace %d mes" msgstr[1] "hace %d meses" -#: ../libempathy/empathy-time.c:142 +#: ../libempathy/empathy-time.c:138 msgid "in the future" msgstr "en el futuro" -#: ../libempathy/empathy-utils.c:226 +#: ../libempathy/empathy-utils.c:215 msgid "Available" msgstr "Disponible" -#: ../libempathy/empathy-utils.c:228 +#: ../libempathy/empathy-utils.c:217 msgid "Busy" msgstr "Ocupado" -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:220 msgid "Away" msgstr "Ausente" -#: ../libempathy/empathy-utils.c:233 +#: ../libempathy/empathy-utils.c:222 msgid "Invisible" msgstr "Invisible" -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:224 msgid "Offline" msgstr "Desconectado" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:238 +#: ../libempathy/empathy-utils.c:227 msgctxt "presence" msgid "Unknown" msgstr "Desconocido" -#: ../libempathy/empathy-utils.c:278 +#: ../libempathy/empathy-utils.c:267 msgid "No reason specified" msgstr "No se especificó ninguna razón" -#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:269 ../libempathy/empathy-utils.c:325 msgid "Status is set to offline" msgstr "El estado se ha establecido a desconectado" -#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316 -#: ../libempathy-gtk/empathy-call-utils.c:47 -#: ../libempathy-gtk/empathy-new-message-dialog.c:80 +#: ../libempathy/empathy-utils.c:271 ../libempathy/empathy-utils.c:305 +#: ../libempathy-gtk/empathy-call-utils.c:41 +#: ../libempathy-gtk/empathy-new-message-dialog.c:70 msgid "Network error" msgstr "Error de red" -#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307 msgid "Authentication failed" msgstr "Falló la autenticación" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309 msgid "Encryption error" msgstr "Error de cifrado" -#: ../libempathy/empathy-utils.c:288 +#: ../libempathy/empathy-utils.c:277 msgid "Name in use" msgstr "Nombre en uso" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311 msgid "Certificate not provided" msgstr "No se proporcionó el certificado" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313 msgid "Certificate untrusted" msgstr "Certificado sin confianza" -#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315 msgid "Certificate expired" msgstr "El certificado ha expirado" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317 msgid "Certificate not activated" msgstr "El certificado no está activado" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:319 msgid "Certificate hostname mismatch" msgstr "El nombre del equipo del certificado no coincide" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:321 msgid "Certificate fingerprint mismatch" msgstr "La huella del certificado no coincide" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:323 msgid "Certificate self-signed" msgstr "Certificado firmado consigo mismo" -#: ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:293 msgid "Certificate error" msgstr "Error del certificado" -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption is not available" msgstr "El cifrado no está disponible" -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate is invalid" msgstr "El certificado no es válido" -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:331 msgid "Connection has been refused" msgstr "Se rechazó la conexión" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:333 msgid "Connection can't be established" msgstr "No se pudo establecer la conexión" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:335 msgid "Connection has been lost" msgstr "Se perdió la conexión" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:337 msgid "This account is already connected to the server" msgstr "Esta cuenta ya está conectada al servidor" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:339 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "" "Se ha reemplazado la conexión por una conexión nueva usando el mismo recurso" -#: ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:342 msgid "The account already exists on the server" msgstr "La cuenta ya existe en el servidor" -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:344 msgid "Server is currently too busy to handle the connection" msgstr "" "Actualmente el servidor está demasiado ocupado para gestionar la conexión" -#: ../libempathy/empathy-utils.c:357 +#: ../libempathy/empathy-utils.c:346 msgid "Certificate has been revoked" msgstr "Se revocó el certificado" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:348 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "El certificado usa un algoritmo de cifrado inseguro o es criptográficamente " "débil" -#: ../libempathy/empathy-utils.c:362 +#: ../libempathy/empathy-utils.c:351 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -789,32 +789,32 @@ msgstr "" "servidor de certificados exceden los lÃmites impuestos por la biblioteca " "cripotográfica" -#: ../libempathy/empathy-utils.c:366 +#: ../libempathy/empathy-utils.c:355 msgid "Your software is too old" msgstr "Su software es demasiado antiguo" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:357 msgid "Internal error" msgstr "Error interno" -#: ../libempathy/empathy-utils.c:497 -#: ../libempathy-gtk/empathy-roster-model.h:30 +#: ../libempathy/empathy-utils.c:486 +#: ../libempathy-gtk/empathy-roster-model.h:28 msgid "People Nearby" msgstr "Gente cerca" -#: ../libempathy/empathy-utils.c:502 +#: ../libempathy/empathy-utils.c:491 msgid "Yahoo! Japan" msgstr "Yahoo Japón" -#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:642 +#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:539 +#: ../libempathy/empathy-utils.c:528 msgid "Facebook Chat" msgstr "Chat de Facebook" -#: ../libempathy-gtk/empathy-account-chooser.c:689 +#: ../libempathy-gtk/empathy-account-chooser.c:684 msgid "All accounts" msgstr "Todas las cuentas" @@ -893,56 +893,56 @@ msgstr "¿Cuál es su contraseña de AIM?" msgid "Remember Password" msgstr "Recordar contraseña" -#: ../libempathy-gtk/empathy-account-widget.c:675 +#: ../libempathy-gtk/empathy-account-widget.c:668 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -#: ../src/empathy-import-widget.c:322 +#: ../src/empathy-import-widget.c:316 msgid "Account" msgstr "Cuenta" -#: ../libempathy-gtk/empathy-account-widget.c:676 +#: ../libempathy-gtk/empathy-account-widget.c:669 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Password" msgstr "Contraseña" -#: ../libempathy-gtk/empathy-account-widget.c:677 +#: ../libempathy-gtk/empathy-account-widget.c:670 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:511 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:498 msgid "Server" msgstr "Servidor" -#: ../libempathy-gtk/empathy-account-widget.c:678 +#: ../libempathy-gtk/empathy-account-widget.c:671 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:532 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:519 msgid "Port" msgstr "Puerto" -#: ../libempathy-gtk/empathy-account-widget.c:762 +#: ../libempathy-gtk/empathy-account-widget.c:755 #, c-format msgid "%s" msgstr "%s" -#: ../libempathy-gtk/empathy-account-widget.c:817 +#: ../libempathy-gtk/empathy-account-widget.c:810 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1429 +#: ../libempathy-gtk/empathy-account-widget.c:1422 msgid "Username:" msgstr "Nombre de usuario:" -#: ../libempathy-gtk/empathy-account-widget.c:1746 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "A_pply" msgstr "_Aplicar" -#: ../libempathy-gtk/empathy-account-widget.c:1775 +#: ../libempathy-gtk/empathy-account-widget.c:1768 msgid "L_og in" msgstr "Iniciar _sesión" -#: ../libempathy-gtk/empathy-account-widget.c:1845 +#: ../libempathy-gtk/empathy-account-widget.c:1838 msgid "This account already exists on the server" msgstr "Esta cuenta ya existe en el servidor" -#: ../libempathy-gtk/empathy-account-widget.c:1849 +#: ../libempathy-gtk/empathy-account-widget.c:1842 msgid "Create a new account on the server" msgstr "Crear una cuenta nueva en el servidor" @@ -951,19 +951,19 @@ msgstr "Crear una cuenta nueva en el servidor" #. * 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:2270 +#: ../libempathy-gtk/empathy-account-widget.c:2255 #, c-format msgid "%1$s on %2$s" msgstr "%1$s en %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2296 +#: ../libempathy-gtk/empathy-account-widget.c:2281 #, c-format msgid "%s Account" msgstr "Cuenta %s" -#: ../libempathy-gtk/empathy-account-widget.c:2300 +#: ../libempathy-gtk/empathy-account-widget.c:2285 msgid "New account" msgstr "Cuenta nueva" @@ -1186,32 +1186,32 @@ msgstr "¿Cuál es su ID de Windows Live?" msgid "What is your Windows Live password?" msgstr "¿Cuál es su contraseña de Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:207 -#: ../libempathy-gtk/empathy-account-widget-sip.c:240 +#: ../libempathy-gtk/empathy-account-widget-sip.c:198 +#: ../libempathy-gtk/empathy-account-widget-sip.c:231 msgid "Auto" msgstr "Auto" -#: ../libempathy-gtk/empathy-account-widget-sip.c:210 +#: ../libempathy-gtk/empathy-account-widget-sip.c:201 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:213 +#: ../libempathy-gtk/empathy-account-widget-sip.c:204 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:216 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 msgid "TLS" msgstr "TLS" -#: ../libempathy-gtk/empathy-account-widget-sip.c:245 +#: ../libempathy-gtk/empathy-account-widget-sip.c:236 msgid "Register" msgstr "Registrador" -#: ../libempathy-gtk/empathy-account-widget-sip.c:250 +#: ../libempathy-gtk/empathy-account-widget-sip.c:241 msgid "Options" msgstr "Opciones" -#: ../libempathy-gtk/empathy-account-widget-sip.c:253 +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 msgid "None" msgstr "Ninguno" @@ -1323,55 +1323,55 @@ msgstr "¿Cuál es su ID de Yahoo!?" msgid "What is your Yahoo! password?" msgstr "¿Cuál es su contraseña de Yahoo!?" -#: ../libempathy-gtk/empathy-avatar-chooser.c:545 -#: ../libempathy-gtk/empathy-avatar-chooser.c:630 +#: ../libempathy-gtk/empathy-avatar-chooser.c:539 +#: ../libempathy-gtk/empathy-avatar-chooser.c:624 msgid "Couldn't convert image" msgstr "No se pudo convertir la imagen" -#: ../libempathy-gtk/empathy-avatar-chooser.c:546 +#: ../libempathy-gtk/empathy-avatar-chooser.c:540 msgid "None of the accepted image formats are supported on your system" msgstr "Su sistema no soporta ninguno de los formatos de imagen aceptados" -#: ../libempathy-gtk/empathy-avatar-chooser.c:906 +#: ../libempathy-gtk/empathy-avatar-chooser.c:900 msgid "Couldn't save picture to file" msgstr "No se pudo guardar la imagen a un archivo" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1030 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1024 msgid "Select Your Avatar Image" msgstr "Seleccione su imagen de avatar" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1038 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1032 msgid "Take a picture..." msgstr "Tomar una imagen…" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1051 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1045 msgid "No Image" msgstr "Sin imagen" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1108 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1102 msgid "Images" msgstr "Imágenes" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1112 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1106 msgid "All Files" msgstr "Todos los archivos" -#: ../libempathy-gtk/empathy-avatar-image.c:322 +#: ../libempathy-gtk/empathy-avatar-image.c:319 msgid "Click to enlarge" msgstr "Pulse para agrandar" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:128 #, c-format msgid "Authentication failed for account <b>%s</b>" msgstr "Falló la autenticación para la cuenta <b>%s</b>" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 -#: ../libempathy-gtk/empathy-chat.c:3724 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:140 +#: ../libempathy-gtk/empathy-chat.c:3844 msgid "Retry" msgstr "Volver a intentarlo" #: ../libempathy-gtk/empathy-base-password-dialog.c:224 -#: ../libempathy-gtk/empathy-password-dialog.c:134 +#: ../libempathy-gtk/empathy-password-dialog.c:132 #, c-format msgid "" "Enter your password for account\n" @@ -1380,72 +1380,72 @@ msgstr "" "Introduzca su contraseña para la cuenta\n" "<b>%s</b>" -#: ../libempathy-gtk/empathy-calendar-button.c:66 +#: ../libempathy-gtk/empathy-calendar-button.c:63 msgid "Select..." msgstr "Seleccionar…" -#: ../libempathy-gtk/empathy-calendar-button.c:154 +#: ../libempathy-gtk/empathy-calendar-button.c:151 msgid "_Select" msgstr "_Seleccionar" -#: ../libempathy-gtk/empathy-call-utils.c:42 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:36 +#: ../libempathy-gtk/empathy-call-utils.c:54 msgid "There was an error starting the call" msgstr "Hubo un error al iniciar la llamada" -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:43 msgid "The specified contact doesn't support calls" msgstr "El contacto especificado no soporta llamadas" -#: ../libempathy-gtk/empathy-call-utils.c:51 +#: ../libempathy-gtk/empathy-call-utils.c:45 msgid "The specified contact is offline" msgstr "El contacto especificado está desconectado" -#: ../libempathy-gtk/empathy-call-utils.c:53 +#: ../libempathy-gtk/empathy-call-utils.c:47 msgid "The specified contact is not valid" msgstr "El contacto especificado no es válido" -#: ../libempathy-gtk/empathy-call-utils.c:55 +#: ../libempathy-gtk/empathy-call-utils.c:49 msgid "Emergency calls are not supported on this protocol" msgstr "Este protocolo no soporta llamadas de emergencia" -#: ../libempathy-gtk/empathy-call-utils.c:57 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "You don't have enough credit in order to place this call" msgstr "No tiene crédito suficiente para hacer esta llamada" -#: ../libempathy-gtk/empathy-chat.c:727 +#: ../libempathy-gtk/empathy-chat.c:731 msgid "Failed to open private chat" msgstr "Falló al abrir el chat privado" -#: ../libempathy-gtk/empathy-chat.c:785 +#: ../libempathy-gtk/empathy-chat.c:789 msgid "Topic not supported on this conversation" msgstr "El tema no está soportado en esta conversación" -#: ../libempathy-gtk/empathy-chat.c:791 +#: ../libempathy-gtk/empathy-chat.c:795 msgid "You are not allowed to change the topic" msgstr "No le está permitido cambiar el tema" -#: ../libempathy-gtk/empathy-chat.c:967 +#: ../libempathy-gtk/empathy-chat.c:971 msgid "Invalid contact ID" msgstr "ID de contacto no válido" -#: ../libempathy-gtk/empathy-chat.c:1054 +#: ../libempathy-gtk/empathy-chat.c:1058 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: limpiar todos los mensajes de la conversación actual" -#: ../libempathy-gtk/empathy-chat.c:1057 +#: ../libempathy-gtk/empathy-chat.c:1061 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <tema>: establecer el tema para la conversación actual" -#: ../libempathy-gtk/empathy-chat.c:1060 +#: ../libempathy-gtk/empathy-chat.c:1064 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <id de sala de chat>: unirse a una sala de chat nueva" -#: ../libempathy-gtk/empathy-chat.c:1063 +#: ../libempathy-gtk/empathy-chat.c:1067 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <id de sala de chat>: unirse a una sala de chat nueva" -#: ../libempathy-gtk/empathy-chat.c:1067 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" @@ -1453,23 +1453,23 @@ msgstr "" "/part [<ID de la sala de chat>] [<razón>]: abandonar la sala de chat, la " "actual de manera predeterminada" -#: ../libempathy-gtk/empathy-chat.c:1071 +#: ../libempathy-gtk/empathy-chat.c:1075 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado" -#: ../libempathy-gtk/empathy-chat.c:1074 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado" -#: ../libempathy-gtk/empathy-chat.c:1077 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <apodo>: cambiar su apodo en el servidor actual" -#: ../libempathy-gtk/empathy-chat.c:1080 +#: ../libempathy-gtk/empathy-chat.c:1084 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <mensaje>: enviar un mensaje de ACCIÓN a la conversación actual" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1087 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 " @@ -1479,11 +1479,11 @@ msgstr "" "para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa " "para unirse a una sala de chat nueva»" -#: ../libempathy-gtk/empathy-chat.c:1088 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/whois <contact ID>: display information about a contact" msgstr "/whois <ID del contacto>: mostrar información sobre un contacto" -#: ../libempathy-gtk/empathy-chat.c:1091 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1491,128 +1491,128 @@ msgstr "" "/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está " "definido, muestra su uso." -#: ../libempathy-gtk/empathy-chat.c:1110 +#: ../libempathy-gtk/empathy-chat.c:1114 #, c-format msgid "Usage: %s" msgstr "Uso: %s" -#: ../libempathy-gtk/empathy-chat.c:1155 +#: ../libempathy-gtk/empathy-chat.c:1159 msgid "Unknown command" msgstr "Comando desconocido" -#: ../libempathy-gtk/empathy-chat.c:1281 +#: ../libempathy-gtk/empathy-chat.c:1285 msgid "Unknown command; see /help for the available commands" msgstr "Comando desconocido; consulte /help para ver los comandos disponibles" -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1542 msgid "insufficient balance to send message" msgstr "no tiene balance suficiente para enviar el mensaje" -#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556 -#: ../libempathy-gtk/empathy-chat.c:1619 +#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560 +#: ../libempathy-gtk/empathy-chat.c:1623 #, c-format msgid "Error sending message '%s': %s" msgstr "Error al enviar el mensaje «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561 -#: ../libempathy-gtk/empathy-chat.c:1623 +#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1627 #, c-format msgid "Error sending message: %s" msgstr "Error al enviar el mensaje: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1550 +#: ../libempathy-gtk/empathy-chat.c:1554 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "" "no tiene balance suficiente para enviar el mensaje. <a href='%s'>Recargar</" "a>." -#: ../libempathy-gtk/empathy-chat.c:1590 +#: ../libempathy-gtk/empathy-chat.c:1594 msgid "not capable" msgstr "no es posible" -#: ../libempathy-gtk/empathy-chat.c:1597 +#: ../libempathy-gtk/empathy-chat.c:1601 msgid "offline" msgstr "desconectado" -#: ../libempathy-gtk/empathy-chat.c:1600 +#: ../libempathy-gtk/empathy-chat.c:1604 msgid "invalid contact" msgstr "contacto no válido" -#: ../libempathy-gtk/empathy-chat.c:1603 +#: ../libempathy-gtk/empathy-chat.c:1607 msgid "permission denied" msgstr "permiso denegado" -#: ../libempathy-gtk/empathy-chat.c:1606 +#: ../libempathy-gtk/empathy-chat.c:1610 msgid "too long message" msgstr "mensaje demasiado largo" -#: ../libempathy-gtk/empathy-chat.c:1609 +#: ../libempathy-gtk/empathy-chat.c:1613 msgid "not implemented" msgstr "no implementado" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1617 msgid "unknown" msgstr "desconocido" -#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979 +#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967 msgid "Topic:" msgstr "Tema:" -#: ../libempathy-gtk/empathy-chat.c:1695 +#: ../libempathy-gtk/empathy-chat.c:1699 #, c-format msgid "Topic set to: %s" msgstr "El tema se ha establecido a: %s" -#: ../libempathy-gtk/empathy-chat.c:1697 +#: ../libempathy-gtk/empathy-chat.c:1701 #, c-format msgid "Topic set by %s to: %s" msgstr "Tema establecido por %s a: %s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1702 +#: ../libempathy-gtk/empathy-chat.c:1706 msgid "No topic defined" msgstr "No se ha definido el tema" -#: ../libempathy-gtk/empathy-chat.c:2218 +#: ../libempathy-gtk/empathy-chat.c:2222 msgid "(No Suggestions)" msgstr "(Sin sugerencias)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2286 +#: ../libempathy-gtk/empathy-chat.c:2290 #, c-format msgid "Add '%s' to Dictionary" msgstr "Añadir «%s» al diccionario" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2323 +#: ../libempathy-gtk/empathy-chat.c:2327 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Añadir «%s» al diccionario de «%s»" -#: ../libempathy-gtk/empathy-chat.c:2393 +#: ../libempathy-gtk/empathy-chat.c:2397 msgid "Insert Smiley" msgstr "Insertar emoticono" #. send button -#: ../libempathy-gtk/empathy-chat.c:2411 -#: ../libempathy-gtk/empathy-ui-utils.c:1180 +#: ../libempathy-gtk/empathy-chat.c:2415 +#: ../libempathy-gtk/empathy-ui-utils.c:1208 msgid "_Send" msgstr "E_nviar" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2468 +#: ../libempathy-gtk/empathy-chat.c:2472 msgid "_Spelling Suggestions" msgstr "_Sugerencias ortográficas" -#: ../libempathy-gtk/empathy-chat.c:2574 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Falló al recibir los registros recientes" -#: ../libempathy-gtk/empathy-chat.c:2718 +#: ../libempathy-gtk/empathy-chat.c:2826 #, c-format msgid "%s has disconnected" msgstr "%s se ha desconectado" @@ -1620,12 +1620,12 @@ msgstr "%s se ha desconectado" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2725 +#: ../libempathy-gtk/empathy-chat.c:2833 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s expulsó a %1$s" -#: ../libempathy-gtk/empathy-chat.c:2728 +#: ../libempathy-gtk/empathy-chat.c:2836 #, c-format msgid "%s was kicked" msgstr "%s fue expulsado" @@ -1633,17 +1633,17 @@ msgstr "%s fue expulsado" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2736 +#: ../libempathy-gtk/empathy-chat.c:2844 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s vetó a %1$s" -#: ../libempathy-gtk/empathy-chat.c:2739 +#: ../libempathy-gtk/empathy-chat.c:2847 #, c-format msgid "%s was banned" msgstr "%s fue vetado" -#: ../libempathy-gtk/empathy-chat.c:2743 +#: ../libempathy-gtk/empathy-chat.c:2851 #, c-format msgid "%s has left the room" msgstr "%s ha dejado la sala" @@ -1653,17 +1653,17 @@ msgstr "%s ha dejado la sala" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2752 +#: ../libempathy-gtk/empathy-chat.c:2860 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2777 +#: ../libempathy-gtk/empathy-chat.c:2885 #, c-format msgid "%s has joined the room" msgstr "%s ha entrado en la sala" -#: ../libempathy-gtk/empathy-chat.c:2802 +#: ../libempathy-gtk/empathy-chat.c:2910 #, c-format msgid "%s is now known as %s" msgstr "Ahora %s se llama %s" @@ -1671,82 +1671,82 @@ msgstr "Ahora %s se llama %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532 -#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655 -#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166 +#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516 +#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2641 +#: ../src/empathy-call-window.c:2948 ../src/empathy-event-manager.c:1158 msgid "Disconnected" msgstr "Desconectado" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3664 +#: ../libempathy-gtk/empathy-chat.c:3784 msgid "Would you like to store this password?" msgstr "¿Quiere guardar esta contraseña?" -#: ../libempathy-gtk/empathy-chat.c:3670 +#: ../libempathy-gtk/empathy-chat.c:3790 msgid "Remember" msgstr "Recordar" -#: ../libempathy-gtk/empathy-chat.c:3680 +#: ../libempathy-gtk/empathy-chat.c:3800 msgid "Not now" msgstr "Ahora no" -#: ../libempathy-gtk/empathy-chat.c:3728 +#: ../libempathy-gtk/empathy-chat.c:3848 msgid "Wrong password; please try again:" msgstr "Contraseña incorrecta; inténtelo de nuevo:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3858 +#: ../libempathy-gtk/empathy-chat.c:3972 msgid "This room is protected by a password:" msgstr "Esta sala está protegida por contraseña:" -#: ../libempathy-gtk/empathy-chat.c:3885 -#: ../src/empathy-new-chatroom-dialog.c:780 +#: ../libempathy-gtk/empathy-chat.c:3999 +#: ../src/empathy-new-chatroom-dialog.c:785 msgid "Join" msgstr "Unirse" -#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187 +#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1179 msgid "Connected" msgstr "Conectado" -#: ../libempathy-gtk/empathy-chat.c:4132 +#: ../libempathy-gtk/empathy-chat.c:4246 msgid "Conversation" msgstr "Conversación" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4137 +#: ../libempathy-gtk/empathy-chat.c:4251 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261 msgid "Unknown or invalid identifier" msgstr "Identificador desconocido o no válido" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263 msgid "Contact blocking temporarily unavailable" msgstr "Bloqueo de contactos no disponible temporalmente" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 msgid "Contact blocking unavailable" msgstr "Bloqueo de contactos no disponible" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 msgid "Permission Denied" msgstr "Permiso denegado" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 msgid "Could not block contact" msgstr "No se pudo bloquear el contacto" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610 msgid "Edit Blocked Contacts" msgstr "Editar contactos bloqueados" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 -#: ../libempathy-gtk/empathy-individual-widget.c:1485 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:528 +#: ../libempathy-gtk/empathy-individual-widget.c:1473 #: ../src/empathy-chatrooms-window.ui.h:2 #: ../src/empathy-new-chatroom-dialog.ui.h:6 msgid "Account:" @@ -1756,120 +1756,120 @@ msgstr "Cuenta:" msgid "Blocked Contacts" msgstr "Contactos bloqueados" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:98 msgid "Full name" msgstr "Nombre completo" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:99 msgid "Phone number" msgstr "NuÌmero de teleÌfono" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:100 msgid "E-mail address" msgstr "Dirección de correo-e" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:101 msgid "Website" msgstr "Página web" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 msgid "Birthday" msgstr "Cumpleaños" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Last seen:" msgstr "Última actividad:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Server:" msgstr "Servidor:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:109 msgid "Connected from:" msgstr "Conectado desde:" #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Away message:" msgstr "Mensaje de ausencia:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:126 msgid "work" msgstr "trabajo" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:127 msgid "home" msgstr "personal" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:128 msgid "mobile" msgstr "móvil" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:129 msgid "voice" msgstr "voz" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 msgid "preferred" msgstr "preferido" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 msgid "postal" msgstr "postal" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "parcel" msgstr "grupo" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:522 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:521 msgid "Search contacts" msgstr "Buscar contactos" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:552 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:551 msgid "Search: " msgstr "Buscar:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:610 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:609 msgid "_Add Contact" msgstr "_Añadir contacto" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:628 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 msgid "No contacts found" msgstr "No se encontraron contactos" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:644 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:643 msgid "Your message introducing yourself:" msgstr "Su mensaje de presentación:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:652 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:651 msgid "Please let me see when you're online. Thanks!" msgstr "PermÃtame ver cuando está en lÃnea. Gracias." -#: ../libempathy-gtk/empathy-contact-widget.c:168 -#: ../libempathy-gtk/empathy-individual-widget.c:900 +#: ../libempathy-gtk/empathy-contact-widget.c:156 +#: ../libempathy-gtk/empathy-individual-widget.c:888 msgid "Save Avatar" msgstr "Guardar avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:224 -#: ../libempathy-gtk/empathy-individual-widget.c:958 +#: ../libempathy-gtk/empathy-contact-widget.c:212 +#: ../libempathy-gtk/empathy-individual-widget.c:946 msgid "Unable to save avatar" msgstr "No se pudo guardar el avatar" #. Identifier to connect to Instant Messaging network #. Setup id label #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-user-info.c:444 +#: ../libempathy-gtk/empathy-user-info.c:455 msgid "Identifier" msgstr "Identificador" #. Setup nickname entry #: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -#: ../libempathy-gtk/empathy-user-info.c:449 +#: ../libempathy-gtk/empathy-user-info.c:460 msgid "Alias" msgstr "Apodo" @@ -1903,11 +1903,11 @@ msgstr "Versión" msgid "Client" msgstr "Cliente" -#: ../libempathy-gtk/empathy-groups-widget.c:327 +#: ../libempathy-gtk/empathy-groups-widget.c:317 msgid "Groups" msgstr "Grupos" -#: ../libempathy-gtk/empathy-groups-widget.c:339 +#: ../libempathy-gtk/empathy-groups-widget.c:329 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -1915,122 +1915,122 @@ msgstr "" "Seleccione los grupos en los que quiere que este contacto aparezca, Note que " "puede seleccionar más de un grupo o ningún grupo." -#: ../libempathy-gtk/empathy-groups-widget.c:358 +#: ../libempathy-gtk/empathy-groups-widget.c:348 msgid "_Add Group" msgstr "_Añadir grupo" -#: ../libempathy-gtk/empathy-groups-widget.c:393 +#: ../libempathy-gtk/empathy-groups-widget.c:383 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Seleccionar" -#: ../libempathy-gtk/empathy-groups-widget.c:403 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgid "Group" msgstr "Grupo" -#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +#: ../libempathy-gtk/empathy-individual-dialogs.c:108 msgid "New Contact" msgstr "Contacto nuevo" -#: ../libempathy-gtk/empathy-individual-dialogs.c:193 -#: ../libempathy-gtk/empathy-subscription-dialog.c:121 +#: ../libempathy-gtk/empathy-individual-dialogs.c:183 +#: ../libempathy-gtk/empathy-subscription-dialog.c:120 #, c-format msgid "Block %s?" msgstr "¿Bloquear a %s?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:248 -#: ../libempathy-gtk/empathy-subscription-dialog.c:125 +#: ../libempathy-gtk/empathy-individual-dialogs.c:238 +#: ../libempathy-gtk/empathy-subscription-dialog.c:124 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "" "¿Está seguro de que quiere bloquear a «%s» para que no le vuelva a contactar?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-individual-dialogs.c:243 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Se bloqueará la siguiente identidad:" msgstr[1] "Se bloquearán la siguientes identidades:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:250 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "No se puede bloquear la siguiente identidad:" msgstr[1] "No se pueden bloquear la siguientes identidades:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:270 -#: ../libempathy-gtk/empathy-subscription-dialog.c:130 -#: ../libempathy-gtk/empathy-subscription-dialog.c:275 +#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-subscription-dialog.c:129 +#: ../libempathy-gtk/empathy-subscription-dialog.c:274 msgid "_Block" msgstr "_Bloquear" -#: ../libempathy-gtk/empathy-individual-dialogs.c:279 -#: ../libempathy-gtk/empathy-subscription-dialog.c:150 +#: ../libempathy-gtk/empathy-individual-dialogs.c:269 +#: ../libempathy-gtk/empathy-subscription-dialog.c:149 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "Info_rmar de este contacto como abusivo" msgstr[1] "Info_rmar de estos contacto como abusivos" -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237 msgid "Edit Contact Information" msgstr "Editar información del contacto" #. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:293 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:283 msgid "Linked Contacts" msgstr "Contactos enlazados" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:332 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:322 msgid "gnome-contacts not installed" msgstr "gnome-contacts no está instalado" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:335 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:325 msgid "Please install gnome-contacts to access contacts details." msgstr "Instale gnome-contacts para acceder a los detalles de los contactos." #. 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:177 +#: ../libempathy-gtk/empathy-individual-menu.c:168 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:353 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Seleccionar la cuenta que usar para realizar la llamada" -#: ../libempathy-gtk/empathy-individual-menu.c:357 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-call-window.ui.h:20 msgid "Call" msgstr "Llamar" -#: ../libempathy-gtk/empathy-individual-menu.c:422 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Móvil" -#: ../libempathy-gtk/empathy-individual-menu.c:424 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Trabajo" -#: ../libempathy-gtk/empathy-individual-menu.c:426 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "Casa" -#: ../libempathy-gtk/empathy-individual-menu.c:669 +#: ../libempathy-gtk/empathy-individual-menu.c:660 msgid "_Block Contact" msgstr "_Bloquear contacto" -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:716 msgid "Delete and _Block" msgstr "Eliminar y _bloquear" -#: ../libempathy-gtk/empathy-individual-menu.c:787 +#: ../libempathy-gtk/empathy-individual-menu.c:778 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "¿Realmente quiere quitar el contacto «%s»?" -#: ../libempathy-gtk/empathy-individual-menu.c:796 +#: ../libempathy-gtk/empathy-individual-menu.c:787 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2039,218 +2039,218 @@ msgstr "" "¿Realmente quiere quitar el contacto enlazado «%s»? Tenga en cuenta que esto " "quitará todos los contactos que componen este contacto enlazado." -#: ../libempathy-gtk/empathy-individual-menu.c:807 +#: ../libempathy-gtk/empathy-individual-menu.c:798 msgid "Removing contact" msgstr "Quitando el contacto" -#: ../libempathy-gtk/empathy-individual-menu.c:871 -#: ../libempathy-gtk/empathy-individual-view.c:2453 +#: ../libempathy-gtk/empathy-individual-menu.c:862 +#: ../libempathy-gtk/empathy-individual-view.c:2440 msgid "_Remove" msgstr "_Quitar" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1234 -#: ../libempathy-gtk/empathy-new-message-dialog.c:318 +#: ../libempathy-gtk/empathy-individual-menu.c:1225 +#: ../libempathy-gtk/empathy-new-message-dialog.c:308 msgid "_Chat" msgstr "_Chat" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1269 -#: ../libempathy-gtk/empathy-new-message-dialog.c:312 +#: ../libempathy-gtk/empathy-individual-menu.c:1260 +#: ../libempathy-gtk/empathy-new-message-dialog.c:302 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1302 +#: ../libempathy-gtk/empathy-individual-menu.c:1293 msgctxt "menu item" msgid "_Audio Call" msgstr "Llamada de vo_z" -#: ../libempathy-gtk/empathy-individual-menu.c:1335 +#: ../libempathy-gtk/empathy-individual-menu.c:1326 msgctxt "menu item" msgid "_Video Call" msgstr "Llamada de _vÃdeo" -#: ../libempathy-gtk/empathy-individual-menu.c:1376 +#: ../libempathy-gtk/empathy-individual-menu.c:1367 #: ../src/empathy-roster-window-menubar.ui.h:11 msgid "_Previous Conversations" msgstr "Conversaciones an_teriores" -#: ../libempathy-gtk/empathy-individual-menu.c:1405 +#: ../libempathy-gtk/empathy-individual-menu.c:1396 msgid "Send File" msgstr "Enviar archivo" -#: ../libempathy-gtk/empathy-individual-menu.c:1435 +#: ../libempathy-gtk/empathy-individual-menu.c:1426 msgid "Share My Desktop" msgstr "Compartir mi escritorio" -#: ../libempathy-gtk/empathy-individual-menu.c:1461 -#: ../libempathy-gtk/empathy-individual-widget.c:1368 +#: ../libempathy-gtk/empathy-individual-menu.c:1452 +#: ../libempathy-gtk/empathy-individual-widget.c:1356 msgid "Favorite" msgstr "Favorita" -#: ../libempathy-gtk/empathy-individual-menu.c:1490 +#: ../libempathy-gtk/empathy-individual-menu.c:1481 msgid "Infor_mation" msgstr "Infor_mación" -#: ../libempathy-gtk/empathy-individual-menu.c:1539 +#: ../libempathy-gtk/empathy-individual-menu.c:1530 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Editar" #. send invitation -#: ../libempathy-gtk/empathy-individual-menu.c:1655 -#: ../src/empathy-chat-window.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1646 +#: ../src/empathy-chat-window.c:1233 msgid "Inviting you to this room" msgstr "Invitándolo a esta sala" -#: ../libempathy-gtk/empathy-individual-menu.c:1701 +#: ../libempathy-gtk/empathy-individual-menu.c:1692 msgid "_Invite to Chat Room" msgstr "_Invitar a sala de chat" -#: ../libempathy-gtk/empathy-individual-menu.c:1897 +#: ../libempathy-gtk/empathy-individual-menu.c:1888 msgid "_Add Contact…" msgstr "_Añadir contacto…" -#: ../libempathy-gtk/empathy-individual-view.c:2373 +#: ../libempathy-gtk/empathy-individual-view.c:2360 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "¿Realmente quiere quitar el grupo «%s»?" -#: ../libempathy-gtk/empathy-individual-view.c:2376 +#: ../libempathy-gtk/empathy-individual-view.c:2363 msgid "Removing group" msgstr "Quitando grupo" -#: ../libempathy-gtk/empathy-individual-view.c:2444 +#: ../libempathy-gtk/empathy-individual-view.c:2431 msgid "Re_name" msgstr "Re_nombrar" -#: ../libempathy-gtk/empathy-individual-widget.c:304 +#: ../libempathy-gtk/empathy-individual-widget.c:294 msgid "Channels:" msgstr "Canales:" -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-individual-widget.c:445 msgid "Country ISO Code:" msgstr "Código ISO de paÃs:" -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-individual-widget.c:447 msgid "Country:" msgstr "PaÃs:" -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-individual-widget.c:449 msgid "State:" msgstr "Estado:" -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-individual-widget.c:451 msgid "City:" msgstr "Ciudad:" -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-individual-widget.c:453 msgid "Area:" msgstr "Ãrea:" -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Postal Code:" msgstr "Código postal:" -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Street:" msgstr "Calle:" -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "Building:" msgstr "Edificio:" -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "Floor:" msgstr "Planta:" -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Room:" msgstr "Habitación:" -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Text:" msgstr "Texto:" -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Description:" msgstr "Descripción:" -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Accuracy Level:" msgstr "Nivel de precisión:" -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Error:" msgstr "Error:" -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Vertical Error (meters):" msgstr "Error vertical (metros):" -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Horizontal Error (meters):" msgstr "Error horizontal (metros):" -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "Speed:" msgstr "Velocidad:" -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Bearing:" msgstr "Retardo:" -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Climb Speed:" msgstr "Velocidad de ascenso:" -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Last Updated on:" msgstr "Actualizado por última vez:" -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Longitude:" msgstr "Longitud_" -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Latitude:" msgstr "Latitud:" -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Altitude:" msgstr "Altitud:" -#: ../libempathy-gtk/empathy-individual-widget.c:593 -#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../libempathy-gtk/empathy-individual-widget.c:583 +#: ../libempathy-gtk/empathy-individual-widget.c:598 #: ../src/empathy-preferences.ui.h:39 msgid "Location" msgstr "Ubicación geográfica" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-individual-widget.c:610 +#: ../libempathy-gtk/empathy-individual-widget.c:600 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-individual-widget.c:659 +#: ../libempathy-gtk/empathy-individual-widget.c:649 msgid "%B %e, %Y at %R UTC" msgstr "%e de %B de %Y a las %R UTC" #. Alias -#: ../libempathy-gtk/empathy-individual-widget.c:1304 +#: ../libempathy-gtk/empathy-individual-widget.c:1292 msgid "Alias:" msgstr "Apodo:" #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-individual-widget.c:1513 +#: ../libempathy-gtk/empathy-individual-widget.c:1501 msgid "Identifier:" msgstr "Identificador:" -#: ../libempathy-gtk/empathy-individual-widget.c:1652 +#: ../libempathy-gtk/empathy-individual-widget.c:1640 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2265,32 +2265,32 @@ msgstr "<b>Ubicación</b> en (fecha)" msgid "Online from a phone or mobile device" msgstr "Conectado desde un teléfono o un dispositivo móvil" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329 msgid "New Network" msgstr "Red nueva" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532 msgid "Choose an IRC network" msgstr "Elegir una red IRC" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615 msgid "Reset _Networks List" msgstr "Rei_niciar lista de redes" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Seleccionar" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:271 msgid "new server" msgstr "servidor nuevo" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:547 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:534 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80 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 " @@ -2300,11 +2300,11 @@ msgstr "" "red para poder chatear con ellas. Si quiere usar esta caracterÃstica " "compruebe que los detalles de abajo son correctos." -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100 msgid "People nearby" msgstr "Gente cerca" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115 msgid "" "You can change these details later or disable this feature by choosing <span " "style=\"italic\">Edit → Accounts</span> in the Contact List." @@ -2313,137 +2313,137 @@ msgstr "" "caracterÃstica eligiendo <span style=\"italic\">Editar → Cuentas</span> en " "la lista de contactos." -#: ../libempathy-gtk/empathy-log-window.c:622 +#: ../libempathy-gtk/empathy-log-window.c:607 msgid "History" msgstr "Histórico" -#: ../libempathy-gtk/empathy-log-window.c:677 +#: ../libempathy-gtk/empathy-log-window.c:662 msgid "Show" msgstr "Mostrar" -#: ../libempathy-gtk/empathy-log-window.c:699 +#: ../libempathy-gtk/empathy-log-window.c:684 msgid "Search" msgstr "Buscar" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1135 #, c-format msgid "Chat in %s" msgstr "Chatee en %s" -#: ../libempathy-gtk/empathy-log-window.c:1152 +#: ../libempathy-gtk/empathy-log-window.c:1137 #, c-format msgid "Chat with %s" msgstr "Chat con %s" -#: ../libempathy-gtk/empathy-log-window.c:1202 -#: ../libempathy-gtk/empathy-log-window.c:1346 +#: ../libempathy-gtk/empathy-log-window.c:1187 +#: ../libempathy-gtk/empathy-log-window.c:1331 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e de %B de %Y a las %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1289 +#: ../libempathy-gtk/empathy-log-window.c:1274 #, c-format msgid "<i>* %s %s</i>" msgstr "<i>* %s %s</i>" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1295 +#: ../libempathy-gtk/empathy-log-window.c:1280 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1370 +#: ../libempathy-gtk/empathy-log-window.c:1355 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s segundo" msgstr[1] "%s segundos" -#: ../libempathy-gtk/empathy-log-window.c:1377 +#: ../libempathy-gtk/empathy-log-window.c:1362 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s minuto" msgstr[1] "%s minutos" -#: ../libempathy-gtk/empathy-log-window.c:1385 +#: ../libempathy-gtk/empathy-log-window.c:1370 #, c-format msgid "Call took %s, ended at %s" msgstr "La llamada duró %s, finalizó a las %s" -#: ../libempathy-gtk/empathy-log-window.c:1716 +#: ../libempathy-gtk/empathy-log-window.c:1701 msgid "Today" msgstr "Hoy" -#: ../libempathy-gtk/empathy-log-window.c:1720 +#: ../libempathy-gtk/empathy-log-window.c:1705 msgid "Yesterday" msgstr "Ayer" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1735 +#: ../libempathy-gtk/empathy-log-window.c:1720 msgid "%e %B %Y" msgstr "%e de %B de %Y" -#: ../libempathy-gtk/empathy-log-window.c:1839 -#: ../libempathy-gtk/empathy-log-window.c:3462 +#: ../libempathy-gtk/empathy-log-window.c:1824 +#: ../libempathy-gtk/empathy-log-window.c:3447 msgid "Anytime" msgstr "Cualquier hora" -#: ../libempathy-gtk/empathy-log-window.c:1938 -#: ../libempathy-gtk/empathy-log-window.c:2397 +#: ../libempathy-gtk/empathy-log-window.c:1923 +#: ../libempathy-gtk/empathy-log-window.c:2382 msgid "Anyone" msgstr "Cualquiera" -#: ../libempathy-gtk/empathy-log-window.c:2710 +#: ../libempathy-gtk/empathy-log-window.c:2695 msgid "Who" msgstr "Quién" -#: ../libempathy-gtk/empathy-log-window.c:2919 +#: ../libempathy-gtk/empathy-log-window.c:2904 msgid "When" msgstr "Cuándo" -#: ../libempathy-gtk/empathy-log-window.c:3037 +#: ../libempathy-gtk/empathy-log-window.c:3022 msgid "Anything" msgstr "Cualquier cosa" -#: ../libempathy-gtk/empathy-log-window.c:3039 +#: ../libempathy-gtk/empathy-log-window.c:3024 msgid "Text chats" msgstr "Chats de texto" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3025 #: ../src/empathy-preferences.ui.h:29 msgid "Calls" msgstr "Llamadas" -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3029 msgid "Incoming calls" msgstr "Llamadas entrantes" -#: ../libempathy-gtk/empathy-log-window.c:3045 +#: ../libempathy-gtk/empathy-log-window.c:3030 msgid "Outgoing calls" msgstr "Llamadas salientes" -#: ../libempathy-gtk/empathy-log-window.c:3046 +#: ../libempathy-gtk/empathy-log-window.c:3031 msgid "Missed calls" msgstr "Llamadas perdidas" -#: ../libempathy-gtk/empathy-log-window.c:3066 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "What" msgstr "Qué" -#: ../libempathy-gtk/empathy-log-window.c:3755 +#: ../libempathy-gtk/empathy-log-window.c:3740 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "" "¿Está seguro de que quiere eliminar todos los registros de conversaciones " "anteriores?" -#: ../libempathy-gtk/empathy-log-window.c:3759 +#: ../libempathy-gtk/empathy-log-window.c:3744 msgid "Clear All" msgstr "Limpiar todo" -#: ../libempathy-gtk/empathy-log-window.c:3766 +#: ../libempathy-gtk/empathy-log-window.c:3751 msgid "Delete from:" msgstr "Eliminar de:" @@ -2465,7 +2465,7 @@ msgid "Profile" msgstr "Perfil" #: ../libempathy-gtk/empathy-log-window.ui.h:5 -#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-chat-window.c:1426 ../src/empathy-preferences.ui.h:11 msgid "Chat" msgstr "Chat" @@ -2487,75 +2487,76 @@ msgid "What kind of chat account do you have?" msgstr "¿Qué tipo de cuenta tiene?" #: ../libempathy-gtk/empathy-new-account-dialog.c:151 -msgid "Adding new account" -msgstr "Añadiendo cuenta nueva" +#| msgid "Adding new account" +msgid "Add new account" +msgstr "Añadir una cuenta nueva" -#: ../libempathy-gtk/empathy-new-call-dialog.c:199 -#: ../libempathy-gtk/empathy-new-message-dialog.c:289 +#: ../libempathy-gtk/empathy-new-call-dialog.c:189 +#: ../libempathy-gtk/empathy-new-message-dialog.c:279 msgid "Enter a contact identifier or phone number:" msgstr "Introduzca el identificador de un contacto o un número de teléfono:" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:222 +#: ../libempathy-gtk/empathy-new-call-dialog.c:212 msgid "_Video Call" msgstr "Llamada de _vÃdeo" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:232 +#: ../libempathy-gtk/empathy-new-call-dialog.c:222 msgid "_Audio Call" msgstr "Llamada de vo_z" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:242 +#: ../libempathy-gtk/empathy-new-call-dialog.c:232 msgid "New Call" msgstr "Llamada nueva" -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:72 msgid "The contact is offline" msgstr "El contacto está desconectado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:74 msgid "The specified contact is either invalid or unknown" msgstr "El contacto especificado es desconocido o no es válido" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:76 msgid "The contact does not support this kind of conversation" msgstr "El contacto no soporta este tipo de conversación" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:78 msgid "The requested functionality is not implemented for this protocol" msgstr "La funcionalidad requerida no está implementada para ese protocolo" -#: ../libempathy-gtk/empathy-new-message-dialog.c:94 +#: ../libempathy-gtk/empathy-new-message-dialog.c:84 msgid "Could not start a conversation with the given contact" msgstr "No se pudo iniciar una conversación con el contacto dado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:86 msgid "You are banned from this channel" msgstr "Se le ha bloqueado en este canal" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:88 msgid "This channel is full" msgstr "Este canal está completo" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:90 msgid "You must be invited to join this channel" msgstr "Debe estar invitado para unirse a este canal" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:92 msgid "Can't proceed while disconnected" msgstr "No se puede proceder mientras esté desconectado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:94 msgid "Permission denied" msgstr "Permiso denegado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:110 +#: ../libempathy-gtk/empathy-new-message-dialog.c:100 msgid "There was an error starting the conversation" msgstr "Hubo un error al iniciar la conversación" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:332 +#: ../libempathy-gtk/empathy-new-message-dialog.c:322 msgid "New Conversation" msgstr "Conversación nueva" @@ -2565,26 +2566,26 @@ msgstr "Conversación nueva" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:164 -#: ../libempathy-gtk/empathy-presence-chooser.c:200 +#: ../libempathy-gtk/empathy-presence-chooser.c:157 +#: ../libempathy-gtk/empathy-presence-chooser.c:193 msgid "Custom Message…" msgstr "Mensaje personalizado…" -#: ../libempathy-gtk/empathy-presence-chooser.c:217 -#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:210 +#: ../libempathy-gtk/empathy-presence-chooser.c:212 msgid "Edit Custom Messages…" msgstr "Editar mensajes personalizados…" -#: ../libempathy-gtk/empathy-presence-chooser.c:341 +#: ../libempathy-gtk/empathy-presence-chooser.c:334 msgid "Click to remove this status as a favorite" msgstr "Pulse pare eliminar este estado de los favoritos" -#: ../libempathy-gtk/empathy-presence-chooser.c:350 +#: ../libempathy-gtk/empathy-presence-chooser.c:343 msgid "Click to make this status a favorite" msgstr "Pulse para hacer este estado uno favorito" #. Translators: %s is a status message like 'At the pub' for example -#: ../libempathy-gtk/empathy-presence-chooser.c:384 +#: ../libempathy-gtk/empathy-presence-chooser.c:377 #, c-format msgid "" "<b>Current message: %s</b>\n" @@ -2594,12 +2595,12 @@ msgstr "" "<small><i>Pulse Intro para establecer el mensaje nuevo o Esc para cancelar.</" "i></small>" -#: ../libempathy-gtk/empathy-presence-chooser.c:393 +#: ../libempathy-gtk/empathy-presence-chooser.c:386 msgid "Set status" msgstr "Establecer estado" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1101 +#: ../libempathy-gtk/empathy-presence-chooser.c:1094 msgid "Custom messages…" msgstr "Mensajes personalizados…" @@ -2607,12 +2608,12 @@ msgstr "Mensajes personalizados…" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../libempathy-gtk/empathy-protocol-chooser.c:608 +#: ../libempathy-gtk/empathy-protocol-chooser.c:603 #, c-format msgid "New %s account" msgstr "Cuenta de %s nueva" -#: ../libempathy-gtk/empathy-search-bar.c:243 +#: ../libempathy-gtk/empathy-search-bar.c:237 msgid "_Match case" msgstr "_Coincidir con capitalizacioÌn" @@ -2636,169 +2637,169 @@ msgstr "_Coincidir con capitalización" msgid "Phrase not found" msgstr "No se encontró la frase" -#: ../libempathy-gtk/empathy-sound-manager.c:51 +#: ../libempathy-gtk/empathy-sound-manager.c:49 msgid "Received an instant message" msgstr "Mensaje instantáneo recibido" -#: ../libempathy-gtk/empathy-sound-manager.c:53 +#: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Sent an instant message" msgstr "Enviar un mensaje instantáneo" -#: ../libempathy-gtk/empathy-sound-manager.c:55 +#: ../libempathy-gtk/empathy-sound-manager.c:53 msgid "Incoming chat request" msgstr "Solicitud de chat entrante" -#: ../libempathy-gtk/empathy-sound-manager.c:57 +#: ../libempathy-gtk/empathy-sound-manager.c:55 msgid "Contact connected" msgstr "Contacto conectado" -#: ../libempathy-gtk/empathy-sound-manager.c:59 +#: ../libempathy-gtk/empathy-sound-manager.c:57 msgid "Contact disconnected" msgstr "Contacto desconectado" -#: ../libempathy-gtk/empathy-sound-manager.c:61 +#: ../libempathy-gtk/empathy-sound-manager.c:59 msgid "Connected to server" msgstr "Conectado con el servidor" -#: ../libempathy-gtk/empathy-sound-manager.c:63 +#: ../libempathy-gtk/empathy-sound-manager.c:61 msgid "Disconnected from server" msgstr "Desconectado del servidor" -#: ../libempathy-gtk/empathy-sound-manager.c:65 +#: ../libempathy-gtk/empathy-sound-manager.c:63 msgid "Incoming voice call" msgstr "Llamada de voz entrante" -#: ../libempathy-gtk/empathy-sound-manager.c:67 +#: ../libempathy-gtk/empathy-sound-manager.c:65 msgid "Outgoing voice call" msgstr "Llamada de voz saliente" -#: ../libempathy-gtk/empathy-sound-manager.c:69 +#: ../libempathy-gtk/empathy-sound-manager.c:67 msgid "Voice call ended" msgstr "Finalizó la llamada de voz" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:294 msgid "Edit Custom Messages" msgstr "Editar mensajes personalizados" -#: ../libempathy-gtk/empathy-subscription-dialog.c:234 +#: ../libempathy-gtk/empathy-subscription-dialog.c:233 msgid "Subscription Request" msgstr "Petición de suscripción" -#: ../libempathy-gtk/empathy-subscription-dialog.c:240 -#: ../src/empathy-event-manager.c:1104 +#: ../libempathy-gtk/empathy-subscription-dialog.c:239 +#: ../src/empathy-event-manager.c:1096 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s quiere permiso para ver cuándo está en lÃnea" -#: ../libempathy-gtk/empathy-subscription-dialog.c:281 -#: ../src/empathy-event-manager.c:729 +#: ../libempathy-gtk/empathy-subscription-dialog.c:280 +#: ../src/empathy-event-manager.c:721 msgid "_Decline" msgstr "_Rechazar" -#: ../libempathy-gtk/empathy-subscription-dialog.c:282 +#: ../libempathy-gtk/empathy-subscription-dialog.c:281 msgid "_Accept" msgstr "_Aceptar" -#: ../libempathy-gtk/empathy-theme-adium.c:1101 +#: ../libempathy-gtk/empathy-theme-adium.c:1211 #, c-format msgid "Message edited at %s" msgstr "Mensaje editado a las %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1801 +#: ../libempathy-gtk/empathy-theme-adium.c:1913 msgid "Normal" msgstr "Normal" -#: ../libempathy-gtk/empathy-tls-dialog.c:150 +#: ../libempathy-gtk/empathy-tls-dialog.c:147 msgid "The identity provided by the chat server cannot be verified." msgstr "" "No se puede verificar la identidad proporcionada por el servidor de chat." -#: ../libempathy-gtk/empathy-tls-dialog.c:157 +#: ../libempathy-gtk/empathy-tls-dialog.c:154 msgid "The certificate is not signed by a Certification Authority." msgstr "El certificado no está firmado por una Autoridad de certificación." -#: ../libempathy-gtk/empathy-tls-dialog.c:161 +#: ../libempathy-gtk/empathy-tls-dialog.c:158 msgid "The certificate has expired." msgstr "El certificado ha caducado." -#: ../libempathy-gtk/empathy-tls-dialog.c:164 +#: ../libempathy-gtk/empathy-tls-dialog.c:161 msgid "The certificate hasn't yet been activated." msgstr "El certificado aún no está activado." -#: ../libempathy-gtk/empathy-tls-dialog.c:167 +#: ../libempathy-gtk/empathy-tls-dialog.c:164 msgid "The certificate does not have the expected fingerprint." msgstr "El certificado no tiene la huella esperada." -#: ../libempathy-gtk/empathy-tls-dialog.c:170 +#: ../libempathy-gtk/empathy-tls-dialog.c:167 msgid "The hostname verified by the certificate doesn't match the server name." msgstr "" "El nombre del servidor verificado por el certificado no coincide con el " "nombre del servidor." -#: ../libempathy-gtk/empathy-tls-dialog.c:174 +#: ../libempathy-gtk/empathy-tls-dialog.c:171 msgid "The certificate is self-signed." msgstr "El certificado está firmado consigo mismo." -#: ../libempathy-gtk/empathy-tls-dialog.c:177 +#: ../libempathy-gtk/empathy-tls-dialog.c:174 msgid "" "The certificate has been revoked by the issuing Certification Authority." msgstr "La Autoridad de certificación emisora ha revocado el certificado.." -#: ../libempathy-gtk/empathy-tls-dialog.c:181 +#: ../libempathy-gtk/empathy-tls-dialog.c:178 msgid "The certificate is cryptographically weak." msgstr "El certificado es criptográficamente débil." -#: ../libempathy-gtk/empathy-tls-dialog.c:184 +#: ../libempathy-gtk/empathy-tls-dialog.c:181 msgid "The certificate length exceeds verifiable limits." msgstr "La longitud del certificado excede de los lÃmites verificables." -#: ../libempathy-gtk/empathy-tls-dialog.c:188 +#: ../libempathy-gtk/empathy-tls-dialog.c:185 msgid "The certificate is malformed." msgstr "El certificado está mal formado." -#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#: ../libempathy-gtk/empathy-tls-dialog.c:203 #, c-format msgid "Expected hostname: %s" msgstr "Nombre del servidor esperado: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#: ../libempathy-gtk/empathy-tls-dialog.c:206 #, c-format msgid "Certificate hostname: %s" msgstr "Nombre del servidor de certificados: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:281 +#: ../libempathy-gtk/empathy-tls-dialog.c:278 msgid "C_ontinue" msgstr "C_ontinuar" -#: ../libempathy-gtk/empathy-tls-dialog.c:287 +#: ../libempathy-gtk/empathy-tls-dialog.c:284 msgid "Untrusted connection" msgstr "La conexión no es de confianza" -#: ../libempathy-gtk/empathy-tls-dialog.c:288 +#: ../libempathy-gtk/empathy-tls-dialog.c:285 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Esta conexión no es de confianza. ¿Quiere continuar de todas formas?" -#: ../libempathy-gtk/empathy-tls-dialog.c:298 +#: ../libempathy-gtk/empathy-tls-dialog.c:295 msgid "Remember this choice for future connections" msgstr "Recordar esta opción para futuras conexiones" -#: ../libempathy-gtk/empathy-tls-dialog.c:304 +#: ../libempathy-gtk/empathy-tls-dialog.c:301 msgid "Certificate Details" msgstr "Detalles del certificado" -#: ../libempathy-gtk/empathy-ui-utils.c:1050 +#: ../libempathy-gtk/empathy-ui-utils.c:1078 msgid "Unable to open URI" msgstr "No se pudo abrir el URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1174 +#: ../libempathy-gtk/empathy-ui-utils.c:1202 msgid "Select a file" msgstr "Seleccionar un archivo" -#: ../libempathy-gtk/empathy-ui-utils.c:1248 +#: ../libempathy-gtk/empathy-ui-utils.c:1276 msgid "Insufficient free space to save file" msgstr "No hay espacio suficiente para guardar el archivo" -#: ../libempathy-gtk/empathy-ui-utils.c:1256 +#: ../libempathy-gtk/empathy-ui-utils.c:1284 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2807,16 +2808,16 @@ msgstr "" "Se requiere %s de espacio libre para guardar este archivo, pero sólo hay %s " "disponible. Elija otra ubicación." -#: ../libempathy-gtk/empathy-ui-utils.c:1302 +#: ../libempathy-gtk/empathy-ui-utils.c:1330 #, c-format msgid "Incoming file from %s" msgstr "Archivo entrante de %s" -#: ../libempathy-gtk/empathy-user-info.c:384 +#: ../libempathy-gtk/empathy-user-info.c:395 msgid "Go online to edit your personal information." msgstr "Conéctese para editar su información personal." -#: ../libempathy-gtk/empathy-user-info.c:464 +#: ../libempathy-gtk/empathy-user-info.c:475 msgid "<b>Personal Details</b>" msgstr "<b>Detalles personales</b>" @@ -2835,197 +2836,197 @@ msgstr "_Abrir enlace" msgid "Inspect HTML" msgstr "Inspeccionar HTML" -#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +#: ../libempathy-gtk/totem-subtitle-encoding.c:157 msgid "Current Locale" msgstr "Configuración regional actual" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:160 +#: ../libempathy-gtk/totem-subtitle-encoding.c:162 +#: ../libempathy-gtk/totem-subtitle-encoding.c:164 +#: ../libempathy-gtk/totem-subtitle-encoding.c:166 msgid "Arabic" msgstr "Ãrabe" -#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +#: ../libempathy-gtk/totem-subtitle-encoding.c:169 msgid "Armenian" msgstr "Armenio" -#: ../libempathy-gtk/totem-subtitle-encoding.c:173 -#: ../libempathy-gtk/totem-subtitle-encoding.c:175 -#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +#: ../libempathy-gtk/totem-subtitle-encoding.c:172 +#: ../libempathy-gtk/totem-subtitle-encoding.c:174 +#: ../libempathy-gtk/totem-subtitle-encoding.c:176 msgid "Baltic" msgstr "Báltico" -#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +#: ../libempathy-gtk/totem-subtitle-encoding.c:179 msgid "Celtic" msgstr "Celta" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:182 +#: ../libempathy-gtk/totem-subtitle-encoding.c:184 +#: ../libempathy-gtk/totem-subtitle-encoding.c:186 +#: ../libempathy-gtk/totem-subtitle-encoding.c:188 msgid "Central European" msgstr "Centroeuropeo" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:191 +#: ../libempathy-gtk/totem-subtitle-encoding.c:193 +#: ../libempathy-gtk/totem-subtitle-encoding.c:195 +#: ../libempathy-gtk/totem-subtitle-encoding.c:197 msgid "Chinese Simplified" msgstr "Chino simplificado" -#: ../libempathy-gtk/totem-subtitle-encoding.c:201 -#: ../libempathy-gtk/totem-subtitle-encoding.c:203 -#: ../libempathy-gtk/totem-subtitle-encoding.c:205 +#: ../libempathy-gtk/totem-subtitle-encoding.c:200 +#: ../libempathy-gtk/totem-subtitle-encoding.c:202 +#: ../libempathy-gtk/totem-subtitle-encoding.c:204 msgid "Chinese Traditional" msgstr "Chino tradicional" -#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +#: ../libempathy-gtk/totem-subtitle-encoding.c:207 msgid "Croatian" msgstr "Croata" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:210 +#: ../libempathy-gtk/totem-subtitle-encoding.c:212 +#: ../libempathy-gtk/totem-subtitle-encoding.c:214 +#: ../libempathy-gtk/totem-subtitle-encoding.c:216 +#: ../libempathy-gtk/totem-subtitle-encoding.c:218 +#: ../libempathy-gtk/totem-subtitle-encoding.c:220 msgid "Cyrillic" msgstr "CirÃlico" -#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +#: ../libempathy-gtk/totem-subtitle-encoding.c:223 msgid "Cyrillic/Russian" msgstr "CirÃlico/Ruso" -#: ../libempathy-gtk/totem-subtitle-encoding.c:227 -#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +#: ../libempathy-gtk/totem-subtitle-encoding.c:226 +#: ../libempathy-gtk/totem-subtitle-encoding.c:228 msgid "Cyrillic/Ukrainian" msgstr "CirÃlico/Ucraniano" -#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +#: ../libempathy-gtk/totem-subtitle-encoding.c:231 msgid "Georgian" msgstr "Georgiano" -#: ../libempathy-gtk/totem-subtitle-encoding.c:235 -#: ../libempathy-gtk/totem-subtitle-encoding.c:237 -#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +#: ../libempathy-gtk/totem-subtitle-encoding.c:234 +#: ../libempathy-gtk/totem-subtitle-encoding.c:236 +#: ../libempathy-gtk/totem-subtitle-encoding.c:238 msgid "Greek" msgstr "Griego" -#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +#: ../libempathy-gtk/totem-subtitle-encoding.c:241 msgid "Gujarati" msgstr "Gujarati" -#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +#: ../libempathy-gtk/totem-subtitle-encoding.c:244 msgid "Gurmukhi" msgstr "Gurmukhi" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:247 +#: ../libempathy-gtk/totem-subtitle-encoding.c:249 +#: ../libempathy-gtk/totem-subtitle-encoding.c:251 +#: ../libempathy-gtk/totem-subtitle-encoding.c:253 msgid "Hebrew" msgstr "Hebreo" -#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +#: ../libempathy-gtk/totem-subtitle-encoding.c:256 msgid "Hebrew Visual" msgstr "Hebreo visual" -#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +#: ../libempathy-gtk/totem-subtitle-encoding.c:259 msgid "Hindi" msgstr "Hindú" -#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +#: ../libempathy-gtk/totem-subtitle-encoding.c:262 msgid "Icelandic" msgstr "Islandés" -#: ../libempathy-gtk/totem-subtitle-encoding.c:266 -#: ../libempathy-gtk/totem-subtitle-encoding.c:268 -#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +#: ../libempathy-gtk/totem-subtitle-encoding.c:265 +#: ../libempathy-gtk/totem-subtitle-encoding.c:267 +#: ../libempathy-gtk/totem-subtitle-encoding.c:269 msgid "Japanese" msgstr "Japonés" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:272 +#: ../libempathy-gtk/totem-subtitle-encoding.c:274 +#: ../libempathy-gtk/totem-subtitle-encoding.c:276 +#: ../libempathy-gtk/totem-subtitle-encoding.c:278 msgid "Korean" msgstr "Coreano" -#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +#: ../libempathy-gtk/totem-subtitle-encoding.c:281 msgid "Nordic" msgstr "Nórdico" -#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +#: ../libempathy-gtk/totem-subtitle-encoding.c:284 msgid "Persian" msgstr "Persa" -#: ../libempathy-gtk/totem-subtitle-encoding.c:288 -#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +#: ../libempathy-gtk/totem-subtitle-encoding.c:287 +#: ../libempathy-gtk/totem-subtitle-encoding.c:289 msgid "Romanian" msgstr "Rumano" -#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +#: ../libempathy-gtk/totem-subtitle-encoding.c:292 msgid "South European" msgstr "Europa del sur" -#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +#: ../libempathy-gtk/totem-subtitle-encoding.c:295 msgid "Thai" msgstr "Tailandés" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:298 +#: ../libempathy-gtk/totem-subtitle-encoding.c:300 +#: ../libempathy-gtk/totem-subtitle-encoding.c:302 +#: ../libempathy-gtk/totem-subtitle-encoding.c:304 msgid "Turkish" msgstr "Turco" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:307 +#: ../libempathy-gtk/totem-subtitle-encoding.c:309 +#: ../libempathy-gtk/totem-subtitle-encoding.c:311 +#: ../libempathy-gtk/totem-subtitle-encoding.c:313 +#: ../libempathy-gtk/totem-subtitle-encoding.c:315 msgid "Unicode" msgstr "Unicode" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:318 +#: ../libempathy-gtk/totem-subtitle-encoding.c:320 +#: ../libempathy-gtk/totem-subtitle-encoding.c:322 +#: ../libempathy-gtk/totem-subtitle-encoding.c:324 +#: ../libempathy-gtk/totem-subtitle-encoding.c:326 msgid "Western" msgstr "Occidental" -#: ../libempathy-gtk/totem-subtitle-encoding.c:330 -#: ../libempathy-gtk/totem-subtitle-encoding.c:332 -#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +#: ../libempathy-gtk/totem-subtitle-encoding.c:329 +#: ../libempathy-gtk/totem-subtitle-encoding.c:331 +#: ../libempathy-gtk/totem-subtitle-encoding.c:333 msgid "Vietnamese" msgstr "Vietnamita" -#: ../libempathy-gtk/empathy-roster-model.h:29 +#: ../libempathy-gtk/empathy-roster-model.h:27 msgid "Top Contacts" msgstr "Contactos favoritos" -#: ../libempathy-gtk/empathy-roster-model.h:31 +#: ../libempathy-gtk/empathy-roster-model.h:29 msgid "Ungrouped" msgstr "Sin grupo" #. Add a prefix explaining that something goes wrong when trying to #. * fetch contact's presence. -#: ../libempathy-gtk/empathy-roster-contact.c:219 +#: ../libempathy-gtk/empathy-roster-contact.c:201 #, c-format msgid "Server cannot find contact: %s" msgstr "El servidor no puede encontrar el contacto: %s" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223 msgid "No error message" msgstr "Sin mensaje de eeror" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296 msgid "Instant Message (Empathy)" msgstr "Mensaje instantáneo (Empathy)" -#: ../src/empathy-about-dialog.c:81 +#: ../src/empathy-about-dialog.c:77 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 " @@ -3037,7 +3038,7 @@ msgstr "" "Foundation; ya sea en la versión 2 de la Licencia, o (a su elección) " "cualquier versión posterior." -#: ../src/empathy-about-dialog.c:85 +#: ../src/empathy-about-dialog.c:81 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 " @@ -3049,7 +3050,7 @@ msgstr "" "PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública General de GNU para " "más detalles." -#: ../src/empathy-about-dialog.c:89 +#: ../src/empathy-about-dialog.c:85 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 " @@ -3059,80 +3060,80 @@ msgstr "" "con Gossip ; si no, escriba a la Free Software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-130159 EE. UU." -#: ../src/empathy-about-dialog.c:109 +#: ../src/empathy-about-dialog.c:105 msgid "An Instant Messaging client for GNOME" msgstr "Un cliente de mensajerÃa instantánea para GNOME" -#: ../src/empathy-about-dialog.c:115 +#: ../src/empathy-about-dialog.c:111 msgid "translator-credits" msgstr "" "Jorge González <jorgegonz@svn.gnome.org>, 2007-2010\n" "Daniel Mustieles <daniel.mustieles@gmail.com>, 2010" -#: ../src/empathy-accounts.c:182 +#: ../src/empathy-accounts.c:171 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "" "No mostrar ningún diálogo; realizar cualquier trabajo (ej. importar) y salir" -#: ../src/empathy-accounts.c:186 +#: ../src/empathy-accounts.c:175 msgid "" "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "" "No mostrar ningún diálogo a no ser que sólo existan cuentas «Gente cerca»" -#: ../src/empathy-accounts.c:190 +#: ../src/empathy-accounts.c:179 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "Cuenta proporcionada inicialmente seleccionada (ej. gabble/jabber/ejemplo)" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:181 msgid "<account-id>" msgstr "<id-de-cuenta>" -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:186 msgid "- Empathy Accounts" msgstr ": Cuentas en Empathy" -#: ../src/empathy-accounts.c:240 +#: ../src/empathy-accounts.c:239 msgid "Empathy Accounts" msgstr "Cuentas en Empathy" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:52 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Existen modificaciones sin guardar en su cuenta %s." #. 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:72 +#: ../src/empathy-accounts-dialog.c:56 msgid "Your new account has not been saved yet." msgstr "Aún no se ha guardado su cuenta nueva." -#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274 +#: ../src/empathy-accounts-dialog.c:388 ../src/empathy-call-window.c:1258 msgid "Connecting…" msgstr "Conectando…" -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:429 #, c-format msgid "Offline — %s" msgstr "Desconectado: %s" -#: ../src/empathy-accounts-dialog.c:457 +#: ../src/empathy-accounts-dialog.c:441 #, c-format msgid "Disconnected — %s" msgstr "Desconectado: %s" -#: ../src/empathy-accounts-dialog.c:468 +#: ../src/empathy-accounts-dialog.c:452 msgid "Offline — No Network Connection" msgstr "Desconectado: sin conexión de red" -#: ../src/empathy-accounts-dialog.c:475 +#: ../src/empathy-accounts-dialog.c:459 msgid "Unknown Status" msgstr "Estado desconocido" -#: ../src/empathy-accounts-dialog.c:492 +#: ../src/empathy-accounts-dialog.c:476 msgid "" "This account has been disabled because it relies on an old, unsupported " "backend. Please install telepathy-haze and restart your session to migrate " @@ -3142,28 +3143,28 @@ msgstr "" "soportado. Instale telepathy-haze y reinicie la sesión para migrar esta " "cuenta." -#: ../src/empathy-accounts-dialog.c:502 +#: ../src/empathy-accounts-dialog.c:486 msgid "Offline — Account Disabled" msgstr "Desconectado: cuenta desactivada" -#: ../src/empathy-accounts-dialog.c:608 +#: ../src/empathy-accounts-dialog.c:592 msgid "Edit Connection Parameters" msgstr "Editar los parámetros de la conexión" -#: ../src/empathy-accounts-dialog.c:735 +#: ../src/empathy-accounts-dialog.c:719 msgid "_Edit Connection Parameters..." msgstr "_Editar los parámetros de la conexión…" -#: ../src/empathy-accounts-dialog.c:1268 +#: ../src/empathy-accounts-dialog.c:1252 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "¿Quiere quitar %s de su equipo?" -#: ../src/empathy-accounts-dialog.c:1272 +#: ../src/empathy-accounts-dialog.c:1256 msgid "This will not remove your account on the server." msgstr "Esto no quitará su cuenta del servidor." -#: ../src/empathy-accounts-dialog.c:1477 +#: ../src/empathy-accounts-dialog.c:1461 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3172,24 +3173,24 @@ msgstr "" "¿Seguro que quiere continuar?" #. Menu item: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1668 +#: ../src/empathy-accounts-dialog.c:1652 msgid "_Enabled" msgstr "_Activada" #. Menu item: Rename -#: ../src/empathy-accounts-dialog.c:1691 +#: ../src/empathy-accounts-dialog.c:1675 msgid "Rename" msgstr "Renombrar" -#: ../src/empathy-accounts-dialog.c:2107 +#: ../src/empathy-accounts-dialog.c:2091 msgid "_Skip" msgstr "_Omitir" -#: ../src/empathy-accounts-dialog.c:2111 +#: ../src/empathy-accounts-dialog.c:2095 msgid "_Connect" msgstr "_Conectar" -#: ../src/empathy-accounts-dialog.c:2290 +#: ../src/empathy-accounts-dialog.c:2274 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3198,7 +3199,7 @@ msgstr "" "¿Seguro que quiere continuar?" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:2433 +#: ../src/empathy-accounts-dialog.c:2417 msgid "Messaging and VoIP Accounts" msgstr "Cuentas de mensajerÃa y Voz IP" @@ -3222,31 +3223,31 @@ msgstr "" msgid "No protocol backends installed" msgstr "No hay «backends» de protocolos instalados" -#: ../src/empathy-auth-client.c:296 +#: ../src/empathy-auth-client.c:285 msgid " - Empathy authentication client" msgstr ": Cliente de autenticación de Empathy" -#: ../src/empathy-auth-client.c:312 +#: ../src/empathy-auth-client.c:301 msgid "Empathy authentication client" msgstr "Cliente de autenticación de Empathy" -#: ../src/empathy.c:427 +#: ../src/empathy.c:407 msgid "Don't connect on startup" msgstr "No conectarse automáticamente al inicio" -#: ../src/empathy.c:431 +#: ../src/empathy.c:411 msgid "Don't display the contact list or any other dialogs on startup" msgstr "No mostrar la lista de contactos o cualquier otro diálogo al inicio" -#: ../src/empathy.c:447 +#: ../src/empathy.c:440 msgid "- Empathy IM Client" msgstr "- Cliente de mensajerÃa instantánea Empathy" -#: ../src/empathy.c:623 +#: ../src/empathy.c:626 msgid "Error contacting the Account Manager" msgstr "Error al contactar con el Gestor de cuentas" -#: ../src/empathy.c:625 +#: ../src/empathy.c:628 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3259,111 +3260,105 @@ msgstr "" "\n" "%s" -#: ../src/empathy-call.c:124 +#: ../src/empathy-call.c:115 msgid "In a call" msgstr "En una llamada" -#: ../src/empathy-call.c:224 +#: ../src/empathy-call.c:215 msgid "- Empathy Audio/Video Client" msgstr ": Cliente de sonido/vÃdeo Empathy" -#: ../src/empathy-call.c:248 +#: ../src/empathy-call.c:239 msgid "Empathy Audio/Video Client" msgstr "Cliente de sonido/vÃdeo Empathy" -#: ../src/empathy-call-observer.c:119 +#: ../src/empathy-call-observer.c:110 #, c-format msgid "%s just tried to call you, but you were in another call." msgstr "%s intentó llamarle, pero estaba en otra llamada." -#. Translators: this is an "Info" label. It should be as short -#. * as possible. -#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147 -msgid "i" -msgstr "Información" - -#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508 +#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500 msgid "Incoming call" msgstr "Llamada entrante" -#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming video call from %s" msgstr "Llamada de vÃdeo entrante de %s" -#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516 -#: ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming call from %s" msgstr "Llamada entrante de %s" -#: ../src/empathy-call-window.c:1559 -#: ../src/empathy-notifications-approver.c:197 +#: ../src/empathy-call-window.c:1543 +#: ../src/empathy-notifications-approver.c:191 msgid "Reject" msgstr "Rechazar" -#: ../src/empathy-call-window.c:1560 -#: ../src/empathy-notifications-approver.c:202 -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-call-window.c:1544 +#: ../src/empathy-notifications-approver.c:196 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer" msgstr "Responder" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:1927 +#: ../src/empathy-call-window.c:1913 #, c-format msgid "Call with %s" msgstr "Llamada con %s" -#: ../src/empathy-call-window.c:2179 +#: ../src/empathy-call-window.c:2165 msgid "The IP address as seen by the machine" msgstr "La dirección IP como la ve la máquina" -#: ../src/empathy-call-window.c:2181 +#: ../src/empathy-call-window.c:2167 msgid "The IP address as seen by a server on the Internet" msgstr "La dirección IP como la ve el servidor de Internet" -#: ../src/empathy-call-window.c:2183 +#: ../src/empathy-call-window.c:2169 msgid "The IP address of the peer as seen by the other side" msgstr "La dirección IP del par como la ve la otra parte" -#: ../src/empathy-call-window.c:2185 +#: ../src/empathy-call-window.c:2171 msgid "The IP address of a relay server" msgstr "La dirección IP de un servidor de desvÃo" -#: ../src/empathy-call-window.c:2187 +#: ../src/empathy-call-window.c:2173 msgid "The IP address of the multicast group" msgstr "La dirección IP del grupo multicast" -#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599 -#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601 +#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585 +#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587 #: ../src/empathy-call-window.ui.h:28 msgid "Unknown" msgstr "Desconocido" -#: ../src/empathy-call-window.c:2959 +#: ../src/empathy-call-window.c:2946 msgid "On hold" msgstr "En espera" -#: ../src/empathy-call-window.c:2963 +#: ../src/empathy-call-window.c:2950 msgid "Mute" msgstr "Silenciar" -#: ../src/empathy-call-window.c:2965 +#: ../src/empathy-call-window.c:2952 msgid "Duration" msgstr "DuracioÌn" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2968 +#: ../src/empathy-call-window.c:2955 #, c-format msgid "%s — %d:%02dm" msgstr "%s: %d:%02dm" -#: ../src/empathy-call-window.c:3064 +#: ../src/empathy-call-window.c:3051 msgid "Technical Details" msgstr "Detalles técnicos" -#: ../src/empathy-call-window.c:3103 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3372,7 +3367,7 @@ msgstr "" "El software de «%s» no entiende ninguno de los formatos de vÃdeo soportados " "por su equipo" -#: ../src/empathy-call-window.c:3108 +#: ../src/empathy-call-window.c:3095 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3381,7 +3376,7 @@ msgstr "" "El software de «%s» no entiende ninguno de los formatos de vÃdeo soportados " "por su equipo" -#: ../src/empathy-call-window.c:3114 +#: ../src/empathy-call-window.c:3101 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3390,25 +3385,25 @@ msgstr "" "No se puede establecer una conexión con %s. Uno de los dos puede estar en " "una red que no acepta conexiones directas." -#: ../src/empathy-call-window.c:3120 +#: ../src/empathy-call-window.c:3107 msgid "There was a failure on the network" msgstr "Hubo un fallo en la red" -#: ../src/empathy-call-window.c:3124 +#: ../src/empathy-call-window.c:3111 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "No están instalados en su equipo los formatos de sonido necesarios para esta " "llamada" -#: ../src/empathy-call-window.c:3127 +#: ../src/empathy-call-window.c:3114 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "No están instalados en su equipo los formatos de vÃdeo necesarios para esta " "llamada" -#: ../src/empathy-call-window.c:3139 +#: ../src/empathy-call-window.c:3126 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3419,32 +3414,32 @@ msgstr "" "\">Informe de este error</a> y añada los registros obtenidos de la ventana " "de «Depuración» en el menú de Ayuda." -#: ../src/empathy-call-window.c:3148 +#: ../src/empathy-call-window.c:3135 msgid "There was a failure in the call engine" msgstr "Hubo un fallo en el motor de llamadas" -#: ../src/empathy-call-window.c:3151 +#: ../src/empathy-call-window.c:3138 msgid "The end of the stream was reached" msgstr "Se llegó al final del flujo" -#: ../src/empathy-call-window.c:3191 +#: ../src/empathy-call-window.c:3178 msgid "Can't establish audio stream" msgstr "No se puede establecer el flujo de voz" -#: ../src/empathy-call-window.c:3201 +#: ../src/empathy-call-window.c:3188 msgid "Can't establish video stream" msgstr "No se puede establecer el flujo de vÃdeo" -#: ../src/empathy-call-window.c:3238 +#: ../src/empathy-call-window.c:3225 #, c-format msgid "Your current balance is %s." msgstr "su balance actual es %s." -#: ../src/empathy-call-window.c:3242 +#: ../src/empathy-call-window.c:3229 msgid "Sorry, you don’t have enough credit for that call." msgstr "No tiene crédito suficiente para hacer esta llamada." -#: ../src/empathy-call-window.c:3244 +#: ../src/empathy-call-window.c:3231 msgid "Top Up" msgstr "Recargar" @@ -3560,19 +3555,19 @@ msgstr "Candidato local:" msgid "Audio" msgstr "Sonido" -#: ../src/empathy-chat.c:102 +#: ../src/empathy-chat.c:101 msgid "- Empathy Chat Client" msgstr ": Cliente de chat Empathy" -#: ../src/empathy-chatrooms-window.c:251 +#: ../src/empathy-chatrooms-window.c:243 msgid "Name" msgstr "Nombre" -#: ../src/empathy-chatrooms-window.c:269 +#: ../src/empathy-chatrooms-window.c:261 msgid "Room" msgstr "Sala" -#: ../src/empathy-chatrooms-window.c:277 +#: ../src/empathy-chatrooms-window.c:269 msgid "Auto-Connect" msgstr "Autoconectar" @@ -3580,11 +3575,11 @@ msgstr "Autoconectar" msgid "Manage Favorite Rooms" msgstr "Gestionar salas favoritas" -#: ../src/empathy-chat-window.c:287 +#: ../src/empathy-chat-window.c:275 msgid "Close this window?" msgstr "¿Cerrar esta ventana?" -#: ../src/empathy-chat-window.c:293 +#: ../src/empathy-chat-window.c:281 #, c-format msgid "" "Closing this window will leave %s. You will not receive any further messages " @@ -3593,7 +3588,7 @@ msgstr "" "Cerrar esta ventana hará que abandone %s. No recibirá más mensajes hasta que " "se una de nuevo." -#: ../src/empathy-chat-window.c:306 +#: ../src/empathy-chat-window.c:294 #, c-format msgid "" "Closing this window will leave a chat room. You will not receive any further " @@ -3608,65 +3603,65 @@ msgstr[1] "" "Cerrar esta ventana hará que abandone %u salas de chat. No recibirá más " "mensajes hasta que se una a ellas de nuevo." -#: ../src/empathy-chat-window.c:317 +#: ../src/empathy-chat-window.c:305 #, c-format msgid "Leave %s?" msgstr "¿Cerrar %s?" -#: ../src/empathy-chat-window.c:319 +#: ../src/empathy-chat-window.c:307 msgid "" "You will not receive any further messages from this chat room until you " "rejoin it." msgstr "No recibirá más mensajes de este chat hasta que se una de nuevo." -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Close window" msgstr "Cerrar la ventana" -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Leave room" msgstr "Abandonar la sala" -#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700 +#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d sin leer)" msgstr[1] "%s (%d sin leer)" -#: ../src/empathy-chat-window.c:692 +#: ../src/empathy-chat-window.c:680 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (y otra)" msgstr[1] "%s (y otras %u)" -#: ../src/empathy-chat-window.c:708 +#: ../src/empathy-chat-window.c:696 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d sin leer de otros)" msgstr[1] "%s (%d sin leer de otros)" -#: ../src/empathy-chat-window.c:717 +#: ../src/empathy-chat-window.c:705 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d sin leer de todos)" msgstr[1] "%s (%d sin leer de todos)" -#: ../src/empathy-chat-window.c:954 +#: ../src/empathy-chat-window.c:942 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:962 +#: ../src/empathy-chat-window.c:950 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "Enviando %d mensaje" msgstr[1] "Enviando %d mensajes" -#: ../src/empathy-chat-window.c:982 +#: ../src/empathy-chat-window.c:970 msgid "Typing a message." msgstr "Tecleando un mensaje." @@ -3730,77 +3725,77 @@ msgstr "Mover pestaña a la _derecha" msgid "_Detach Tab" msgstr "_Desacoplar pestaña" -#: ../src/empathy-debugger.c:69 +#: ../src/empathy-debugger.c:77 msgid "Show a particular service" msgstr "Mostrar un servicio en particular" -#: ../src/empathy-debugger.c:74 +#: ../src/empathy-debugger.c:82 msgid "- Empathy Debugger" msgstr "- Depurador de Empathy" -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:142 msgid "Empathy Debugger" msgstr "Depurador de Empathy" -#: ../src/empathy-debug-window.c:1599 +#: ../src/empathy-debug-window.c:1588 msgid "Save" msgstr "Guardar" -#: ../src/empathy-debug-window.c:1659 +#: ../src/empathy-debug-window.c:1648 msgid "Pastebin link" msgstr "Enlace a pastebin" -#: ../src/empathy-debug-window.c:1668 +#: ../src/empathy-debug-window.c:1657 msgid "Pastebin response" msgstr "Respuesta de pastebin" -#: ../src/empathy-debug-window.c:1675 +#: ../src/empathy-debug-window.c:1664 msgid "Data too large for a single paste. Please save logs to file." msgstr "" "Datos demasiado largos para un pegado sencillo. Guarde el registro en un " "archivo." -#: ../src/empathy-debug-window.c:1857 +#: ../src/empathy-debug-window.c:1846 msgid "Debug Window" msgstr "Depurar ventana" -#: ../src/empathy-debug-window.c:1917 +#: ../src/empathy-debug-window.c:1906 msgid "Send to pastebin" msgstr "Enviar a pastebin" -#: ../src/empathy-debug-window.c:1961 +#: ../src/empathy-debug-window.c:1950 msgid "Pause" msgstr "Pausar" -#: ../src/empathy-debug-window.c:1973 +#: ../src/empathy-debug-window.c:1962 msgid "Level " msgstr "Nivel " -#: ../src/empathy-debug-window.c:1992 +#: ../src/empathy-debug-window.c:1981 msgid "Debug" msgstr "Depurar" -#: ../src/empathy-debug-window.c:1997 +#: ../src/empathy-debug-window.c:1986 msgid "Info" msgstr "Información" -#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077 +#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066 msgid "Message" msgstr "Mensaje" -#: ../src/empathy-debug-window.c:2007 +#: ../src/empathy-debug-window.c:1996 msgid "Warning" msgstr "Advertencia" -#: ../src/empathy-debug-window.c:2012 +#: ../src/empathy-debug-window.c:2001 msgid "Critical" msgstr "CrÃtico" -#: ../src/empathy-debug-window.c:2017 +#: ../src/empathy-debug-window.c:2006 msgid "Error" msgstr "Error" -#: ../src/empathy-debug-window.c:2030 +#: ../src/empathy-debug-window.c:2019 msgid "" "Even if they don't display passwords, logs can contain sensitive information " "such as your list of contacts or the messages you recently sent or " @@ -3819,23 +3814,23 @@ msgstr "" "avanzados del <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy\">informe de error</a>." -#: ../src/empathy-debug-window.c:2062 +#: ../src/empathy-debug-window.c:2051 msgid "Time" msgstr "Hora" -#: ../src/empathy-debug-window.c:2065 +#: ../src/empathy-debug-window.c:2054 msgid "Domain" msgstr "Dominio" -#: ../src/empathy-debug-window.c:2068 +#: ../src/empathy-debug-window.c:2057 msgid "Category" msgstr "CategorÃa" -#: ../src/empathy-debug-window.c:2071 +#: ../src/empathy-debug-window.c:2060 msgid "Level" msgstr "Nivel" -#: ../src/empathy-debug-window.c:2100 +#: ../src/empathy-debug-window.c:2089 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -3843,70 +3838,70 @@ msgstr "" "El gestor de conexiones seleccionado no soporta la extensión de depuración " "remota." -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:500 msgid "Incoming video call" msgstr "Llamada de vÃdeo entrante" -#: ../src/empathy-event-manager.c:512 +#: ../src/empathy-event-manager.c:504 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s le está llamando con vÃdeo. ¿Quiere responder?" -#: ../src/empathy-event-manager.c:513 +#: ../src/empathy-event-manager.c:505 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s le está llamando. ¿Quiere responder?" -#: ../src/empathy-event-manager.c:541 +#: ../src/empathy-event-manager.c:533 msgid "_Reject" msgstr "_Rechazar" -#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549 msgid "_Answer" msgstr "Re_spuesta" -#: ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:549 msgid "_Answer with video" msgstr "_Responder con vÃdeo" -#: ../src/empathy-event-manager.c:712 +#: ../src/empathy-event-manager.c:704 msgid "Room invitation" msgstr "Invitación a una sala" -#: ../src/empathy-event-manager.c:714 +#: ../src/empathy-event-manager.c:706 #, c-format msgid "Invitation to join %s" msgstr "Invitación para unirse a %s" -#: ../src/empathy-event-manager.c:721 +#: ../src/empathy-event-manager.c:713 #, c-format msgid "%s is inviting you to join %s" msgstr "%s le está invitando a unirse a %s" -#: ../src/empathy-event-manager.c:734 +#: ../src/empathy-event-manager.c:726 msgid "_Join" msgstr "_Unirse" -#: ../src/empathy-event-manager.c:760 +#: ../src/empathy-event-manager.c:752 #, c-format msgid "%s invited you to join %s" msgstr "%s le ha invitado a unirse a %s" -#: ../src/empathy-event-manager.c:766 +#: ../src/empathy-event-manager.c:758 #, c-format msgid "You have been invited to join %s" msgstr "Le han invitado a unirse a %s" -#: ../src/empathy-event-manager.c:945 +#: ../src/empathy-event-manager.c:937 #, c-format msgid "Incoming file transfer from %s" msgstr "Transferencia de archivo entrante de %s" -#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227 +#: ../src/empathy-event-manager.c:965 ../src/empathy-roster-window.c:212 msgid "Password required" msgstr "Se requiere una contraseña" -#: ../src/empathy-event-manager.c:1110 +#: ../src/empathy-event-manager.c:1102 #, c-format msgid "" "\n" @@ -3916,105 +3911,105 @@ msgstr "" "Mensaje: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:99 +#: ../src/empathy-ft-manager.c:93 #, 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 +#: ../src/empathy-ft-manager.c:96 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:178 +#: ../src/empathy-ft-manager.c:172 msgctxt "file transfer percent" msgid "Unknown" msgstr "Desconocido" -#: ../src/empathy-ft-manager.c:273 +#: ../src/empathy-ft-manager.c:267 #, c-format msgid "%s of %s at %s/s" msgstr "%s de %s en %s/s" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:268 #, c-format msgid "%s of %s" msgstr "%s de %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:305 +#: ../src/empathy-ft-manager.c:299 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Recibiendo «%s» de %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:308 +#: ../src/empathy-ft-manager.c:302 #, c-format msgid "Sending \"%s\" to %s" msgstr "Enviando «%s» a %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:338 +#: ../src/empathy-ft-manager.c:332 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Error al recibir «%s» de %s" -#: ../src/empathy-ft-manager.c:341 +#: ../src/empathy-ft-manager.c:335 msgid "Error receiving a file" msgstr "Error al recibir un archivo" -#: ../src/empathy-ft-manager.c:346 +#: ../src/empathy-ft-manager.c:340 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Error al enviar «%s» a %s" -#: ../src/empathy-ft-manager.c:349 +#: ../src/empathy-ft-manager.c:343 msgid "Error sending a file" msgstr "Error al enviar un archivo" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:488 +#: ../src/empathy-ft-manager.c:482 #, c-format msgid "\"%s\" received from %s" msgstr "«%s» recibido de %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:493 +#: ../src/empathy-ft-manager.c:487 #, c-format msgid "\"%s\" sent to %s" msgstr "«%s» enviado a %s" -#: ../src/empathy-ft-manager.c:496 +#: ../src/empathy-ft-manager.c:490 msgid "File transfer completed" msgstr "Transferencia de archivo completada" -#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 +#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773 msgid "Waiting for the other participant's response" msgstr "Esperando la respuesta del otro participante" -#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 +#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Comprobando la integridad de «%s»" -#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 +#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676 #, c-format msgid "Hashing \"%s\"" msgstr "Obteniendo el «hash» de «%s»" -#: ../src/empathy-ft-manager.c:1025 +#: ../src/empathy-ft-manager.c:1019 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1037 +#: ../src/empathy-ft-manager.c:1031 msgid "File" msgstr "Archivo" -#: ../src/empathy-ft-manager.c:1059 +#: ../src/empathy-ft-manager.c:1053 msgid "Remaining" msgstr "Restantes" @@ -4028,11 +4023,11 @@ msgstr "" "Eliminar transferencias de archivo completadas, canceladas y fallidas de la " "lista" -#: ../src/empathy-import-dialog.c:76 +#: ../src/empathy-import-dialog.c:70 msgid "_Import" msgstr "_Importar" -#: ../src/empathy-import-dialog.c:88 +#: ../src/empathy-import-dialog.c:82 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -4040,49 +4035,49 @@ msgstr "" "No se pudo encontrar ninguna cuenta que importar. Actualmente Empathy sólo " "soporta importar cuentas desde Pidgin." -#: ../src/empathy-import-dialog.c:209 +#: ../src/empathy-import-dialog.c:203 msgid "Import Accounts" msgstr "Importar cuentas" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:302 +#: ../src/empathy-import-widget.c:296 msgid "Import" msgstr "Importar" -#: ../src/empathy-import-widget.c:311 +#: ../src/empathy-import-widget.c:305 msgid "Protocol" msgstr "Protocolo" -#: ../src/empathy-import-widget.c:335 +#: ../src/empathy-import-widget.c:329 msgid "Source" msgstr "Origen" -#: ../src/empathy-invite-participant-dialog.c:201 -#: ../src/empathy-invite-participant-dialog.c:229 +#: ../src/empathy-invite-participant-dialog.c:196 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite Participant" msgstr "Invitar participante" -#: ../src/empathy-invite-participant-dialog.c:202 +#: ../src/empathy-invite-participant-dialog.c:197 msgid "Choose a contact to invite into the conversation:" msgstr "Elegir un contacto para invitar a la conversación:" -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:220 msgid "Invite" msgstr "Invitar" -#: ../src/empathy-new-chatroom-dialog.c:194 +#: ../src/empathy-new-chatroom-dialog.c:184 msgid "Chat Room" msgstr "Sala de chat" -#: ../src/empathy-new-chatroom-dialog.c:209 +#: ../src/empathy-new-chatroom-dialog.c:199 msgid "Members" msgstr "Miembros" -#: ../src/empathy-new-chatroom-dialog.c:410 +#: ../src/empathy-new-chatroom-dialog.c:400 msgid "Failed to list rooms" msgstr "Falló al listar las salas" -#: ../src/empathy-new-chatroom-dialog.c:439 +#: ../src/empathy-new-chatroom-dialog.c:435 #, c-format msgid "" "%s\n" @@ -4095,17 +4090,17 @@ msgstr "" "Se necesita contraseña: %s\n" "Miembros: %s" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:437 +#: ../src/empathy-new-chatroom-dialog.c:438 msgid "Yes" msgstr "SÃ" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:437 +#: ../src/empathy-new-chatroom-dialog.c:438 msgid "No" msgstr "No" -#: ../src/empathy-new-chatroom-dialog.c:784 +#: ../src/empathy-new-chatroom-dialog.c:789 msgid "Join Room" msgstr "Unirse a sala" @@ -4148,104 +4143,104 @@ msgstr "No se pudo cargar la lista de la sala" msgid "Room List" msgstr "Lista de salas" -#: ../src/empathy-notifications-approver.c:188 +#: ../src/empathy-notifications-approver.c:182 msgid "Respond" msgstr "Respuesta" -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer with video" msgstr "Responder con vÃdeo" -#: ../src/empathy-notifications-approver.c:215 -#: ../src/empathy-notifications-approver.c:225 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:219 msgid "Decline" msgstr "Rechazar" -#: ../src/empathy-notifications-approver.c:219 -#: ../src/empathy-notifications-approver.c:230 +#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:224 msgid "Accept" msgstr "Aceptar" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:240 +#: ../src/empathy-notifications-approver.c:234 msgid "Provide" msgstr "Proporcionar" -#: ../src/empathy-preferences.c:143 +#: ../src/empathy-preferences.c:134 msgid "Message received" msgstr "Mensaje recibido" -#: ../src/empathy-preferences.c:144 +#: ../src/empathy-preferences.c:135 msgid "Message sent" msgstr "Mensaje enviado" -#: ../src/empathy-preferences.c:145 +#: ../src/empathy-preferences.c:136 msgid "New conversation" msgstr "Conversación nueva" -#: ../src/empathy-preferences.c:146 +#: ../src/empathy-preferences.c:137 msgid "Contact comes online" msgstr "El contacto se conecta" -#: ../src/empathy-preferences.c:147 +#: ../src/empathy-preferences.c:138 msgid "Contact goes offline" msgstr "El contacto se desconecta" -#: ../src/empathy-preferences.c:148 +#: ../src/empathy-preferences.c:139 msgid "Account connected" msgstr "Cuenta conectada" -#: ../src/empathy-preferences.c:149 +#: ../src/empathy-preferences.c:140 msgid "Account disconnected" msgstr "Cuenta desconectada" -#: ../src/empathy-preferences.c:386 +#: ../src/empathy-preferences.c:377 msgid "Language" msgstr "Idioma" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:637 +#: ../src/empathy-preferences.c:628 msgid "Juliet" msgstr "Julieta" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:644 +#: ../src/empathy-preferences.c:635 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:650 +#: ../src/empathy-preferences.c:641 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "¡Oh, Romeo, Romeo!, ¿dónde estás que no te veo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:654 +#: ../src/empathy-preferences.c:645 msgid "Deny thy father and refuse thy name;" msgstr "Niega a tu padre y rehúsa tu nombre;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:657 +#: ../src/empathy-preferences.c:648 msgid "Or if thou wilt not, be but sworn my love" msgstr "O, si no quieres, júrame tan sólo que me amas" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:660 +#: ../src/empathy-preferences.c:651 msgid "And I'll no longer be a Capulet." msgstr "Y dejaré yo de ser una Capuleto" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:663 +#: ../src/empathy-preferences.c:654 msgid "Shall I hear more, or shall I speak at this?" msgstr "¿Debo oÃr más o contestar a lo dicho?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:666 +#: ../src/empathy-preferences.c:657 msgid "Juliet has disconnected" msgstr "Julieta se ha desconectado" -#: ../src/empathy-preferences.c:1032 +#: ../src/empathy-preferences.c:1023 msgid "Preferences" msgstr "Preferencias" @@ -4257,7 +4252,7 @@ msgstr "Mostrar grupos" msgid "Show account balances" msgstr "Mostrar los balances de las cuentas" -#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2202 +#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2226 msgid "Contact List" msgstr "Lista de contactos" @@ -4424,86 +4419,86 @@ msgstr "Variante:" msgid "Themes" msgstr "Temas" -#: ../src/empathy-roster-window.c:244 +#: ../src/empathy-roster-window.c:229 msgid "Provide Password" msgstr "Escriba su contraseña" -#: ../src/empathy-roster-window.c:250 +#: ../src/empathy-roster-window.c:235 msgid "Disconnect" msgstr "Desconectar" -#: ../src/empathy-roster-window.c:464 -msgid "You need to setup an account to see contacts here." +#: ../src/empathy-roster-window.c:478 +msgid "You need to set up an account to see contacts here." msgstr "Debe configurar una cuenta para ver contactos aquÃ." -#: ../src/empathy-roster-window.c:540 +#: ../src/empathy-roster-window.c:554 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" "Las cuentas de %s no se pueden usar hasta que no se haya actualizado su " "software de %s." -#: ../src/empathy-roster-window.c:640 +#: ../src/empathy-roster-window.c:655 msgid "Windows Live" msgstr "Windows Live" -#: ../src/empathy-roster-window.c:644 +#: ../src/empathy-roster-window.c:659 msgid "Facebook" msgstr "Facebook" #. translators: %s is an account name like 'Facebook' or 'Google Talk' -#: ../src/empathy-roster-window.c:659 +#: ../src/empathy-roster-window.c:674 #, c-format msgid "%s account requires authorisation" msgstr "La cuenta de %s requiere autorización" -#: ../src/empathy-roster-window.c:670 +#: ../src/empathy-roster-window.c:685 msgid "Online Accounts" msgstr "Cuentas en liÌnea" -#: ../src/empathy-roster-window.c:717 +#: ../src/empathy-roster-window.c:732 msgid "Update software..." msgstr "Actualizar software…" -#: ../src/empathy-roster-window.c:723 +#: ../src/empathy-roster-window.c:738 msgid "Reconnect" msgstr "Reconectar" -#: ../src/empathy-roster-window.c:727 +#: ../src/empathy-roster-window.c:742 msgid "Edit Account" msgstr "Editar cuenta" -#: ../src/empathy-roster-window.c:732 +#: ../src/empathy-roster-window.c:747 msgid "Close" msgstr "Cerrar" -#: ../src/empathy-roster-window.c:869 +#: ../src/empathy-roster-window.c:889 msgid "Top up account" msgstr "Recargar cuenta" -#: ../src/empathy-roster-window.c:1551 +#: ../src/empathy-roster-window.c:1575 msgid "You need to enable one of your accounts to see contacts here." msgstr "Debe activar una de sus cuentas para ver contactos aquÃ." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:1559 +#: ../src/empathy-roster-window.c:1583 #, c-format msgid "You need to enable %s to see contacts here." msgstr "Debe activar %s para ver contactos aquiÌ." -#: ../src/empathy-roster-window.c:1637 +#: ../src/empathy-roster-window.c:1661 msgid "Change your presence to see contacts here" msgstr "Cambie su presencia para ver contactos aquÃ" -#: ../src/empathy-roster-window.c:1646 +#: ../src/empathy-roster-window.c:1670 msgid "No match found" msgstr "No se encontró ninguna coincidencia" -#: ../src/empathy-roster-window.c:1653 +#: ../src/empathy-roster-window.c:1677 msgid "You haven't added any contact yet" msgstr "TodaviÌa no ha añadido ningún contacto" -#: ../src/empathy-roster-window.c:1656 +#: ../src/empathy-roster-window.c:1680 msgid "No online contacts" msgstr "No hay contactos no conectados" @@ -4581,12 +4576,10 @@ msgid "Go _Online" msgstr "Mostrarse _conectado" #: ../src/empathy-roster-window.ui.h:3 -#| msgid "Show offline contacts" msgid "Show _Offline Contacts" msgstr "Mostrar contactos _desconectados" #: ../src/empathy-roster-window.ui.h:4 -#| msgid "_Add Contacts..." msgid "_Add Contact..." msgstr "_Añadir contacto…" @@ -4602,12 +4595,12 @@ msgstr "_Llamada nueva…" msgid "Status" msgstr "Estado" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126 msgid "Done" msgstr "Hecho" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214 msgid "Please enter your account details" msgstr "Introduzca los detalles de su cuenta" @@ -4619,3 +4612,6 @@ msgstr "Editar las opciones de la cuenta %s" #: ../ubuntu-online-accounts/empathy.application.in.h:1 msgid "Integrate your IM accounts" msgstr "Importar sus cuentas de mensajerÃa instantánea" + +#~ msgid "i" +#~ msgstr "Información" @@ -8,13 +8,13 @@ # Antón Méixome <meixome@certima.net>, 2010. # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012. # Leandro Regueiro <leandro.regueiro@gmail.com>, 2012. -# Fran Dieguez <frandieguez@gnome.org>, 2012. +# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: empathy-master-po-gl-57278_.merged\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-30 20:48+0100\n" -"PO-Revision-Date: 2012-12-30 20:49+0200\n" +"POT-Creation-Date: 2013-06-01 23:18+0200\n" +"PO-Revision-Date: 2013-06-01 23:18+0200\n" "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n" "Language-Team: gnome-l10n-gl@gnome.org\n" "Language: gl\n" @@ -600,283 +600,283 @@ msgstr "" "motivos de privacidade." # rever -#: ../libempathy/empathy-ft-handler.c:733 +#: ../libempathy/empathy-ft-handler.c:732 msgid "No reason was specified" msgstr "Non se especificou un motivo" # rever -#: ../libempathy/empathy-ft-handler.c:736 +#: ../libempathy/empathy-ft-handler.c:735 msgid "The change in state was requested" msgstr "Foi solicitado o cambio de estado" # rever -#: ../libempathy/empathy-ft-handler.c:739 +#: ../libempathy/empathy-ft-handler.c:738 msgid "You canceled the file transfer" msgstr "Vostede cancelou a transferencia de ficheiros" # rever -#: ../libempathy/empathy-ft-handler.c:742 +#: ../libempathy/empathy-ft-handler.c:741 msgid "The other participant canceled the file transfer" msgstr "O outro participante cancelou a transferencia de ficheiros" # rever -#: ../libempathy/empathy-ft-handler.c:745 +#: ../libempathy/empathy-ft-handler.c:744 msgid "Error while trying to transfer the file" msgstr "Produciuse un erro ao tentar transferir o ficheiro" # rever -#: ../libempathy/empathy-ft-handler.c:748 +#: ../libempathy/empathy-ft-handler.c:747 msgid "The other participant is unable to transfer the file" msgstr "O outro participante non pode transferir o ficheiro" -#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:295 msgid "Unknown reason" msgstr "Motivo descoñecido" -#: ../libempathy/empathy-ft-handler.c:914 +#: ../libempathy/empathy-ft-handler.c:913 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:1200 +#: ../libempathy/empathy-ft-handler.c:1199 msgid "File transfer not supported by remote contact" msgstr "O contacto remoto non admite a tranferencia de ficheiros" -#: ../libempathy/empathy-ft-handler.c:1256 +#: ../libempathy/empathy-ft-handler.c:1255 msgid "The selected file is not a regular file" msgstr "O ficheiro seleccionado non é un ficheiro regular" -#: ../libempathy/empathy-ft-handler.c:1265 +#: ../libempathy/empathy-ft-handler.c:1264 msgid "The selected file is empty" msgstr "O ficheiro seleccionado está baleiro" -#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194 +#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184 msgid "Password not found" msgstr "Contrasinal non atopado" -#: ../libempathy/empathy-keyring.c:594 +#: ../libempathy/empathy-keyring.c:584 #, c-format msgid "IM account password for %s (%s)" msgstr "Contrasinal da conta de mensaxarÃa para %s (%s)" -#: ../libempathy/empathy-keyring.c:631 +#: ../libempathy/empathy-keyring.c:621 #, c-format msgid "Password for chatroom '%s' on account %s (%s)" msgstr "Contrasinal para a sala de conversa «%s» na conta %s (%s)" -#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116 +#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107 #, c-format msgid "Missed call from %s" msgstr "Chamada perdida de %s" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:407 +#: ../libempathy/empathy-message.c:406 #, c-format msgid "Called %s" msgstr "Chamou %s" -#: ../libempathy/empathy-message.c:410 +#: ../libempathy/empathy-message.c:409 #, c-format msgid "Call from %s" msgstr "Chamada de %s" -#: ../libempathy/empathy-time.c:90 +#: ../libempathy/empathy-time.c:86 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "hai %d segundo" msgstr[1] "hai %d segundos" -#: ../libempathy/empathy-time.c:96 +#: ../libempathy/empathy-time.c:92 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "hai %d minuto" msgstr[1] "hai %d minutos" -#: ../libempathy/empathy-time.c:102 +#: ../libempathy/empathy-time.c:98 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "hai %d hora" msgstr[1] "hai %d horas" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:104 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "hai %d dÃa" msgstr[1] "hai %d dÃas" -#: ../libempathy/empathy-time.c:114 +#: ../libempathy/empathy-time.c:110 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "hai %d semana" msgstr[1] "hai %d semanas" -#: ../libempathy/empathy-time.c:120 +#: ../libempathy/empathy-time.c:116 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "hai %d mes" msgstr[1] "hai %d meses" -#: ../libempathy/empathy-time.c:142 +#: ../libempathy/empathy-time.c:138 msgid "in the future" msgstr "no futuro" -#: ../libempathy/empathy-utils.c:226 +#: ../libempathy/empathy-utils.c:215 msgid "Available" msgstr "DispoñÃbel" -#: ../libempathy/empathy-utils.c:228 +#: ../libempathy/empathy-utils.c:217 msgid "Busy" msgstr "Ocupado" -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:220 msgid "Away" msgstr "Ausente" -#: ../libempathy/empathy-utils.c:233 +#: ../libempathy/empathy-utils.c:222 msgid "Invisible" msgstr "InvisÃbel" -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:224 msgid "Offline" msgstr "Desconectado" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:238 +#: ../libempathy/empathy-utils.c:227 msgctxt "presence" msgid "Unknown" msgstr "Descoñecido" # rever -#: ../libempathy/empathy-utils.c:278 +#: ../libempathy/empathy-utils.c:267 msgid "No reason specified" msgstr "Non se especificou un motivo" -#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:269 ../libempathy/empathy-utils.c:325 msgid "Status is set to offline" msgstr "O estado está definido a desconectado" # rever -#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316 -#: ../libempathy-gtk/empathy-call-utils.c:47 -#: ../libempathy-gtk/empathy-new-message-dialog.c:80 +#: ../libempathy/empathy-utils.c:271 ../libempathy/empathy-utils.c:305 +#: ../libempathy-gtk/empathy-call-utils.c:41 +#: ../libempathy-gtk/empathy-new-message-dialog.c:70 msgid "Network error" msgstr "Erro de rede" -#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307 msgid "Authentication failed" msgstr "Fallou a autenticación" # rever -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309 msgid "Encryption error" msgstr "Erro de cifrado" # rever -#: ../libempathy/empathy-utils.c:288 +#: ../libempathy/empathy-utils.c:277 msgid "Name in use" msgstr "Nome en uso" # rever -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311 msgid "Certificate not provided" msgstr "Non se forneceu o certificado" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313 msgid "Certificate untrusted" msgstr "Certificado sen confianza" # rever -#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315 msgid "Certificate expired" msgstr "O certificado expirou" # rever -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317 msgid "Certificate not activated" msgstr "O certificado non está activado" # rever -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:319 msgid "Certificate hostname mismatch" msgstr "O nome do host do certificado non coincide" # rever -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:321 msgid "Certificate fingerprint mismatch" msgstr "A impresión dixital do certificado non coincide" # rever -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:323 msgid "Certificate self-signed" msgstr "Certificado autoasinado" # rever -#: ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:293 msgid "Certificate error" msgstr "Erro do certificado" -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption is not available" msgstr "O cifrado non está dispoñÃbel" # rever -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate is invalid" msgstr "O certificado non é válido" # rever -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:331 msgid "Connection has been refused" msgstr "Rexeitouse a conexión" # rever -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:333 msgid "Connection can't be established" msgstr "Non é posÃbel estabelecer a conexión" # rever -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:335 msgid "Connection has been lost" msgstr "Perdeuse a conexión" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:337 msgid "This account is already connected to the server" msgstr "Esta conta xa está conectada ao servidor" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:339 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "" "A conexión foi substituÃda por unha conexión nova empregando o mesmo recurso" -#: ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:342 msgid "The account already exists on the server" msgstr "Esta conta xa existe no servidor" -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:344 msgid "Server is currently too busy to handle the connection" msgstr "" "Nestes intres o servidor está demasiado ocupado para xestionar a conexión" # rever -#: ../libempathy/empathy-utils.c:357 +#: ../libempathy/empathy-utils.c:346 msgid "Certificate has been revoked" msgstr "O certificado foi revogado" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:348 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "O certificado usa un algoritmo de cifrado inseguro ou cripotograficamente " "débil" -#: ../libempathy/empathy-utils.c:362 +#: ../libempathy/empathy-utils.c:351 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -885,34 +885,34 @@ msgstr "" "certificado do servidor excede os lÃmites impostos pola biblioteca de " "criptografÃa" -#: ../libempathy/empathy-utils.c:366 +#: ../libempathy/empathy-utils.c:355 msgid "Your software is too old" msgstr "O seu software é demasiado antigo" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:357 msgid "Internal error" msgstr "Erro interno" # rever -#: ../libempathy/empathy-utils.c:497 -#: ../libempathy-gtk/empathy-roster-model.h:30 +#: ../libempathy/empathy-utils.c:486 +#: ../libempathy-gtk/empathy-roster-model.h:28 msgid "People Nearby" msgstr "Xente cerca" # rever -#: ../libempathy/empathy-utils.c:502 +#: ../libempathy/empathy-utils.c:491 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:671 +#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:539 +#: ../libempathy/empathy-utils.c:528 msgid "Facebook Chat" msgstr "Conversa de Facebook" -#: ../libempathy-gtk/empathy-account-chooser.c:689 +#: ../libempathy-gtk/empathy-account-chooser.c:684 msgid "All accounts" msgstr "Todas as contas" @@ -992,56 +992,56 @@ msgstr "Cal e o seu contrasinal para AIM?" msgid "Remember Password" msgstr "Lembrar o contrasinal" -#: ../libempathy-gtk/empathy-account-widget.c:675 +#: ../libempathy-gtk/empathy-account-widget.c:668 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -#: ../src/empathy-import-widget.c:322 +#: ../src/empathy-import-widget.c:316 msgid "Account" msgstr "Conta" -#: ../libempathy-gtk/empathy-account-widget.c:676 +#: ../libempathy-gtk/empathy-account-widget.c:669 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Password" msgstr "Contrasinal" -#: ../libempathy-gtk/empathy-account-widget.c:677 +#: ../libempathy-gtk/empathy-account-widget.c:670 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:511 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:498 msgid "Server" msgstr "Servidor" -#: ../libempathy-gtk/empathy-account-widget.c:678 +#: ../libempathy-gtk/empathy-account-widget.c:671 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:532 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:519 msgid "Port" msgstr "Porto" -#: ../libempathy-gtk/empathy-account-widget.c:762 +#: ../libempathy-gtk/empathy-account-widget.c:755 #, c-format msgid "%s" msgstr "%s" -#: ../libempathy-gtk/empathy-account-widget.c:817 +#: ../libempathy-gtk/empathy-account-widget.c:810 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1429 +#: ../libempathy-gtk/empathy-account-widget.c:1422 msgid "Username:" msgstr "Nome de usuario:" -#: ../libempathy-gtk/empathy-account-widget.c:1746 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "A_pply" msgstr "_Aplicar" -#: ../libempathy-gtk/empathy-account-widget.c:1775 +#: ../libempathy-gtk/empathy-account-widget.c:1768 msgid "L_og in" msgstr "Iniciar _sesión" -#: ../libempathy-gtk/empathy-account-widget.c:1845 +#: ../libempathy-gtk/empathy-account-widget.c:1838 msgid "This account already exists on the server" msgstr "Esta conta xa existe no servidor" -#: ../libempathy-gtk/empathy-account-widget.c:1849 +#: ../libempathy-gtk/empathy-account-widget.c:1842 msgid "Create a new account on the server" msgstr "Crear unha nova conta no servidor" @@ -1051,20 +1051,20 @@ msgstr "Crear unha nova conta no servidor" #. * 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:2270 +#: ../libempathy-gtk/empathy-account-widget.c:2255 #, 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:2296 +#: ../libempathy-gtk/empathy-account-widget.c:2281 #, c-format msgid "%s Account" msgstr "Conta %s" # rever -#: ../libempathy-gtk/empathy-account-widget.c:2300 +#: ../libempathy-gtk/empathy-account-widget.c:2285 msgid "New account" msgstr "Conta nova" @@ -1297,32 +1297,32 @@ msgstr "Cal é o seu ID de Windows Live?" msgid "What is your Windows Live password?" msgstr "Cal é o seu contrasinal de Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:207 -#: ../libempathy-gtk/empathy-account-widget-sip.c:240 +#: ../libempathy-gtk/empathy-account-widget-sip.c:198 +#: ../libempathy-gtk/empathy-account-widget-sip.c:231 msgid "Auto" msgstr "Auto" -#: ../libempathy-gtk/empathy-account-widget-sip.c:210 +#: ../libempathy-gtk/empathy-account-widget-sip.c:201 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:213 +#: ../libempathy-gtk/empathy-account-widget-sip.c:204 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:216 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 msgid "TLS" msgstr "TLS" -#: ../libempathy-gtk/empathy-account-widget-sip.c:245 +#: ../libempathy-gtk/empathy-account-widget-sip.c:236 msgid "Register" msgstr "Rexistrador" -#: ../libempathy-gtk/empathy-account-widget-sip.c:250 +#: ../libempathy-gtk/empathy-account-widget-sip.c:241 msgid "Options" msgstr "Opcións" -#: ../libempathy-gtk/empathy-account-widget-sip.c:253 +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 msgid "None" msgstr "Ningún" @@ -1439,58 +1439,58 @@ msgid "What is your Yahoo! password?" msgstr "Cal é o seu contrasinal de Yahoo!?" # rever -#: ../libempathy-gtk/empathy-avatar-chooser.c:545 -#: ../libempathy-gtk/empathy-avatar-chooser.c:630 +#: ../libempathy-gtk/empathy-avatar-chooser.c:539 +#: ../libempathy-gtk/empathy-avatar-chooser.c:624 msgid "Couldn't convert image" msgstr "Non foi posÃbel converter a imaxe" # rever -#: ../libempathy-gtk/empathy-avatar-chooser.c:546 +#: ../libempathy-gtk/empathy-avatar-chooser.c:540 msgid "None of the accepted image formats are supported on your system" msgstr "Ningún dos formatos aceptados de imaxe é compatÃbel co seu sistema" -#: ../libempathy-gtk/empathy-avatar-chooser.c:906 +#: ../libempathy-gtk/empathy-avatar-chooser.c:900 msgid "Couldn't save picture to file" msgstr "Non foi posÃbel gardar a imaxe a un ficheiro" # rever -#: ../libempathy-gtk/empathy-avatar-chooser.c:1030 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1024 msgid "Select Your Avatar Image" msgstr "Seleccione a súa imaxe de avatar" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1038 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1032 msgid "Take a picture..." msgstr "Tomar unha foto…" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1051 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1045 msgid "No Image" msgstr "Sen imaxe" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1108 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1102 msgid "Images" msgstr "Imaxes" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1112 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1106 msgid "All Files" msgstr "Todos os ficheiros" # rever -#: ../libempathy-gtk/empathy-avatar-image.c:322 +#: ../libempathy-gtk/empathy-avatar-image.c:319 msgid "Click to enlarge" msgstr "Prema para ampliar" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:128 #, c-format msgid "Authentication failed for account <b>%s</b>" msgstr "Fallou a autenticación para a conta <b>%s</b>" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 -#: ../libempathy-gtk/empathy-chat.c:3724 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:140 +#: ../libempathy-gtk/empathy-chat.c:3844 msgid "Retry" msgstr "Reintentar" #: ../libempathy-gtk/empathy-base-password-dialog.c:224 -#: ../libempathy-gtk/empathy-password-dialog.c:134 +#: ../libempathy-gtk/empathy-password-dialog.c:132 #, c-format msgid "" "Enter your password for account\n" @@ -1499,74 +1499,74 @@ msgstr "" "Escriba o contrasinal para a conta\n" "<b>%s</b>" -#: ../libempathy-gtk/empathy-calendar-button.c:66 +#: ../libempathy-gtk/empathy-calendar-button.c:63 msgid "Select..." msgstr "Seleccionar…" -#: ../libempathy-gtk/empathy-calendar-button.c:154 +#: ../libempathy-gtk/empathy-calendar-button.c:151 msgid "_Select" msgstr "_Seleccionar" -#: ../libempathy-gtk/empathy-call-utils.c:42 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:36 +#: ../libempathy-gtk/empathy-call-utils.c:54 msgid "There was an error starting the call" msgstr "Produciuse un erro ao iniciar a chamada" -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:43 msgid "The specified contact doesn't support calls" msgstr "O contacto especificado non admite as chamadas" # rever -#: ../libempathy-gtk/empathy-call-utils.c:51 +#: ../libempathy-gtk/empathy-call-utils.c:45 msgid "The specified contact is offline" msgstr "O contacto especificado está desconectado" # rever -#: ../libempathy-gtk/empathy-call-utils.c:53 +#: ../libempathy-gtk/empathy-call-utils.c:47 msgid "The specified contact is not valid" msgstr "O contacto especificado non é válido" -#: ../libempathy-gtk/empathy-call-utils.c:55 +#: ../libempathy-gtk/empathy-call-utils.c:49 msgid "Emergency calls are not supported on this protocol" msgstr "Este protocolo non admite as chamadas de emerxencia" -#: ../libempathy-gtk/empathy-call-utils.c:57 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "You don't have enough credit in order to place this call" msgstr "Non ten crédito dabondo para facer esta chamada" -#: ../libempathy-gtk/empathy-chat.c:727 +#: ../libempathy-gtk/empathy-chat.c:731 msgid "Failed to open private chat" msgstr "Produciuse un erro ao abrir unha conversa privada" -#: ../libempathy-gtk/empathy-chat.c:785 +#: ../libempathy-gtk/empathy-chat.c:789 msgid "Topic not supported on this conversation" msgstr "O asunto non é ocmpatÃbel nesta conversa" -#: ../libempathy-gtk/empathy-chat.c:791 +#: ../libempathy-gtk/empathy-chat.c:795 msgid "You are not allowed to change the topic" msgstr "Non se lle permite cambiar o asunto" -#: ../libempathy-gtk/empathy-chat.c:967 +#: ../libempathy-gtk/empathy-chat.c:971 msgid "Invalid contact ID" msgstr "ID de contacto non válido" -#: ../libempathy-gtk/empathy-chat.c:1054 +#: ../libempathy-gtk/empathy-chat.c:1058 msgid "/clear: clear all messages from the current conversation" msgstr "/clear, limpa todas as mensaxes da conversa actual" -#: ../libempathy-gtk/empathy-chat.c:1057 +#: ../libempathy-gtk/empathy-chat.c:1061 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <topic>, estabelece o asunto da conversa actual" -#: ../libempathy-gtk/empathy-chat.c:1060 +#: ../libempathy-gtk/empathy-chat.c:1064 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <chatroom id>, unirse a unha nova sala de conversas" -#: ../libempathy-gtk/empathy-chat.c:1063 +#: ../libempathy-gtk/empathy-chat.c:1067 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <chatroom id>, unirse a unha nova sala de conversas" -#: ../libempathy-gtk/empathy-chat.c:1067 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" @@ -1574,23 +1574,23 @@ msgstr "" "/part [<ID da sala de conversa>] [<razón>]: saÃr da sala de conversas, por " "omisión a actual" -#: ../libempathy-gtk/empathy-chat.c:1071 +#: ../libempathy-gtk/empathy-chat.c:1075 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <id do contacto> [<mensaxe>], abre unha conversa privada" -#: ../libempathy-gtk/empathy-chat.c:1074 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <id do contacto> <mensaxe>, abre unha conversa privada" -#: ../libempathy-gtk/empathy-chat.c:1077 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <alcume>, cambia o seu nome de usuario no servidor actual" -#: ../libempathy-gtk/empathy-chat.c:1080 +#: ../libempathy-gtk/empathy-chat.c:1084 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <mensaxe>, envÃa unha mensaxe ACTION á conversa actual" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1087 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 " @@ -1600,11 +1600,11 @@ msgstr "" "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para " "unirse a unha nova sala de conversas\"" -#: ../libempathy-gtk/empathy-chat.c:1088 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/whois <contact ID>: display information about a contact" msgstr "/whois <ID do contacto>: mostra información sobre un contacto" -#: ../libempathy-gtk/empathy-chat.c:1091 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1612,134 +1612,134 @@ msgstr "" "/help [<orde>], mostra todas as ordes admitidas. Se <orde> está definida, " "mostra o seu uso." -#: ../libempathy-gtk/empathy-chat.c:1110 +#: ../libempathy-gtk/empathy-chat.c:1114 #, c-format msgid "Usage: %s" msgstr "Uso: %s" -#: ../libempathy-gtk/empathy-chat.c:1155 +#: ../libempathy-gtk/empathy-chat.c:1159 msgid "Unknown command" msgstr "Orde descoñecida" -#: ../libempathy-gtk/empathy-chat.c:1281 +#: ../libempathy-gtk/empathy-chat.c:1285 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:1538 +#: ../libempathy-gtk/empathy-chat.c:1542 msgid "insufficient balance to send message" msgstr "non ten balance suficiente para enviar a mensaxe" # rever -#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556 -#: ../libempathy-gtk/empathy-chat.c:1619 +#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560 +#: ../libempathy-gtk/empathy-chat.c:1623 #, c-format msgid "Error sending message '%s': %s" msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s" # rever -#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561 -#: ../libempathy-gtk/empathy-chat.c:1623 +#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1627 #, c-format msgid "Error sending message: %s" msgstr "Produciuse un erro ao enviar a mensaxe: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1550 +#: ../libempathy-gtk/empathy-chat.c:1554 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "" "non ten balance dabondo para enviar a mensaxe <a href='%s'>Recargar</a>." -#: ../libempathy-gtk/empathy-chat.c:1590 +#: ../libempathy-gtk/empathy-chat.c:1594 msgid "not capable" msgstr "non é posÃbel" -#: ../libempathy-gtk/empathy-chat.c:1597 +#: ../libempathy-gtk/empathy-chat.c:1601 msgid "offline" msgstr "desconectado" -#: ../libempathy-gtk/empathy-chat.c:1600 +#: ../libempathy-gtk/empathy-chat.c:1604 msgid "invalid contact" msgstr "contacto non válido" -#: ../libempathy-gtk/empathy-chat.c:1603 +#: ../libempathy-gtk/empathy-chat.c:1607 msgid "permission denied" msgstr "permiso denegado" # rever -#: ../libempathy-gtk/empathy-chat.c:1606 +#: ../libempathy-gtk/empathy-chat.c:1610 msgid "too long message" msgstr "mensaxe é demasiado longa" -#: ../libempathy-gtk/empathy-chat.c:1609 +#: ../libempathy-gtk/empathy-chat.c:1613 msgid "not implemented" msgstr "non implementado" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1617 msgid "unknown" msgstr "descoñecido" -#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979 +#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967 msgid "Topic:" msgstr "Asunto:" # rever -#: ../libempathy-gtk/empathy-chat.c:1695 +#: ../libempathy-gtk/empathy-chat.c:1699 #, c-format msgid "Topic set to: %s" msgstr "Cambiouse o asunto a: %s" # rever -#: ../libempathy-gtk/empathy-chat.c:1697 +#: ../libempathy-gtk/empathy-chat.c:1701 #, c-format msgid "Topic set by %s to: %s" msgstr "Tema estabelecido por %s a: %s" # rever #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1702 +#: ../libempathy-gtk/empathy-chat.c:1706 msgid "No topic defined" msgstr "Non se definiu o asunto" -#: ../libempathy-gtk/empathy-chat.c:2218 +#: ../libempathy-gtk/empathy-chat.c:2222 msgid "(No Suggestions)" msgstr "(Sen suxestións)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2286 +#: ../libempathy-gtk/empathy-chat.c:2290 #, 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:2323 +#: ../libempathy-gtk/empathy-chat.c:2327 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Engadir «%s» ao dicionario de %s" -#: ../libempathy-gtk/empathy-chat.c:2393 +#: ../libempathy-gtk/empathy-chat.c:2397 msgid "Insert Smiley" msgstr "Inserir unha emoticona" #. send button -#: ../libempathy-gtk/empathy-chat.c:2411 -#: ../libempathy-gtk/empathy-ui-utils.c:1180 +#: ../libempathy-gtk/empathy-chat.c:2415 +#: ../libempathy-gtk/empathy-ui-utils.c:1208 msgid "_Send" msgstr "_Enviar" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2468 +#: ../libempathy-gtk/empathy-chat.c:2472 msgid "_Spelling Suggestions" msgstr "Suxestións de _ortografÃa" -#: ../libempathy-gtk/empathy-chat.c:2574 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Produciuse un erro ao obter os rexistros recentes" # rever -#: ../libempathy-gtk/empathy-chat.c:2718 +#: ../libempathy-gtk/empathy-chat.c:2826 #, c-format msgid "%s has disconnected" msgstr "%s desconectou" @@ -1747,12 +1747,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:2725 +#: ../libempathy-gtk/empathy-chat.c:2833 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s foi expulsado por %2$s" -#: ../libempathy-gtk/empathy-chat.c:2728 +#: ../libempathy-gtk/empathy-chat.c:2836 #, c-format msgid "%s was kicked" msgstr "%s foi expulsado" @@ -1760,17 +1760,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:2736 +#: ../libempathy-gtk/empathy-chat.c:2844 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s foi vetado por %2$s" -#: ../libempathy-gtk/empathy-chat.c:2739 +#: ../libempathy-gtk/empathy-chat.c:2847 #, c-format msgid "%s was banned" msgstr "%s foi excluÃdo" -#: ../libempathy-gtk/empathy-chat.c:2743 +#: ../libempathy-gtk/empathy-chat.c:2851 #, c-format msgid "%s has left the room" msgstr "%s deixou a sala" @@ -1780,18 +1780,18 @@ 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:2752 +#: ../libempathy-gtk/empathy-chat.c:2860 #, c-format msgid " (%s)" msgstr " (%s)" # rever -#: ../libempathy-gtk/empathy-chat.c:2777 +#: ../libempathy-gtk/empathy-chat.c:2885 #, c-format msgid "%s has joined the room" msgstr "%s uniuse á sala" -#: ../libempathy-gtk/empathy-chat.c:2802 +#: ../libempathy-gtk/empathy-chat.c:2910 #, c-format msgid "%s is now known as %s" msgstr "%s agora é coñecido como %s" @@ -1799,83 +1799,83 @@ msgstr "%s agora é coñecido como %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532 -#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655 -#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166 +#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516 +#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2641 +#: ../src/empathy-call-window.c:2948 ../src/empathy-event-manager.c:1158 msgid "Disconnected" msgstr "Desconectado" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3664 +#: ../libempathy-gtk/empathy-chat.c:3784 msgid "Would you like to store this password?" msgstr "Desexa gardar este contrasinal?" -#: ../libempathy-gtk/empathy-chat.c:3670 +#: ../libempathy-gtk/empathy-chat.c:3790 msgid "Remember" msgstr "Lembrar" -#: ../libempathy-gtk/empathy-chat.c:3680 +#: ../libempathy-gtk/empathy-chat.c:3800 msgid "Not now" msgstr "Agora non" -#: ../libempathy-gtk/empathy-chat.c:3728 +#: ../libempathy-gtk/empathy-chat.c:3848 msgid "Wrong password; please try again:" msgstr "O contrasinal é incorrecto, ténteo de novo:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3858 +#: ../libempathy-gtk/empathy-chat.c:3972 msgid "This room is protected by a password:" msgstr "Esta sala está protexida por un contrasinal:" -#: ../libempathy-gtk/empathy-chat.c:3885 -#: ../src/empathy-new-chatroom-dialog.c:780 +#: ../libempathy-gtk/empathy-chat.c:3999 +#: ../src/empathy-new-chatroom-dialog.c:770 msgid "Join" msgstr "Unirse" -#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187 +#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1179 msgid "Connected" msgstr "Conectado" -#: ../libempathy-gtk/empathy-chat.c:4132 +#: ../libempathy-gtk/empathy-chat.c:4246 msgid "Conversation" msgstr "Conversa" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4137 +#: ../libempathy-gtk/empathy-chat.c:4251 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261 msgid "Unknown or invalid identifier" msgstr "Identificador descoñecido ou non válido" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263 msgid "Contact blocking temporarily unavailable" msgstr "Bloqueo de contactos non dispoñÃbel temporalmente" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 msgid "Contact blocking unavailable" msgstr "Bloqueo de contactos non dispoñÃbel" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 msgid "Permission Denied" msgstr "Permiso denegado" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 msgid "Could not block contact" msgstr "Non foi posÃbel bloquear o contacto" # rever -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610 msgid "Edit Blocked Contacts" msgstr "Editar os contactos bloqueados" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 -#: ../libempathy-gtk/empathy-individual-widget.c:1485 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:528 +#: ../libempathy-gtk/empathy-individual-widget.c:1473 #: ../src/empathy-chatrooms-window.ui.h:2 #: ../src/empathy-new-chatroom-dialog.ui.h:6 msgid "Account:" @@ -1886,126 +1886,126 @@ msgstr "Conta:" msgid "Blocked Contacts" msgstr "Contactos bloqueados" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:98 msgid "Full name" msgstr "Nome completo" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:99 msgid "Phone number" msgstr "Número de teléfono" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:100 msgid "E-mail address" msgstr "Enderezo de correo electrónico" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:101 msgid "Website" msgstr "Sitio web" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 msgid "Birthday" msgstr "Aniversario" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Last seen:" msgstr "Última actividade" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Server:" msgstr "Servidor:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:109 msgid "Connected from:" msgstr "Conectado desde:" # rever #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Away message:" msgstr "Mensaxe de ausencia:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:126 msgid "work" msgstr "traballo" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:127 msgid "home" msgstr "persoal" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:128 msgid "mobile" msgstr "móbil" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:129 msgid "voice" msgstr "voz" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 msgid "preferred" msgstr "prefirido" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 msgid "postal" msgstr "postal" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "parcel" msgstr "grupo" # rever #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:522 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:521 msgid "Search contacts" msgstr "Buscar contactos" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:552 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:551 msgid "Search: " msgstr "Buscar:" # rever -#: ../libempathy-gtk/empathy-contact-search-dialog.c:610 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:609 msgid "_Add Contact" msgstr "_Engadir contacto" # rever -#: ../libempathy-gtk/empathy-contact-search-dialog.c:628 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 msgid "No contacts found" msgstr "Non se atoparon contactos" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:644 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:643 msgid "Your message introducing yourself:" msgstr "A súa mensaxe de presentación:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:652 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:651 msgid "Please let me see when you're online. Thanks!" msgstr "PermÃtame ver cando está en liña. Grazas." # rever -#: ../libempathy-gtk/empathy-contact-widget.c:168 -#: ../libempathy-gtk/empathy-individual-widget.c:900 +#: ../libempathy-gtk/empathy-contact-widget.c:156 +#: ../libempathy-gtk/empathy-individual-widget.c:888 msgid "Save Avatar" msgstr "Gardar o avatar" # rever -#: ../libempathy-gtk/empathy-contact-widget.c:224 -#: ../libempathy-gtk/empathy-individual-widget.c:958 +#: ../libempathy-gtk/empathy-contact-widget.c:212 +#: ../libempathy-gtk/empathy-individual-widget.c:946 msgid "Unable to save avatar" msgstr "Non foi posÃbel gardar o avatar" #. Identifier to connect to Instant Messaging network #. Setup id label #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-user-info.c:444 +#: ../libempathy-gtk/empathy-user-info.c:455 msgid "Identifier" msgstr "Identificador" #. Setup nickname entry #: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -#: ../libempathy-gtk/empathy-user-info.c:449 +#: ../libempathy-gtk/empathy-user-info.c:460 msgid "Alias" msgstr "Alias" @@ -2042,11 +2042,11 @@ msgstr "Versión" msgid "Client" msgstr "Cliente" -#: ../libempathy-gtk/empathy-groups-widget.c:327 +#: ../libempathy-gtk/empathy-groups-widget.c:317 msgid "Groups" msgstr "Grupos" -#: ../libempathy-gtk/empathy-groups-widget.c:339 +#: ../libempathy-gtk/empathy-groups-widget.c:329 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2054,76 +2054,76 @@ msgstr "" "Seleccione os grupos en que quere que aparezan estes contactos. Note que " "pode seleccionar máis dun grupo ou ningún." -#: ../libempathy-gtk/empathy-groups-widget.c:358 +#: ../libempathy-gtk/empathy-groups-widget.c:348 msgid "_Add Group" msgstr "Eng_adir grupo" -#: ../libempathy-gtk/empathy-groups-widget.c:393 +#: ../libempathy-gtk/empathy-groups-widget.c:383 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Seleccionar" -#: ../libempathy-gtk/empathy-groups-widget.c:403 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgid "Group" msgstr "Grupo" -#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +#: ../libempathy-gtk/empathy-individual-dialogs.c:108 msgid "New Contact" msgstr "Contacto novo" -#: ../libempathy-gtk/empathy-individual-dialogs.c:193 -#: ../libempathy-gtk/empathy-subscription-dialog.c:121 +#: ../libempathy-gtk/empathy-individual-dialogs.c:183 +#: ../libempathy-gtk/empathy-subscription-dialog.c:120 #, c-format msgid "Block %s?" msgstr "Desexa bloquear a %s?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:248 -#: ../libempathy-gtk/empathy-subscription-dialog.c:125 +#: ../libempathy-gtk/empathy-individual-dialogs.c:238 +#: ../libempathy-gtk/empathy-subscription-dialog.c:124 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "" "Ten certeza de bloquear a «%s» para que non volva a contactar con vostede?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-individual-dialogs.c:243 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Bloquearase a seguinte identidade:" msgstr[1] "Bloquearanse as seguintes identidades:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:250 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Non é posÃbel bloquear a seguinte identidade:" msgstr[1] "Non é posÃbel bloquear as seguintes identidades:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:270 -#: ../libempathy-gtk/empathy-subscription-dialog.c:130 -#: ../libempathy-gtk/empathy-subscription-dialog.c:275 +#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-subscription-dialog.c:129 +#: ../libempathy-gtk/empathy-subscription-dialog.c:274 msgid "_Block" msgstr "_Bloquear" -#: ../libempathy-gtk/empathy-individual-dialogs.c:279 -#: ../libempathy-gtk/empathy-subscription-dialog.c:150 +#: ../libempathy-gtk/empathy-individual-dialogs.c:269 +#: ../libempathy-gtk/empathy-subscription-dialog.c:149 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Informar de este contacto como abusivo" msgstr[1] "_Informar destes contactos como abusivos" -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237 msgid "Edit Contact Information" msgstr "Editar a información de contacto" # rever #. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:293 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:283 msgid "Linked Contacts" msgstr "Contactos ligados" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:332 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:322 msgid "gnome-contacts not installed" msgstr "gnome-contacts non está instalado" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:335 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:325 msgid "Please install gnome-contacts to access contacts details." msgstr "" "Instale o programa gnome-contacts para acceder aos detalles dos contactos" @@ -2131,49 +2131,49 @@ 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:177 +#: ../libempathy-gtk/empathy-individual-menu.c:168 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:353 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Seleccione a conta a usar para realizar a chamada" -#: ../libempathy-gtk/empathy-individual-menu.c:357 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-call-window.ui.h:20 msgid "Call" msgstr "Chamar" -#: ../libempathy-gtk/empathy-individual-menu.c:422 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Móbil" -#: ../libempathy-gtk/empathy-individual-menu.c:424 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Traballo" -#: ../libempathy-gtk/empathy-individual-menu.c:426 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "Casa" # rever -#: ../libempathy-gtk/empathy-individual-menu.c:669 +#: ../libempathy-gtk/empathy-individual-menu.c:660 msgid "_Block Contact" msgstr "_Bloquear contacto" -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:716 msgid "Delete and _Block" msgstr "Eliminar e _bloquear" # rever -#: ../libempathy-gtk/empathy-individual-menu.c:787 +#: ../libempathy-gtk/empathy-individual-menu.c:778 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Está seguro de quere retirar o contacto '%s'?" -#: ../libempathy-gtk/empathy-individual-menu.c:796 +#: ../libempathy-gtk/empathy-individual-menu.c:787 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2182,226 +2182,226 @@ msgstr "" "Desexa retirar o contacto ligado %s? Teña en conta que se retirarán tamén " "todos os contactos que conforman este contacto ligado." -#: ../libempathy-gtk/empathy-individual-menu.c:807 +#: ../libempathy-gtk/empathy-individual-menu.c:798 msgid "Removing contact" msgstr "Retirando o contacto" -#: ../libempathy-gtk/empathy-individual-menu.c:871 -#: ../libempathy-gtk/empathy-individual-view.c:2453 +#: ../libempathy-gtk/empathy-individual-menu.c:862 +#: ../libempathy-gtk/empathy-individual-view.c:2440 msgid "_Remove" msgstr "_Retirar" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1234 -#: ../libempathy-gtk/empathy-new-message-dialog.c:318 +#: ../libempathy-gtk/empathy-individual-menu.c:1225 +#: ../libempathy-gtk/empathy-new-message-dialog.c:308 msgid "_Chat" msgstr "_Conversa" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1269 -#: ../libempathy-gtk/empathy-new-message-dialog.c:312 +#: ../libempathy-gtk/empathy-individual-menu.c:1260 +#: ../libempathy-gtk/empathy-new-message-dialog.c:302 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1302 +#: ../libempathy-gtk/empathy-individual-menu.c:1293 msgctxt "menu item" msgid "_Audio Call" msgstr "_Chamada de son" -#: ../libempathy-gtk/empathy-individual-menu.c:1335 +#: ../libempathy-gtk/empathy-individual-menu.c:1326 msgctxt "menu item" msgid "_Video Call" msgstr "_Videochamada" # rever -#: ../libempathy-gtk/empathy-individual-menu.c:1376 +#: ../libempathy-gtk/empathy-individual-menu.c:1367 #: ../src/empathy-roster-window-menubar.ui.h:11 msgid "_Previous Conversations" msgstr "Conversas _previas" -#: ../libempathy-gtk/empathy-individual-menu.c:1405 +#: ../libempathy-gtk/empathy-individual-menu.c:1396 msgid "Send File" msgstr "Enviar ficheiro" -#: ../libempathy-gtk/empathy-individual-menu.c:1435 +#: ../libempathy-gtk/empathy-individual-menu.c:1426 msgid "Share My Desktop" msgstr "Compartir o meu escritorio" # rever -#: ../libempathy-gtk/empathy-individual-menu.c:1461 -#: ../libempathy-gtk/empathy-individual-widget.c:1368 +#: ../libempathy-gtk/empathy-individual-menu.c:1452 +#: ../libempathy-gtk/empathy-individual-widget.c:1356 msgid "Favorite" msgstr "Favorito" -#: ../libempathy-gtk/empathy-individual-menu.c:1490 +#: ../libempathy-gtk/empathy-individual-menu.c:1481 msgid "Infor_mation" msgstr "Infor_mación" -#: ../libempathy-gtk/empathy-individual-menu.c:1539 +#: ../libempathy-gtk/empathy-individual-menu.c:1530 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Editar" # rever #. send invitation -#: ../libempathy-gtk/empathy-individual-menu.c:1655 -#: ../src/empathy-chat-window.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1646 +#: ../src/empathy-chat-window.c:1233 msgid "Inviting you to this room" msgstr "InvÃtao a vostede a esta sala" # rever -#: ../libempathy-gtk/empathy-individual-menu.c:1701 +#: ../libempathy-gtk/empathy-individual-menu.c:1692 msgid "_Invite to Chat Room" msgstr "Conv_idar a sala de conversas" # rever -#: ../libempathy-gtk/empathy-individual-menu.c:1897 +#: ../libempathy-gtk/empathy-individual-menu.c:1888 msgid "_Add Contact…" msgstr "Eng_adir un contacto…" # rever -#: ../libempathy-gtk/empathy-individual-view.c:2373 +#: ../libempathy-gtk/empathy-individual-view.c:2360 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Está seguro de que quere retirar o grupo '%s'?" # rever -#: ../libempathy-gtk/empathy-individual-view.c:2376 +#: ../libempathy-gtk/empathy-individual-view.c:2363 msgid "Removing group" msgstr "Retirando o grupo" -#: ../libempathy-gtk/empathy-individual-view.c:2444 +#: ../libempathy-gtk/empathy-individual-view.c:2431 msgid "Re_name" msgstr "Re_nomear" -#: ../libempathy-gtk/empathy-individual-widget.c:304 +#: ../libempathy-gtk/empathy-individual-widget.c:294 msgid "Channels:" msgstr "Canles:" -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-individual-widget.c:445 msgid "Country ISO Code:" msgstr "Código ISO de paÃs:" -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-individual-widget.c:447 msgid "Country:" msgstr "PaÃs:" -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-individual-widget.c:449 msgid "State:" msgstr "Rexión:" -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-individual-widget.c:451 msgid "City:" msgstr "Cidade:" -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-individual-widget.c:453 msgid "Area:" msgstr "Ãrea:" -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Postal Code:" msgstr "Código postal:" -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Street:" msgstr "Rúa:" -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "Building:" msgstr "Edificio:" # rever -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "Floor:" msgstr "_Andar:" -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Room:" msgstr "Sala:" -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Text:" msgstr "Texto:" -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Description:" msgstr "Descrición:" -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Accuracy Level:" msgstr "Nivel de precisión:" -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Error:" msgstr "Erro:" -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Vertical Error (meters):" msgstr "Erro vertical (metros):" -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Horizontal Error (meters):" msgstr "Erro horizontal (metros):" -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "Speed:" msgstr "Velocidade:" -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Bearing:" msgstr "Orientación:" -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Climb Speed:" msgstr "Velocidade de incremento:" -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Last Updated on:" msgstr "Última actualización:" -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Longitude:" msgstr "Lonxitude:" -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Latitude:" msgstr "Latitude:" -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Altitude:" msgstr "Altitude:" -#: ../libempathy-gtk/empathy-individual-widget.c:593 -#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../libempathy-gtk/empathy-individual-widget.c:583 +#: ../libempathy-gtk/empathy-individual-widget.c:598 #: ../src/empathy-preferences.ui.h:39 msgid "Location" msgstr "Localización" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-individual-widget.c:610 +#: ../libempathy-gtk/empathy-individual-widget.c:600 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-individual-widget.c:659 +#: ../libempathy-gtk/empathy-individual-widget.c:649 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y de %R UTC" #. Alias -#: ../libempathy-gtk/empathy-individual-widget.c:1304 +#: ../libempathy-gtk/empathy-individual-widget.c:1292 msgid "Alias:" msgstr "Alias:" #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-individual-widget.c:1513 +#: ../libempathy-gtk/empathy-individual-widget.c:1501 msgid "Identifier:" msgstr "Identificador:" -#: ../libempathy-gtk/empathy-individual-widget.c:1652 +#: ../libempathy-gtk/empathy-individual-widget.c:1640 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2416,33 +2416,33 @@ msgstr "<b>Localización</b> en (date)" msgid "Online from a phone or mobile device" msgstr "Conectado desde un teléfono ou un dispositivo móbil" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329 msgid "New Network" msgstr "Rede nova" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532 msgid "Choose an IRC network" msgstr "Seleccione unha rede IRC" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615 msgid "Reset _Networks List" msgstr "Rei_niciar a lista de redes" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Seleccionar" # rever -#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:271 msgid "new server" msgstr "servidor novo" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:547 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:534 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80 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 " @@ -2453,11 +2453,11 @@ msgstr "" "detalles de abaixo son correctos." # rever -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100 msgid "People nearby" msgstr "Xente cerca" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115 msgid "" "You can change these details later or disable this feature by choosing <span " "style=\"italic\">Edit → Accounts</span> in the Contact List." @@ -2466,137 +2466,137 @@ msgstr "" "caracterÃstica usando o diálogo <span style=\"italic\">Editar → Contas</" "span> na Lista de contactos." -#: ../libempathy-gtk/empathy-log-window.c:622 +#: ../libempathy-gtk/empathy-log-window.c:607 msgid "History" msgstr "Historial" -#: ../libempathy-gtk/empathy-log-window.c:677 +#: ../libempathy-gtk/empathy-log-window.c:662 msgid "Show" msgstr "Mostrar" -#: ../libempathy-gtk/empathy-log-window.c:699 +#: ../libempathy-gtk/empathy-log-window.c:684 msgid "Search" msgstr "Buscar" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1135 #, c-format msgid "Chat in %s" msgstr "Conversar en %s" -#: ../libempathy-gtk/empathy-log-window.c:1152 +#: ../libempathy-gtk/empathy-log-window.c:1137 #, c-format msgid "Chat with %s" msgstr "Conversa con %s" -#: ../libempathy-gtk/empathy-log-window.c:1202 -#: ../libempathy-gtk/empathy-log-window.c:1346 +#: ../libempathy-gtk/empathy-log-window.c:1187 +#: ../libempathy-gtk/empathy-log-window.c:1331 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e de %B de %Y ás %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1289 +#: ../libempathy-gtk/empathy-log-window.c:1274 #, c-format msgid "<i>* %s %s</i>" msgstr "<i>* %s %s</i>" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1295 +#: ../libempathy-gtk/empathy-log-window.c:1280 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1370 +#: ../libempathy-gtk/empathy-log-window.c:1355 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s segundo" msgstr[1] "%s segundos" -#: ../libempathy-gtk/empathy-log-window.c:1377 +#: ../libempathy-gtk/empathy-log-window.c:1362 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s minuto" msgstr[1] "%s minutos" -#: ../libempathy-gtk/empathy-log-window.c:1385 +#: ../libempathy-gtk/empathy-log-window.c:1370 #, c-format msgid "Call took %s, ended at %s" msgstr "A chamada levou %s, rematou ás %s" -#: ../libempathy-gtk/empathy-log-window.c:1716 +#: ../libempathy-gtk/empathy-log-window.c:1701 msgid "Today" msgstr "Hoxe" -#: ../libempathy-gtk/empathy-log-window.c:1720 +#: ../libempathy-gtk/empathy-log-window.c:1705 msgid "Yesterday" msgstr "Mañá" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1735 +#: ../libempathy-gtk/empathy-log-window.c:1720 msgid "%e %B %Y" msgstr "%e de %B de %Y" -#: ../libempathy-gtk/empathy-log-window.c:1839 -#: ../libempathy-gtk/empathy-log-window.c:3462 +#: ../libempathy-gtk/empathy-log-window.c:1824 +#: ../libempathy-gtk/empathy-log-window.c:3447 msgid "Anytime" msgstr "Calquera momento" -#: ../libempathy-gtk/empathy-log-window.c:1938 -#: ../libempathy-gtk/empathy-log-window.c:2397 +#: ../libempathy-gtk/empathy-log-window.c:1923 +#: ../libempathy-gtk/empathy-log-window.c:2382 msgid "Anyone" msgstr "Calquera persoa" -#: ../libempathy-gtk/empathy-log-window.c:2710 +#: ../libempathy-gtk/empathy-log-window.c:2695 msgid "Who" msgstr "Quen" -#: ../libempathy-gtk/empathy-log-window.c:2919 +#: ../libempathy-gtk/empathy-log-window.c:2904 msgid "When" msgstr "Cando" -#: ../libempathy-gtk/empathy-log-window.c:3037 +#: ../libempathy-gtk/empathy-log-window.c:3022 msgid "Anything" msgstr "Calquera cousa" -#: ../libempathy-gtk/empathy-log-window.c:3039 +#: ../libempathy-gtk/empathy-log-window.c:3024 msgid "Text chats" msgstr "Conversas de texto" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3025 #: ../src/empathy-preferences.ui.h:29 msgid "Calls" msgstr "Chamadas" # rever -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3029 msgid "Incoming calls" msgstr "Chamadas entrantes" # rever -#: ../libempathy-gtk/empathy-log-window.c:3045 +#: ../libempathy-gtk/empathy-log-window.c:3030 msgid "Outgoing calls" msgstr "Chamadas de voz saÃntes" -#: ../libempathy-gtk/empathy-log-window.c:3046 +#: ../libempathy-gtk/empathy-log-window.c:3031 msgid "Missed calls" msgstr "Chamadas perdidas de %s" -#: ../libempathy-gtk/empathy-log-window.c:3066 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "What" msgstr "Que" -#: ../libempathy-gtk/empathy-log-window.c:3755 +#: ../libempathy-gtk/empathy-log-window.c:3740 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Ten certeza de eliminar tódolos rexistros das conversas anteriores?" -#: ../libempathy-gtk/empathy-log-window.c:3759 +#: ../libempathy-gtk/empathy-log-window.c:3744 msgid "Clear All" msgstr "Limpar todo" -#: ../libempathy-gtk/empathy-log-window.c:3766 +#: ../libempathy-gtk/empathy-log-window.c:3751 msgid "Delete from:" msgstr "Eliminar desde:" @@ -2618,7 +2618,7 @@ msgid "Profile" msgstr "PerfÃl" #: ../libempathy-gtk/empathy-log-window.ui.h:5 -#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-chat-window.c:1426 ../src/empathy-preferences.ui.h:11 msgid "Chat" msgstr "Conversa" @@ -2644,76 +2644,76 @@ msgstr "Que tipo de conta ten?" msgid "Adding new account" msgstr "Engadindo conta nova" -#: ../libempathy-gtk/empathy-new-call-dialog.c:199 -#: ../libempathy-gtk/empathy-new-message-dialog.c:289 +#: ../libempathy-gtk/empathy-new-call-dialog.c:189 +#: ../libempathy-gtk/empathy-new-message-dialog.c:279 msgid "Enter a contact identifier or phone number:" msgstr "Escriba o identificador dun contacto ou un número de teléfono:" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:222 +#: ../libempathy-gtk/empathy-new-call-dialog.c:212 msgid "_Video Call" msgstr "Chamada de _vÃdeo" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:232 +#: ../libempathy-gtk/empathy-new-call-dialog.c:222 msgid "_Audio Call" msgstr "Chamada de vo_z" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:242 +#: ../libempathy-gtk/empathy-new-call-dialog.c:232 msgid "New Call" msgstr "Nova chamada" # rever -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:72 msgid "The contact is offline" msgstr "O contacto está desconectado" # rever -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:74 msgid "The specified contact is either invalid or unknown" msgstr "O contacto especificado é descoñecido ou non é válido" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:76 msgid "The contact does not support this kind of conversation" msgstr "O contacto non admite este tipo de conversa" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:78 msgid "The requested functionality is not implemented for this protocol" msgstr "A funcionalidade requirida non está implementada para este protocolo" -#: ../libempathy-gtk/empathy-new-message-dialog.c:94 +#: ../libempathy-gtk/empathy-new-message-dialog.c:84 msgid "Could not start a conversation with the given contact" msgstr "Non foi posÃbel iniciar unha conversa co contacto dado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:86 msgid "You are banned from this channel" msgstr "Vostede foi bloqueado nesta canle" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:88 msgid "This channel is full" msgstr "Esta canel está completa" # rever -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:90 msgid "You must be invited to join this channel" msgstr "Debe ter un convite para unirse a esta canle" # rever -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:92 msgid "Can't proceed while disconnected" msgstr "Non é posÃbel continuar mentres estea desconectado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:94 msgid "Permission denied" msgstr "Permiso denegado" -#: ../libempathy-gtk/empathy-new-message-dialog.c:110 +#: ../libempathy-gtk/empathy-new-message-dialog.c:100 msgid "There was an error starting the conversation" msgstr "Produciuse un erro ao iniciar a conversa" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:332 +#: ../libempathy-gtk/empathy-new-message-dialog.c:322 msgid "New Conversation" msgstr "Conversa nova" @@ -2723,26 +2723,26 @@ msgstr "Conversa nova" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:164 -#: ../libempathy-gtk/empathy-presence-chooser.c:200 +#: ../libempathy-gtk/empathy-presence-chooser.c:157 +#: ../libempathy-gtk/empathy-presence-chooser.c:193 msgid "Custom Message…" msgstr "Mensaxe personalizada…" -#: ../libempathy-gtk/empathy-presence-chooser.c:217 -#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:210 +#: ../libempathy-gtk/empathy-presence-chooser.c:212 msgid "Edit Custom Messages…" msgstr "Editar mensaxes personalizadas…" -#: ../libempathy-gtk/empathy-presence-chooser.c:341 +#: ../libempathy-gtk/empathy-presence-chooser.c:334 msgid "Click to remove this status as a favorite" msgstr "Prema para retirar este estado como favorito" -#: ../libempathy-gtk/empathy-presence-chooser.c:350 +#: ../libempathy-gtk/empathy-presence-chooser.c:343 msgid "Click to make this status a favorite" msgstr "Faga clic para facer este estado un dos favoritos" #. Translators: %s is a status message like 'At the pub' for example -#: ../libempathy-gtk/empathy-presence-chooser.c:384 +#: ../libempathy-gtk/empathy-presence-chooser.c:377 #, c-format msgid "" "<b>Current message: %s</b>\n" @@ -2752,12 +2752,12 @@ msgstr "" "<small><i>Prema Intro para estabelecer o novo mensaxe ou Esc para cancelar.</" "i></small>" -#: ../libempathy-gtk/empathy-presence-chooser.c:393 +#: ../libempathy-gtk/empathy-presence-chooser.c:386 msgid "Set status" msgstr "Estabelecer status" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1101 +#: ../libempathy-gtk/empathy-presence-chooser.c:1094 msgid "Custom messages…" msgstr "Mensaxes personalizadas…" @@ -2766,12 +2766,12 @@ msgstr "Mensaxes personalizadas…" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../libempathy-gtk/empathy-protocol-chooser.c:608 +#: ../libempathy-gtk/empathy-protocol-chooser.c:603 #, c-format msgid "New %s account" msgstr "Conta nova de %s" -#: ../libempathy-gtk/empathy-search-bar.c:243 +#: ../libempathy-gtk/empathy-search-bar.c:237 msgid "_Match case" msgstr "_Coincidir con capitalizacioÌn" @@ -2797,185 +2797,185 @@ msgid "Phrase not found" msgstr "Frase non atopada" # rever -#: ../libempathy-gtk/empathy-sound-manager.c:51 +#: ../libempathy-gtk/empathy-sound-manager.c:49 msgid "Received an instant message" msgstr "Recibir unha mensaxe instantánea" # rever -#: ../libempathy-gtk/empathy-sound-manager.c:53 +#: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Sent an instant message" msgstr "Enviar unha mensaxe instantánea" # rever -#: ../libempathy-gtk/empathy-sound-manager.c:55 +#: ../libempathy-gtk/empathy-sound-manager.c:53 msgid "Incoming chat request" msgstr "Solicitude de conversa entrante" # rever -#: ../libempathy-gtk/empathy-sound-manager.c:57 +#: ../libempathy-gtk/empathy-sound-manager.c:55 msgid "Contact connected" msgstr "Contacto conectado" # rever -#: ../libempathy-gtk/empathy-sound-manager.c:59 +#: ../libempathy-gtk/empathy-sound-manager.c:57 msgid "Contact disconnected" msgstr "Contacto desconectado" # rever -#: ../libempathy-gtk/empathy-sound-manager.c:61 +#: ../libempathy-gtk/empathy-sound-manager.c:59 msgid "Connected to server" msgstr "Conectado co servidor" -#: ../libempathy-gtk/empathy-sound-manager.c:63 +#: ../libempathy-gtk/empathy-sound-manager.c:61 msgid "Disconnected from server" msgstr "Desconectado do servidor" # rever -#: ../libempathy-gtk/empathy-sound-manager.c:65 +#: ../libempathy-gtk/empathy-sound-manager.c:63 msgid "Incoming voice call" msgstr "Chamada de voz entrante" # rever -#: ../libempathy-gtk/empathy-sound-manager.c:67 +#: ../libempathy-gtk/empathy-sound-manager.c:65 msgid "Outgoing voice call" msgstr "Chamada de voz saÃnte" # rever -#: ../libempathy-gtk/empathy-sound-manager.c:69 +#: ../libempathy-gtk/empathy-sound-manager.c:67 msgid "Voice call ended" msgstr "Chamada de voz finalizada" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:294 msgid "Edit Custom Messages" msgstr "Editar mensaxes personalizadas" # rever -#: ../libempathy-gtk/empathy-subscription-dialog.c:234 +#: ../libempathy-gtk/empathy-subscription-dialog.c:233 msgid "Subscription Request" msgstr "Solicitude de subscrición" -#: ../libempathy-gtk/empathy-subscription-dialog.c:240 -#: ../src/empathy-event-manager.c:1104 +#: ../libempathy-gtk/empathy-subscription-dialog.c:239 +#: ../src/empathy-event-manager.c:1096 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s solicita permiso para ver cando vostede está dispoñÃbel" -#: ../libempathy-gtk/empathy-subscription-dialog.c:281 -#: ../src/empathy-event-manager.c:729 +#: ../libempathy-gtk/empathy-subscription-dialog.c:280 +#: ../src/empathy-event-manager.c:721 msgid "_Decline" msgstr "_Rexeitar" -#: ../libempathy-gtk/empathy-subscription-dialog.c:282 +#: ../libempathy-gtk/empathy-subscription-dialog.c:281 msgid "_Accept" msgstr "_Aceptar" -#: ../libempathy-gtk/empathy-theme-adium.c:1101 +#: ../libempathy-gtk/empathy-theme-adium.c:1211 #, c-format msgid "Message edited at %s" msgstr "Mensaxe editado ás %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1801 +#: ../libempathy-gtk/empathy-theme-adium.c:1913 msgid "Normal" msgstr "Normal" -#: ../libempathy-gtk/empathy-tls-dialog.c:150 +#: ../libempathy-gtk/empathy-tls-dialog.c:147 msgid "The identity provided by the chat server cannot be verified." msgstr "" "Non é posÃbel verificar a identidade fornecida polo servidor de conversas." -#: ../libempathy-gtk/empathy-tls-dialog.c:157 +#: ../libempathy-gtk/empathy-tls-dialog.c:154 msgid "The certificate is not signed by a Certification Authority." msgstr "O certificado non está asinado por unha Autoridade Certificadora." # rever -#: ../libempathy-gtk/empathy-tls-dialog.c:161 +#: ../libempathy-gtk/empathy-tls-dialog.c:158 msgid "The certificate has expired." msgstr "O certificado caducou." # rever -#: ../libempathy-gtk/empathy-tls-dialog.c:164 +#: ../libempathy-gtk/empathy-tls-dialog.c:161 msgid "The certificate hasn't yet been activated." msgstr "O certificado non está activado aÃnda." -#: ../libempathy-gtk/empathy-tls-dialog.c:167 +#: ../libempathy-gtk/empathy-tls-dialog.c:164 msgid "The certificate does not have the expected fingerprint." msgstr "O certificado non ten a pegada dixital esperada." -#: ../libempathy-gtk/empathy-tls-dialog.c:170 +#: ../libempathy-gtk/empathy-tls-dialog.c:167 msgid "The hostname verified by the certificate doesn't match the server name." msgstr "" "O nome de servidor verificado polo certificado non coincide co nome do " "servidor." # rever -#: ../libempathy-gtk/empathy-tls-dialog.c:174 +#: ../libempathy-gtk/empathy-tls-dialog.c:171 msgid "The certificate is self-signed." msgstr "O certificado está autoasinado." -#: ../libempathy-gtk/empathy-tls-dialog.c:177 +#: ../libempathy-gtk/empathy-tls-dialog.c:174 msgid "" "The certificate has been revoked by the issuing Certification Authority." msgstr "O certificado foi revocado pola Autoridade Certificadora." -#: ../libempathy-gtk/empathy-tls-dialog.c:181 +#: ../libempathy-gtk/empathy-tls-dialog.c:178 msgid "The certificate is cryptographically weak." msgstr "O certificado é criptograficamente débil." -#: ../libempathy-gtk/empathy-tls-dialog.c:184 +#: ../libempathy-gtk/empathy-tls-dialog.c:181 msgid "The certificate length exceeds verifiable limits." msgstr "A lonxitude do certificado excede os lÃmites verificábeis." # rever -#: ../libempathy-gtk/empathy-tls-dialog.c:188 +#: ../libempathy-gtk/empathy-tls-dialog.c:185 msgid "The certificate is malformed." msgstr "O certificado está mal formado." # rever -#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#: ../libempathy-gtk/empathy-tls-dialog.c:203 #, c-format msgid "Expected hostname: %s" msgstr "Nome do servidor esperado: %s" # rever -#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#: ../libempathy-gtk/empathy-tls-dialog.c:206 #, c-format msgid "Certificate hostname: %s" msgstr "Nome do servidor do certificado: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:281 +#: ../libempathy-gtk/empathy-tls-dialog.c:278 msgid "C_ontinue" msgstr "C_ontinuar" -#: ../libempathy-gtk/empathy-tls-dialog.c:287 +#: ../libempathy-gtk/empathy-tls-dialog.c:284 msgid "Untrusted connection" msgstr "A conexión non é confianza" -#: ../libempathy-gtk/empathy-tls-dialog.c:288 +#: ../libempathy-gtk/empathy-tls-dialog.c:285 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "A conexión non confiábel. Desexa continuar de todas formas?" -#: ../libempathy-gtk/empathy-tls-dialog.c:298 +#: ../libempathy-gtk/empathy-tls-dialog.c:295 msgid "Remember this choice for future connections" msgstr "Lembrar esta elección para futuras conexións" # rever -#: ../libempathy-gtk/empathy-tls-dialog.c:304 +#: ../libempathy-gtk/empathy-tls-dialog.c:301 msgid "Certificate Details" msgstr "Detalles do certificado" -#: ../libempathy-gtk/empathy-ui-utils.c:1050 +#: ../libempathy-gtk/empathy-ui-utils.c:1078 msgid "Unable to open URI" msgstr "Non foi posÃbel abrir o URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1174 +#: ../libempathy-gtk/empathy-ui-utils.c:1202 msgid "Select a file" msgstr "Seleccione un ficheiro" -#: ../libempathy-gtk/empathy-ui-utils.c:1248 +#: ../libempathy-gtk/empathy-ui-utils.c:1276 msgid "Insufficient free space to save file" msgstr "Non hai espazo suficiente para gardar o ficheiro" -#: ../libempathy-gtk/empathy-ui-utils.c:1256 +#: ../libempathy-gtk/empathy-ui-utils.c:1284 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2984,17 +2984,17 @@ msgstr "" "RequÃrense %s de espazo libre para gardar este ficheiro, pero só hai %s " "dispoñÃbeis. Elixa outra localización." -#: ../libempathy-gtk/empathy-ui-utils.c:1302 +#: ../libempathy-gtk/empathy-ui-utils.c:1330 #, c-format msgid "Incoming file from %s" msgstr "Ficheiro entrante de %s" -#: ../libempathy-gtk/empathy-user-info.c:384 +#: ../libempathy-gtk/empathy-user-info.c:395 msgid "Go online to edit your personal information." msgstr "Conéctese para editar a súa información persoal" # rever -#: ../libempathy-gtk/empathy-user-info.c:464 +#: ../libempathy-gtk/empathy-user-info.c:475 msgid "<b>Personal Details</b>" msgstr "<b>Detalles persoais</b>" @@ -3013,200 +3013,200 @@ msgstr "_Abrir a ligazón" msgid "Inspect HTML" msgstr "Inspeccionar HTML" -#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +#: ../libempathy-gtk/totem-subtitle-encoding.c:157 msgid "Current Locale" msgstr "Configuración rexional actual" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:160 +#: ../libempathy-gtk/totem-subtitle-encoding.c:162 +#: ../libempathy-gtk/totem-subtitle-encoding.c:164 +#: ../libempathy-gtk/totem-subtitle-encoding.c:166 msgid "Arabic" msgstr "Ãrabe" -#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +#: ../libempathy-gtk/totem-subtitle-encoding.c:169 msgid "Armenian" msgstr "Armenio" -#: ../libempathy-gtk/totem-subtitle-encoding.c:173 -#: ../libempathy-gtk/totem-subtitle-encoding.c:175 -#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +#: ../libempathy-gtk/totem-subtitle-encoding.c:172 +#: ../libempathy-gtk/totem-subtitle-encoding.c:174 +#: ../libempathy-gtk/totem-subtitle-encoding.c:176 msgid "Baltic" msgstr "Báltico" -#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +#: ../libempathy-gtk/totem-subtitle-encoding.c:179 msgid "Celtic" msgstr "Celta" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:182 +#: ../libempathy-gtk/totem-subtitle-encoding.c:184 +#: ../libempathy-gtk/totem-subtitle-encoding.c:186 +#: ../libempathy-gtk/totem-subtitle-encoding.c:188 msgid "Central European" msgstr "Centroeuropeo" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:191 +#: ../libempathy-gtk/totem-subtitle-encoding.c:193 +#: ../libempathy-gtk/totem-subtitle-encoding.c:195 +#: ../libempathy-gtk/totem-subtitle-encoding.c:197 msgid "Chinese Simplified" msgstr "Chinés simplificado" -#: ../libempathy-gtk/totem-subtitle-encoding.c:201 -#: ../libempathy-gtk/totem-subtitle-encoding.c:203 -#: ../libempathy-gtk/totem-subtitle-encoding.c:205 +#: ../libempathy-gtk/totem-subtitle-encoding.c:200 +#: ../libempathy-gtk/totem-subtitle-encoding.c:202 +#: ../libempathy-gtk/totem-subtitle-encoding.c:204 msgid "Chinese Traditional" msgstr "Chinés tradicional" -#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +#: ../libempathy-gtk/totem-subtitle-encoding.c:207 msgid "Croatian" msgstr "Croata" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:210 +#: ../libempathy-gtk/totem-subtitle-encoding.c:212 +#: ../libempathy-gtk/totem-subtitle-encoding.c:214 +#: ../libempathy-gtk/totem-subtitle-encoding.c:216 +#: ../libempathy-gtk/totem-subtitle-encoding.c:218 +#: ../libempathy-gtk/totem-subtitle-encoding.c:220 msgid "Cyrillic" msgstr "CirÃlico" -#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +#: ../libempathy-gtk/totem-subtitle-encoding.c:223 msgid "Cyrillic/Russian" msgstr "CirÃlico/Ruso" -#: ../libempathy-gtk/totem-subtitle-encoding.c:227 -#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +#: ../libempathy-gtk/totem-subtitle-encoding.c:226 +#: ../libempathy-gtk/totem-subtitle-encoding.c:228 msgid "Cyrillic/Ukrainian" msgstr "CirÃlico/UcraÃno" -#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +#: ../libempathy-gtk/totem-subtitle-encoding.c:231 msgid "Georgian" msgstr "Xeorxiano" -#: ../libempathy-gtk/totem-subtitle-encoding.c:235 -#: ../libempathy-gtk/totem-subtitle-encoding.c:237 -#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +#: ../libempathy-gtk/totem-subtitle-encoding.c:234 +#: ../libempathy-gtk/totem-subtitle-encoding.c:236 +#: ../libempathy-gtk/totem-subtitle-encoding.c:238 msgid "Greek" msgstr "Grego" -#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +#: ../libempathy-gtk/totem-subtitle-encoding.c:241 msgid "Gujarati" msgstr "Guxarati" -#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +#: ../libempathy-gtk/totem-subtitle-encoding.c:244 msgid "Gurmukhi" msgstr "Gurmukhi" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:247 +#: ../libempathy-gtk/totem-subtitle-encoding.c:249 +#: ../libempathy-gtk/totem-subtitle-encoding.c:251 +#: ../libempathy-gtk/totem-subtitle-encoding.c:253 msgid "Hebrew" msgstr "Hebreo" -#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +#: ../libempathy-gtk/totem-subtitle-encoding.c:256 msgid "Hebrew Visual" msgstr "Hebreo visual" -#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +#: ../libempathy-gtk/totem-subtitle-encoding.c:259 msgid "Hindi" msgstr "Hindi" -#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +#: ../libempathy-gtk/totem-subtitle-encoding.c:262 msgid "Icelandic" msgstr "Islandés" -#: ../libempathy-gtk/totem-subtitle-encoding.c:266 -#: ../libempathy-gtk/totem-subtitle-encoding.c:268 -#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +#: ../libempathy-gtk/totem-subtitle-encoding.c:265 +#: ../libempathy-gtk/totem-subtitle-encoding.c:267 +#: ../libempathy-gtk/totem-subtitle-encoding.c:269 msgid "Japanese" msgstr "Xaponés" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:272 +#: ../libempathy-gtk/totem-subtitle-encoding.c:274 +#: ../libempathy-gtk/totem-subtitle-encoding.c:276 +#: ../libempathy-gtk/totem-subtitle-encoding.c:278 msgid "Korean" msgstr "Coreano" -#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +#: ../libempathy-gtk/totem-subtitle-encoding.c:281 msgid "Nordic" msgstr "Nórdico" -#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +#: ../libempathy-gtk/totem-subtitle-encoding.c:284 msgid "Persian" msgstr "Persa" -#: ../libempathy-gtk/totem-subtitle-encoding.c:288 -#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +#: ../libempathy-gtk/totem-subtitle-encoding.c:287 +#: ../libempathy-gtk/totem-subtitle-encoding.c:289 msgid "Romanian" msgstr "Romanés" -#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +#: ../libempathy-gtk/totem-subtitle-encoding.c:292 msgid "South European" msgstr "Sureuropeo" -#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +#: ../libempathy-gtk/totem-subtitle-encoding.c:295 msgid "Thai" msgstr "Tailandés" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:298 +#: ../libempathy-gtk/totem-subtitle-encoding.c:300 +#: ../libempathy-gtk/totem-subtitle-encoding.c:302 +#: ../libempathy-gtk/totem-subtitle-encoding.c:304 msgid "Turkish" msgstr "Turco" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:307 +#: ../libempathy-gtk/totem-subtitle-encoding.c:309 +#: ../libempathy-gtk/totem-subtitle-encoding.c:311 +#: ../libempathy-gtk/totem-subtitle-encoding.c:313 +#: ../libempathy-gtk/totem-subtitle-encoding.c:315 msgid "Unicode" msgstr "Unicode" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:318 +#: ../libempathy-gtk/totem-subtitle-encoding.c:320 +#: ../libempathy-gtk/totem-subtitle-encoding.c:322 +#: ../libempathy-gtk/totem-subtitle-encoding.c:324 +#: ../libempathy-gtk/totem-subtitle-encoding.c:326 msgid "Western" msgstr "Occidental" -#: ../libempathy-gtk/totem-subtitle-encoding.c:330 -#: ../libempathy-gtk/totem-subtitle-encoding.c:332 -#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +#: ../libempathy-gtk/totem-subtitle-encoding.c:329 +#: ../libempathy-gtk/totem-subtitle-encoding.c:331 +#: ../libempathy-gtk/totem-subtitle-encoding.c:333 msgid "Vietnamese" msgstr "Vietnamita" -#: ../libempathy-gtk/empathy-roster-model.h:29 +#: ../libempathy-gtk/empathy-roster-model.h:27 msgid "Top Contacts" msgstr "Contactos importantes" -#: ../libempathy-gtk/empathy-roster-model.h:31 +#: ../libempathy-gtk/empathy-roster-model.h:29 msgid "Ungrouped" msgstr "Sen grupo" # rever #. Add a prefix explaining that something goes wrong when trying to #. * fetch contact's presence. -#: ../libempathy-gtk/empathy-roster-contact.c:219 +#: ../libempathy-gtk/empathy-roster-contact.c:201 #, c-format msgid "Server cannot find contact: %s" msgstr "O servidor non puido atopar o contacto: %s" # rever -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223 msgid "No error message" msgstr "Non hai mensaxe de erro" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296 msgid "Instant Message (Empathy)" msgstr "Mensaxe instantáneo (Empathy)" # rever -#: ../src/empathy-about-dialog.c:81 +#: ../src/empathy-about-dialog.c:77 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 " @@ -3219,7 +3219,7 @@ msgstr "" "versión posterior." # rever -#: ../src/empathy-about-dialog.c:85 +#: ../src/empathy-about-dialog.c:81 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 " @@ -3231,7 +3231,7 @@ msgstr "" "PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza pública xeral GNU." # rever -#: ../src/empathy-about-dialog.c:89 +#: ../src/empathy-about-dialog.c:85 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 " @@ -3242,11 +3242,11 @@ msgstr "" "Street, Fifth Floor, Boston, MA 02110-130159 USA" # rever -#: ../src/empathy-about-dialog.c:109 +#: ../src/empathy-about-dialog.c:105 msgid "An Instant Messaging client for GNOME" msgstr "Un cliente de mensaxarÃa instantánea para o GNOME" -#: ../src/empathy-about-dialog.c:115 +#: ../src/empathy-about-dialog.c:111 msgid "translator-credits" msgstr "" "Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.\n" @@ -3259,72 +3259,72 @@ msgstr "" "Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas\n" "colaborar connosco, podes atopar máis información en http://www.trasno.net" -#: ../src/empathy-accounts.c:182 +#: ../src/empathy-accounts.c:171 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "" "Non mostra ningún diálogo, realizar calquera traballo (p.ex. importar) e sair" -#: ../src/empathy-accounts.c:186 +#: ../src/empathy-accounts.c:175 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 «Xente cerca»" -#: ../src/empathy-accounts.c:190 +#: ../src/empathy-accounts.c:179 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "Conta fornecida inicialmente seleccionada (p.ex. gabble/jabber/exemplo)" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:181 msgid "<account-id>" msgstr "<account-id>" # rever -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:186 msgid "- Empathy Accounts" msgstr "- Contas de Empathy" # rever -#: ../src/empathy-accounts.c:240 +#: ../src/empathy-accounts.c:239 msgid "Empathy Accounts" msgstr "Contas de Empathy" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:52 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Hai modificacións sen gardar respecto da súa conta %s." #. 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:72 +#: ../src/empathy-accounts-dialog.c:56 msgid "Your new account has not been saved yet." msgstr "A súa nova conta aÃnda non foi gardada." -#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274 +#: ../src/empathy-accounts-dialog.c:388 ../src/empathy-call-window.c:1258 msgid "Connecting…" msgstr "Conectando…" -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:429 #, c-format msgid "Offline — %s" msgstr "Desconectado — %s" -#: ../src/empathy-accounts-dialog.c:457 +#: ../src/empathy-accounts-dialog.c:441 #, c-format msgid "Disconnected — %s" msgstr "Desconectado — %s" -#: ../src/empathy-accounts-dialog.c:468 +#: ../src/empathy-accounts-dialog.c:452 msgid "Offline — No Network Connection" msgstr "Desconectado — Sen conexión de rede" -#: ../src/empathy-accounts-dialog.c:475 +#: ../src/empathy-accounts-dialog.c:459 msgid "Unknown Status" msgstr "Estado descoñecido" -#: ../src/empathy-accounts-dialog.c:492 +#: ../src/empathy-accounts-dialog.c:476 msgid "" "This account has been disabled because it relies on an old, unsupported " "backend. Please install telepathy-haze and restart your session to migrate " @@ -3333,31 +3333,31 @@ msgstr "" "Esta conta desactivouse porque depende dunha infraestrutura antiga e non " "admitida. Instale telepathy-haze e reinicie a sesión para migrar esta conta." -#: ../src/empathy-accounts-dialog.c:502 +#: ../src/empathy-accounts-dialog.c:486 msgid "Offline — Account Disabled" msgstr "Desconectado — Conta desactivada" # rever -#: ../src/empathy-accounts-dialog.c:608 +#: ../src/empathy-accounts-dialog.c:592 msgid "Edit Connection Parameters" msgstr "Editar os parámetros da conexión" -#: ../src/empathy-accounts-dialog.c:735 +#: ../src/empathy-accounts-dialog.c:719 msgid "_Edit Connection Parameters..." msgstr "_Editar os parámetros da conexión…" # rever -#: ../src/empathy-accounts-dialog.c:1268 +#: ../src/empathy-accounts-dialog.c:1252 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Está seguro de que quere retirar o grupo '%s' do seu computador?" -#: ../src/empathy-accounts-dialog.c:1272 +#: ../src/empathy-accounts-dialog.c:1256 msgid "This will not remove your account on the server." msgstr "Isto non retirará a súa conta no servidor." # rever -#: ../src/empathy-accounts-dialog.c:1477 +#: ../src/empathy-accounts-dialog.c:1461 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3366,25 +3366,25 @@ msgstr "" "Está seguro de que quere proceder?" #. Menu item: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1668 +#: ../src/empathy-accounts-dialog.c:1652 msgid "_Enabled" msgstr "_Activado" #. Menu item: Rename -#: ../src/empathy-accounts-dialog.c:1691 +#: ../src/empathy-accounts-dialog.c:1675 msgid "Rename" msgstr "Renomear" -#: ../src/empathy-accounts-dialog.c:2107 +#: ../src/empathy-accounts-dialog.c:2091 msgid "_Skip" msgstr "_Omitir" -#: ../src/empathy-accounts-dialog.c:2111 +#: ../src/empathy-accounts-dialog.c:2095 msgid "_Connect" msgstr "_Conectar" # rever -#: ../src/empathy-accounts-dialog.c:2290 +#: ../src/empathy-accounts-dialog.c:2274 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3393,7 +3393,7 @@ msgstr "" "Está seguro de que quere continuar?" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:2433 +#: ../src/empathy-accounts-dialog.c:2417 msgid "Messaging and VoIP Accounts" msgstr "Contas de mensaxarÃa e Voz IP" @@ -3420,34 +3420,34 @@ msgid "No protocol backends installed" msgstr "Non hai infraestruturas de protocolos instaladas" # rever -#: ../src/empathy-auth-client.c:296 +#: ../src/empathy-auth-client.c:285 msgid " - Empathy authentication client" msgstr "- Cliente de autenticación Empathy" -#: ../src/empathy-auth-client.c:312 +#: ../src/empathy-auth-client.c:301 msgid "Empathy authentication client" msgstr "Cliente de autenticación Empathy" # rever -#: ../src/empathy.c:427 +#: ../src/empathy.c:407 msgid "Don't connect on startup" msgstr "Non conectarse ao inicio" # rever -#: ../src/empathy.c:431 +#: ../src/empathy.c:411 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:447 +#: ../src/empathy.c:440 msgid "- Empathy IM Client" msgstr " - Cliente de mensaxarÃa instantánea Empathy" -#: ../src/empathy.c:623 +#: ../src/empathy.c:626 msgid "Error contacting the Account Manager" msgstr "Produciuse un erro ao contactar co Xestor de contas" -#: ../src/empathy.c:625 +#: ../src/empathy.c:628 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3461,116 +3461,110 @@ msgstr "" "%s" # rever -#: ../src/empathy-call.c:124 +#: ../src/empathy-call.c:115 msgid "In a call" msgstr "Nunha chamada" # rever -#: ../src/empathy-call.c:224 +#: ../src/empathy-call.c:215 msgid "- Empathy Audio/Video Client" msgstr "- Cliente de voz/vÃdeo Empathy" -#: ../src/empathy-call.c:248 +#: ../src/empathy-call.c:239 msgid "Empathy Audio/Video Client" msgstr "Cliente de voz/vÃdeo Empathy" -#: ../src/empathy-call-observer.c:119 +#: ../src/empathy-call-observer.c:110 #, c-format msgid "%s just tried to call you, but you were in another call." msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada." -#. Translators: this is an "Info" label. It should be as short -#. * as possible. -#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147 -msgid "i" -msgstr "Información" - # rever -#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508 +#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500 msgid "Incoming call" msgstr "Chamada entrante" -#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming video call from %s" msgstr "Videochamada entrante de %s" -#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516 -#: ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming call from %s" msgstr "Chamada entrante de %s" -#: ../src/empathy-call-window.c:1559 -#: ../src/empathy-notifications-approver.c:197 +#: ../src/empathy-call-window.c:1543 +#: ../src/empathy-notifications-approver.c:191 msgid "Reject" msgstr "Rexeitar" # rever -#: ../src/empathy-call-window.c:1560 -#: ../src/empathy-notifications-approver.c:202 -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-call-window.c:1544 +#: ../src/empathy-notifications-approver.c:196 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer" msgstr "Responder" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:1927 +#: ../src/empathy-call-window.c:1913 #, c-format msgid "Call with %s" msgstr "Chamada con %s" -#: ../src/empathy-call-window.c:2179 +#: ../src/empathy-call-window.c:2165 msgid "The IP address as seen by the machine" msgstr "O enderezo IP tal como o ve a máquina" -#: ../src/empathy-call-window.c:2181 +#: ../src/empathy-call-window.c:2167 msgid "The IP address as seen by a server on the Internet" msgstr "O enderezo IP como é visto por un servidor na Internet" -#: ../src/empathy-call-window.c:2183 +#: ../src/empathy-call-window.c:2169 msgid "The IP address of the peer as seen by the other side" msgstr "O enderezo IP do par como é visto pola outra parte" -#: ../src/empathy-call-window.c:2185 +#: ../src/empathy-call-window.c:2171 msgid "The IP address of a relay server" msgstr "O enderezo IP dun servidor de desvÃo" -#: ../src/empathy-call-window.c:2187 +#: ../src/empathy-call-window.c:2173 msgid "The IP address of the multicast group" msgstr "O enderezo IP do grupo multicast" -#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599 -#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601 +#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585 +#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587 #: ../src/empathy-call-window.ui.h:28 msgid "Unknown" msgstr "Descoñecido" -#: ../src/empathy-call-window.c:2959 +#: ../src/empathy-call-window.c:2946 msgid "On hold" msgstr "En espera" -#: ../src/empathy-call-window.c:2963 +#: ../src/empathy-call-window.c:2950 msgid "Mute" msgstr "Silenciar" -#: ../src/empathy-call-window.c:2965 +#: ../src/empathy-call-window.c:2952 msgid "Duration" msgstr "Duración" # rever #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2968 +#: ../src/empathy-call-window.c:2955 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" # rever -#: ../src/empathy-call-window.c:3064 +#: ../src/empathy-call-window.c:3051 msgid "Technical Details" msgstr "Detalles técnicos" -#: ../src/empathy-call-window.c:3103 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3579,7 +3573,7 @@ msgstr "" "O software de %s non entende algúns dos formatos de video admitidos polo seu " "computador" -#: ../src/empathy-call-window.c:3108 +#: ../src/empathy-call-window.c:3095 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3588,7 +3582,7 @@ msgstr "" "O software de %s non entende algúns dos formatos de vÃdeo admitidos polo seu " "computador" -#: ../src/empathy-call-window.c:3114 +#: ../src/empathy-call-window.c:3101 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3597,21 +3591,21 @@ msgstr "" "Non é posÃbel estabelecer unha conexión a %s. Un deles pode estar nunha rede " "que non permite conexións directas." -#: ../src/empathy-call-window.c:3120 +#: ../src/empathy-call-window.c:3107 msgid "There was a failure on the network" msgstr "Produciuse un fallo na rede" -#: ../src/empathy-call-window.c:3124 +#: ../src/empathy-call-window.c:3111 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "Non ten instalados neste computador os formatos de son necesarios" -#: ../src/empathy-call-window.c:3127 +#: ../src/empathy-call-window.c:3114 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "Non ten instalados os formatos de vÃdeo necesarios neste computador" -#: ../src/empathy-call-window.c:3139 +#: ../src/empathy-call-window.c:3126 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3622,32 +3616,32 @@ msgstr "" "\">Informe de este erro</a> e anexe os rexistros que pode ollar na xanela " "«Depuración» no menú Axuda." -#: ../src/empathy-call-window.c:3148 +#: ../src/empathy-call-window.c:3135 msgid "There was a failure in the call engine" msgstr "Produciuse un erro ao chamar ao motor" -#: ../src/empathy-call-window.c:3151 +#: ../src/empathy-call-window.c:3138 msgid "The end of the stream was reached" msgstr "Chegouse ao final do fluxo" -#: ../src/empathy-call-window.c:3191 +#: ../src/empathy-call-window.c:3178 msgid "Can't establish audio stream" msgstr "Non é posÃbel estabelecer un fluxo de son" -#: ../src/empathy-call-window.c:3201 +#: ../src/empathy-call-window.c:3188 msgid "Can't establish video stream" msgstr "Non é posÃbel estabelecer un fluxo de vÃdeo" -#: ../src/empathy-call-window.c:3238 +#: ../src/empathy-call-window.c:3225 #, c-format msgid "Your current balance is %s." msgstr "O seu crédito actual é %s." -#: ../src/empathy-call-window.c:3242 +#: ../src/empathy-call-window.c:3229 msgid "Sorry, you don’t have enough credit for that call." msgstr "Non ten crédito dabondo para facer esta chamada." -#: ../src/empathy-call-window.c:3244 +#: ../src/empathy-call-window.c:3231 msgid "Top Up" msgstr "Recargar" @@ -3764,20 +3758,20 @@ msgid "Audio" msgstr "Son" # rever -#: ../src/empathy-chat.c:102 +#: ../src/empathy-chat.c:101 msgid "- Empathy Chat Client" msgstr "- Cliente de conversa Empathy" -#: ../src/empathy-chatrooms-window.c:251 +#: ../src/empathy-chatrooms-window.c:243 msgid "Name" msgstr "Nome" -#: ../src/empathy-chatrooms-window.c:269 +#: ../src/empathy-chatrooms-window.c:261 msgid "Room" msgstr "Sala" # rever -#: ../src/empathy-chatrooms-window.c:277 +#: ../src/empathy-chatrooms-window.c:269 msgid "Auto-Connect" msgstr "Autoconectar" @@ -3787,11 +3781,11 @@ msgid "Manage Favorite Rooms" msgstr "Xestionar as salas favoritas" # rever -#: ../src/empathy-chat-window.c:287 +#: ../src/empathy-chat-window.c:275 msgid "Close this window?" msgstr "Pechar esta xanela?" -#: ../src/empathy-chat-window.c:293 +#: ../src/empathy-chat-window.c:281 #, c-format msgid "" "Closing this window will leave %s. You will not receive any further messages " @@ -3800,7 +3794,7 @@ msgstr "" "Se pecha esta xanela sairá de %s. Non recibirá máis mensaxes até que se una " "de novo." -#: ../src/empathy-chat-window.c:306 +#: ../src/empathy-chat-window.c:294 #, c-format msgid "" "Closing this window will leave a chat room. You will not receive any further " @@ -3815,60 +3809,60 @@ msgstr[1] "" "Se pecha esta xanela sairá de %u salas de conversas. Non recibirá máis " "mensaxes até que se una de novo a elas." -#: ../src/empathy-chat-window.c:317 +#: ../src/empathy-chat-window.c:305 #, c-format msgid "Leave %s?" msgstr "SaÃr de %s?" -#: ../src/empathy-chat-window.c:319 +#: ../src/empathy-chat-window.c:307 msgid "" "You will not receive any further messages from this chat room until you " "rejoin it." msgstr "" "Non recibirá máis mensaxes desta sala de conversas até que se volva unir." -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Close window" msgstr "Pechar a xanela" -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Leave room" msgstr "SaÃr da sala" -#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700 +#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d sen ler)" msgstr[1] "%s (%d sen ler)" -#: ../src/empathy-chat-window.c:692 +#: ../src/empathy-chat-window.c:680 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (e outro %u)" msgstr[1] "%s (e outros %u)" -#: ../src/empathy-chat-window.c:708 +#: ../src/empathy-chat-window.c:696 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d sen ler de outros)" msgstr[1] "%s (%d sen ler de outros)" -#: ../src/empathy-chat-window.c:717 +#: ../src/empathy-chat-window.c:705 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d sen ler de todos)" msgstr[1] "%s (%d sen ler de todos)" -#: ../src/empathy-chat-window.c:954 +#: ../src/empathy-chat-window.c:942 msgid "SMS:" msgstr "SMS:" # rever -#: ../src/empathy-chat-window.c:962 +#: ../src/empathy-chat-window.c:950 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3876,7 +3870,7 @@ msgstr[0] "Enviando %d mensaxe." msgstr[1] "Enviando %d mensaxes." # rever -#: ../src/empathy-chat-window.c:982 +#: ../src/empathy-chat-window.c:970 msgid "Typing a message." msgstr "Escribindo unha mensaxe." @@ -3944,76 +3938,76 @@ msgstr "Mover lapela á _dereita" msgid "_Detach Tab" msgstr "_Desacoplar lapela" -#: ../src/empathy-debugger.c:69 +#: ../src/empathy-debugger.c:77 msgid "Show a particular service" msgstr "Mostrar un servizo en particular" -#: ../src/empathy-debugger.c:74 +#: ../src/empathy-debugger.c:82 msgid "- Empathy Debugger" msgstr "- Depurador de Empathy" -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:142 msgid "Empathy Debugger" msgstr "Depurador de Empathy" -#: ../src/empathy-debug-window.c:1599 +#: ../src/empathy-debug-window.c:1588 msgid "Save" msgstr "Gardar" -#: ../src/empathy-debug-window.c:1659 +#: ../src/empathy-debug-window.c:1648 msgid "Pastebin link" msgstr "Ligazón a pastebin" -#: ../src/empathy-debug-window.c:1668 +#: ../src/empathy-debug-window.c:1657 msgid "Pastebin response" msgstr "Resposta de pastebin" -#: ../src/empathy-debug-window.c:1675 +#: ../src/empathy-debug-window.c:1664 msgid "Data too large for a single paste. Please save logs to file." msgstr "" "Datos demasiado longos para un pegado sinxelo. Garde o rexistro nun ficheiro." -#: ../src/empathy-debug-window.c:1857 +#: ../src/empathy-debug-window.c:1846 msgid "Debug Window" msgstr "Depurar xanela" -#: ../src/empathy-debug-window.c:1917 +#: ../src/empathy-debug-window.c:1906 msgid "Send to pastebin" msgstr "Enviar a pastebin" -#: ../src/empathy-debug-window.c:1961 +#: ../src/empathy-debug-window.c:1950 msgid "Pause" msgstr "Pausa" -#: ../src/empathy-debug-window.c:1973 +#: ../src/empathy-debug-window.c:1962 msgid "Level " msgstr "Nivel" -#: ../src/empathy-debug-window.c:1992 +#: ../src/empathy-debug-window.c:1981 msgid "Debug" msgstr "Depuración" -#: ../src/empathy-debug-window.c:1997 +#: ../src/empathy-debug-window.c:1986 msgid "Info" msgstr "Información" -#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077 +#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066 msgid "Message" msgstr "Mensaxe" -#: ../src/empathy-debug-window.c:2007 +#: ../src/empathy-debug-window.c:1996 msgid "Warning" msgstr "Aviso" -#: ../src/empathy-debug-window.c:2012 +#: ../src/empathy-debug-window.c:2001 msgid "Critical" msgstr "CrÃtico" -#: ../src/empathy-debug-window.c:2017 +#: ../src/empathy-debug-window.c:2006 msgid "Error" msgstr "Erro" -#: ../src/empathy-debug-window.c:2030 +#: ../src/empathy-debug-window.c:2019 msgid "" "Even if they don't display passwords, logs can contain sensitive information " "such as your list of contacts or the messages you recently sent or " @@ -4031,23 +4025,23 @@ msgstr "" "Empathy ao informalo mostrando os cambios avanzados do <a href=\"https://" "bugzilla.gnome.org/enter_bug.cgi?product=empathy\">informe de erro</a>." -#: ../src/empathy-debug-window.c:2062 +#: ../src/empathy-debug-window.c:2051 msgid "Time" msgstr "Hora" -#: ../src/empathy-debug-window.c:2065 +#: ../src/empathy-debug-window.c:2054 msgid "Domain" msgstr "Dominio" -#: ../src/empathy-debug-window.c:2068 +#: ../src/empathy-debug-window.c:2057 msgid "Category" msgstr "CategorÃa" -#: ../src/empathy-debug-window.c:2071 +#: ../src/empathy-debug-window.c:2060 msgid "Level" msgstr "Nivel" -#: ../src/empathy-debug-window.c:2100 +#: ../src/empathy-debug-window.c:2089 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -4056,79 +4050,79 @@ msgstr "" "depuración remota." # rever -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:500 msgid "Incoming video call" msgstr "Chamada de vÃdeo entrante" # rever -#: ../src/empathy-event-manager.c:512 +#: ../src/empathy-event-manager.c:504 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s está chamándoo con vÃdeo. Desexa responderlle?" # rever -#: ../src/empathy-event-manager.c:513 +#: ../src/empathy-event-manager.c:505 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s estao chamando. Quere responder?" -#: ../src/empathy-event-manager.c:541 +#: ../src/empathy-event-manager.c:533 msgid "_Reject" msgstr "_Rexeitar" # rever -#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549 msgid "_Answer" msgstr "_Responder" -#: ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:549 msgid "_Answer with video" msgstr "_Responder con vÃdeo" # rever -#: ../src/empathy-event-manager.c:712 +#: ../src/empathy-event-manager.c:704 msgid "Room invitation" msgstr "Convite a unha sala" # rever -#: ../src/empathy-event-manager.c:714 +#: ../src/empathy-event-manager.c:706 #, c-format msgid "Invitation to join %s" msgstr "Convite para unirse a %s" # rever -#: ../src/empathy-event-manager.c:721 +#: ../src/empathy-event-manager.c:713 #, c-format msgid "%s is inviting you to join %s" msgstr "%s está convidándoo a unirse a %s" -#: ../src/empathy-event-manager.c:734 +#: ../src/empathy-event-manager.c:726 msgid "_Join" msgstr "_Unirse" # rever -#: ../src/empathy-event-manager.c:760 +#: ../src/empathy-event-manager.c:752 #, c-format msgid "%s invited you to join %s" msgstr "%s convidouno a unirse a %s" # rever -#: ../src/empathy-event-manager.c:766 +#: ../src/empathy-event-manager.c:758 #, c-format msgid "You have been invited to join %s" msgstr "Vostede foi convidado a unirse a %s" # rever -#: ../src/empathy-event-manager.c:945 +#: ../src/empathy-event-manager.c:937 #, c-format msgid "Incoming file transfer from %s" msgstr "Transferencia de ficheiro entrante de %s" -#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227 +#: ../src/empathy-event-manager.c:965 ../src/empathy-roster-window.c:212 msgid "Password required" msgstr "RequÃrese o contrasinal" -#: ../src/empathy-event-manager.c:1110 +#: ../src/empathy-event-manager.c:1102 #, c-format msgid "" "\n" @@ -4138,44 +4132,44 @@ msgstr "" "Mensaxe: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:99 +#: ../src/empathy-ft-manager.c:93 #, 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 +#: ../src/empathy-ft-manager.c:96 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:178 +#: ../src/empathy-ft-manager.c:172 msgctxt "file transfer percent" msgid "Unknown" msgstr "Descoñecido" # rever -#: ../src/empathy-ft-manager.c:273 +#: ../src/empathy-ft-manager.c:267 #, c-format msgid "%s of %s at %s/s" msgstr "%s de %s en %s/s" # rever -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:268 #, c-format msgid "%s of %s" msgstr "%s de %s" # rever #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:305 +#: ../src/empathy-ft-manager.c:299 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Recibindo «%s» de %s" # rever #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:308 +#: ../src/empathy-ft-manager.c:302 #, c-format msgid "Sending \"%s\" to %s" msgstr "Enviando «%s» a %s" @@ -4183,30 +4177,30 @@ msgstr "Enviando «%s» a %s" # rever #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:338 +#: ../src/empathy-ft-manager.c:332 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Produciuse un erro ao recibir «%s» de %s" -#: ../src/empathy-ft-manager.c:341 +#: ../src/empathy-ft-manager.c:335 msgid "Error receiving a file" msgstr "Produciuse un erro ao recibir un ficheiro" # rever -#: ../src/empathy-ft-manager.c:346 +#: ../src/empathy-ft-manager.c:340 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Produciuse un erro ao enviar «%s» a %s" # rever -#: ../src/empathy-ft-manager.c:349 +#: ../src/empathy-ft-manager.c:343 msgid "Error sending a file" msgstr "Produciuse un erro ao enviar un ficheiro" # rever #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:488 +#: ../src/empathy-ft-manager.c:482 #, c-format msgid "\"%s\" received from %s" msgstr "«%s» recibido de %s" @@ -4214,39 +4208,39 @@ msgstr "«%s» recibido de %s" # rever #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:493 +#: ../src/empathy-ft-manager.c:487 #, c-format msgid "\"%s\" sent to %s" msgstr "«%s» enviado a %s" -#: ../src/empathy-ft-manager.c:496 +#: ../src/empathy-ft-manager.c:490 msgid "File transfer completed" msgstr "Transferencia de ficheiros rematada" # rever -#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 +#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773 msgid "Waiting for the other participant's response" msgstr "Agardando pola resposta do outro participante" -#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 +#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Comprobando a integridade de «%s»" -#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 +#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676 #, c-format msgid "Hashing \"%s\"" msgstr "Obtendo o «hash» de «%s»" -#: ../src/empathy-ft-manager.c:1025 +#: ../src/empathy-ft-manager.c:1019 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1037 +#: ../src/empathy-ft-manager.c:1031 msgid "File" msgstr "Ficheiro" -#: ../src/empathy-ft-manager.c:1059 +#: ../src/empathy-ft-manager.c:1053 msgid "Remaining" msgstr "Restantes" @@ -4261,12 +4255,12 @@ msgstr "" "Retirar da lista as transferencias de ficheiros rematadas, canceladas e as " "que fallaron" -#: ../src/empathy-import-dialog.c:76 +#: ../src/empathy-import-dialog.c:70 msgid "_Import" msgstr "_Importar" # rever -#: ../src/empathy-import-dialog.c:88 +#: ../src/empathy-import-dialog.c:82 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -4275,51 +4269,51 @@ msgstr "" "permite a importación de contas do Pidgin." # rever -#: ../src/empathy-import-dialog.c:209 +#: ../src/empathy-import-dialog.c:203 msgid "Import Accounts" msgstr "Importar contas" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:302 +#: ../src/empathy-import-widget.c:296 msgid "Import" msgstr "Importar" -#: ../src/empathy-import-widget.c:311 +#: ../src/empathy-import-widget.c:305 msgid "Protocol" msgstr "Protocolo" -#: ../src/empathy-import-widget.c:335 +#: ../src/empathy-import-widget.c:329 msgid "Source" msgstr "Orixe" -#: ../src/empathy-invite-participant-dialog.c:201 -#: ../src/empathy-invite-participant-dialog.c:229 +#: ../src/empathy-invite-participant-dialog.c:196 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite Participant" msgstr "Convidar participante" -#: ../src/empathy-invite-participant-dialog.c:202 +#: ../src/empathy-invite-participant-dialog.c:197 msgid "Choose a contact to invite into the conversation:" msgstr "Seleccione un contacto para convidalo á conversa:" -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:220 msgid "Invite" msgstr "Convidar" # rever -#: ../src/empathy-new-chatroom-dialog.c:194 +#: ../src/empathy-new-chatroom-dialog.c:184 msgid "Chat Room" msgstr "Salas de conversas" -#: ../src/empathy-new-chatroom-dialog.c:209 +#: ../src/empathy-new-chatroom-dialog.c:199 msgid "Members" msgstr "Membros" # rever -#: ../src/empathy-new-chatroom-dialog.c:410 +#: ../src/empathy-new-chatroom-dialog.c:400 msgid "Failed to list rooms" msgstr "Produciuse un erro ao listar as salas" -#: ../src/empathy-new-chatroom-dialog.c:439 +#: ../src/empathy-new-chatroom-dialog.c:429 #, c-format msgid "" "%s\n" @@ -4332,17 +4326,17 @@ msgstr "" "RequÃrese contrasinal: %s\n" "Membros: %s" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "Yes" msgstr "Si" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "No" msgstr "Non" -#: ../src/empathy-new-chatroom-dialog.c:784 +#: ../src/empathy-new-chatroom-dialog.c:774 msgid "Join Room" msgstr "Unirse á sala" @@ -4389,109 +4383,109 @@ msgstr "Non foi posÃbel ler a lista da sala" msgid "Room List" msgstr "Lista de salas" -#: ../src/empathy-notifications-approver.c:188 +#: ../src/empathy-notifications-approver.c:182 msgid "Respond" msgstr "Responder" -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer with video" msgstr "Responder con vÃdeo" -#: ../src/empathy-notifications-approver.c:215 -#: ../src/empathy-notifications-approver.c:225 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:219 msgid "Decline" msgstr "Rexeitar" -#: ../src/empathy-notifications-approver.c:219 -#: ../src/empathy-notifications-approver.c:230 +#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:224 msgid "Accept" msgstr "Aceptar" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:240 +#: ../src/empathy-notifications-approver.c:234 msgid "Provide" msgstr "Fornecer" -#: ../src/empathy-preferences.c:143 +#: ../src/empathy-preferences.c:134 msgid "Message received" msgstr "Mensaxe recibida" -#: ../src/empathy-preferences.c:144 +#: ../src/empathy-preferences.c:135 msgid "Message sent" msgstr "Mensaxe enviada" -#: ../src/empathy-preferences.c:145 +#: ../src/empathy-preferences.c:136 msgid "New conversation" msgstr "Conversa nova" # rever -#: ../src/empathy-preferences.c:146 +#: ../src/empathy-preferences.c:137 msgid "Contact comes online" msgstr "O contacto conéctase" # rever -#: ../src/empathy-preferences.c:147 +#: ../src/empathy-preferences.c:138 msgid "Contact goes offline" msgstr "O contacto desconéctase" # rever -#: ../src/empathy-preferences.c:148 +#: ../src/empathy-preferences.c:139 msgid "Account connected" msgstr "Conta conectada" # rever -#: ../src/empathy-preferences.c:149 +#: ../src/empathy-preferences.c:140 msgid "Account disconnected" msgstr "Conta desconectada" -#: ../src/empathy-preferences.c:386 +#: ../src/empathy-preferences.c:377 msgid "Language" msgstr "Idioma" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:637 +#: ../src/empathy-preferences.c:628 msgid "Juliet" msgstr "Xulieta" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:644 +#: ../src/empathy-preferences.c:635 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:650 +#: ../src/empathy-preferences.c:641 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Oh, Romeu, Romeu!, ¿onde estás que non te vexo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:654 +#: ../src/empathy-preferences.c:645 msgid "Deny thy father and refuse thy name;" msgstr "Nega ao teu pai e rexeita o teu nome;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:657 +#: ../src/empathy-preferences.c:648 msgid "Or if thou wilt not, be but sworn my love" msgstr "Ou, se non queres, xúrame tan só que me amas" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:660 +#: ../src/empathy-preferences.c:651 msgid "And I'll no longer be a Capulet." msgstr "E deixarei eu de ser un Capuleto." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:663 +#: ../src/empathy-preferences.c:654 msgid "Shall I hear more, or shall I speak at this?" msgstr "Debo escoitar máis ou contestar ao dito?" # rever #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:666 +#: ../src/empathy-preferences.c:657 msgid "Juliet has disconnected" msgstr "Xulieta desconectouse" -#: ../src/empathy-preferences.c:1032 +#: ../src/empathy-preferences.c:1023 msgid "Preferences" msgstr "Preferencias" @@ -4505,7 +4499,7 @@ msgstr "Mostrar grupos" msgid "Show account balances" msgstr "Mostrar os balances das contas" -#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2236 +#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2226 msgid "Contact List" msgstr "Lista de contactos" @@ -4687,88 +4681,88 @@ msgstr "Variante:" msgid "Themes" msgstr "Temas" -#: ../src/empathy-roster-window.c:244 +#: ../src/empathy-roster-window.c:229 msgid "Provide Password" msgstr "Escriba o seu contrasinal" -#: ../src/empathy-roster-window.c:250 +#: ../src/empathy-roster-window.c:235 msgid "Disconnect" msgstr "Desconectar" -#: ../src/empathy-roster-window.c:493 -msgid "You need to setup an account to see contacts here." +#: ../src/empathy-roster-window.c:478 +msgid "You need to set up an account to see contacts here." msgstr "Debe configurar unha conta para ver contactos aquÃ." -#: ../src/empathy-roster-window.c:569 +#: ../src/empathy-roster-window.c:554 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" "As contas de %s non se poden usar até que non teña actualizado o seu " "software %s." -#: ../src/empathy-roster-window.c:669 +#: ../src/empathy-roster-window.c:655 msgid "Windows Live" msgstr "Windows Live" -#: ../src/empathy-roster-window.c:673 +#: ../src/empathy-roster-window.c:659 msgid "Facebook" msgstr "Facebook" #. translators: %s is an account name like 'Facebook' or 'Google Talk' -#: ../src/empathy-roster-window.c:688 +#: ../src/empathy-roster-window.c:674 #, c-format msgid "%s account requires authorisation" msgstr "A conta %s require autorización" -#: ../src/empathy-roster-window.c:699 +#: ../src/empathy-roster-window.c:685 msgid "Online Accounts" msgstr "Contas en liña" -#: ../src/empathy-roster-window.c:746 +#: ../src/empathy-roster-window.c:732 msgid "Update software..." msgstr "Actualizar software…" -#: ../src/empathy-roster-window.c:752 +#: ../src/empathy-roster-window.c:738 msgid "Reconnect" msgstr "Reconectar" -#: ../src/empathy-roster-window.c:756 +#: ../src/empathy-roster-window.c:742 msgid "Edit Account" msgstr "Editar a conta" -#: ../src/empathy-roster-window.c:761 +#: ../src/empathy-roster-window.c:747 msgid "Close" msgstr "Pechar" -#: ../src/empathy-roster-window.c:903 +#: ../src/empathy-roster-window.c:889 msgid "Top up account" msgstr "Recargar conta" -#: ../src/empathy-roster-window.c:1585 +#: ../src/empathy-roster-window.c:1575 msgid "You need to enable one of your accounts to see contacts here." msgstr "Debe activar unha das súas contas para ver contactos aquÃ." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:1593 +#: ../src/empathy-roster-window.c:1583 #, c-format msgid "You need to enable %s to see contacts here." msgstr "Debe activar %s para ver contactos aquÃ." -#: ../src/empathy-roster-window.c:1671 +#: ../src/empathy-roster-window.c:1661 msgid "Change your presence to see contacts here" msgstr "Cambie a súa presencia para ver os contactos aquÃ" # rever -#: ../src/empathy-roster-window.c:1680 +#: ../src/empathy-roster-window.c:1670 msgid "No match found" msgstr "Non se atopou ningunha coincidencia." -#: ../src/empathy-roster-window.c:1687 +#: ../src/empathy-roster-window.c:1677 msgid "You haven't added any contact yet" msgstr "Non engadiu ningún contacto aÃnda" # rever -#: ../src/empathy-roster-window.c:1690 +#: ../src/empathy-roster-window.c:1680 msgid "No online contacts" msgstr "Non hai contactos en liña" @@ -4871,12 +4865,12 @@ msgstr "Nova _chamada…" msgid "Status" msgstr "Estado" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126 msgid "Done" msgstr "Feito" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214 msgid "Please enter your account details" msgstr "Escriba os detalles da súa conta" @@ -4890,6 +4884,9 @@ msgstr "Editar as opcións da conta %s" msgid "Integrate your IM accounts" msgstr "Integre as súas contas de MI" +#~ msgid "i" +#~ msgstr "Información" + #~ msgid "Manage Messaging and VoIP accounts" #~ msgstr "Xestionar as contas de mensaxarÃa e Voz IP" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 19:56+0200\n" -"PO-Revision-Date: 2012-12-26 19:58+0200\n" +"POT-Creation-Date: 2013-05-24 11:47+0300\n" +"PO-Revision-Date: 2013-05-24 11:48+0200\n" "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" "Language-Team: \n" "Language: \n" @@ -431,299 +431,299 @@ msgstr "Empathy should reduce the location's accuracy" msgid "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "Whether Empathy should reduce the location's accuracy for privacy reasons." -#: ../libempathy/empathy-ft-handler.c:733 +#: ../libempathy/empathy-ft-handler.c:732 msgid "No reason was specified" msgstr "×œ× ×¦×•×™× ×” סיבה" -#: ../libempathy/empathy-ft-handler.c:736 +#: ../libempathy/empathy-ft-handler.c:735 msgid "The change in state was requested" msgstr "התבקש ×©×™× ×•×™ המצב" -#: ../libempathy/empathy-ft-handler.c:739 +#: ../libempathy/empathy-ft-handler.c:738 msgid "You canceled the file transfer" msgstr "ביטלת ×ת ההעברה" -#: ../libempathy/empathy-ft-handler.c:742 +#: ../libempathy/empathy-ft-handler.c:741 msgid "The other participant canceled the file transfer" msgstr "המשתתף ×”×חר ביטל ×ת העברת הקובץ" -#: ../libempathy/empathy-ft-handler.c:745 +#: ../libempathy/empathy-ft-handler.c:744 msgid "Error while trying to transfer the file" msgstr "התרחשה שגי××” בזמן × ×™×¡×™×•×Ÿ העברת הקובץ" -#: ../libempathy/empathy-ft-handler.c:748 +#: ../libempathy/empathy-ft-handler.c:747 msgid "The other participant is unable to transfer the file" msgstr "המשתתף ×”×חר ×œ× ×™×›×•×œ להעביר ×ת הקובץ" -#: ../libempathy/empathy-ft-handler.c:751 -#: ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-ft-handler.c:750 +#: ../libempathy/empathy-utils.c:295 msgid "Unknown reason" msgstr "סיבה ×œ× ×™×“×•×¢×”" -#: ../libempathy/empathy-ft-handler.c:914 +#: ../libempathy/empathy-ft-handler.c:913 msgid "File transfer completed, but the file was corrupted" msgstr "העברת קובץ הושלמה, ×ך הקובץ ×”×™×” פגו×" -#: ../libempathy/empathy-ft-handler.c:1200 +#: ../libempathy/empathy-ft-handler.c:1199 msgid "File transfer not supported by remote contact" msgstr "העברת ×§×‘×¦×™× ×œ× × ×ª×ž×›×ª על ידי ×יש הקשר המרוחק" -#: ../libempathy/empathy-ft-handler.c:1256 +#: ../libempathy/empathy-ft-handler.c:1255 msgid "The selected file is not a regular file" msgstr "הקובץ ×”× ×‘×—×¨ ××™× ×• קובץ רגיל" -#: ../libempathy/empathy-ft-handler.c:1265 +#: ../libempathy/empathy-ft-handler.c:1264 msgid "The selected file is empty" msgstr "הקובץ ×”× ×‘×—×¨ ריק" -#: ../libempathy/empathy-keyring.c:85 -#: ../libempathy/empathy-keyring.c:194 +#: ../libempathy/empathy-keyring.c:75 +#: ../libempathy/empathy-keyring.c:184 msgid "Password not found" msgstr "הססמה ×œ× × ×ž×¦××”" -#: ../libempathy/empathy-keyring.c:594 +#: ../libempathy/empathy-keyring.c:584 #, c-format msgid "IM account password for %s (%s)" msgstr "ססמת חשבון ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×¢×‘×•×¨ %s†(%s)" -#: ../libempathy/empathy-keyring.c:631 +#: ../libempathy/empathy-keyring.c:621 #, c-format msgid "Password for chatroom '%s' on account %s (%s)" msgstr "הססמה עבור החדר '%s' דרך החשבון %s â€(%s)" -#: ../libempathy/empathy-message.c:403 -#: ../src/empathy-call-observer.c:116 +#: ../libempathy/empathy-message.c:402 +#: ../src/empathy-call-observer.c:107 #, c-format msgid "Missed call from %s" msgstr "שיחה ×©×œ× × ×¢× ×ª×” מ×ת %s" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:407 +#: ../libempathy/empathy-message.c:406 #, c-format msgid "Called %s" msgstr "התקשרת ל%s" -#: ../libempathy/empathy-message.c:410 +#: ../libempathy/empathy-message.c:409 #, c-format msgid "Call from %s" msgstr "שיחה מ×ת %s" -#: ../libempathy/empathy-time.c:90 +#: ../libempathy/empathy-time.c:86 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "×œ×¤× ×™ ×©× ×™×™×”" msgstr[1] "×œ×¤× ×™ %d ×©× ×™×•×ª" -#: ../libempathy/empathy-time.c:96 +#: ../libempathy/empathy-time.c:92 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "×œ×¤× ×™ דקה" msgstr[1] "×œ×¤× ×™ %d דקות" -#: ../libempathy/empathy-time.c:102 +#: ../libempathy/empathy-time.c:98 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "×œ×¤× ×™ שעה" msgstr[1] "×œ×¤× ×™ %d שעות" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:104 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "×œ×¤× ×™ יו×" msgstr[1] "×œ×¤× ×™ %d ימי×" -#: ../libempathy/empathy-time.c:114 +#: ../libempathy/empathy-time.c:110 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "×œ×¤× ×™ שבוע" msgstr[1] "×œ×¤× ×™ %d שבועות" -#: ../libempathy/empathy-time.c:120 +#: ../libempathy/empathy-time.c:116 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "×œ×¤× ×™ חודש" msgstr[1] "×œ×¤× ×™ %d חודשי×" -#: ../libempathy/empathy-time.c:142 +#: ../libempathy/empathy-time.c:138 msgid "in the future" msgstr "בעתיד" -#: ../libempathy/empathy-utils.c:226 +#: ../libempathy/empathy-utils.c:215 msgid "Available" msgstr "זמין" -#: ../libempathy/empathy-utils.c:228 +#: ../libempathy/empathy-utils.c:217 msgid "Busy" msgstr "עסוק" -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:220 msgid "Away" msgstr "מרוחק" -#: ../libempathy/empathy-utils.c:233 +#: ../libempathy/empathy-utils.c:222 msgid "Invisible" msgstr "בלתי × ×¨××”" -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:224 msgid "Offline" msgstr "×œ× ×ž×—×•×‘×¨" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:238 +#: ../libempathy/empathy-utils.c:227 msgctxt "presence" msgid "Unknown" msgstr "×œ× ×™×“×•×¢" -#: ../libempathy/empathy-utils.c:278 +#: ../libempathy/empathy-utils.c:267 msgid "No reason specified" msgstr "×œ× ×¦×•×™×™× ×” סיבה" -#: ../libempathy/empathy-utils.c:280 -#: ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:269 +#: ../libempathy/empathy-utils.c:325 msgid "Status is set to offline" msgstr "המצב מוגדר ×›×ž× ×•×ª×§" -#: ../libempathy/empathy-utils.c:282 -#: ../libempathy/empathy-utils.c:316 -#: ../libempathy-gtk/empathy-call-utils.c:47 -#: ../libempathy-gtk/empathy-new-message-dialog.c:80 +#: ../libempathy/empathy-utils.c:271 +#: ../libempathy/empathy-utils.c:305 +#: ../libempathy-gtk/empathy-call-utils.c:41 +#: ../libempathy-gtk/empathy-new-message-dialog.c:70 msgid "Network error" msgstr "שגי×ת רשת" -#: ../libempathy/empathy-utils.c:284 -#: ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:273 +#: ../libempathy/empathy-utils.c:307 msgid "Authentication failed" msgstr "×”×ימות × ×›×©×œ" -#: ../libempathy/empathy-utils.c:286 -#: ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:275 +#: ../libempathy/empathy-utils.c:309 msgid "Encryption error" msgstr "שגי×ת ×”×¦×¤× ×”" -#: ../libempathy/empathy-utils.c:288 +#: ../libempathy/empathy-utils.c:277 msgid "Name in use" msgstr "×”×©× ×‘×©×™×ž×•×©" -#: ../libempathy/empathy-utils.c:290 -#: ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:279 +#: ../libempathy/empathy-utils.c:311 msgid "Certificate not provided" msgstr "×œ× ×¡×•×¤×§×” תעודה" -#: ../libempathy/empathy-utils.c:292 -#: ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:281 +#: ../libempathy/empathy-utils.c:313 msgid "Certificate untrusted" msgstr "התעודה ××™× ×” מ×ובטחת" -#: ../libempathy/empathy-utils.c:294 -#: ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:283 +#: ../libempathy/empathy-utils.c:315 msgid "Certificate expired" msgstr "התעודה ×œ× ×ª×§×¤×”" -#: ../libempathy/empathy-utils.c:296 -#: ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:285 +#: ../libempathy/empathy-utils.c:317 msgid "Certificate not activated" msgstr "התעודה ××™× ×” פעילה" -#: ../libempathy/empathy-utils.c:298 -#: ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:287 +#: ../libempathy/empathy-utils.c:319 msgid "Certificate hostname mismatch" msgstr "×©× ×”×ž×רח בתעודה ×œ× ×ª×•××" -#: ../libempathy/empathy-utils.c:300 -#: ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:289 +#: ../libempathy/empathy-utils.c:321 msgid "Certificate fingerprint mismatch" msgstr "טביעת ×”×צבע של התעודה ××™× ×” תו×מת" -#: ../libempathy/empathy-utils.c:302 -#: ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:291 +#: ../libempathy/empathy-utils.c:323 msgid "Certificate self-signed" msgstr "תעודה בחתימה עצמית" -#: ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:293 msgid "Certificate error" msgstr "שגי×ת תעודה" -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption is not available" msgstr "×ין ×”×¦×¤× ×” ×–×ž×™× ×”" -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate is invalid" msgstr "התעודה שגויה" -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:331 msgid "Connection has been refused" msgstr "החיבור × ×ª×§×œ בסירוב" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:333 msgid "Connection can't be established" msgstr "×œ× × ×™×ª×Ÿ ×œ×§×™×™× ×ת החיבור" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:335 msgid "Connection has been lost" msgstr "החיבור × ×§×˜×¢" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:337 msgid "This account is already connected to the server" msgstr "חשבון ×–×” כבר מחובר לשרת" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:339 msgid "Connection has been replaced by a new connection using the same resource" msgstr "החיבור הוחלף בחיבור חדש ב×מצעות ×ותו המש×ב" -#: ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:342 msgid "The account already exists on the server" msgstr "החשבון כבר ×§×™×™× ×‘×©×¨×ª" -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:344 msgid "Server is currently too busy to handle the connection" msgstr "השרת עסוק מכדי לטפל בחיבור" -#: ../libempathy/empathy-utils.c:357 +#: ../libempathy/empathy-utils.c:346 msgid "Certificate has been revoked" msgstr "התעודה × ×©×œ×œ×”" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:348 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "התעודה משתמשת ב××œ×’×•×¨×™×ª× ×”×¦×¤× ×” בלתי מ×ובטח ×ו ×©×”×•× ×—×œ×© ×ž×‘×—×™× ×” קריפטוגרפית" -#: ../libempathy/empathy-utils.c:362 +#: ../libempathy/empathy-utils.c:351 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:366 +#: ../libempathy/empathy-utils.c:355 msgid "Your software is too old" msgstr "×”×ª×›× ×” שלך ×™×©× ×” מדי" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:357 msgid "Internal error" msgstr "שגי××” ×¤× ×™×ž×™×ª" -#: ../libempathy/empathy-utils.c:497 -#: ../libempathy-gtk/empathy-roster-model.h:30 +#: ../libempathy/empathy-utils.c:486 +#: ../libempathy-gtk/empathy-roster-model.h:28 msgid "People Nearby" msgstr "×× ×©×™× ×‘×§×¨×‘×ª×™" -#: ../libempathy/empathy-utils.c:502 +#: ../libempathy/empathy-utils.c:491 msgid "Yahoo! Japan" msgstr "â€Yahoo! יפן" -#: ../libempathy/empathy-utils.c:538 -#: ../src/empathy-roster-window.c:671 +#: ../libempathy/empathy-utils.c:527 +#: ../src/empathy-roster-window.c:657 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:539 +#: ../libempathy/empathy-utils.c:528 msgid "Facebook Chat" msgstr "צ׳×ט Facebook" -#: ../libempathy-gtk/empathy-account-chooser.c:689 +#: ../libempathy-gtk/empathy-account-chooser.c:684 msgid "All accounts" msgstr "כל ×”×—×©×‘×•× ×•×ª" @@ -802,56 +802,56 @@ msgstr "מהי הססמה שלך ×צל AIM?" msgid "Remember Password" msgstr "שמירת הססמה" -#: ../libempathy-gtk/empathy-account-widget.c:675 +#: ../libempathy-gtk/empathy-account-widget.c:668 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -#: ../src/empathy-import-widget.c:322 +#: ../src/empathy-import-widget.c:316 msgid "Account" msgstr "חשבון" -#: ../libempathy-gtk/empathy-account-widget.c:676 +#: ../libempathy-gtk/empathy-account-widget.c:669 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Password" msgstr "ססמה" -#: ../libempathy-gtk/empathy-account-widget.c:677 +#: ../libempathy-gtk/empathy-account-widget.c:670 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:511 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:498 msgid "Server" msgstr "שרת" -#: ../libempathy-gtk/empathy-account-widget.c:678 +#: ../libempathy-gtk/empathy-account-widget.c:671 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:532 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:519 msgid "Port" msgstr "פתחה" -#: ../libempathy-gtk/empathy-account-widget.c:762 +#: ../libempathy-gtk/empathy-account-widget.c:755 #, c-format msgid "%s" msgstr "%s" -#: ../libempathy-gtk/empathy-account-widget.c:817 +#: ../libempathy-gtk/empathy-account-widget.c:810 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1429 +#: ../libempathy-gtk/empathy-account-widget.c:1422 msgid "Username:" msgstr "ש_× ×ž×©×ª×ž×©:" -#: ../libempathy-gtk/empathy-account-widget.c:1746 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "A_pply" msgstr "×”_חלה" -#: ../libempathy-gtk/empathy-account-widget.c:1775 +#: ../libempathy-gtk/empathy-account-widget.c:1768 msgid "L_og in" msgstr "_×›× ×™×¡×”" -#: ../libempathy-gtk/empathy-account-widget.c:1845 +#: ../libempathy-gtk/empathy-account-widget.c:1838 msgid "This account already exists on the server" msgstr "חשבון ×–×” כבר ×§×™×™× ×¢×œ השרת" -#: ../libempathy-gtk/empathy-account-widget.c:1849 +#: ../libempathy-gtk/empathy-account-widget.c:1842 msgid "Create a new account on the server" msgstr "יצירת חשבון חדש על השרת" @@ -860,19 +860,19 @@ msgstr "יצירת חשבון חדש על השרת" #. * 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:2270 +#: ../libempathy-gtk/empathy-account-widget.c:2255 #, c-format msgid "%1$s on %2$s" msgstr "â€%1$s על גבי %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:2296 +#: ../libempathy-gtk/empathy-account-widget.c:2281 #, c-format msgid "%s Account" msgstr "חשבון %s" -#: ../libempathy-gtk/empathy-account-widget.c:2300 +#: ../libempathy-gtk/empathy-account-widget.c:2285 msgid "New account" msgstr "חשבון חדש" @@ -1089,32 +1089,32 @@ msgstr "מהו ×©× ×”×ž×©×ª×ž×© שלך ב־Windows Live?" msgid "What is your Windows Live password?" msgstr "מהי ססמתך ב־Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:207 -#: ../libempathy-gtk/empathy-account-widget-sip.c:240 +#: ../libempathy-gtk/empathy-account-widget-sip.c:198 +#: ../libempathy-gtk/empathy-account-widget-sip.c:231 msgid "Auto" msgstr "×וטומטי" -#: ../libempathy-gtk/empathy-account-widget-sip.c:210 +#: ../libempathy-gtk/empathy-account-widget-sip.c:201 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:213 +#: ../libempathy-gtk/empathy-account-widget-sip.c:204 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:216 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 msgid "TLS" msgstr "TLS" -#: ../libempathy-gtk/empathy-account-widget-sip.c:245 +#: ../libempathy-gtk/empathy-account-widget-sip.c:236 msgid "Register" msgstr "הרשמה" -#: ../libempathy-gtk/empathy-account-widget-sip.c:250 +#: ../libempathy-gtk/empathy-account-widget-sip.c:241 msgid "Options" msgstr "×פשרויות" -#: ../libempathy-gtk/empathy-account-widget-sip.c:253 +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 msgid "None" msgstr "לל×" @@ -1226,55 +1226,55 @@ msgstr "מהו המזהה בחשבון ×”Ö¾Yahoo! שלך?" msgid "What is your Yahoo! password?" msgstr "מהי ססמת חשבון ×”Ö¾Yahoo! שלך?" -#: ../libempathy-gtk/empathy-avatar-chooser.c:545 -#: ../libempathy-gtk/empathy-avatar-chooser.c:630 +#: ../libempathy-gtk/empathy-avatar-chooser.c:539 +#: ../libempathy-gtk/empathy-avatar-chooser.c:624 msgid "Couldn't convert image" msgstr "×œ× × ×™×ª×Ÿ להמיר ×ª×ž×•× ×”" -#: ../libempathy-gtk/empathy-avatar-chooser.c:546 +#: ../libempathy-gtk/empathy-avatar-chooser.c:540 msgid "None of the accepted image formats are supported on your system" msgstr "××£ ×חד מסוגי ×”×ª×ž×•× ×•×ª ×”×ž×§×•×‘×œ×™× ××™× × × ×ª×ž×›×™× ×¢×œ ידי המערכת שלך" -#: ../libempathy-gtk/empathy-avatar-chooser.c:906 +#: ../libempathy-gtk/empathy-avatar-chooser.c:900 msgid "Couldn't save picture to file" msgstr "×œ× × ×™×ª×Ÿ לשמור ×ת ×”×ª×ž×•× ×” לקובץ" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1030 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1024 msgid "Select Your Avatar Image" msgstr "× × ×œ×‘×—×•×¨ ×ת ×”×ª×ž×•× ×” ×”×ישית שלך" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1038 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1032 msgid "Take a picture..." msgstr "×¦×™×œ×•× ×ª×ž×•× ×”..." -#: ../libempathy-gtk/empathy-avatar-chooser.c:1051 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1045 msgid "No Image" msgstr "×œ×œ× ×ª×ž×•× ×”" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1108 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1102 msgid "Images" msgstr "×ª×ž×•× ×•×ª" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1112 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1106 msgid "All Files" msgstr "כל הקבצי×" -#: ../libempathy-gtk/empathy-avatar-image.c:322 +#: ../libempathy-gtk/empathy-avatar-image.c:319 msgid "Click to enlarge" msgstr "יש ללחוץ כדי להגדיל" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:128 #, c-format msgid "Authentication failed for account <b>%s</b>" msgstr "×”×ימות עבור החשבון <b>%s</b> × ×›×©×œ" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 -#: ../libempathy-gtk/empathy-chat.c:3724 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:140 +#: ../libempathy-gtk/empathy-chat.c:3844 msgid "Retry" msgstr "× ×™×¡×™×•×Ÿ חוזר" #: ../libempathy-gtk/empathy-base-password-dialog.c:224 -#: ../libempathy-gtk/empathy-password-dialog.c:134 +#: ../libempathy-gtk/empathy-password-dialog.c:132 #, c-format msgid "" "Enter your password for account\n" @@ -1283,226 +1283,226 @@ msgstr "" "× × ×œ×”×–×™×Ÿ ×ת הססמה לחשבון\n" "<b>%s</b>" -#: ../libempathy-gtk/empathy-calendar-button.c:66 +#: ../libempathy-gtk/empathy-calendar-button.c:63 msgid "Select..." msgstr "בחירה..." -#: ../libempathy-gtk/empathy-calendar-button.c:154 +#: ../libempathy-gtk/empathy-calendar-button.c:151 msgid "_Select" msgstr "_בחירה" -#: ../libempathy-gtk/empathy-call-utils.c:42 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:36 +#: ../libempathy-gtk/empathy-call-utils.c:54 msgid "There was an error starting the call" msgstr "התחלת השיחה × ×›×©×œ×”" -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:43 msgid "The specified contact doesn't support calls" msgstr "×יש הקשר ×”×ž×¡×•×™× ×”×–×” ××™× ×• תומך בשיחות" -#: ../libempathy-gtk/empathy-call-utils.c:51 +#: ../libempathy-gtk/empathy-call-utils.c:45 msgid "The specified contact is offline" msgstr "×יש הקשר ×”×ž×¡×•×™× ×”×–×” ×ž× ×•×ª×§" -#: ../libempathy-gtk/empathy-call-utils.c:53 +#: ../libempathy-gtk/empathy-call-utils.c:47 msgid "The specified contact is not valid" msgstr "×יש הקשר ×”×ž×¡×•×™× ×”×–×” ××™× ×• ×ª×§× ×™" -#: ../libempathy-gtk/empathy-call-utils.c:55 +#: ../libempathy-gtk/empathy-call-utils.c:49 msgid "Emergency calls are not supported on this protocol" msgstr "×ין תמיכה בשיחות ×—×™×¨×•× ×‘×¤×¨×•×˜×•×§×•×œ ×–×”" -#: ../libempathy-gtk/empathy-call-utils.c:57 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "You don't have enough credit in order to place this call" msgstr "×ין לך די ×שר××™ כדי לבצע שיחה זו" -#: ../libempathy-gtk/empathy-chat.c:727 +#: ../libempathy-gtk/empathy-chat.c:731 msgid "Failed to open private chat" msgstr "פתיחת שיחה פרטית × ×›×©×œ×”" -#: ../libempathy-gtk/empathy-chat.c:785 +#: ../libempathy-gtk/empathy-chat.c:789 msgid "Topic not supported on this conversation" msgstr "×ין תמיכה בשימוש ×‘× ×•×©× ×‘×“×™×•×Ÿ ×–×”" -#: ../libempathy-gtk/empathy-chat.c:791 +#: ../libempathy-gtk/empathy-chat.c:795 msgid "You are not allowed to change the topic" msgstr "×ין לך הרש××” ×œ×©× ×•×ª ×ת ×”× ×•×©×" -#: ../libempathy-gtk/empathy-chat.c:967 +#: ../libempathy-gtk/empathy-chat.c:971 msgid "Invalid contact ID" msgstr "מזהה ×יש קשר שגוי" -#: ../libempathy-gtk/empathy-chat.c:1054 +#: ../libempathy-gtk/empathy-chat.c:1058 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: ×¤×™× ×•×™ כל ההודעות מהדיון ×”× ×•×›×—×™" -#: ../libempathy-gtk/empathy-chat.c:1057 +#: ../libempathy-gtk/empathy-chat.c:1061 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <× ×•×©×>:‎ הגדרת × ×•×©× ×”×©×™×—×” ×”× ×•×›×—×™×ª" -#: ../libempathy-gtk/empathy-chat.c:1060 +#: ../libempathy-gtk/empathy-chat.c:1064 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש" -#: ../libempathy-gtk/empathy-chat.c:1063 +#: ../libempathy-gtk/empathy-chat.c:1067 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש" -#: ../libempathy-gtk/empathy-chat.c:1067 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one" msgstr "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ השיחה, ×”× ×•×›×—×™ ×”×•× ×‘×¨×¨×ª המחדל" -#: ../libempathy-gtk/empathy-chat.c:1071 +#: ../libempathy-gtk/empathy-chat.c:1075 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <זיהוי ×יש הקשר> ‎[<הודעה>]:‎ פתיחת צ׳×ט ×ישי" -#: ../libempathy-gtk/empathy-chat.c:1074 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <זיהוי ×יש הקשר>‎ <הודעה>:‎ פתיחת צ׳×ט פרטי" -#: ../libempathy-gtk/empathy-chat.c:1077 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <×›×™× ×•×™>:‎ ×©×™× ×•×™ ×”×›×™× ×•×™ שלך בשרת ×”× ×•×›×—×™" -#: ../libempathy-gtk/empathy-chat.c:1080 +#: ../libempathy-gtk/empathy-chat.c:1084 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <הודעה>:‎ שליחת הודעת ACTION לדיון ×”× ×•×›×—×™" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1087 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 <הודעה>:‎ שליחת <הודעה> לדיון ×”× ×•×›×—×™. פקודה זו משמשת לשליחת הודעות המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\"" -#: ../libempathy-gtk/empathy-chat.c:1088 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/whois <contact ID>: display information about a contact" msgstr "/whois <מזהה המשתמש>:‎ הצגת ×¤×¨×˜×™× ×¢×œ ×יש הקשר" -#: ../libempathy-gtk/empathy-chat.c:1091 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage." msgstr "/help [<פקודה>]:‎ הצגת כל הפקודות ×”× ×ª×ž×›×•×ª. ×× ×™×© הגדרה ל־<פקודה> יוצג ×ופן הפעלתה." -#: ../libempathy-gtk/empathy-chat.c:1110 +#: ../libempathy-gtk/empathy-chat.c:1114 #, c-format msgid "Usage: %s" msgstr "שימוש: %s" -#: ../libempathy-gtk/empathy-chat.c:1155 +#: ../libempathy-gtk/empathy-chat.c:1159 msgid "Unknown command" msgstr "פקודה ×œ× ×™×“×•×¢×”" -#: ../libempathy-gtk/empathy-chat.c:1281 +#: ../libempathy-gtk/empathy-chat.c:1285 msgid "Unknown command; see /help for the available commands" msgstr "פקודה בלתי מוכרת; יש לעיין ב־‎/help לצפייה בפקודות ×”×–×ž×™× ×•×ª" -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1542 msgid "insufficient balance to send message" msgstr "המ×זן ××™× ×• מ×פשר לשלוח הודעה" -#: ../libempathy-gtk/empathy-chat.c:1542 -#: ../libempathy-gtk/empathy-chat.c:1556 -#: ../libempathy-gtk/empathy-chat.c:1619 +#: ../libempathy-gtk/empathy-chat.c:1546 +#: ../libempathy-gtk/empathy-chat.c:1560 +#: ../libempathy-gtk/empathy-chat.c:1623 #, c-format msgid "Error sending message '%s': %s" msgstr "שגי××” בשליחת ההודעה '%s': â€%s" -#: ../libempathy-gtk/empathy-chat.c:1544 -#: ../libempathy-gtk/empathy-chat.c:1561 -#: ../libempathy-gtk/empathy-chat.c:1623 +#: ../libempathy-gtk/empathy-chat.c:1548 +#: ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1627 #, c-format msgid "Error sending message: %s" msgstr "שגי××” בשליחת ההודעה: â€%s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1550 +#: ../libempathy-gtk/empathy-chat.c:1554 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "המ×זן ××™× ×• מ×פשר לשלוח הודעה. <a href='%s'>Top up</a>." -#: ../libempathy-gtk/empathy-chat.c:1590 +#: ../libempathy-gtk/empathy-chat.c:1594 msgid "not capable" msgstr "×œ×œ× ×™×›×•×œ×ª" -#: ../libempathy-gtk/empathy-chat.c:1597 +#: ../libempathy-gtk/empathy-chat.c:1601 msgid "offline" msgstr "×œ× ×ž×—×•×‘×¨" -#: ../libempathy-gtk/empathy-chat.c:1600 +#: ../libempathy-gtk/empathy-chat.c:1604 msgid "invalid contact" msgstr "×יש קשר שגוי" -#: ../libempathy-gtk/empathy-chat.c:1603 +#: ../libempathy-gtk/empathy-chat.c:1607 msgid "permission denied" msgstr "הרש××” × ×סרה" -#: ../libempathy-gtk/empathy-chat.c:1606 +#: ../libempathy-gtk/empathy-chat.c:1610 msgid "too long message" msgstr "הודעה ×רוכה מדי" -#: ../libempathy-gtk/empathy-chat.c:1609 +#: ../libempathy-gtk/empathy-chat.c:1613 msgid "not implemented" msgstr "×”×ª×›×•× ×” ×œ× ×ž×•×ž×©×”" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1617 msgid "unknown" msgstr "×œ× ×™×“×•×¢" -#: ../libempathy-gtk/empathy-chat.c:1680 -#: ../src/empathy-chat-window.c:979 +#: ../libempathy-gtk/empathy-chat.c:1684 +#: ../src/empathy-chat-window.c:967 msgid "Topic:" msgstr "× ×•×©×:" -#: ../libempathy-gtk/empathy-chat.c:1695 +#: ../libempathy-gtk/empathy-chat.c:1699 #, c-format msgid "Topic set to: %s" msgstr "×”× ×•×©× ×”×•×’×“×¨ ל־: %s" -#: ../libempathy-gtk/empathy-chat.c:1697 +#: ../libempathy-gtk/empathy-chat.c:1701 #, c-format msgid "Topic set by %s to: %s" msgstr "×”× ×•×©× ×”×•×’×“×¨ על ידי %s בתור: %s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1702 +#: ../libempathy-gtk/empathy-chat.c:1706 msgid "No topic defined" msgstr "×œ× × ×§×‘×¢ × ×•×©×" -#: ../libempathy-gtk/empathy-chat.c:2218 +#: ../libempathy-gtk/empathy-chat.c:2222 msgid "(No Suggestions)" msgstr "(×ין הצעות)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2286 +#: ../libempathy-gtk/empathy-chat.c:2290 #, c-format msgid "Add '%s' to Dictionary" msgstr "הוספת '%s' למילון" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2323 +#: ../libempathy-gtk/empathy-chat.c:2327 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "הוספת '%s' למילון %s" -#: ../libempathy-gtk/empathy-chat.c:2393 +#: ../libempathy-gtk/empathy-chat.c:2397 msgid "Insert Smiley" msgstr "הוספת חייכן" #. send button -#: ../libempathy-gtk/empathy-chat.c:2411 -#: ../libempathy-gtk/empathy-ui-utils.c:1180 +#: ../libempathy-gtk/empathy-chat.c:2415 +#: ../libempathy-gtk/empathy-ui-utils.c:1208 msgid "_Send" msgstr "_שליחה" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2468 +#: ../libempathy-gtk/empathy-chat.c:2472 msgid "_Spelling Suggestions" msgstr "הצעות _×יות" -#: ../libempathy-gtk/empathy-chat.c:2574 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "קבלת הדוחות ×”××—×¨×•× ×™× × ×›×©×œ×”" -#: ../libempathy-gtk/empathy-chat.c:2718 +#: ../libempathy-gtk/empathy-chat.c:2826 #, c-format msgid "%s has disconnected" msgstr "â€%s ×”×ª× ×ª×§" @@ -1510,12 +1510,12 @@ msgstr "â€%s ×”×ª× ×ª×§" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2725 +#: ../libempathy-gtk/empathy-chat.c:2833 #, c-format msgid "%1$s was kicked by %2$s" msgstr "â€%1$s סולק על ידי %2$s" -#: ../libempathy-gtk/empathy-chat.c:2728 +#: ../libempathy-gtk/empathy-chat.c:2836 #, c-format msgid "%s was kicked" msgstr "â€%s סולק" @@ -1523,17 +1523,17 @@ msgstr "â€%s סולק" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2736 +#: ../libempathy-gtk/empathy-chat.c:2844 #, c-format msgid "%1$s was banned by %2$s" msgstr "â€%1$s × ×—×¡× ×¢×œ ידי %2$s" -#: ../libempathy-gtk/empathy-chat.c:2739 +#: ../libempathy-gtk/empathy-chat.c:2847 #, c-format msgid "%s was banned" msgstr "â€%s × ×—×¡×" -#: ../libempathy-gtk/empathy-chat.c:2743 +#: ../libempathy-gtk/empathy-chat.c:2851 #, c-format msgid "%s has left the room" msgstr "â€%s עזב ×ת החדר" @@ -1543,17 +1543,17 @@ msgstr "â€%s עזב ×ת החדר" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2752 +#: ../libempathy-gtk/empathy-chat.c:2860 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2777 +#: ../libempathy-gtk/empathy-chat.c:2885 #, c-format msgid "%s has joined the room" msgstr "â€%s הצטרף לחדר" -#: ../libempathy-gtk/empathy-chat.c:2802 +#: ../libempathy-gtk/empathy-chat.c:2910 #, c-format msgid "%s is now known as %s" msgstr "â€%s × ×•×“×¢ כעת ×‘×›×™× ×•×™ %s" @@ -1561,86 +1561,86 @@ msgstr "â€%s × ×•×“×¢ כעת ×‘×›×™× ×•×™ %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2989 -#: ../src/empathy-call-window.c:1532 -#: ../src/empathy-call-window.c:1582 -#: ../src/empathy-call-window.c:2655 -#: ../src/empathy-call-window.c:2961 -#: ../src/empathy-event-manager.c:1166 +#: ../libempathy-gtk/empathy-chat.c:3097 +#: ../src/empathy-call-window.c:1516 +#: ../src/empathy-call-window.c:1566 +#: ../src/empathy-call-window.c:2641 +#: ../src/empathy-call-window.c:2948 +#: ../src/empathy-event-manager.c:1158 msgid "Disconnected" msgstr "×ž× ×•×ª×§" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3664 +#: ../libempathy-gtk/empathy-chat.c:3784 msgid "Would you like to store this password?" msgstr "×”×× ×‘×¨×¦×•× ×š ל×חסן ססמה זו?" -#: ../libempathy-gtk/empathy-chat.c:3670 +#: ../libempathy-gtk/empathy-chat.c:3790 msgid "Remember" msgstr "שמירה" -#: ../libempathy-gtk/empathy-chat.c:3680 +#: ../libempathy-gtk/empathy-chat.c:3800 msgid "Not now" msgstr "×œ× ×›×¢×ª" -#: ../libempathy-gtk/empathy-chat.c:3728 +#: ../libempathy-gtk/empathy-chat.c:3848 msgid "Wrong password; please try again:" msgstr "ססמה שגויה; × × ×œ× ×¡×•×ª שוב:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3858 +#: ../libempathy-gtk/empathy-chat.c:3972 msgid "This room is protected by a password:" msgstr "חדר ×–×” מוגן בססמה:" -#: ../libempathy-gtk/empathy-chat.c:3885 -#: ../src/empathy-new-chatroom-dialog.c:780 +#: ../libempathy-gtk/empathy-chat.c:3999 +#: ../src/empathy-new-chatroom-dialog.c:770 msgid "Join" msgstr "הצטרפות" -#: ../libempathy-gtk/empathy-chat.c:4077 -#: ../src/empathy-event-manager.c:1187 +#: ../libempathy-gtk/empathy-chat.c:4191 +#: ../src/empathy-event-manager.c:1179 msgid "Connected" msgstr "מחובר" -#: ../libempathy-gtk/empathy-chat.c:4132 +#: ../libempathy-gtk/empathy-chat.c:4246 msgid "Conversation" msgstr "שיחה" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4137 +#: ../libempathy-gtk/empathy-chat.c:4251 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261 msgid "Unknown or invalid identifier" msgstr "המזהה ××™× ×• ידוע ×ו שגוי" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263 msgid "Contact blocking temporarily unavailable" msgstr "חסימת ×× ×©×™ קשר ××™× ×” ×–×ž×™× ×” כרגע" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 msgid "Contact blocking unavailable" msgstr "חסימת ×× ×©×™ קשר ××™× ×” ×–×ž×™× ×”" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 msgid "Permission Denied" msgstr "ההרש××” × ×“×—×ª×”" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 msgid "Could not block contact" msgstr "×œ× × ×™×ª×Ÿ ×œ×—×¡×•× ×ת ×יש הקשר" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610 msgid "Edit Blocked Contacts" msgstr "עריכת ×× ×©×™ הקשר החסומי×" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 -#: ../libempathy-gtk/empathy-individual-widget.c:1485 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:528 +#: ../libempathy-gtk/empathy-individual-widget.c:1473 #: ../src/empathy-chatrooms-window.ui.h:2 #: ../src/empathy-new-chatroom-dialog.ui.h:6 msgid "Account:" @@ -1650,120 +1650,120 @@ msgstr "חשבון:" msgid "Blocked Contacts" msgstr "×× ×©×™ קשר חסומי×" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:98 msgid "Full name" msgstr "×©× ×ž×œ×" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:99 msgid "Phone number" msgstr "מספר טלפון" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:100 msgid "E-mail address" msgstr "כתובת דו×״ל" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:101 msgid "Website" msgstr "×תר ××™× ×˜×¨× ×˜" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 msgid "Birthday" msgstr "×™×•× ×”×•×œ×“×ª" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Last seen:" msgstr "פעילות ××—×¨×•× ×”:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Server:" msgstr "שרת:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:109 msgid "Connected from:" msgstr "החיבור דרך:" #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Away message:" msgstr "הודעת התרחקות:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:126 msgid "work" msgstr "עבודה" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:127 msgid "home" msgstr "בית" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:128 msgid "mobile" msgstr "סלולרי" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:129 msgid "voice" msgstr "קול" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 msgid "preferred" msgstr "מועדף" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 msgid "postal" msgstr "מיקוד" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "parcel" msgstr "כתובת למשלוחי×" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:522 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:521 msgid "Search contacts" msgstr "חיפוש בין ×× ×©×™ הקשר" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:552 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:551 msgid "Search: " msgstr "חיפוש:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:610 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:609 msgid "_Add Contact" msgstr "הוספת _×יש קשר" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:628 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 msgid "No contacts found" msgstr "×œ× × ×ž×¦×ו ×× ×©×™ קשר" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:644 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:643 msgid "Your message introducing yourself:" msgstr "ההודעה המציגה ×ותך:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:652 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:651 msgid "Please let me see when you're online. Thanks!" msgstr "× × ×œ×פשר לי לר×ות מתי מצבך ×”×•× ×ž×—×•×‘×¨. תודה!" -#: ../libempathy-gtk/empathy-contact-widget.c:168 -#: ../libempathy-gtk/empathy-individual-widget.c:900 +#: ../libempathy-gtk/empathy-contact-widget.c:156 +#: ../libempathy-gtk/empathy-individual-widget.c:888 msgid "Save Avatar" msgstr "שמירת ×ª×ž×•× ×” ×ישית" -#: ../libempathy-gtk/empathy-contact-widget.c:224 -#: ../libempathy-gtk/empathy-individual-widget.c:958 +#: ../libempathy-gtk/empathy-contact-widget.c:212 +#: ../libempathy-gtk/empathy-individual-widget.c:946 msgid "Unable to save avatar" msgstr "×œ× × ×™×ª×Ÿ לשמור ×ª×ž×•× ×” ×ישית" #. Identifier to connect to Instant Messaging network #. Setup id label #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-user-info.c:444 +#: ../libempathy-gtk/empathy-user-info.c:455 msgid "Identifier" msgstr "מזהה" #. Setup nickname entry #: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -#: ../libempathy-gtk/empathy-user-info.c:449 +#: ../libempathy-gtk/empathy-user-info.c:460 msgid "Alias" msgstr "×›×™× ×•×™" @@ -1797,345 +1797,345 @@ msgstr "גרסה" msgid "Client" msgstr "לקוח" -#: ../libempathy-gtk/empathy-groups-widget.c:327 +#: ../libempathy-gtk/empathy-groups-widget.c:317 msgid "Groups" msgstr "קבוצות" -#: ../libempathy-gtk/empathy-groups-widget.c:339 +#: ../libempathy-gtk/empathy-groups-widget.c:329 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:358 +#: ../libempathy-gtk/empathy-groups-widget.c:348 msgid "_Add Group" msgstr "הוס_פת קבוצה" -#: ../libempathy-gtk/empathy-groups-widget.c:393 +#: ../libempathy-gtk/empathy-groups-widget.c:383 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "בחירה" -#: ../libempathy-gtk/empathy-groups-widget.c:403 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgid "Group" msgstr "קבוצה" -#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +#: ../libempathy-gtk/empathy-individual-dialogs.c:108 msgid "New Contact" msgstr "×יש קשר חדש" -#: ../libempathy-gtk/empathy-individual-dialogs.c:193 -#: ../libempathy-gtk/empathy-subscription-dialog.c:121 +#: ../libempathy-gtk/empathy-individual-dialogs.c:183 +#: ../libempathy-gtk/empathy-subscription-dialog.c:120 #, c-format msgid "Block %s?" msgstr "×”×× ×œ×—×¡×•× ×ת %s?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:248 -#: ../libempathy-gtk/empathy-subscription-dialog.c:125 +#: ../libempathy-gtk/empathy-individual-dialogs.c:238 +#: ../libempathy-gtk/empathy-subscription-dialog.c:124 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "×”×× ×כן ×‘×¨×¦×•× ×š ×œ×—×¡×•× ×ת ×פשרות ההתקשרות של '%s' ×ליך?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-individual-dialogs.c:243 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "הזהות הב××” תיחס×:" msgstr[1] "בעלי הזהות הב××™× ×™×™×—×¡×ž×•:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:250 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "×œ× × ×™×ª×Ÿ ×œ×—×¡×•× ×ת הזהות הב××”:" msgstr[1] "×œ× × ×™×ª×Ÿ ×œ×—×¡×•× ×ת בעלי הזהות הב××™×:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:270 -#: ../libempathy-gtk/empathy-subscription-dialog.c:130 -#: ../libempathy-gtk/empathy-subscription-dialog.c:275 +#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-subscription-dialog.c:129 +#: ../libempathy-gtk/empathy-subscription-dialog.c:274 msgid "_Block" msgstr "×—_סימה" -#: ../libempathy-gtk/empathy-individual-dialogs.c:279 -#: ../libempathy-gtk/empathy-subscription-dialog.c:150 +#: ../libempathy-gtk/empathy-individual-dialogs.c:269 +#: ../libempathy-gtk/empathy-subscription-dialog.c:149 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_דיווח על משתמש ×–×” כמטרד" msgstr[1] "_דיווח על ×ž×©×ª×ž×©×™× ×לה כמטרד" -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237 msgid "Edit Contact Information" msgstr "עריכת פרטי ×יש קשר" #. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:293 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:283 msgid "Linked Contacts" msgstr "×× ×©×™ קשר מקושרי×" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:332 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:322 msgid "gnome-contacts not installed" msgstr "×œ× ×”×•×ª×§× ×” ×”×ª×›× ×™×ª gnome-contacts" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:335 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:325 msgid "Please install gnome-contacts to access contacts details." msgstr "× × ×œ×”×ª×§×™×Ÿ ×ת gnome-contacts כדי לגשת לפרטי ×× ×©×™ הקשר." #. 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:177 +#: ../libempathy-gtk/empathy-individual-menu.c:168 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:353 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "× × ×œ×‘×—×•×¨ ×ת החשבון לשימוש לצורך ההתקשרות" -#: ../libempathy-gtk/empathy-individual-menu.c:357 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-call-window.ui.h:20 msgid "Call" msgstr "התקשרות" -#: ../libempathy-gtk/empathy-individual-menu.c:422 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "סלולרי" -#: ../libempathy-gtk/empathy-individual-menu.c:424 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "עבודה" -#: ../libempathy-gtk/empathy-individual-menu.c:426 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "בית" -#: ../libempathy-gtk/empathy-individual-menu.c:669 +#: ../libempathy-gtk/empathy-individual-menu.c:660 msgid "_Block Contact" msgstr "×—_סימת ×יש קשר" -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:716 msgid "Delete and _Block" msgstr "מחיקה ו_חסימה" -#: ../libempathy-gtk/empathy-individual-menu.c:787 +#: ../libempathy-gtk/empathy-individual-menu.c:778 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "להסיר ×ת ×יש הקשר '%s'?" -#: ../libempathy-gtk/empathy-individual-menu.c:796 +#: ../libempathy-gtk/empathy-individual-menu.c:787 #, c-format msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact." msgstr "×”×× ×כן ×‘×¨×¦×•× ×š להסיר ×ת ×יש הקשר המקושר '%s'? × × ×œ×©×™× ×œ×‘ שפעולה זו תסיר ×ת כל ×× ×©×™ הקשר המת××’×“×™× ×œ×יש קשר מקושר ×–×”." -#: ../libempathy-gtk/empathy-individual-menu.c:807 +#: ../libempathy-gtk/empathy-individual-menu.c:798 msgid "Removing contact" msgstr "×יש קשר מוסר" -#: ../libempathy-gtk/empathy-individual-menu.c:871 -#: ../libempathy-gtk/empathy-individual-view.c:2453 +#: ../libempathy-gtk/empathy-individual-menu.c:862 +#: ../libempathy-gtk/empathy-individual-view.c:2440 msgid "_Remove" msgstr "×”_סרה" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1234 -#: ../libempathy-gtk/empathy-new-message-dialog.c:318 +#: ../libempathy-gtk/empathy-individual-menu.c:1225 +#: ../libempathy-gtk/empathy-new-message-dialog.c:308 msgid "_Chat" msgstr "_שיחה" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1269 -#: ../libempathy-gtk/empathy-new-message-dialog.c:312 +#: ../libempathy-gtk/empathy-individual-menu.c:1260 +#: ../libempathy-gtk/empathy-new-message-dialog.c:302 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1302 +#: ../libempathy-gtk/empathy-individual-menu.c:1293 msgctxt "menu item" msgid "_Audio Call" msgstr "שיחה _קולית" -#: ../libempathy-gtk/empathy-individual-menu.c:1335 +#: ../libempathy-gtk/empathy-individual-menu.c:1326 msgctxt "menu item" msgid "_Video Call" msgstr "שיחת _ויד×ו" -#: ../libempathy-gtk/empathy-individual-menu.c:1376 +#: ../libempathy-gtk/empathy-individual-menu.c:1367 #: ../src/empathy-roster-window-menubar.ui.h:11 msgid "_Previous Conversations" msgstr "שיחות _קודמות" -#: ../libempathy-gtk/empathy-individual-menu.c:1405 +#: ../libempathy-gtk/empathy-individual-menu.c:1396 msgid "Send File" msgstr "שליחת קובץ" -#: ../libempathy-gtk/empathy-individual-menu.c:1435 +#: ../libempathy-gtk/empathy-individual-menu.c:1426 msgid "Share My Desktop" msgstr "שיתוף שולחן העבודה שלי" -#: ../libempathy-gtk/empathy-individual-menu.c:1461 -#: ../libempathy-gtk/empathy-individual-widget.c:1368 +#: ../libempathy-gtk/empathy-individual-menu.c:1452 +#: ../libempathy-gtk/empathy-individual-widget.c:1356 msgid "Favorite" msgstr "מועדף" -#: ../libempathy-gtk/empathy-individual-menu.c:1490 +#: ../libempathy-gtk/empathy-individual-menu.c:1481 msgid "Infor_mation" msgstr "_מידע" -#: ../libempathy-gtk/empathy-individual-menu.c:1539 +#: ../libempathy-gtk/empathy-individual-menu.c:1530 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "×¢_ריכה" #. send invitation -#: ../libempathy-gtk/empathy-individual-menu.c:1655 -#: ../src/empathy-chat-window.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1646 +#: ../src/empathy-chat-window.c:1233 msgid "Inviting you to this room" msgstr "מזמין/×” ×ותך לחדר ×–×”" -#: ../libempathy-gtk/empathy-individual-menu.c:1701 +#: ../libempathy-gtk/empathy-individual-menu.c:1692 msgid "_Invite to Chat Room" msgstr "×”_×–×ž× ×” לחדר שיחה" -#: ../libempathy-gtk/empathy-individual-menu.c:1897 +#: ../libempathy-gtk/empathy-individual-menu.c:1888 msgid "_Add Contact…" msgstr "הוספת _×יש קשר…" -#: ../libempathy-gtk/empathy-individual-view.c:2373 +#: ../libempathy-gtk/empathy-individual-view.c:2360 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "×”×× ×œ×”×¡×™×¨ ×ת הקבוצה '%s'?" -#: ../libempathy-gtk/empathy-individual-view.c:2376 +#: ../libempathy-gtk/empathy-individual-view.c:2363 msgid "Removing group" msgstr "הקבוצה מוסרת" -#: ../libempathy-gtk/empathy-individual-view.c:2444 +#: ../libempathy-gtk/empathy-individual-view.c:2431 msgid "Re_name" msgstr "×©× ×” _ש×" -#: ../libempathy-gtk/empathy-individual-widget.c:304 +#: ../libempathy-gtk/empathy-individual-widget.c:294 msgid "Channels:" msgstr "ערוצי×:" -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-individual-widget.c:445 msgid "Country ISO Code:" msgstr "קוד ×”×ž×“×™× ×” בתקן ISO:" -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-individual-widget.c:447 msgid "Country:" msgstr "×רץ:" -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-individual-widget.c:449 msgid "State:" msgstr "×ž×“×™× ×”:" -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-individual-widget.c:451 msgid "City:" msgstr "עיר:" -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-individual-widget.c:453 msgid "Area:" msgstr "×זור:" -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Postal Code:" msgstr "מיקוד:" -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Street:" msgstr "רחוב:" -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "Building:" msgstr "×ž×‘× ×”:" -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "Floor:" msgstr "קומה:" -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Room:" msgstr "חדר:" -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Text:" msgstr "טקסט:" -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Description:" msgstr "תי×ור:" -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "URI:" msgstr "כתובת:" -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Accuracy Level:" msgstr "רמת דיוק:" -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Error:" msgstr "שגי××”:" -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Vertical Error (meters):" msgstr "סטייה ×× ×›×™×ª (מטרי×):" -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Horizontal Error (meters):" msgstr "סטייה ×ופקית (מטרי×):" -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "Speed:" msgstr "מהירות:" -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Bearing:" msgstr "×זימוט:" -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Climb Speed:" msgstr "מהירות הטיפוס:" -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Last Updated on:" msgstr "עדכון ×חרון ב־:" -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Longitude:" msgstr "קו ×ורך:" -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Latitude:" msgstr "קו רוחב:" -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Altitude:" msgstr "גובה:" -#: ../libempathy-gtk/empathy-individual-widget.c:593 -#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../libempathy-gtk/empathy-individual-widget.c:583 +#: ../libempathy-gtk/empathy-individual-widget.c:598 #: ../src/empathy-preferences.ui.h:39 msgid "Location" msgstr "מיקו×" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-individual-widget.c:610 +#: ../libempathy-gtk/empathy-individual-widget.c:600 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-individual-widget.c:659 +#: ../libempathy-gtk/empathy-individual-widget.c:649 msgid "%B %e, %Y at %R UTC" msgstr "â€%B %e, %Y ב־â€%R â€UTC" #. Alias -#: ../libempathy-gtk/empathy-individual-widget.c:1304 +#: ../libempathy-gtk/empathy-individual-widget.c:1292 msgid "Alias:" msgstr "×›×™× ×•×™:" #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-individual-widget.c:1513 +#: ../libempathy-gtk/empathy-individual-widget.c:1501 msgid "Identifier:" msgstr "מזהה:" -#: ../libempathy-gtk/empathy-individual-widget.c:1652 +#: ../libempathy-gtk/empathy-individual-widget.c:1640 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2150,172 +2150,172 @@ msgstr "<b>מיקו×</b> ב(ת×ריך)" msgid "Online from a phone or mobile device" msgstr "בחיבור סלולרי ×ו דרך התקן × ×™×™×“" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329 msgid "New Network" msgstr "רשת חדשה" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532 msgid "Choose an IRC network" msgstr "בחירת רשת IRC" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615 msgid "Reset _Networks List" msgstr "_×יפוס רשימת הרשתות" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "בחירה" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:271 msgid "new server" msgstr "שרת חדש" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:547 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:534 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80 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." msgstr "ב×פשרות Empathy לגלות ×•×œ× ×”×œ שיחות ×¢× ×× ×©×™× ×”×ž×—×•×‘×¨×™× ×œ×ותה הרשת כמוך. ×× ×‘×¨×¦×•× ×š להשתמש ×‘×ª×›×•× ×” זו, × × ×œ×‘×“×•×§ ×©×”×¤×¨×˜×™× ×©×œ×”×œ×Ÿ × ×›×•× ×™×." -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100 msgid "People nearby" msgstr "×× ×©×™× ×‘×§×¨×‘×ª×™" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115 msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List." msgstr "ב×פשרותך ×œ×©× ×•×ª ×¤×¨×˜×™× ×לה מ×וחר יותר ×ו ×œ× ×˜×¨×œ ×ª×›×•× ×” זו על ידי בחירה ב<span style=\"italic\">עריכה â† ×—×©×‘×•× ×•×ª</span> ברשימת ×× ×©×™ הקשר." -#: ../libempathy-gtk/empathy-log-window.c:622 +#: ../libempathy-gtk/empathy-log-window.c:607 msgid "History" msgstr "היסטוריה" -#: ../libempathy-gtk/empathy-log-window.c:677 +#: ../libempathy-gtk/empathy-log-window.c:662 msgid "Show" msgstr "הצגה" -#: ../libempathy-gtk/empathy-log-window.c:699 +#: ../libempathy-gtk/empathy-log-window.c:684 msgid "Search" msgstr "חיפוש" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1135 #, c-format msgid "Chat in %s" msgstr "שיחה תחת %s" -#: ../libempathy-gtk/empathy-log-window.c:1152 +#: ../libempathy-gtk/empathy-log-window.c:1137 #, c-format msgid "Chat with %s" msgstr "שיחה ×¢× %s" -#: ../libempathy-gtk/empathy-log-window.c:1202 -#: ../libempathy-gtk/empathy-log-window.c:1346 +#: ../libempathy-gtk/empathy-log-window.c:1187 +#: ../libempathy-gtk/empathy-log-window.c:1336 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A %d ב%B %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1289 +#: ../libempathy-gtk/empathy-log-window.c:1277 #, c-format msgid "<i>* %s %s</i>" msgstr "* %s %s" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1295 +#: ../libempathy-gtk/empathy-log-window.c:1283 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1370 +#: ../libempathy-gtk/empathy-log-window.c:1360 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "×©× ×™×™×” ×חת" msgstr[1] "%s ×©× ×™×•×ª" -#: ../libempathy-gtk/empathy-log-window.c:1377 +#: ../libempathy-gtk/empathy-log-window.c:1367 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "דקה ×חת" msgstr[1] "%s דקות" -#: ../libempathy-gtk/empathy-log-window.c:1385 +#: ../libempathy-gtk/empathy-log-window.c:1375 #, c-format msgid "Call took %s, ended at %s" msgstr "השיחה ×רכה %s, הסתיימה ב־%s" -#: ../libempathy-gtk/empathy-log-window.c:1716 +#: ../libempathy-gtk/empathy-log-window.c:1706 msgid "Today" msgstr "היו×" -#: ../libempathy-gtk/empathy-log-window.c:1720 +#: ../libempathy-gtk/empathy-log-window.c:1710 msgid "Yesterday" msgstr "×תמול" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1735 +#: ../libempathy-gtk/empathy-log-window.c:1725 msgid "%e %B %Y" msgstr "×”Ö¾%e ב%B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1839 -#: ../libempathy-gtk/empathy-log-window.c:3462 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3452 msgid "Anytime" msgstr "כל זמן שהו×" -#: ../libempathy-gtk/empathy-log-window.c:1938 -#: ../libempathy-gtk/empathy-log-window.c:2397 +#: ../libempathy-gtk/empathy-log-window.c:1928 +#: ../libempathy-gtk/empathy-log-window.c:2387 msgid "Anyone" msgstr "כל ×חד" -#: ../libempathy-gtk/empathy-log-window.c:2710 +#: ../libempathy-gtk/empathy-log-window.c:2700 msgid "Who" msgstr "מי" -#: ../libempathy-gtk/empathy-log-window.c:2919 +#: ../libempathy-gtk/empathy-log-window.c:2909 msgid "When" msgstr "מתי" -#: ../libempathy-gtk/empathy-log-window.c:3037 +#: ../libempathy-gtk/empathy-log-window.c:3027 msgid "Anything" msgstr "כל דבר" -#: ../libempathy-gtk/empathy-log-window.c:3039 +#: ../libempathy-gtk/empathy-log-window.c:3029 msgid "Text chats" msgstr "צ׳××˜×™× ×‘×˜×§×¡×˜" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3030 #: ../src/empathy-preferences.ui.h:29 msgid "Calls" msgstr "שיחות" -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3034 msgid "Incoming calls" msgstr "שיחות × ×›× ×¡×•×ª" -#: ../libempathy-gtk/empathy-log-window.c:3045 +#: ../libempathy-gtk/empathy-log-window.c:3035 msgid "Outgoing calls" msgstr "שיחות יוצ×ות" -#: ../libempathy-gtk/empathy-log-window.c:3046 +#: ../libempathy-gtk/empathy-log-window.c:3036 msgid "Missed calls" msgstr "שיחות ×©×œ× × ×¢× ×•" -#: ../libempathy-gtk/empathy-log-window.c:3066 +#: ../libempathy-gtk/empathy-log-window.c:3056 msgid "What" msgstr "מה" -#: ../libempathy-gtk/empathy-log-window.c:3755 +#: ../libempathy-gtk/empathy-log-window.c:3745 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "×”×× ×כן ×‘×¨×¦×•× ×š למחוק ×ת כל ×”×™×•×ž× ×™× ×©×œ ×”×“×™×•× ×™× ×”××—×¨×•× ×™× ×©×œ×š?" -#: ../libempathy-gtk/empathy-log-window.c:3759 +#: ../libempathy-gtk/empathy-log-window.c:3749 msgid "Clear All" msgstr "מחיקת הכול" -#: ../libempathy-gtk/empathy-log-window.c:3766 +#: ../libempathy-gtk/empathy-log-window.c:3756 msgid "Delete from:" msgstr "מחיקה עד מ־:" @@ -2338,7 +2338,7 @@ msgid "Profile" msgstr "פרופיל" #: ../libempathy-gtk/empathy-log-window.ui.h:5 -#: ../src/empathy-chat-window.c:1438 +#: ../src/empathy-chat-window.c:1426 #: ../src/empathy-preferences.ui.h:11 msgid "Chat" msgstr "שיחה" @@ -2364,72 +2364,72 @@ msgstr "×ילו ×—×©×‘×•× ×•×ª יש לך?" msgid "Adding new account" msgstr "× ×•×¡×£ חשבון חדש" -#: ../libempathy-gtk/empathy-new-call-dialog.c:199 -#: ../libempathy-gtk/empathy-new-message-dialog.c:289 +#: ../libempathy-gtk/empathy-new-call-dialog.c:189 +#: ../libempathy-gtk/empathy-new-message-dialog.c:279 msgid "Enter a contact identifier or phone number:" msgstr "יש להזין מזהה ל×יש הקשר ×ו מספר טלפון:" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:222 +#: ../libempathy-gtk/empathy-new-call-dialog.c:212 msgid "_Video Call" msgstr "שיֹחת _ויד×ו" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:232 +#: ../libempathy-gtk/empathy-new-call-dialog.c:222 msgid "_Audio Call" msgstr "שיחה _קולית" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:242 +#: ../libempathy-gtk/empathy-new-call-dialog.c:232 msgid "New Call" msgstr "שיחה חדשה" -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:72 msgid "The contact is offline" msgstr "×יש קשר ×–×” ×ž× ×•×ª×§" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:74 msgid "The specified contact is either invalid or unknown" msgstr "×יש הקשר ×”×ž×¡×•×™× ×”×–×” ××™× ×• ×ª×§× ×™ ×ו ש××™× ×• מוכר" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:76 msgid "The contact does not support this kind of conversation" msgstr "×יש הקשר ××™× ×• תומך בסוג ×›×–×” של דיון" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:78 msgid "The requested functionality is not implemented for this protocol" msgstr "×”×ª×›×•× ×” המבוקשת ××™× ×” מיושמת בפרוטוקול ×–×”" -#: ../libempathy-gtk/empathy-new-message-dialog.c:94 +#: ../libempathy-gtk/empathy-new-message-dialog.c:84 msgid "Could not start a conversation with the given contact" msgstr "×œ× × ×™×ª×Ÿ להתחיל ×ת הדיון ×¢× ×יש הקשר ×”× ×‘×—×¨" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:86 msgid "You are banned from this channel" msgstr "גישתך × ×—×¡×ž×” לערוץ ×–×”" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:88 msgid "This channel is full" msgstr "ערוץ ×–×” מל×" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:90 msgid "You must be invited to join this channel" msgstr "עליך לקבל ×”×–×ž× ×” כדי להצטרף לערוץ ×–×”" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:92 msgid "Can't proceed while disconnected" msgstr "×œ× × ×™×ª×Ÿ להמשיך בזמן × ×™×ª×•×§" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:94 msgid "Permission denied" msgstr "ההרש××” × ×“×—×ª×”" -#: ../libempathy-gtk/empathy-new-message-dialog.c:110 +#: ../libempathy-gtk/empathy-new-message-dialog.c:100 msgid "There was an error starting the conversation" msgstr "×ירעה שגי××” בעת התחלת הדיון" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:332 +#: ../libempathy-gtk/empathy-new-message-dialog.c:322 msgid "New Conversation" msgstr "שיחה חדשה" @@ -2439,26 +2439,26 @@ msgstr "שיחה חדשה" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:164 -#: ../libempathy-gtk/empathy-presence-chooser.c:200 +#: ../libempathy-gtk/empathy-presence-chooser.c:157 +#: ../libempathy-gtk/empathy-presence-chooser.c:193 msgid "Custom Message…" msgstr "הודעה מות×מת ×ישית…" -#: ../libempathy-gtk/empathy-presence-chooser.c:217 -#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:210 +#: ../libempathy-gtk/empathy-presence-chooser.c:212 msgid "Edit Custom Messages…" msgstr "עריכת ההודעות המות×מות ×ישית…" -#: ../libempathy-gtk/empathy-presence-chooser.c:341 +#: ../libempathy-gtk/empathy-presence-chooser.c:334 msgid "Click to remove this status as a favorite" msgstr "יש ללחוץ כדי להסיר מצב ×–×” מהמועדפי×" -#: ../libempathy-gtk/empathy-presence-chooser.c:350 +#: ../libempathy-gtk/empathy-presence-chooser.c:343 msgid "Click to make this status a favorite" msgstr "יש ללחוץ כדי להוסיף מצב ×–×” למועדפי×" #. Translators: %s is a status message like 'At the pub' for example -#: ../libempathy-gtk/empathy-presence-chooser.c:384 +#: ../libempathy-gtk/empathy-presence-chooser.c:377 #, c-format msgid "" "<b>Current message: %s</b>\n" @@ -2467,12 +2467,12 @@ msgstr "" "<b>הודעה × ×•×›×—×™×ª: %s</b>\n" "<small>יש ללחוץ על Enter כדי להגדיר הודעה חדשה ×ו Esc כדי לבטל.</small>" -#: ../libempathy-gtk/empathy-presence-chooser.c:393 +#: ../libempathy-gtk/empathy-presence-chooser.c:386 msgid "Set status" msgstr "הגדרת מצב" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1101 +#: ../libempathy-gtk/empathy-presence-chooser.c:1094 msgid "Custom messages…" msgstr "הודעות מות×מות ×ישית…" @@ -2480,12 +2480,12 @@ msgstr "הודעות מות×מות ×ישית…" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../libempathy-gtk/empathy-protocol-chooser.c:608 +#: ../libempathy-gtk/empathy-protocol-chooser.c:603 #, c-format msgid "New %s account" msgstr "חשבון %s חדש" -#: ../libempathy-gtk/empathy-search-bar.c:243 +#: ../libempathy-gtk/empathy-search-bar.c:237 msgid "_Match case" msgstr "הת×מת _רישיות" @@ -2509,179 +2509,179 @@ msgstr "הת×מת _רישיות" msgid "Phrase not found" msgstr "הביטוי ×œ× × ×ž×¦×" -#: ../libempathy-gtk/empathy-sound-manager.c:51 +#: ../libempathy-gtk/empathy-sound-manager.c:49 msgid "Received an instant message" msgstr "התקבלה הודעה מידית" -#: ../libempathy-gtk/empathy-sound-manager.c:53 +#: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Sent an instant message" msgstr "שליחת הודעה מידית" -#: ../libempathy-gtk/empathy-sound-manager.c:55 +#: ../libempathy-gtk/empathy-sound-manager.c:53 msgid "Incoming chat request" msgstr "בקשת שיחה × ×›× ×¡×ª" -#: ../libempathy-gtk/empathy-sound-manager.c:57 +#: ../libempathy-gtk/empathy-sound-manager.c:55 msgid "Contact connected" msgstr "×יש קשר התחבר" -#: ../libempathy-gtk/empathy-sound-manager.c:59 +#: ../libempathy-gtk/empathy-sound-manager.c:57 msgid "Contact disconnected" msgstr "×יש קשר ×”×ª× ×ª×§" -#: ../libempathy-gtk/empathy-sound-manager.c:61 +#: ../libempathy-gtk/empathy-sound-manager.c:59 msgid "Connected to server" msgstr "מחובר לשרת" -#: ../libempathy-gtk/empathy-sound-manager.c:63 +#: ../libempathy-gtk/empathy-sound-manager.c:61 msgid "Disconnected from server" msgstr "×ž× ×•×ª×§ מהשרת" -#: ../libempathy-gtk/empathy-sound-manager.c:65 +#: ../libempathy-gtk/empathy-sound-manager.c:63 msgid "Incoming voice call" msgstr "שיחה קולית × ×›× ×¡×ª" -#: ../libempathy-gtk/empathy-sound-manager.c:67 +#: ../libempathy-gtk/empathy-sound-manager.c:65 msgid "Outgoing voice call" msgstr "שיחה קולית פעילה" -#: ../libempathy-gtk/empathy-sound-manager.c:69 +#: ../libempathy-gtk/empathy-sound-manager.c:67 msgid "Voice call ended" msgstr "שיחה קולית הסתיימה" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:294 msgid "Edit Custom Messages" msgstr "עריכת הודעה מות×מת" -#: ../libempathy-gtk/empathy-subscription-dialog.c:234 +#: ../libempathy-gtk/empathy-subscription-dialog.c:233 msgid "Subscription Request" msgstr "בקשת הצטרפות" -#: ../libempathy-gtk/empathy-subscription-dialog.c:240 -#: ../src/empathy-event-manager.c:1104 +#: ../libempathy-gtk/empathy-subscription-dialog.c:239 +#: ../src/empathy-event-manager.c:1096 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s רוצה הרש×ות לצפייה מתי המשתמש שלך מחובר" -#: ../libempathy-gtk/empathy-subscription-dialog.c:281 -#: ../src/empathy-event-manager.c:729 +#: ../libempathy-gtk/empathy-subscription-dialog.c:280 +#: ../src/empathy-event-manager.c:721 msgid "_Decline" msgstr "_סירוב" -#: ../libempathy-gtk/empathy-subscription-dialog.c:282 +#: ../libempathy-gtk/empathy-subscription-dialog.c:281 msgid "_Accept" msgstr "_קבלה" -#: ../libempathy-gtk/empathy-theme-adium.c:1101 +#: ../libempathy-gtk/empathy-theme-adium.c:1211 #, c-format msgid "Message edited at %s" msgstr "ההודעה × ×¢×¨×›×” ב־%s" -#: ../libempathy-gtk/empathy-theme-adium.c:1801 +#: ../libempathy-gtk/empathy-theme-adium.c:1913 msgid "Normal" msgstr "רגיל" -#: ../libempathy-gtk/empathy-tls-dialog.c:150 +#: ../libempathy-gtk/empathy-tls-dialog.c:147 msgid "The identity provided by the chat server cannot be verified." msgstr "הזהות שסופקה על ידי שרת הצ׳×ט ××™× ×” × ×™×ª× ×ª ל×ימות." -#: ../libempathy-gtk/empathy-tls-dialog.c:157 +#: ../libempathy-gtk/empathy-tls-dialog.c:154 msgid "The certificate is not signed by a Certification Authority." msgstr "×ישור ×בטחה ×–×” ××™× ×• ×—×ª×•× ×¢×œ ידי רשות ×ישורי ×בטחה." -#: ../libempathy-gtk/empathy-tls-dialog.c:161 +#: ../libempathy-gtk/empathy-tls-dialog.c:158 msgid "The certificate has expired." msgstr "×ישור ×”×בטחה פג." -#: ../libempathy-gtk/empathy-tls-dialog.c:164 +#: ../libempathy-gtk/empathy-tls-dialog.c:161 msgid "The certificate hasn't yet been activated." msgstr "×ישור ×”×בטחה ×œ× ×”×•×¤×¢×œ." -#: ../libempathy-gtk/empathy-tls-dialog.c:167 +#: ../libempathy-gtk/empathy-tls-dialog.c:164 msgid "The certificate does not have the expected fingerprint." msgstr "ל×ישור ×”×בטחה ×ין ×ת טביעת ×”×צבע המצופה." -#: ../libempathy-gtk/empathy-tls-dialog.c:170 +#: ../libempathy-gtk/empathy-tls-dialog.c:167 msgid "The hostname verified by the certificate doesn't match the server name." msgstr "×©× ×”×ž×רח שצוין ב×ישור ×”×בטחה ××™× ×• תו×× ×œ×©× ×”×©×¨×ª." -#: ../libempathy-gtk/empathy-tls-dialog.c:174 +#: ../libempathy-gtk/empathy-tls-dialog.c:171 msgid "The certificate is self-signed." msgstr "×ישור ×”×בטחה × ×—×ª× ×¢×¦×ž×ית." -#: ../libempathy-gtk/empathy-tls-dialog.c:177 +#: ../libempathy-gtk/empathy-tls-dialog.c:174 msgid "The certificate has been revoked by the issuing Certification Authority." msgstr "×ישור ×”×בטחה × ×©×œ×œ על ידי רשות ×ישורי ×”×בטחה ×”×ž× ×¤×™×§×”." -#: ../libempathy-gtk/empathy-tls-dialog.c:181 +#: ../libempathy-gtk/empathy-tls-dialog.c:178 msgid "The certificate is cryptographically weak." msgstr "×ישור ×בטחה ×–×” חלש ×ž×‘×—×™× ×ª ×”×¦×¤× ×”." -#: ../libempathy-gtk/empathy-tls-dialog.c:184 +#: ../libempathy-gtk/empathy-tls-dialog.c:181 msgid "The certificate length exceeds verifiable limits." msgstr "×ורך ×ישור ×”×בטחה חורג מהגבולות ×”× ×™×ª× ×™× ×œ×ימות." -#: ../libempathy-gtk/empathy-tls-dialog.c:188 +#: ../libempathy-gtk/empathy-tls-dialog.c:185 msgid "The certificate is malformed." msgstr "×ישור ×”×בטחה פגו×." -#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#: ../libempathy-gtk/empathy-tls-dialog.c:203 #, c-format msgid "Expected hostname: %s" msgstr "המ×רח הצפוי: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#: ../libempathy-gtk/empathy-tls-dialog.c:206 #, c-format msgid "Certificate hostname: %s" msgstr "מ×רח ×ישור ×”×בטחה: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:281 +#: ../libempathy-gtk/empathy-tls-dialog.c:278 msgid "C_ontinue" msgstr "המ_שך" -#: ../libempathy-gtk/empathy-tls-dialog.c:287 +#: ../libempathy-gtk/empathy-tls-dialog.c:284 msgid "Untrusted connection" msgstr "חיבור מפוקפק" -#: ../libempathy-gtk/empathy-tls-dialog.c:288 +#: ../libempathy-gtk/empathy-tls-dialog.c:285 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "חיבור ×–×” ××™× ×• מהימן. ×”×× ×‘×¨×¦×•× ×š להמשיך בכל מקרה?" -#: ../libempathy-gtk/empathy-tls-dialog.c:298 +#: ../libempathy-gtk/empathy-tls-dialog.c:295 msgid "Remember this choice for future connections" msgstr "יש לזכור בחירה זו עבור ×—×™×‘×•×¨×™× ×¢×ª×™×“×™×™×" -#: ../libempathy-gtk/empathy-tls-dialog.c:304 +#: ../libempathy-gtk/empathy-tls-dialog.c:301 msgid "Certificate Details" msgstr "פרטי התעודה" -#: ../libempathy-gtk/empathy-ui-utils.c:1050 +#: ../libempathy-gtk/empathy-ui-utils.c:1078 msgid "Unable to open URI" msgstr "×œ× × ×™×ª×Ÿ לפתוח ×ת הכתובת" -#: ../libempathy-gtk/empathy-ui-utils.c:1174 +#: ../libempathy-gtk/empathy-ui-utils.c:1202 msgid "Select a file" msgstr "בחירת קובץ" -#: ../libempathy-gtk/empathy-ui-utils.c:1248 +#: ../libempathy-gtk/empathy-ui-utils.c:1276 msgid "Insufficient free space to save file" msgstr "×ין די ×ž×§×•× ×¤× ×•×™ לשמירת הקובץ" -#: ../libempathy-gtk/empathy-ui-utils.c:1256 +#: ../libempathy-gtk/empathy-ui-utils.c:1284 #, c-format msgid "%s of free space are required to save this file, but only %s is available. Please choose another location." msgstr "× ×“×¨×©×™× %s של ×ž×§×•× ×¤× ×•×™ כדי לשמור קובץ ×–×”, ×ך ×™×©× × ×¨×§ %s ×¤× ×•×™×™×. × × ×œ×‘×—×•×¨ ×‘×ž×™×§×•× ×חר." -#: ../libempathy-gtk/empathy-ui-utils.c:1302 +#: ../libempathy-gtk/empathy-ui-utils.c:1330 #, c-format msgid "Incoming file from %s" msgstr "קובץ × ×›× ×¡ מ־%s" -#: ../libempathy-gtk/empathy-user-info.c:384 +#: ../libempathy-gtk/empathy-user-info.c:395 msgid "Go online to edit your personal information." msgstr "עליך להתחבר כדי לערוך ×ת ×”×¤×¨×˜×™× ×”××™×©×™×™× ×©×œ×š." -#: ../libempathy-gtk/empathy-user-info.c:464 +#: ../libempathy-gtk/empathy-user-info.c:475 msgid "<b>Personal Details</b>" msgstr "<b>×¤×¨×˜×™× ×ישיי×</b>" @@ -2700,213 +2700,213 @@ msgstr "_פתיחת קישור" msgid "Inspect HTML" msgstr "× ×™×ª×•×— ×”Ö¾HTML" -#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +#: ../libempathy-gtk/totem-subtitle-encoding.c:157 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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:160 +#: ../libempathy-gtk/totem-subtitle-encoding.c:162 +#: ../libempathy-gtk/totem-subtitle-encoding.c:164 +#: ../libempathy-gtk/totem-subtitle-encoding.c:166 msgid "Arabic" msgstr "ערבית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +#: ../libempathy-gtk/totem-subtitle-encoding.c:169 msgid "Armenian" msgstr "××¨×ž× ×™×ª" -#: ../libempathy-gtk/totem-subtitle-encoding.c:173 -#: ../libempathy-gtk/totem-subtitle-encoding.c:175 -#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +#: ../libempathy-gtk/totem-subtitle-encoding.c:172 +#: ../libempathy-gtk/totem-subtitle-encoding.c:174 +#: ../libempathy-gtk/totem-subtitle-encoding.c:176 msgid "Baltic" msgstr "בלטית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +#: ../libempathy-gtk/totem-subtitle-encoding.c:179 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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:182 +#: ../libempathy-gtk/totem-subtitle-encoding.c:184 +#: ../libempathy-gtk/totem-subtitle-encoding.c:186 +#: ../libempathy-gtk/totem-subtitle-encoding.c:188 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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:191 +#: ../libempathy-gtk/totem-subtitle-encoding.c:193 +#: ../libempathy-gtk/totem-subtitle-encoding.c:195 +#: ../libempathy-gtk/totem-subtitle-encoding.c:197 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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:200 +#: ../libempathy-gtk/totem-subtitle-encoding.c:202 +#: ../libempathy-gtk/totem-subtitle-encoding.c:204 msgid "Chinese Traditional" msgstr "×¡×™× ×™×ª מסורתית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +#: ../libempathy-gtk/totem-subtitle-encoding.c:207 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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:210 +#: ../libempathy-gtk/totem-subtitle-encoding.c:212 +#: ../libempathy-gtk/totem-subtitle-encoding.c:214 +#: ../libempathy-gtk/totem-subtitle-encoding.c:216 +#: ../libempathy-gtk/totem-subtitle-encoding.c:218 +#: ../libempathy-gtk/totem-subtitle-encoding.c:220 msgid "Cyrillic" msgstr "קירילית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +#: ../libempathy-gtk/totem-subtitle-encoding.c:223 msgid "Cyrillic/Russian" msgstr "קירילית/רוסית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:227 -#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +#: ../libempathy-gtk/totem-subtitle-encoding.c:226 +#: ../libempathy-gtk/totem-subtitle-encoding.c:228 msgid "Cyrillic/Ukrainian" msgstr "קירילית/×וקר××™× ×™×ª" -#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +#: ../libempathy-gtk/totem-subtitle-encoding.c:231 msgid "Georgian" msgstr "×’×ורגית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:235 -#: ../libempathy-gtk/totem-subtitle-encoding.c:237 -#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +#: ../libempathy-gtk/totem-subtitle-encoding.c:234 +#: ../libempathy-gtk/totem-subtitle-encoding.c:236 +#: ../libempathy-gtk/totem-subtitle-encoding.c:238 msgid "Greek" msgstr "×™×•×•× ×™×ª" -#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +#: ../libempathy-gtk/totem-subtitle-encoding.c:241 msgid "Gujarati" msgstr "גוג׳ר×טית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +#: ../libempathy-gtk/totem-subtitle-encoding.c:244 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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:247 +#: ../libempathy-gtk/totem-subtitle-encoding.c:249 +#: ../libempathy-gtk/totem-subtitle-encoding.c:251 +#: ../libempathy-gtk/totem-subtitle-encoding.c:253 msgid "Hebrew" msgstr "עברית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +#: ../libempathy-gtk/totem-subtitle-encoding.c:256 msgid "Hebrew Visual" msgstr "עברית ויזו×לית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +#: ../libempathy-gtk/totem-subtitle-encoding.c:259 msgid "Hindi" msgstr "×”×™× ×“×™×ª" -#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +#: ../libempathy-gtk/totem-subtitle-encoding.c:262 msgid "Icelandic" msgstr "××™×¡×œ× ×“×™×ª" -#: ../libempathy-gtk/totem-subtitle-encoding.c:266 -#: ../libempathy-gtk/totem-subtitle-encoding.c:268 -#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +#: ../libempathy-gtk/totem-subtitle-encoding.c:265 +#: ../libempathy-gtk/totem-subtitle-encoding.c:267 +#: ../libempathy-gtk/totem-subtitle-encoding.c:269 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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:272 +#: ../libempathy-gtk/totem-subtitle-encoding.c:274 +#: ../libempathy-gtk/totem-subtitle-encoding.c:276 +#: ../libempathy-gtk/totem-subtitle-encoding.c:278 msgid "Korean" msgstr "קורי×× ×™×ª" -#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +#: ../libempathy-gtk/totem-subtitle-encoding.c:281 msgid "Nordic" msgstr "× ×•×¨×“×™×ª" -#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +#: ../libempathy-gtk/totem-subtitle-encoding.c:284 msgid "Persian" msgstr "פרסית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:288 -#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +#: ../libempathy-gtk/totem-subtitle-encoding.c:287 +#: ../libempathy-gtk/totem-subtitle-encoding.c:289 msgid "Romanian" msgstr "×¨×•×ž× ×™×ª" -#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +#: ../libempathy-gtk/totem-subtitle-encoding.c:292 msgid "South European" msgstr "×“×¨×•× ×ירופ×ית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +#: ../libempathy-gtk/totem-subtitle-encoding.c:295 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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:298 +#: ../libempathy-gtk/totem-subtitle-encoding.c:300 +#: ../libempathy-gtk/totem-subtitle-encoding.c:302 +#: ../libempathy-gtk/totem-subtitle-encoding.c:304 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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:307 +#: ../libempathy-gtk/totem-subtitle-encoding.c:309 +#: ../libempathy-gtk/totem-subtitle-encoding.c:311 +#: ../libempathy-gtk/totem-subtitle-encoding.c:313 +#: ../libempathy-gtk/totem-subtitle-encoding.c:315 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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:318 +#: ../libempathy-gtk/totem-subtitle-encoding.c:320 +#: ../libempathy-gtk/totem-subtitle-encoding.c:322 +#: ../libempathy-gtk/totem-subtitle-encoding.c:324 +#: ../libempathy-gtk/totem-subtitle-encoding.c:326 msgid "Western" msgstr "מערבית" -#: ../libempathy-gtk/totem-subtitle-encoding.c:330 -#: ../libempathy-gtk/totem-subtitle-encoding.c:332 -#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +#: ../libempathy-gtk/totem-subtitle-encoding.c:329 +#: ../libempathy-gtk/totem-subtitle-encoding.c:331 +#: ../libempathy-gtk/totem-subtitle-encoding.c:333 msgid "Vietnamese" msgstr "×•×™×™×˜× ×מית" -#: ../libempathy-gtk/empathy-roster-model.h:29 +#: ../libempathy-gtk/empathy-roster-model.h:27 msgid "Top Contacts" msgstr "×× ×©×™ קשר מובילי×" -#: ../libempathy-gtk/empathy-roster-model.h:31 +#: ../libempathy-gtk/empathy-roster-model.h:29 msgid "Ungrouped" msgstr "×œ×œ× ×§×‘×•×¦×”" #. Add a prefix explaining that something goes wrong when trying to #. * fetch contact's presence. -#: ../libempathy-gtk/empathy-roster-contact.c:219 +#: ../libempathy-gtk/empathy-roster-contact.c:201 #, c-format msgid "Server cannot find contact: %s" msgstr "השרת ×œ× ×™×›×•×œ ×œ×ž×¦×•× ×ת ×יש הקשר: %s" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223 msgid "No error message" msgstr "×ין הודעת שגי××”" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296 msgid "Instant Message (Empathy)" msgstr "הודעה מיידית (Empathy)" -#: ../src/empathy-about-dialog.c:81 +#: ../src/empathy-about-dialog.c:77 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 "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." -#: ../src/empathy-about-dialog.c:85 +#: ../src/empathy-about-dialog.c:81 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 "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." -#: ../src/empathy-about-dialog.c:89 +#: ../src/empathy-about-dialog.c:85 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 "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" -#: ../src/empathy-about-dialog.c:109 +#: ../src/empathy-about-dialog.c:105 msgid "An Instant Messaging client for GNOME" msgstr "לקוח ×ž×¡×¨×™× ×ž×™×™×“×™×™× ×¢×‘×•×¨ GNOME" -#: ../src/empathy-about-dialog.c:115 +#: ../src/empathy-about-dialog.c:111 msgid "translator-credits" msgstr "" "מ×רק ×§×¨×¤×™×‘× ×¨ <mark125@gmail.com>\n" @@ -2915,92 +2915,92 @@ msgstr "" "פרוייקט ×ª×¨×’×•× GNOME לעברית:\n" "â€http://gnome-il.berlios.de" -#: ../src/empathy-accounts.c:182 +#: ../src/empathy-accounts.c:171 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "×ין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבו×) ול×חריה ×”×ª×›× ×™×ª תסגר" -#: ../src/empathy-accounts.c:186 +#: ../src/empathy-accounts.c:175 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "×ין להציג תיבות דו־שיח כלשהן ××œ× ×× ×›×Ÿ ×™×©× ×Ÿ ×—×©×‘×•× ×•×ª \"×× ×©×™× ×‘×§×¨×‘×ª×™\"" -#: ../src/empathy-accounts.c:190 +#: ../src/empathy-accounts.c:179 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "בחירת החשבון ×”× ×ª×•×Ÿ כבר בהתחלה (לדוגמה gabble/jabber/foo_40example_2eorg0)" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:181 msgid "<account-id>" msgstr "<account-id>" -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:186 msgid "- Empathy Accounts" msgstr "- ×—×©×‘×•× ×•×ª Empathy" -#: ../src/empathy-accounts.c:240 +#: ../src/empathy-accounts.c:239 msgid "Empathy Accounts" msgstr "×—×©×‘×•× ×•×ª Empathy" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:52 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "×™×©× × ×©×™× ×•×™×™× ×©×œ× × ×©×ž×¨×• בחשבון ×”Ö¾%s שלך." #. 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:72 +#: ../src/empathy-accounts-dialog.c:56 msgid "Your new account has not been saved yet." msgstr "החשבון החדש שלך ×œ× × ×©×ž×¨ עדיין." -#: ../src/empathy-accounts-dialog.c:404 -#: ../src/empathy-call-window.c:1274 +#: ../src/empathy-accounts-dialog.c:388 +#: ../src/empathy-call-window.c:1258 msgid "Connecting…" msgstr "בהתחברות…" -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:429 #, c-format msgid "Offline — %s" msgstr "×œ× ×ž×—×•×‘×¨ — %s" -#: ../src/empathy-accounts-dialog.c:457 +#: ../src/empathy-accounts-dialog.c:441 #, c-format msgid "Disconnected — %s" msgstr "×ž× ×•×ª×§ — %s" -#: ../src/empathy-accounts-dialog.c:468 +#: ../src/empathy-accounts-dialog.c:452 msgid "Offline — No Network Connection" msgstr "×ž× ×•×ª×§ — ×ין חיבור לרשת" -#: ../src/empathy-accounts-dialog.c:475 +#: ../src/empathy-accounts-dialog.c:459 msgid "Unknown Status" msgstr "מצב ×œ× ×™×“×•×¢" -#: ../src/empathy-accounts-dialog.c:492 +#: ../src/empathy-accounts-dialog.c:476 msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account." msgstr "חשבון ×–×” × ×•×˜×¨×œ כיוון ×©×”×•× × ×©×¢×Ÿ על ×ž× ×’× ×•×Ÿ ישן ש××™× ×• × ×ª×ž×š עוד. × × ×œ×”×ª×§×™×Ÿ ×ת telepathy-haze ולצ×ת ×•×œ×”×™×›× ×¡ לחשבון המשתמש שלך כדי ×œ×™×™×‘× ×ת החשבון." -#: ../src/empathy-accounts-dialog.c:502 +#: ../src/empathy-accounts-dialog.c:486 msgid "Offline — Account Disabled" msgstr "×ž× ×•×ª×§ — החשבון ×ž× ×•×˜×¨×œ" -#: ../src/empathy-accounts-dialog.c:608 +#: ../src/empathy-accounts-dialog.c:592 msgid "Edit Connection Parameters" msgstr "עריכת הגדרות החיבור" -#: ../src/empathy-accounts-dialog.c:735 +#: ../src/empathy-accounts-dialog.c:719 msgid "_Edit Connection Parameters..." msgstr "×¢_ריכת הגדרות החיבור..." -#: ../src/empathy-accounts-dialog.c:1268 +#: ../src/empathy-accounts-dialog.c:1252 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "×”×× ×‘×¨×¦×•× ×š להסיר ×ת החשבון '%s' ממחשבך?" -#: ../src/empathy-accounts-dialog.c:1272 +#: ../src/empathy-accounts-dialog.c:1256 msgid "This will not remove your account on the server." msgstr "פעולה זו ×œ× ×ª×¡×™×¨ ×ת ×—×©×‘×•× ×š מהשרת." -#: ../src/empathy-accounts-dialog.c:1477 +#: ../src/empathy-accounts-dialog.c:1461 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3009,24 +3009,24 @@ msgstr "" "×ת ×”×©×™× ×•×™×™× ×©×œ×š. ×”×× ×œ×”×ž×©×™×š?" #. Menu item: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1668 +#: ../src/empathy-accounts-dialog.c:1652 msgid "_Enabled" msgstr "מו_פעל" #. Menu item: Rename -#: ../src/empathy-accounts-dialog.c:1691 +#: ../src/empathy-accounts-dialog.c:1675 msgid "Rename" msgstr "×©×™× ×•×™ ש×" -#: ../src/empathy-accounts-dialog.c:2107 +#: ../src/empathy-accounts-dialog.c:2091 msgid "_Skip" msgstr "_דילוג" -#: ../src/empathy-accounts-dialog.c:2111 +#: ../src/empathy-accounts-dialog.c:2095 msgid "_Connect" msgstr "הת_חברות" -#: ../src/empathy-accounts-dialog.c:2290 +#: ../src/empathy-accounts-dialog.c:2274 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3035,7 +3035,7 @@ msgstr "" "×ת ×”×©×™× ×•×™×™× ×©×œ×š. ×”×× ×œ×”×ž×©×™×š?" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:2433 +#: ../src/empathy-accounts-dialog.c:2417 msgid "Messaging and VoIP Accounts" msgstr "×—×©×‘×•× ×•×ª התכתבות ו־VoIP" @@ -3055,31 +3055,31 @@ msgstr "על ×ž× ×ª להוסיף חשבון חדש עליך להתקין ×ž× ×•× msgid "No protocol backends installed" msgstr "×ין ×ž× ×’× ×•× ×™ ×¤×¨×•×˜×•×§×•×œ×™× ×ž×•×ª×§× ×™×" -#: ../src/empathy-auth-client.c:296 +#: ../src/empathy-auth-client.c:285 msgid " - Empathy authentication client" msgstr "- לקוח ×”×ימות של Empathy" -#: ../src/empathy-auth-client.c:312 +#: ../src/empathy-auth-client.c:301 msgid "Empathy authentication client" msgstr "לקוח ×”×ימות של Empathy" -#: ../src/empathy.c:427 +#: ../src/empathy.c:407 msgid "Don't connect on startup" msgstr "×œ× ×œ×”×ª×—×‘×¨ בהפעלה" -#: ../src/empathy.c:431 +#: ../src/empathy.c:411 msgid "Don't display the contact list or any other dialogs on startup" msgstr "×ין להציג ×ת רשימת ×× ×©×™ הקשר ×ו כל דו־שיח ×חר בהפעלה" -#: ../src/empathy.c:447 +#: ../src/empathy.c:440 msgid "- Empathy IM Client" msgstr "- לקוח ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× Empathy" -#: ../src/empathy.c:623 +#: ../src/empathy.c:626 msgid "Error contacting the Account Manager" msgstr "שגי××” ביצירת קשר ×¢× ×ž× ×”×œ ×”×—×©×‘×•× ×•×ª" -#: ../src/empathy.c:625 +#: ../src/empathy.c:628 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n" @@ -3090,174 +3090,167 @@ msgstr "" "\n" "%s" -#: ../src/empathy-call.c:124 +#: ../src/empathy-call.c:115 msgid "In a call" msgstr "בשיחה" -#: ../src/empathy-call.c:224 +#: ../src/empathy-call.c:215 msgid "- Empathy Audio/Video Client" msgstr "- לקוח השמע/הוויד×ו Empathy" -#: ../src/empathy-call.c:248 +#: ../src/empathy-call.c:239 msgid "Empathy Audio/Video Client" msgstr "לקוח השמע/הוויד×ו Empathy" -#: ../src/empathy-call-observer.c:119 +#: ../src/empathy-call-observer.c:110 #, c-format msgid "%s just tried to call you, but you were in another call." msgstr "התקבלה בקשת שיחה מ×ת %s, ×ך ב×ותו הזמן כבר היית בשיחה ×חרת." -#. Translators: this is an "Info" label. It should be as short -#. * as possible. -#: ../src/empathy-call-window.c:1131 -#: ../src/empathy-call-window.c:1147 -msgid "i" -msgstr "i" - -#: ../src/empathy-call-window.c:1549 -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-call-window.c:1533 +#: ../src/empathy-event-manager.c:500 msgid "Incoming call" msgstr "שיחה × ×›× ×¡×ª" -#: ../src/empathy-call-window.c:1555 -#: ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 +#: ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming video call from %s" msgstr "שיחת ויד×ו × ×›× ×¡×ª מ־%s" -#: ../src/empathy-call-window.c:1555 -#: ../src/empathy-event-manager.c:516 -#: ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 +#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming call from %s" msgstr "שיחה × ×›× ×¡×ª מ־%s" -#: ../src/empathy-call-window.c:1559 -#: ../src/empathy-notifications-approver.c:197 +#: ../src/empathy-call-window.c:1543 +#: ../src/empathy-notifications-approver.c:191 msgid "Reject" msgstr "דחייה" -#: ../src/empathy-call-window.c:1560 -#: ../src/empathy-notifications-approver.c:202 -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-call-window.c:1544 +#: ../src/empathy-notifications-approver.c:196 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer" 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:1927 +#: ../src/empathy-call-window.c:1913 #, c-format msgid "Call with %s" msgstr "שיחה ×¢× %s" -#: ../src/empathy-call-window.c:2179 +#: ../src/empathy-call-window.c:2165 msgid "The IP address as seen by the machine" msgstr "כתובת ×”Ö¾IP כפי ×©× ×¨×ית על ידי המחשב" -#: ../src/empathy-call-window.c:2181 +#: ../src/empathy-call-window.c:2167 msgid "The IP address as seen by a server on the Internet" msgstr "כתובת ×”Ö¾IP כפי ×©× ×¨×ית על ידי שרת ב××™× ×˜×¨× ×˜" -#: ../src/empathy-call-window.c:2183 +#: ../src/empathy-call-window.c:2169 msgid "The IP address of the peer as seen by the other side" msgstr "כתובת ×”Ö¾IP כדי ×©× ×¨×ית על ידי עמית מהצד ×”×©× ×™" -#: ../src/empathy-call-window.c:2185 +#: ../src/empathy-call-window.c:2171 msgid "The IP address of a relay server" msgstr "כתובת ×”Ö¾IP של שרת הממסר" -#: ../src/empathy-call-window.c:2187 +#: ../src/empathy-call-window.c:2173 msgid "The IP address of the multicast group" msgstr "כתובת ×”Ö¾IP של קבוצת התשדורת" -#: ../src/empathy-call-window.c:2598 -#: ../src/empathy-call-window.c:2599 -#: ../src/empathy-call-window.c:2600 -#: ../src/empathy-call-window.c:2601 +#: ../src/empathy-call-window.c:2584 +#: ../src/empathy-call-window.c:2585 +#: ../src/empathy-call-window.c:2586 +#: ../src/empathy-call-window.c:2587 #: ../src/empathy-call-window.ui.h:28 msgid "Unknown" msgstr "×œ× ×™×“×•×¢" -#: ../src/empathy-call-window.c:2959 +#: ../src/empathy-call-window.c:2946 msgid "On hold" msgstr "×‘×”×ž×ª× ×”" -#: ../src/empathy-call-window.c:2963 +#: ../src/empathy-call-window.c:2950 msgid "Mute" msgstr "השתק" -#: ../src/empathy-call-window.c:2965 +#: ../src/empathy-call-window.c:2952 msgid "Duration" msgstr "משך" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2968 +#: ../src/empathy-call-window.c:2955 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02d דק׳" -#: ../src/empathy-call-window.c:3064 +#: ../src/empathy-call-window.c:3051 msgid "Technical Details" msgstr "×¤×¨×˜×™× ×˜×›× ×™×™×" -#: ../src/empathy-call-window.c:3103 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "%s's software does not understand any of the audio formats supported by your computer" msgstr "×”×ª×›× ×” של %s ××™× ×” ×ž×‘×™× ×” ×ת ×ž×‘× ×™ השמע ×”× ×ª×ž×›×™× ×¢×œ ידי המחשב שלך" -#: ../src/empathy-call-window.c:3108 +#: ../src/empathy-call-window.c:3095 #, c-format msgid "%s's software does not understand any of the video formats supported by your computer" msgstr "×”×ª×›× ×” של %s ××™× ×” ×ž×‘×™× ×” ×ת ×ž×‘× ×™ הוויד×ו ×”× ×ª×ž×›×™× ×¢×œ ידי המחשב שלך" -#: ../src/empathy-call-window.c:3114 +#: ../src/empathy-call-window.c:3101 #, 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 "×œ× × ×™×ª×Ÿ להפעיל ×ת החיבור ×ל %s. ×›× ×¨××” ×חד ממשתתפי השיחה מחובר לרשת ש××™× ×” מ×פשרת ×—×™×‘×•×¨×™× ×™×©×™×¨×™×." -#: ../src/empathy-call-window.c:3120 +#: ../src/empathy-call-window.c:3107 msgid "There was a failure on the network" msgstr "×ירעה שגי××” ברשת" -#: ../src/empathy-call-window.c:3124 +#: ../src/empathy-call-window.c:3111 msgid "The audio formats necessary for this call are not installed on your computer" msgstr "×ž×‘× ×™ השמע ×”×“×¨×•×©×™× ×œ×§×™×•× ×©×™×—×” זו ××™× × ×ž×•×ª×§× ×™× ×‘×ž×—×©×‘×š" -#: ../src/empathy-call-window.c:3127 +#: ../src/empathy-call-window.c:3114 msgid "The video formats necessary for this call are not installed on your computer" msgstr "×ž×‘× ×™ הוויד×ו ×”×“×¨×•×©×™× ×œ×§×™×•× ×©×™×—×” זו ××™× × ×ž×•×ª×§× ×™× ×‘×ž×—×©×‘×š" -#: ../src/empathy-call-window.c:3139 +#: ../src/empathy-call-window.c:3126 #, 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 "משהו בלתי צפוי ×רע ברכיב של Telepathy. × × <a href=\"%s\">לדווח על ב××’ ×–×”</a> ולהוסיף דוחות ×©× ×ספו מחלון '× ×™×¤×•×™ השגי×ות' שבתפריט העזרה." -#: ../src/empathy-call-window.c:3148 +#: ../src/empathy-call-window.c:3135 msgid "There was a failure in the call engine" msgstr "×ירעה שגי××” ×‘×ž× ×•×¢ הקרי××”" -#: ../src/empathy-call-window.c:3151 +#: ../src/empathy-call-window.c:3138 msgid "The end of the stream was reached" msgstr "×”×ª×–×¨×™× ×”×’×™×¢ לסיומו" -#: ../src/empathy-call-window.c:3191 +#: ../src/empathy-call-window.c:3178 msgid "Can't establish audio stream" msgstr "×œ× × ×™×ª×Ÿ ×œ×§×™×™× ×ª×–×¨×™× ×©×ž×¢" -#: ../src/empathy-call-window.c:3201 +#: ../src/empathy-call-window.c:3188 msgid "Can't establish video stream" msgstr "×œ× × ×™×ª×Ÿ ×œ×§×™×™× ×ª×–×¨×™× ×•×™×“×ו" -#: ../src/empathy-call-window.c:3238 +#: ../src/empathy-call-window.c:3225 #, c-format msgid "Your current balance is %s." msgstr "המ×זן ×”× ×•×›×—×™ שלך ×”×•× %s." -#: ../src/empathy-call-window.c:3242 +#: ../src/empathy-call-window.c:3229 msgid "Sorry, you don’t have enough credit for that call." msgstr "×ין לך מספיק ×שר××™ כדי לבצע שיחה זו." -#: ../src/empathy-call-window.c:3244 +#: ../src/empathy-call-window.c:3231 msgid "Top Up" msgstr "Top Up" @@ -3376,19 +3369,19 @@ msgstr "מועמד מקומי:" msgid "Audio" msgstr "שמע" -#: ../src/empathy-chat.c:102 +#: ../src/empathy-chat.c:101 msgid "- Empathy Chat Client" msgstr "- לקוח הצ׳××˜×™× Empathy" -#: ../src/empathy-chatrooms-window.c:251 +#: ../src/empathy-chatrooms-window.c:243 msgid "Name" msgstr "ש×" -#: ../src/empathy-chatrooms-window.c:269 +#: ../src/empathy-chatrooms-window.c:261 msgid "Room" msgstr "חדר" -#: ../src/empathy-chatrooms-window.c:277 +#: ../src/empathy-chatrooms-window.c:269 msgid "Auto-Connect" msgstr "חיבור ×וטומטי" @@ -3396,80 +3389,80 @@ msgstr "חיבור ×וטומטי" msgid "Manage Favorite Rooms" msgstr "× ×™×”×•×œ חדרי שיחה מועדפי×" -#: ../src/empathy-chat-window.c:287 +#: ../src/empathy-chat-window.c:275 msgid "Close this window?" msgstr "×”×× ×œ×¡×’×•×¨ חלון ×–×”?" -#: ../src/empathy-chat-window.c:293 +#: ../src/empathy-chat-window.c:281 #, c-format msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it." msgstr "סגירת חלון ×–×” ×ª×’×¨×•× ×œ×¢×–×™×‘×ª %s. ×œ× ×™×ª×§×‘×œ×• עוד הודעות על להצטרפותך ×ליו מחדש." -#: ../src/empathy-chat-window.c:306 +#: ../src/empathy-chat-window.c:294 #, c-format msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it." msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them." msgstr[0] "סגירת חלון ×–×” תוביל לעזיבת חדר הצ׳×ט. ×œ× ×™×ª×§×‘×œ×• עוד הודעות עד להתחברותך מחדש ×ליו." msgstr[1] "סגירת חלון ×–×” תוביל לעזיבת %u חדרי הצ׳×ט. ×œ× ×™×ª×§×‘×œ×• עוד הודעות עד להתחברותך מחדש ×ליה×." -#: ../src/empathy-chat-window.c:317 +#: ../src/empathy-chat-window.c:305 #, c-format msgid "Leave %s?" msgstr "×”×× ×œ×¢×–×•×‘ ×ת %s?" -#: ../src/empathy-chat-window.c:319 +#: ../src/empathy-chat-window.c:307 msgid "You will not receive any further messages from this chat room until you rejoin it." msgstr "×œ× ×™×ª×§×‘×œ×• עוד הודעות מחדר צ׳×ט ×–×” עד להצטרפותך המחודשת ×ליו." -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Close window" msgstr "סגירת החלון" -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Leave room" msgstr "עזיבת החדר" -#: ../src/empathy-chat-window.c:677 -#: ../src/empathy-chat-window.c:700 +#: ../src/empathy-chat-window.c:665 +#: ../src/empathy-chat-window.c:688 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "â€%s (×חת ×©×œ× × ×§×¨××”)" msgstr[1] "â€%s â€(%d ×©×œ× × ×§×¨×ו)" -#: ../src/empathy-chat-window.c:692 +#: ../src/empathy-chat-window.c:680 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "â€%s (ו×חד × ×•×¡×£)" msgstr[1] "â€%s (ו־%u × ×•×¡×¤×™×)" -#: ../src/empathy-chat-window.c:708 +#: ../src/empathy-chat-window.c:696 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "â€%s (×חת ×©×œ× × ×§×¨××” מ×חרי×)" msgstr[1] "â€%s (%d ×©×œ× × ×§×¨×ו מ×חרי×)" -#: ../src/empathy-chat-window.c:717 +#: ../src/empathy-chat-window.c:705 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "â€%s (×חת ×©×œ× × ×§×¨××” מכול×)" msgstr[1] "â€%s (%d ×©×œ× × ×§×¨×ו מכול×)" -#: ../src/empathy-chat-window.c:954 +#: ../src/empathy-chat-window.c:942 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:962 +#: ../src/empathy-chat-window.c:950 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "× ×©×œ×—×ª הודעה ×חת" msgstr[1] "× ×©×œ×—×•×ª %d הודעות" -#: ../src/empathy-chat-window.c:982 +#: ../src/empathy-chat-window.c:970 msgid "Typing a message." msgstr "הודעה מוקלדת." @@ -3534,76 +3527,76 @@ msgstr "הזזת ×”×œ×©×•× ×™×ª _×™×ž×™× ×”" msgid "_Detach Tab" msgstr "_× ×™×ª×•×§ ×”×œ×©×•× ×™×ª" -#: ../src/empathy-debugger.c:69 +#: ../src/empathy-debugger.c:77 msgid "Show a particular service" msgstr "הצגת שירות מסוי×" -#: ../src/empathy-debugger.c:74 +#: ../src/empathy-debugger.c:82 msgid "- Empathy Debugger" msgstr "- ×ž× ×¤×” השגי×ות של Empathy" -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:142 msgid "Empathy Debugger" msgstr "×ž× ×¤×” השגי×ות של Empathy" -#: ../src/empathy-debug-window.c:1599 +#: ../src/empathy-debug-window.c:1588 msgid "Save" msgstr "שמירה" -#: ../src/empathy-debug-window.c:1659 +#: ../src/empathy-debug-window.c:1648 msgid "Pastebin link" msgstr "קישור ל־Pastebin" -#: ../src/empathy-debug-window.c:1668 +#: ../src/empathy-debug-window.c:1657 msgid "Pastebin response" msgstr "תגובה מ־Pastebin" -#: ../src/empathy-debug-window.c:1675 +#: ../src/empathy-debug-window.c:1664 msgid "Data too large for a single paste. Please save logs to file." msgstr "×”× ×ª×•× ×™× ×’×“×•×œ×™× ×ž×“×™ להדבקה ×חת. × × ×œ×©×ž×•×¨ ×ת ×”×™×•×ž× ×™× ×œ×§×•×‘×¥." -#: ../src/empathy-debug-window.c:1857 +#: ../src/empathy-debug-window.c:1846 msgid "Debug Window" msgstr "חלון × ×™×¤×•×™ שגי×ות" -#: ../src/empathy-debug-window.c:1917 +#: ../src/empathy-debug-window.c:1906 msgid "Send to pastebin" msgstr "שליחה ל־Pastebin" -#: ../src/empathy-debug-window.c:1961 +#: ../src/empathy-debug-window.c:1950 msgid "Pause" msgstr "השהייה" -#: ../src/empathy-debug-window.c:1973 +#: ../src/empathy-debug-window.c:1962 msgid "Level " msgstr "רמה" -#: ../src/empathy-debug-window.c:1992 +#: ../src/empathy-debug-window.c:1981 msgid "Debug" msgstr "× ×™×¤×•×™ שגי×ות" -#: ../src/empathy-debug-window.c:1997 +#: ../src/empathy-debug-window.c:1986 msgid "Info" msgstr "מידע" -#: ../src/empathy-debug-window.c:2002 -#: ../src/empathy-debug-window.c:2077 +#: ../src/empathy-debug-window.c:1991 +#: ../src/empathy-debug-window.c:2066 msgid "Message" msgstr "הודעה" -#: ../src/empathy-debug-window.c:2007 +#: ../src/empathy-debug-window.c:1996 msgid "Warning" msgstr "×זהרה" -#: ../src/empathy-debug-window.c:2012 +#: ../src/empathy-debug-window.c:2001 msgid "Critical" msgstr "קריטי" -#: ../src/empathy-debug-window.c:2017 +#: ../src/empathy-debug-window.c:2006 msgid "Error" msgstr "שגי××”" -#: ../src/empathy-debug-window.c:2030 +#: ../src/empathy-debug-window.c:2019 msgid "" "Even if they don't display passwords, logs can contain sensitive information such as your list of contacts or the messages you recently sent or received.\n" "If you don't want to see such information available in a public bug report, you can choose to limit the visibility of your bug to Empathy developers when reporting it by displaying the advanced fields in the <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>." @@ -3611,92 +3604,92 @@ msgstr "" "×פילו ×œ×œ× ×”×¦×’×ª ססמ×ות, ×™×•×ž× ×™× ×¢×œ×•×œ×™× ×œ×”×›×™×œ מידע רגיש כגון ×× ×©×™ הקשר שלך ×ו ההודעות ×”××—×¨×•× ×•×ª ששלחת ×ו קיבלת.\n" " ×× ×œ× ×ª×¨×¦×” לר×ות ×¤×¨×˜×™× ×›×לה ×ž×•×¤×™×¢×™× ×‘×“×™×•×•×— תקלה ציבורי, × ×™×ª×Ÿ להגביל ×ת טווח ×”×¦×•×¤×™× ×œ×ž×¤×ª×—×™ Empathy בלבד בעת הדיווח על ידי הצגת השדות ×”×ž×ª×§×“×ž×™× ×‘<a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">דוח התקלה</a>." -#: ../src/empathy-debug-window.c:2062 +#: ../src/empathy-debug-window.c:2051 msgid "Time" msgstr "זמן" -#: ../src/empathy-debug-window.c:2065 +#: ../src/empathy-debug-window.c:2054 msgid "Domain" msgstr "תחו×" -#: ../src/empathy-debug-window.c:2068 +#: ../src/empathy-debug-window.c:2057 msgid "Category" msgstr "קטגוריה" -#: ../src/empathy-debug-window.c:2071 +#: ../src/empathy-debug-window.c:2060 msgid "Level" msgstr "רמה" -#: ../src/empathy-debug-window.c:2100 +#: ../src/empathy-debug-window.c:2089 msgid "The selected connection manager does not support the remote debugging extension." msgstr "×ž× ×”×œ ×”×—×™×‘×•×¨×™× ×©× ×‘×—×¨ ××™× ×• תומך בהרחבת × ×™×¤×•×™ שגי×ות מרחוק." -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:500 msgid "Incoming video call" msgstr "שיחה קולית × ×›× ×¡×ª" -#: ../src/empathy-event-manager.c:512 +#: ../src/empathy-event-manager.c:504 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "â€%s מתקשר ×ליך ×¢× ×•×™×“×ו, ×”×× ×‘×¨×¦×•× ×š ×œ×¢× ×•×ª?" -#: ../src/empathy-event-manager.c:513 +#: ../src/empathy-event-manager.c:505 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "â€%s מתקשר ×ליך, ×”×× ×‘×¨×¦×•× ×š ×œ×¢× ×•×ª?" -#: ../src/empathy-event-manager.c:541 +#: ../src/empathy-event-manager.c:533 msgid "_Reject" msgstr "_דחייה" +#: ../src/empathy-event-manager.c:541 #: ../src/empathy-event-manager.c:549 -#: ../src/empathy-event-manager.c:557 msgid "_Answer" msgstr "_×ž×¢× ×”" -#: ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:549 msgid "_Answer with video" msgstr "מ_×¢× ×” ×¢× ×•×™×“×ו" -#: ../src/empathy-event-manager.c:712 +#: ../src/empathy-event-manager.c:704 msgid "Room invitation" msgstr "×”×–×ž× ×” לחדר" -#: ../src/empathy-event-manager.c:714 +#: ../src/empathy-event-manager.c:706 #, c-format msgid "Invitation to join %s" msgstr "×”×•×–×ž× ×ª להצטרף ל־%s" -#: ../src/empathy-event-manager.c:721 +#: ../src/empathy-event-manager.c:713 #, c-format msgid "%s is inviting you to join %s" msgstr "â€%s ×ž×–×ž×™× ×š ×ותך להצטרף ×ל %s" -#: ../src/empathy-event-manager.c:734 +#: ../src/empathy-event-manager.c:726 msgid "_Join" msgstr "×”_צטרפות" -#: ../src/empathy-event-manager.c:760 +#: ../src/empathy-event-manager.c:752 #, c-format msgid "%s invited you to join %s" msgstr "×”×•×–×ž× ×ª על ידי â€%s להצטרף ×ל %s" -#: ../src/empathy-event-manager.c:766 +#: ../src/empathy-event-manager.c:758 #, c-format msgid "You have been invited to join %s" msgstr "×”×•×–×ž× ×ª להצטרף ×ל %s" -#: ../src/empathy-event-manager.c:945 +#: ../src/empathy-event-manager.c:937 #, c-format msgid "Incoming file transfer from %s" msgstr "העברת ×§×‘×¦×™× × ×›× ×¡×ª מ־%s" -#: ../src/empathy-event-manager.c:973 -#: ../src/empathy-roster-window.c:227 +#: ../src/empathy-event-manager.c:965 +#: ../src/empathy-roster-window.c:212 msgid "Password required" msgstr "× ×“×¨×©×ª ססמה" -#: ../src/empathy-event-manager.c:1110 +#: ../src/empathy-event-manager.c:1102 #, c-format msgid "" "\n" @@ -3706,108 +3699,108 @@ msgstr "" "הודעה: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:99 +#: ../src/empathy-ft-manager.c:93 #, 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 +#: ../src/empathy-ft-manager.c:96 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:178 +#: ../src/empathy-ft-manager.c:172 msgctxt "file transfer percent" msgid "Unknown" msgstr "×œ× ×™×“×•×¢" -#: ../src/empathy-ft-manager.c:273 +#: ../src/empathy-ft-manager.c:267 #, c-format msgid "%s of %s at %s/s" msgstr "â€%s מתוך %s ב־%s/ש׳" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:268 #, 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 +#: ../src/empathy-ft-manager.c:299 #, c-format msgid "Receiving \"%s\" from %s" msgstr "מתקבל הקובץ \"%s\" מ־%s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:308 +#: ../src/empathy-ft-manager.c:302 #, c-format msgid "Sending \"%s\" to %s" msgstr "â€\"%s\" × ×©×œ×— ×ל \"%s\"" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:338 +#: ../src/empathy-ft-manager.c:332 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "×רעה שגי××” בקבלת הקובץ \"%s\" מ־%s" -#: ../src/empathy-ft-manager.c:341 +#: ../src/empathy-ft-manager.c:335 msgid "Error receiving a file" msgstr "שגי××” בקבלת קובץ" -#: ../src/empathy-ft-manager.c:346 +#: ../src/empathy-ft-manager.c:340 #, c-format msgid "Error sending \"%s\" to %s" msgstr "שגי××” בשליחת הקובץ \"%s\" ×ל %s" -#: ../src/empathy-ft-manager.c:349 +#: ../src/empathy-ft-manager.c:343 msgid "Error sending a file" msgstr "שגי××” בשליחת קובץ" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:488 +#: ../src/empathy-ft-manager.c:482 #, 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 +#: ../src/empathy-ft-manager.c:487 #, c-format msgid "\"%s\" sent to %s" msgstr "הקובץ \"%s\" × ×©×œ×— ×ל %s" -#: ../src/empathy-ft-manager.c:496 +#: ../src/empathy-ft-manager.c:490 msgid "File transfer completed" msgstr "העברת קובץ הושלמה" -#: ../src/empathy-ft-manager.c:615 -#: ../src/empathy-ft-manager.c:779 +#: ../src/empathy-ft-manager.c:609 +#: ../src/empathy-ft-manager.c:773 msgid "Waiting for the other participant's response" msgstr "×‘×”×ž×ª× ×” לתגובה של ×ž×©×ª×ª×¤×™× × ×•×¡×¤×™×" -#: ../src/empathy-ft-manager.c:641 -#: ../src/empathy-ft-manager.c:679 +#: ../src/empathy-ft-manager.c:635 +#: ../src/empathy-ft-manager.c:673 #, c-format msgid "Checking integrity of \"%s\"" msgstr "השלמות של „%s“ × ×‘×“×§×ª" -#: ../src/empathy-ft-manager.c:644 -#: ../src/empathy-ft-manager.c:682 +#: ../src/empathy-ft-manager.c:638 +#: ../src/empathy-ft-manager.c:676 #, c-format msgid "Hashing \"%s\"" msgstr "מתבצע גיבוב לקובץ „%s“" -#: ../src/empathy-ft-manager.c:1025 +#: ../src/empathy-ft-manager.c:1019 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1037 +#: ../src/empathy-ft-manager.c:1031 msgid "File" msgstr "קובץ" -#: ../src/empathy-ft-manager.c:1059 +#: ../src/empathy-ft-manager.c:1053 msgid "Remaining" msgstr "× ×•×ª×¨" @@ -3819,57 +3812,57 @@ msgstr "העברות קבצי×" msgid "Remove completed, canceled and failed file transfers from the list" msgstr "הסרת העברות ×§×‘×¦×™× ×©×”×•×©×œ×ž×•, בוטלו ×ו × ×›×©×œ×• מהרשימה" -#: ../src/empathy-import-dialog.c:76 +#: ../src/empathy-import-dialog.c:70 msgid "_Import" msgstr "×™_בו×" -#: ../src/empathy-import-dialog.c:88 +#: ../src/empathy-import-dialog.c:82 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin." msgstr "×œ× × ×ž×¦×ו ×—×©×‘×•× ×•×ª לייבו×. Empathy תומך כרגע ×‘×™×™×‘×•× ×—×©×‘×•× ×•×ª מ־Pidgin בלבד." -#: ../src/empathy-import-dialog.c:209 +#: ../src/empathy-import-dialog.c:203 msgid "Import Accounts" msgstr "×™×‘×•× ×—×©×‘×•× ×•×ª" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:302 +#: ../src/empathy-import-widget.c:296 msgid "Import" msgstr "יבו×" -#: ../src/empathy-import-widget.c:311 +#: ../src/empathy-import-widget.c:305 msgid "Protocol" msgstr "פרוטוקול" -#: ../src/empathy-import-widget.c:335 +#: ../src/empathy-import-widget.c:329 msgid "Source" msgstr "מקור" -#: ../src/empathy-invite-participant-dialog.c:201 -#: ../src/empathy-invite-participant-dialog.c:229 +#: ../src/empathy-invite-participant-dialog.c:196 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite Participant" msgstr "×”×–×ž× ×ª משתתפי×" -#: ../src/empathy-invite-participant-dialog.c:202 +#: ../src/empathy-invite-participant-dialog.c:197 msgid "Choose a contact to invite into the conversation:" msgstr "× × ×œ×‘×—×•×¨ ×× ×©×™ קשר ×œ×”×–×ž× ×” לדיון:" -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:220 msgid "Invite" msgstr "×”×–×ž× ×”" -#: ../src/empathy-new-chatroom-dialog.c:194 +#: ../src/empathy-new-chatroom-dialog.c:184 msgid "Chat Room" msgstr "חדר שיחה" -#: ../src/empathy-new-chatroom-dialog.c:209 +#: ../src/empathy-new-chatroom-dialog.c:199 msgid "Members" msgstr "חברי×" -#: ../src/empathy-new-chatroom-dialog.c:410 +#: ../src/empathy-new-chatroom-dialog.c:400 msgid "Failed to list rooms" msgstr "הצגת רשימת ×”×—×“×¨×™× × ×›×©×œ×”" -#: ../src/empathy-new-chatroom-dialog.c:439 +#: ../src/empathy-new-chatroom-dialog.c:429 #, c-format msgid "" "%s\n" @@ -3882,17 +3875,17 @@ msgstr "" "× ×“×¨×©×ª ססמה: %s\n" "חברי×: %s" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "Yes" msgstr "כן" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "No" msgstr "ל×" -#: ../src/empathy-new-chatroom-dialog.c:784 +#: ../src/empathy-new-chatroom-dialog.c:774 msgid "Join Room" msgstr "הצטרפות לחדר" @@ -3924,104 +3917,104 @@ msgstr "×œ× × ×™×ª×Ÿ לטעון ×ת רשימת החדרי×" msgid "Room List" msgstr "רשימת חדרי×" -#: ../src/empathy-notifications-approver.c:188 +#: ../src/empathy-notifications-approver.c:182 msgid "Respond" msgstr "תגובה" -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer with video" msgstr "×ž×¢× ×” ×¢× ×•×™×“×ו" -#: ../src/empathy-notifications-approver.c:215 -#: ../src/empathy-notifications-approver.c:225 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:219 msgid "Decline" msgstr "סירוב" -#: ../src/empathy-notifications-approver.c:219 -#: ../src/empathy-notifications-approver.c:230 +#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:224 msgid "Accept" msgstr "×ישור" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:240 +#: ../src/empathy-notifications-approver.c:234 msgid "Provide" msgstr "×”×–× ×”" -#: ../src/empathy-preferences.c:143 +#: ../src/empathy-preferences.c:134 msgid "Message received" msgstr "התקבלה הודעה" -#: ../src/empathy-preferences.c:144 +#: ../src/empathy-preferences.c:135 msgid "Message sent" msgstr "הודעה × ×©×œ×—×”" -#: ../src/empathy-preferences.c:145 +#: ../src/empathy-preferences.c:136 msgid "New conversation" msgstr "שיחה חדשה" -#: ../src/empathy-preferences.c:146 +#: ../src/empathy-preferences.c:137 msgid "Contact comes online" msgstr "×יש הקשר מתחבר" -#: ../src/empathy-preferences.c:147 +#: ../src/empathy-preferences.c:138 msgid "Contact goes offline" msgstr "×יש קשר ×ž×ª× ×ª×§" -#: ../src/empathy-preferences.c:148 +#: ../src/empathy-preferences.c:139 msgid "Account connected" msgstr "חשבון מחובר" -#: ../src/empathy-preferences.c:149 +#: ../src/empathy-preferences.c:140 msgid "Account disconnected" msgstr "חשבון × ×•×ª×§" -#: ../src/empathy-preferences.c:386 +#: ../src/empathy-preferences.c:377 msgid "Language" msgstr "שפה" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:637 +#: ../src/empathy-preferences.c:628 msgid "Juliet" msgstr "יוליה" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:644 +#: ../src/empathy-preferences.c:635 msgid "Romeo" msgstr "רומי×ו" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:650 +#: ../src/empathy-preferences.c:641 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "הו רומי×ו, רומי×ו, מן ×ין שבת רומי×ו?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:654 +#: ../src/empathy-preferences.c:645 msgid "Deny thy father and refuse thy name;" msgstr "התכחש ל×ביך וסרב לשמו;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:657 +#: ../src/empathy-preferences.c:648 msgid "Or if thou wilt not, be but sworn my love" msgstr "×ו ×× ×œ× ×ª×¡×›×™×, ×שבע לך ב×הבתי" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:660 +#: ../src/empathy-preferences.c:651 msgid "And I'll no longer be a Capulet." msgstr "×•×œ× ××”×™×” עוד בת קפולט." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:663 +#: ../src/empathy-preferences.c:654 msgid "Shall I hear more, or shall I speak at this?" msgstr "×”×× ×“×™×‘×¨×ª×™ די ×ו ×©×ž× ×וסיף לדבר?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:666 +#: ../src/empathy-preferences.c:657 msgid "Juliet has disconnected" msgstr "יוליה ×”×ª× ×ª×§×”" -#: ../src/empathy-preferences.c:1032 +#: ../src/empathy-preferences.c:1023 msgid "Preferences" msgstr "העדפות" @@ -4034,7 +4027,7 @@ msgid "Show account balances" msgstr "הצגת מ××–× ×™ ×”×—×©×‘×•× ×•×ª" #: ../src/empathy-preferences.ui.h:4 -#: ../src/empathy-roster-window.c:2236 +#: ../src/empathy-roster-window.c:2226 msgid "Contact List" msgstr "רשימת ×× ×©×™ קשר" @@ -4183,84 +4176,84 @@ msgstr "הגוון:" msgid "Themes" msgstr "ערכות × ×•×©×" -#: ../src/empathy-roster-window.c:244 +#: ../src/empathy-roster-window.c:229 msgid "Provide Password" msgstr "×”×–× ×ª ססמה" -#: ../src/empathy-roster-window.c:250 +#: ../src/empathy-roster-window.c:235 msgid "Disconnect" msgstr "× ×™×ª×•×§" -#: ../src/empathy-roster-window.c:493 -msgid "You need to setup an account to see contacts here." +#: ../src/empathy-roster-window.c:478 +msgid "You need to set up an account to see contacts here." msgstr "עליך להגדיר חשבון כדי שיופיעו ×›×ן ×× ×©×™ קשר." -#: ../src/empathy-roster-window.c:569 +#: ../src/empathy-roster-window.c:554 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "×œ× × ×™×ª×Ÿ להשתמש ×‘×—×©×‘×•× ×•×ª %s עד ×©×”×ª×›× ×” %s תעודכן, עמך הסליחה." -#: ../src/empathy-roster-window.c:669 +#: ../src/empathy-roster-window.c:655 msgid "Windows Live" msgstr "Windows Live" -#: ../src/empathy-roster-window.c:673 +#: ../src/empathy-roster-window.c:659 msgid "Facebook" msgstr "Facebook" #. translators: %s is an account name like 'Facebook' or 'Google Talk' -#: ../src/empathy-roster-window.c:688 +#: ../src/empathy-roster-window.c:674 #, c-format msgid "%s account requires authorisation" msgstr "חשבון ×”Ö¾%s דורש ×ימות" -#: ../src/empathy-roster-window.c:699 +#: ../src/empathy-roster-window.c:685 msgid "Online Accounts" msgstr "×—×©×‘×•× ×•×ª ×ž×§×•×•× ×™×" -#: ../src/empathy-roster-window.c:746 +#: ../src/empathy-roster-window.c:732 msgid "Update software..." msgstr "עדכון ×”×ª×›× ×”..." -#: ../src/empathy-roster-window.c:752 +#: ../src/empathy-roster-window.c:738 msgid "Reconnect" msgstr "התחברות מחדש" -#: ../src/empathy-roster-window.c:756 +#: ../src/empathy-roster-window.c:742 msgid "Edit Account" msgstr "עריכת חשבון" -#: ../src/empathy-roster-window.c:761 +#: ../src/empathy-roster-window.c:747 msgid "Close" msgstr "סגירה" -#: ../src/empathy-roster-window.c:903 +#: ../src/empathy-roster-window.c:889 msgid "Top up account" msgstr "חשבון Top up" -#: ../src/empathy-roster-window.c:1585 +#: ../src/empathy-roster-window.c:1575 msgid "You need to enable one of your accounts to see contacts here." msgstr "עליך להפעיל ×ת ×חד ×”×—×©×‘×•× ×•×ª שלך כדי שיופיעו ×›×ן ×× ×©×™ קשר." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:1593 +#: ../src/empathy-roster-window.c:1583 #, c-format msgid "You need to enable %s to see contacts here." msgstr "עליך להפעיל ×ת %s כדי שיופיעו ×›×ן ×× ×©×™ קשר." -#: ../src/empathy-roster-window.c:1671 +#: ../src/empathy-roster-window.c:1661 msgid "Change your presence to see contacts here" msgstr "×©×™× ×•×™ ×”× ×•×›×—×•×ª שלך כדי לצפות ב×× ×©×™ קשר להלן" -#: ../src/empathy-roster-window.c:1680 +#: ../src/empathy-roster-window.c:1670 msgid "No match found" msgstr "×œ× × ×ž×¦××” הת×מה" -#: ../src/empathy-roster-window.c:1687 +#: ../src/empathy-roster-window.c:1677 msgid "You haven't added any contact yet" msgstr "×œ× ×”×•×¡×¤×ª ×× ×©×™ קשר עדיין" -#: ../src/empathy-roster-window.c:1690 +#: ../src/empathy-roster-window.c:1680 msgid "No online contacts" msgstr "×ין ×× ×©×™ קשר מחוברי×" @@ -4357,12 +4350,12 @@ msgstr "_שיחה חדשה…" msgid "Status" msgstr "מצב" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126 msgid "Done" msgstr "בוצע" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214 msgid "Please enter your account details" msgstr "× × ×œ×”×–×™×Ÿ ×ת פרטי החשבון שלך" @@ -4375,6 +4368,9 @@ msgstr "עריכת ×פשרויות חשבון ×”Ö¾%s" msgid "Integrate your IM accounts" msgstr "שילוב ×—×©×‘×•× ×•×ª ×”×ž×¡×¨×™× ×”×ž×™×“×™×™× ×©×œ×š" +#~ msgid "i" +#~ msgstr "i" + #~ msgid "Manage Messaging and VoIP accounts" #~ msgstr "× ×™×”×•×œ ×—×©×‘×•× ×•×ª התכתבות ו־VoIP" @@ -1,24 +1,23 @@ # Italian translation for Empaty -# Copyright (C) 2003-2010, 2011, 2012 The Free Software Foundation, Inc. +# Copyright (C) 2003-2010, 2011, 2012, 2013 The Free Software Foundation, Inc. # This file is distributed under the same license as the Empaty package. -# Fabio Bonelli <fabiobonelli@libero.it>, 2003 -# Michele Baldessari <michele@pupazzo.org>, 2003 +# Fabio Bonelli <fabiobonelli@libero.it>, 2003 +# Michele Baldessari <michele@pupazzo.org>, 2003 # Luca Ferretti <lferrett@gnome.org>, 2011. # Milo Casagrande <milo@ubuntu.com>, 2007-2010, 2011, 2012, 2013. -# msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-12 18:43+0100\n" -"PO-Revision-Date: 2013-03-12 18:46+0100\n" +"POT-Creation-Date: 2013-06-17 22:04+0200\n" +"PO-Revision-Date: 2013-06-17 22:38+0200\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/empathy.desktop.in.in.h:1 msgid "Empathy" @@ -105,7 +104,7 @@ msgstr "" #: ../data/org.gnome.Empathy.gschema.xml.h:12 #: ../src/empathy-preferences.ui.h:1 msgid "Show offline contacts" -msgstr "Mostra contatti fuori rete" +msgstr "Mostrare contatti fuori rete" #: ../data/org.gnome.Empathy.gschema.xml.h:13 msgid "Whether to show contacts that are offline in the contact list." @@ -537,262 +536,262 @@ msgstr "" "Indica se il programma deve ridurre o meno la precisione della posizione " "geografica per motivi di privacy." -#: ../libempathy/empathy-ft-handler.c:733 +#: ../libempathy/empathy-ft-handler.c:732 msgid "No reason was specified" msgstr "Nessun motivo specificato" -#: ../libempathy/empathy-ft-handler.c:736 +#: ../libempathy/empathy-ft-handler.c:735 msgid "The change in state was requested" msgstr "È stata richiesta la modifica dello stato" -#: ../libempathy/empathy-ft-handler.c:739 +#: ../libempathy/empathy-ft-handler.c:738 msgid "You canceled the file transfer" msgstr "È stato annullato il trasferimento del file" -#: ../libempathy/empathy-ft-handler.c:742 +#: ../libempathy/empathy-ft-handler.c:741 msgid "The other participant canceled the file transfer" msgstr "L'altro utente ha annullato il trasferimento del file" -#: ../libempathy/empathy-ft-handler.c:745 +#: ../libempathy/empathy-ft-handler.c:744 msgid "Error while trying to transfer the file" msgstr "Errore nel tentativo di trasferire il file" -#: ../libempathy/empathy-ft-handler.c:748 +#: ../libempathy/empathy-ft-handler.c:747 msgid "The other participant is unable to transfer the file" msgstr "L'altro utente non è in grado di trasferire il file" -#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:295 msgid "Unknown reason" msgstr "Motivo sconosciuto" -#: ../libempathy/empathy-ft-handler.c:914 +#: ../libempathy/empathy-ft-handler.c:913 msgid "File transfer completed, but the file was corrupted" msgstr "Trasferimento file completato, ma il file era danneggiato" -#: ../libempathy/empathy-ft-handler.c:1200 +#: ../libempathy/empathy-ft-handler.c:1199 msgid "File transfer not supported by remote contact" msgstr "Il trasferimento di file non è supportato dal contatto remoto" -#: ../libempathy/empathy-ft-handler.c:1256 +#: ../libempathy/empathy-ft-handler.c:1255 msgid "The selected file is not a regular file" msgstr "Il file selezionato non è un file regolare" -#: ../libempathy/empathy-ft-handler.c:1265 +#: ../libempathy/empathy-ft-handler.c:1264 msgid "The selected file is empty" msgstr "Il file selezionato è vuoto" -#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194 +#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184 msgid "Password not found" msgstr "Password non trovata" -#: ../libempathy/empathy-keyring.c:594 +#: ../libempathy/empathy-keyring.c:584 #, c-format msgid "IM account password for %s (%s)" msgstr "Password account messaggistica per %s (%s)" -#: ../libempathy/empathy-keyring.c:631 +#: ../libempathy/empathy-keyring.c:621 #, c-format msgid "Password for chatroom '%s' on account %s (%s)" msgstr "Password per la stanza «%s» sull'account %s (%s)" -#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116 +#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107 #, c-format msgid "Missed call from %s" msgstr "Chiamata persa da %s" # (ndt) quello che c'è dopo è il nome del contatto #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:407 +#: ../libempathy/empathy-message.c:406 #, c-format msgid "Called %s" msgstr "%s ha chiamato" -#: ../libempathy/empathy-message.c:410 +#: ../libempathy/empathy-message.c:409 #, c-format msgid "Call from %s" msgstr "Chiamata da %s" -#: ../libempathy/empathy-time.c:90 +#: ../libempathy/empathy-time.c:86 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "%d secondo fa" msgstr[1] "%d secondi fa" -#: ../libempathy/empathy-time.c:96 +#: ../libempathy/empathy-time.c:92 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "%d minuto fa" msgstr[1] "%d minuti fa" -#: ../libempathy/empathy-time.c:102 +#: ../libempathy/empathy-time.c:98 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "%d ora fa" msgstr[1] "%d ore fa" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:104 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d giorno fa" msgstr[1] "%d giorni fa" -#: ../libempathy/empathy-time.c:114 +#: ../libempathy/empathy-time.c:110 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d settimana fa" msgstr[1] "%d settimane fa" -#: ../libempathy/empathy-time.c:120 +#: ../libempathy/empathy-time.c:116 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d mese fa" msgstr[1] "%d mesi fa" -#: ../libempathy/empathy-time.c:142 +#: ../libempathy/empathy-time.c:138 msgid "in the future" msgstr "nel futuro" -#: ../libempathy/empathy-utils.c:226 +#: ../libempathy/empathy-utils.c:215 msgid "Available" msgstr "Disponibile" -#: ../libempathy/empathy-utils.c:228 +#: ../libempathy/empathy-utils.c:217 msgid "Busy" msgstr "Non disponibile" -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:220 msgid "Away" msgstr "Assente" -#: ../libempathy/empathy-utils.c:233 +#: ../libempathy/empathy-utils.c:222 msgid "Invisible" msgstr "Invisibile" -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:224 msgid "Offline" msgstr "Fuori rete" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:238 +#: ../libempathy/empathy-utils.c:227 msgctxt "presence" msgid "Unknown" msgstr "Sconosciuto" -#: ../libempathy/empathy-utils.c:278 +#: ../libempathy/empathy-utils.c:267 msgid "No reason specified" msgstr "Nessun motivo specificato" -#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:269 ../libempathy/empathy-utils.c:325 msgid "Status is set to offline" msgstr "Lo stato è impostato a «Fuori rete»" -#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316 -#: ../libempathy-gtk/empathy-call-utils.c:47 -#: ../libempathy-gtk/empathy-new-message-dialog.c:80 +#: ../libempathy/empathy-utils.c:271 ../libempathy/empathy-utils.c:305 +#: ../libempathy-gtk/empathy-call-utils.c:41 +#: ../libempathy-gtk/empathy-new-message-dialog.c:70 msgid "Network error" msgstr "Errore di rete" -#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307 msgid "Authentication failed" msgstr "Autenticazione non riuscita" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309 msgid "Encryption error" msgstr "Errore di cifratura" -#: ../libempathy/empathy-utils.c:288 +#: ../libempathy/empathy-utils.c:277 msgid "Name in use" msgstr "Nome in uso" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311 msgid "Certificate not provided" msgstr "Certificato non fornito" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313 msgid "Certificate untrusted" msgstr "Certificato non fidato" -#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315 msgid "Certificate expired" msgstr "Certificato scaduto" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317 msgid "Certificate not activated" msgstr "Certificato non attivato" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:319 msgid "Certificate hostname mismatch" msgstr "Corrispondenza errata nel nome host del certificato" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:321 msgid "Certificate fingerprint mismatch" msgstr "Corrispondenza errata nell'impronta del certificato" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:323 msgid "Certificate self-signed" msgstr "Certificato auto-firmato" -#: ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:293 msgid "Certificate error" msgstr "Errore nel certificato" -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption is not available" msgstr "La cifratura non è disponibile" -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate is invalid" msgstr "Il certificato non è valido" -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:331 msgid "Connection has been refused" msgstr "La connessione è stata rifiutata" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:333 msgid "Connection can't be established" msgstr "La connessione non può essere stabilita" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:335 msgid "Connection has been lost" msgstr "La connessione è stata persa" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:337 msgid "This account is already connected to the server" msgstr "Questo account è già collegato al server" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:339 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "" "La connessione è stata sostituita con una nuova che sfrutta la stessa risorsa" -#: ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:342 msgid "The account already exists on the server" msgstr "L'account esiste già sul server" # (ndt) rivedere too busy -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:344 msgid "Server is currently too busy to handle the connection" msgstr "Il server è troppo carico per gestire la connessione" -#: ../libempathy/empathy-utils.c:357 +#: ../libempathy/empathy-utils.c:346 msgid "Certificate has been revoked" msgstr "Il certificato è stato revocato" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:348 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "Il cifrario utilizzato dall'algoritmo del certificato non è sicuro o ha una " "cifratura debole" -#: ../libempathy/empathy-utils.c:362 +#: ../libempathy/empathy-utils.c:351 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -800,33 +799,33 @@ msgstr "" "La lunghezza del certificato o la profondità della catena del certificato " "del server supera i limiti imposti dalla libreria di cifratura" -#: ../libempathy/empathy-utils.c:366 +#: ../libempathy/empathy-utils.c:355 msgid "Your software is too old" msgstr "Il software in uso è troppo datato" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:357 msgid "Internal error" msgstr "Errore interno" -#: ../libempathy/empathy-utils.c:497 -#: ../libempathy-gtk/empathy-roster-model.h:30 +#: ../libempathy/empathy-utils.c:486 +#: ../libempathy-gtk/empathy-roster-model.h:28 msgid "People Nearby" msgstr "Persone nelle vicinanze" # (ndt) opzione -#: ../libempathy/empathy-utils.c:502 +#: ../libempathy/empathy-utils.c:491 msgid "Yahoo! Japan" msgstr "Yahoo! Giappone" -#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672 +#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:539 +#: ../libempathy/empathy-utils.c:528 msgid "Facebook Chat" msgstr "Chat di Facebook" -#: ../libempathy-gtk/empathy-account-chooser.c:689 +#: ../libempathy-gtk/empathy-account-chooser.c:684 msgid "All accounts" msgstr "Tutti gli account" @@ -907,57 +906,57 @@ msgstr "Qual è la password di AIM?" msgid "Remember Password" msgstr "Ricordare la password" -#: ../libempathy-gtk/empathy-account-widget.c:675 +#: ../libempathy-gtk/empathy-account-widget.c:668 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -#: ../src/empathy-import-widget.c:322 +#: ../src/empathy-import-widget.c:316 msgid "Account" msgstr "Account" -#: ../libempathy-gtk/empathy-account-widget.c:676 +#: ../libempathy-gtk/empathy-account-widget.c:669 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Password" msgstr "Password" -#: ../libempathy-gtk/empathy-account-widget.c:677 +#: ../libempathy-gtk/empathy-account-widget.c:670 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:511 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:498 msgid "Server" msgstr "Server" -#: ../libempathy-gtk/empathy-account-widget.c:678 +#: ../libempathy-gtk/empathy-account-widget.c:671 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:532 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:519 msgid "Port" msgstr "Porta" -#: ../libempathy-gtk/empathy-account-widget.c:762 +#: ../libempathy-gtk/empathy-account-widget.c:755 #, c-format msgid "%s" msgstr "%s" -#: ../libempathy-gtk/empathy-account-widget.c:817 +#: ../libempathy-gtk/empathy-account-widget.c:810 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1429 +#: ../libempathy-gtk/empathy-account-widget.c:1422 msgid "Username:" msgstr "Nome utente:" -#: ../libempathy-gtk/empathy-account-widget.c:1746 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "A_pply" msgstr "A_pplica" # (ndt) pulsante -#: ../libempathy-gtk/empathy-account-widget.c:1775 +#: ../libempathy-gtk/empathy-account-widget.c:1768 msgid "L_og in" msgstr "Acce_di" -#: ../libempathy-gtk/empathy-account-widget.c:1845 +#: ../libempathy-gtk/empathy-account-widget.c:1838 msgid "This account already exists on the server" msgstr "Questo account esiste già sul server" -#: ../libempathy-gtk/empathy-account-widget.c:1849 +#: ../libempathy-gtk/empathy-account-widget.c:1842 msgid "Create a new account on the server" msgstr "Creare un nuovo account sul server" @@ -966,7 +965,7 @@ msgstr "Creare un nuovo account sul server" #. * 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:2270 +#: ../libempathy-gtk/empathy-account-widget.c:2255 #, c-format msgid "%1$s on %2$s" msgstr "%1$s su %2$s" @@ -974,12 +973,12 @@ msgstr "%1$s su %2$s" # (ndt) il %s pare sia il protocollo #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:2296 +#: ../libempathy-gtk/empathy-account-widget.c:2281 #, c-format msgid "%s Account" msgstr "Account %s" -#: ../libempathy-gtk/empathy-account-widget.c:2300 +#: ../libempathy-gtk/empathy-account-widget.c:2285 msgid "New account" msgstr "Nuovo account" @@ -1208,32 +1207,32 @@ msgstr "Qual è l'identificativo di Windows Live?" msgid "What is your Windows Live password?" msgstr "Qual è la password di Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:207 -#: ../libempathy-gtk/empathy-account-widget-sip.c:240 +#: ../libempathy-gtk/empathy-account-widget-sip.c:198 +#: ../libempathy-gtk/empathy-account-widget-sip.c:231 msgid "Auto" msgstr "Automatico" -#: ../libempathy-gtk/empathy-account-widget-sip.c:210 +#: ../libempathy-gtk/empathy-account-widget-sip.c:201 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:213 +#: ../libempathy-gtk/empathy-account-widget-sip.c:204 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:216 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 msgid "TLS" msgstr "TLS" -#: ../libempathy-gtk/empathy-account-widget-sip.c:245 +#: ../libempathy-gtk/empathy-account-widget-sip.c:236 msgid "Register" msgstr "Register" -#: ../libempathy-gtk/empathy-account-widget-sip.c:250 +#: ../libempathy-gtk/empathy-account-widget-sip.c:241 msgid "Options" msgstr "Opzioni" -#: ../libempathy-gtk/empathy-account-widget-sip.c:253 +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 msgid "None" msgstr "Nessuno" @@ -1350,56 +1349,56 @@ msgstr "Qual è l'identificativo Yahoo?" msgid "What is your Yahoo! password?" msgstr "Qual è la password di Yahoo?" -#: ../libempathy-gtk/empathy-avatar-chooser.c:545 -#: ../libempathy-gtk/empathy-avatar-chooser.c:630 +#: ../libempathy-gtk/empathy-avatar-chooser.c:539 +#: ../libempathy-gtk/empathy-avatar-chooser.c:624 msgid "Couldn't convert image" msgstr "Impossibile convertire l'immagine" -#: ../libempathy-gtk/empathy-avatar-chooser.c:546 +#: ../libempathy-gtk/empathy-avatar-chooser.c:540 msgid "None of the accepted image formats are supported on your system" msgstr "Nessuno dei formati di immagine accettati è supportato dal sistema" -#: ../libempathy-gtk/empathy-avatar-chooser.c:906 +#: ../libempathy-gtk/empathy-avatar-chooser.c:900 msgid "Couldn't save picture to file" msgstr "Impossibile salvare l'immagine su file" # (ndt) titolo dialogo -#: ../libempathy-gtk/empathy-avatar-chooser.c:1030 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1024 msgid "Select Your Avatar Image" msgstr "Selezione immagine" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1038 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1032 msgid "Take a picture..." msgstr "Scatta foto..." -#: ../libempathy-gtk/empathy-avatar-chooser.c:1051 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1045 msgid "No Image" msgstr "Nessuna immagine" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1108 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1102 msgid "Images" msgstr "Immagini" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1112 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1106 msgid "All Files" msgstr "Tutti i file" -#: ../libempathy-gtk/empathy-avatar-image.c:322 +#: ../libempathy-gtk/empathy-avatar-image.c:319 msgid "Click to enlarge" msgstr "Clic per ingrandire" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:128 #, c-format msgid "Authentication failed for account <b>%s</b>" msgstr "Autenticazione non riuscita per l'account <b>%s</b>" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 -#: ../libempathy-gtk/empathy-chat.c:3853 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:140 +#: ../libempathy-gtk/empathy-chat.c:3844 msgid "Retry" msgstr "Riprova" #: ../libempathy-gtk/empathy-base-password-dialog.c:224 -#: ../libempathy-gtk/empathy-password-dialog.c:134 +#: ../libempathy-gtk/empathy-password-dialog.c:132 #, c-format msgid "" "Enter your password for account\n" @@ -1408,73 +1407,73 @@ msgstr "" "Inserire la password per l'account\n" "<b>%s</b>" -#: ../libempathy-gtk/empathy-calendar-button.c:66 +#: ../libempathy-gtk/empathy-calendar-button.c:63 msgid "Select..." msgstr "Seleziona..." # (ndt) nome di una colonna -#: ../libempathy-gtk/empathy-calendar-button.c:154 +#: ../libempathy-gtk/empathy-calendar-button.c:151 msgid "_Select" msgstr "_Seleziona" -#: ../libempathy-gtk/empathy-call-utils.c:42 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:36 +#: ../libempathy-gtk/empathy-call-utils.c:54 msgid "There was an error starting the call" msgstr "Si è verificato un errore nell'iniziare la chiamata" -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:43 msgid "The specified contact doesn't support calls" msgstr "Il contatto specificato non supporta le chiamate" -#: ../libempathy-gtk/empathy-call-utils.c:51 +#: ../libempathy-gtk/empathy-call-utils.c:45 msgid "The specified contact is offline" msgstr "Il contatto specificato è fuori rete" -#: ../libempathy-gtk/empathy-call-utils.c:53 +#: ../libempathy-gtk/empathy-call-utils.c:47 msgid "The specified contact is not valid" msgstr "Il contatto specificato non è valido" -#: ../libempathy-gtk/empathy-call-utils.c:55 +#: ../libempathy-gtk/empathy-call-utils.c:49 msgid "Emergency calls are not supported on this protocol" msgstr "Le chiamate di emergenza non sono supportate su questo protocollo" -#: ../libempathy-gtk/empathy-call-utils.c:57 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "You don't have enough credit in order to place this call" msgstr "Non si dispone di credito sufficiente per effettuare questa chiamata" -#: ../libempathy-gtk/empathy-chat.c:740 +#: ../libempathy-gtk/empathy-chat.c:731 msgid "Failed to open private chat" msgstr "Apertura della conversazione privata non riuscita" -#: ../libempathy-gtk/empathy-chat.c:798 +#: ../libempathy-gtk/empathy-chat.c:789 msgid "Topic not supported on this conversation" msgstr "Argomento non supportato in questa conversazione" -#: ../libempathy-gtk/empathy-chat.c:804 +#: ../libempathy-gtk/empathy-chat.c:795 msgid "You are not allowed to change the topic" msgstr "Non si è autorizzati a modificare l'argomento" -#: ../libempathy-gtk/empathy-chat.c:980 +#: ../libempathy-gtk/empathy-chat.c:971 msgid "Invalid contact ID" msgstr "ID contatto non valido" -#: ../libempathy-gtk/empathy-chat.c:1067 +#: ../libempathy-gtk/empathy-chat.c:1058 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: pulisce tutti i messaggi dalla conversazione attuale" -#: ../libempathy-gtk/empathy-chat.c:1070 +#: ../libempathy-gtk/empathy-chat.c:1061 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <argomento>: imposta l'argomento per la conversazione attuale" -#: ../libempathy-gtk/empathy-chat.c:1073 +#: ../libempathy-gtk/empathy-chat.c:1064 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <ID stanza>: entra in una nuova stanza" -#: ../libempathy-gtk/empathy-chat.c:1076 +#: ../libempathy-gtk/empathy-chat.c:1067 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <ID stanza>: entra in una nuova stanza" -#: ../libempathy-gtk/empathy-chat.c:1080 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" @@ -1482,23 +1481,23 @@ msgstr "" "/part [<ID stanza>] [<motivo>]: esce dalla stanza, in modo predefinito " "quella attuale" -#: ../libempathy-gtk/empathy-chat.c:1084 +#: ../libempathy-gtk/empathy-chat.c:1075 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <ID contatto> [<messaggio>]: apre una conversazione privata" -#: ../libempathy-gtk/empathy-chat.c:1087 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <ID contatto> <messaggio>: apre una conversazione privata" -#: ../libempathy-gtk/empathy-chat.c:1090 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <soprannome>: modifica il proprio soprannome sul server attuale" -#: ../libempathy-gtk/empathy-chat.c:1093 +#: ../libempathy-gtk/empathy-chat.c:1084 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <messaggio>: invia un messaggio ACTION alla conversazione attuale" -#: ../libempathy-gtk/empathy-chat.c:1096 +#: ../libempathy-gtk/empathy-chat.c:1087 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 " @@ -1508,11 +1507,11 @@ msgstr "" "inviare un messaggio che inizia con «/». Per esempio: \"/say /join è usato " "per entrare in una nuova stanza\"" -#: ../libempathy-gtk/empathy-chat.c:1101 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/whois <contact ID>: display information about a contact" msgstr "/whois <ID contatto>: visualizza informazioni riguardo un contatto" -#: ../libempathy-gtk/empathy-chat.c:1104 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1520,127 +1519,127 @@ msgstr "" "/help [<comando>]: mostra tutti i comandi supportati. Se <comando> è " "definito, ne mostra l'uso." -#: ../libempathy-gtk/empathy-chat.c:1123 +#: ../libempathy-gtk/empathy-chat.c:1114 #, c-format msgid "Usage: %s" msgstr "Uso: %s" -#: ../libempathy-gtk/empathy-chat.c:1168 +#: ../libempathy-gtk/empathy-chat.c:1159 msgid "Unknown command" msgstr "Comando sconosciuto" -#: ../libempathy-gtk/empathy-chat.c:1294 +#: ../libempathy-gtk/empathy-chat.c:1285 msgid "Unknown command; see /help for the available commands" msgstr "Comando sconosciuto. Provare /help per i comandi disponibili." -#: ../libempathy-gtk/empathy-chat.c:1551 +#: ../libempathy-gtk/empathy-chat.c:1542 msgid "insufficient balance to send message" msgstr "saldo non sufficiente per inviare messaggi" -#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569 -#: ../libempathy-gtk/empathy-chat.c:1632 +#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560 +#: ../libempathy-gtk/empathy-chat.c:1623 #, c-format msgid "Error sending message '%s': %s" msgstr "Errore nell'inviare il messaggio «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574 -#: ../libempathy-gtk/empathy-chat.c:1636 +#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1627 #, c-format msgid "Error sending message: %s" msgstr "Errore nell'inviare il messaggio: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1563 +#: ../libempathy-gtk/empathy-chat.c:1554 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "Saldo non sufficiente per inviare messaggi. <a href='%s'>Ricarica</a>." -#: ../libempathy-gtk/empathy-chat.c:1603 +#: ../libempathy-gtk/empathy-chat.c:1594 msgid "not capable" msgstr "non possibile" -#: ../libempathy-gtk/empathy-chat.c:1610 +#: ../libempathy-gtk/empathy-chat.c:1601 msgid "offline" msgstr "fuori rete" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1604 msgid "invalid contact" msgstr "contatto non valido" -#: ../libempathy-gtk/empathy-chat.c:1616 +#: ../libempathy-gtk/empathy-chat.c:1607 msgid "permission denied" msgstr "permesso negato" -#: ../libempathy-gtk/empathy-chat.c:1619 +#: ../libempathy-gtk/empathy-chat.c:1610 msgid "too long message" msgstr "messaggio troppo lungo" -#: ../libempathy-gtk/empathy-chat.c:1622 +#: ../libempathy-gtk/empathy-chat.c:1613 msgid "not implemented" msgstr "non implementato" -#: ../libempathy-gtk/empathy-chat.c:1626 +#: ../libempathy-gtk/empathy-chat.c:1617 msgid "unknown" msgstr "sconosciuto" -#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979 +#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967 msgid "Topic:" msgstr "Argomento:" -#: ../libempathy-gtk/empathy-chat.c:1708 +#: ../libempathy-gtk/empathy-chat.c:1699 #, c-format msgid "Topic set to: %s" msgstr "Argomento impostato a: %s" -#: ../libempathy-gtk/empathy-chat.c:1710 +#: ../libempathy-gtk/empathy-chat.c:1701 #, c-format msgid "Topic set by %s to: %s" msgstr "Argomento impostato a «%2$s» da %1$s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1715 +#: ../libempathy-gtk/empathy-chat.c:1706 msgid "No topic defined" msgstr "Nessun argomento definito" -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2222 msgid "(No Suggestions)" msgstr "(Nessun suggerimento)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2299 +#: ../libempathy-gtk/empathy-chat.c:2290 #, c-format msgid "Add '%s' to Dictionary" msgstr "Aggiungi «%s» al dizionario" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2336 +#: ../libempathy-gtk/empathy-chat.c:2327 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Aggiungi «%s» al dizionario %s" -#: ../libempathy-gtk/empathy-chat.c:2406 +#: ../libempathy-gtk/empathy-chat.c:2397 msgid "Insert Smiley" msgstr "Inserisci faccina" #. send button -#: ../libempathy-gtk/empathy-chat.c:2424 -#: ../libempathy-gtk/empathy-ui-utils.c:1180 +#: ../libempathy-gtk/empathy-chat.c:2415 +#: ../libempathy-gtk/empathy-ui-utils.c:1208 msgid "_Send" msgstr "_Invia" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2481 +#: ../libempathy-gtk/empathy-chat.c:2472 msgid "_Spelling Suggestions" msgstr "_Suggerimenti ortografici" -#: ../libempathy-gtk/empathy-chat.c:2592 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Recupero dei registri recenti non riuscito" # (ndt) messa così per renderla asessuale -#: ../libempathy-gtk/empathy-chat.c:2835 +#: ../libempathy-gtk/empathy-chat.c:2826 #, c-format msgid "%s has disconnected" msgstr "L'utente %s si è disconnesso" @@ -1648,13 +1647,13 @@ msgstr "L'utente %s si è disconnesso" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2842 +#: ../libempathy-gtk/empathy-chat.c:2833 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s ha espulso %1$s" # (ndt) messa così per renderla asessuale -#: ../libempathy-gtk/empathy-chat.c:2845 +#: ../libempathy-gtk/empathy-chat.c:2836 #, c-format msgid "%s was kicked" msgstr "L'utente %s è stato espulso" @@ -1662,19 +1661,19 @@ msgstr "L'utente %s è stato espulso" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2853 +#: ../libempathy-gtk/empathy-chat.c:2844 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s ha bandito %1$s" # (ndt) messa così per renderla asessuale -#: ../libempathy-gtk/empathy-chat.c:2856 +#: ../libempathy-gtk/empathy-chat.c:2847 #, c-format msgid "%s was banned" msgstr "L'utente %s è stato bandito" # (ndt) messa così per renderla asessuale -#: ../libempathy-gtk/empathy-chat.c:2860 +#: ../libempathy-gtk/empathy-chat.c:2851 #, c-format msgid "%s has left the room" msgstr "L'utente %s ha lasciato la stanza" @@ -1684,19 +1683,19 @@ msgstr "L'utente %s ha lasciato la stanza" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2869 +#: ../libempathy-gtk/empathy-chat.c:2860 #, c-format msgid " (%s)" msgstr " (%s)" # (ndt) per renderla "asessuale" -#: ../libempathy-gtk/empathy-chat.c:2894 +#: ../libempathy-gtk/empathy-chat.c:2885 #, c-format msgid "%s has joined the room" msgstr "L'utente %s è entrato nella stanza" # (ndt) per cercare di stare "asessuali" -#: ../libempathy-gtk/empathy-chat.c:2919 +#: ../libempathy-gtk/empathy-chat.c:2910 #, c-format msgid "%s is now known as %s" msgstr "L'utente %s è ora conosciuto come %s" @@ -1705,85 +1704,85 @@ msgstr "L'utente %s è ora conosciuto come %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:3106 ../src/empathy-call-window.c:1537 -#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662 -#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166 +#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516 +#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2641 +#: ../src/empathy-call-window.c:2948 ../src/empathy-event-manager.c:1158 msgid "Disconnected" msgstr "Disconnessi" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3793 +#: ../libempathy-gtk/empathy-chat.c:3784 msgid "Would you like to store this password?" msgstr "Salvare questa password?" # (ndt) pulsante -#: ../libempathy-gtk/empathy-chat.c:3799 +#: ../libempathy-gtk/empathy-chat.c:3790 msgid "Remember" msgstr "Ricorda" # (ndt) pulsante -#: ../libempathy-gtk/empathy-chat.c:3809 +#: ../libempathy-gtk/empathy-chat.c:3800 msgid "Not now" msgstr "Non ora" -#: ../libempathy-gtk/empathy-chat.c:3857 +#: ../libempathy-gtk/empathy-chat.c:3848 msgid "Wrong password; please try again:" msgstr "Password errata. Provare nuovamente:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3987 +#: ../libempathy-gtk/empathy-chat.c:3972 msgid "This room is protected by a password:" msgstr "Questa stanza è protetta da una password:" # (ndt) pulsante -#: ../libempathy-gtk/empathy-chat.c:4014 -#: ../src/empathy-new-chatroom-dialog.c:780 +#: ../libempathy-gtk/empathy-chat.c:3999 +#: ../src/empathy-new-chatroom-dialog.c:785 msgid "Join" msgstr "Entra" -#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187 +#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1179 msgid "Connected" msgstr "Connessi" -#: ../libempathy-gtk/empathy-chat.c:4261 +#: ../libempathy-gtk/empathy-chat.c:4246 msgid "Conversation" msgstr "Conversazione" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4266 +#: ../libempathy-gtk/empathy-chat.c:4251 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261 msgid "Unknown or invalid identifier" msgstr "Identificatore sconosciuto o non valido" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263 msgid "Contact blocking temporarily unavailable" msgstr "Blocco del contatto momentaneamente non disponibile" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 msgid "Contact blocking unavailable" msgstr "Blocco del contatto non disponibile" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 msgid "Permission Denied" msgstr "Permesso negato" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 msgid "Could not block contact" msgstr "Impossibile bloccare il contatto" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610 msgid "Edit Blocked Contacts" msgstr "Modifica contatti bloccati" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 -#: ../libempathy-gtk/empathy-individual-widget.c:1483 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:528 +#: ../libempathy-gtk/empathy-individual-widget.c:1473 #: ../src/empathy-chatrooms-window.ui.h:2 #: ../src/empathy-new-chatroom-dialog.ui.h:6 msgid "Account:" @@ -1793,23 +1792,23 @@ msgstr "Account:" msgid "Blocked Contacts" msgstr "Contatti bloccati" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:98 msgid "Full name" msgstr "Nome completo" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:99 msgid "Phone number" msgstr "Numero di telefono" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:100 msgid "E-mail address" msgstr "Indirizzo email" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:101 msgid "Website" msgstr "Sito web" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 msgid "Birthday" msgstr "Compleanno" @@ -1817,98 +1816,98 @@ msgstr "Compleanno" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Last seen:" msgstr "Ultima attività :" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Server:" msgstr "Server:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:109 msgid "Connected from:" msgstr "Connessione da:" # (ndt) usato lo stesso di xchat-gnome #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Away message:" msgstr "Messaggio di assenza:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:126 msgid "work" msgstr "lavoro" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:127 msgid "home" msgstr "casa" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:128 msgid "mobile" msgstr "cellulare" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:129 msgid "voice" msgstr "voce" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 msgid "preferred" msgstr "preferito" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 msgid "postal" msgstr "postale" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "parcel" msgstr "parcel" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:522 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:521 msgid "Search contacts" msgstr "Cerca contatti" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:552 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:551 msgid "Search: " msgstr "Cerca:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:610 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:609 msgid "_Add Contact" msgstr "A_ggiungi contatto..." -#: ../libempathy-gtk/empathy-contact-search-dialog.c:628 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 msgid "No contacts found" msgstr "Nessun contatto trovato" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:644 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:643 msgid "Your message introducing yourself:" msgstr "Un messaggio di presentazione:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:652 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:651 msgid "Please let me see when you're online. Thanks!" msgstr "Vorrei poter vedere quando sei online! Grazie!" -#: ../libempathy-gtk/empathy-contact-widget.c:168 -#: ../libempathy-gtk/empathy-individual-widget.c:898 +#: ../libempathy-gtk/empathy-contact-widget.c:156 +#: ../libempathy-gtk/empathy-individual-widget.c:888 msgid "Save Avatar" msgstr "Salva immagine" -#: ../libempathy-gtk/empathy-contact-widget.c:224 -#: ../libempathy-gtk/empathy-individual-widget.c:956 +#: ../libempathy-gtk/empathy-contact-widget.c:212 +#: ../libempathy-gtk/empathy-individual-widget.c:946 msgid "Unable to save avatar" msgstr "Impossibile salvare l'immagine" #. Identifier to connect to Instant Messaging network #. Setup id label #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-user-info.c:444 +#: ../libempathy-gtk/empathy-user-info.c:455 msgid "Identifier" msgstr "Identificatore" #. Setup nickname entry #: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -#: ../libempathy-gtk/empathy-user-info.c:449 +#: ../libempathy-gtk/empathy-user-info.c:460 msgid "Alias" msgstr "Pseudonimo" @@ -1944,11 +1943,11 @@ msgstr "Versione" msgid "Client" msgstr "Client" -#: ../libempathy-gtk/empathy-groups-widget.c:327 +#: ../libempathy-gtk/empathy-groups-widget.c:317 msgid "Groups" msgstr "Gruppi" -#: ../libempathy-gtk/empathy-groups-widget.c:339 +#: ../libempathy-gtk/empathy-groups-widget.c:329 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -1957,125 +1956,125 @@ msgstr "" "selezionarne più di uno oppure nessuno." # (ndt) pulsante -#: ../libempathy-gtk/empathy-groups-widget.c:358 +#: ../libempathy-gtk/empathy-groups-widget.c:348 msgid "_Add Group" msgstr "A_ggiungi gruppo" # (ndt) nome di una colonna -#: ../libempathy-gtk/empathy-groups-widget.c:393 +#: ../libempathy-gtk/empathy-groups-widget.c:383 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Selezione" -#: ../libempathy-gtk/empathy-groups-widget.c:403 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgid "Group" msgstr "Gruppo" -#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +#: ../libempathy-gtk/empathy-individual-dialogs.c:108 msgid "New Contact" msgstr "Nuovo contatto" -#: ../libempathy-gtk/empathy-individual-dialogs.c:193 -#: ../libempathy-gtk/empathy-subscription-dialog.c:121 +#: ../libempathy-gtk/empathy-individual-dialogs.c:183 +#: ../libempathy-gtk/empathy-subscription-dialog.c:120 #, c-format msgid "Block %s?" msgstr "Bloccare %s?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:248 -#: ../libempathy-gtk/empathy-subscription-dialog.c:125 +#: ../libempathy-gtk/empathy-individual-dialogs.c:238 +#: ../libempathy-gtk/empathy-subscription-dialog.c:124 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "Bloccare veramente «%s»? " -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-individual-dialogs.c:243 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "La seguente identità verrà bloccata:" msgstr[1] "Le seguenti identità verranno bloccate:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:250 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "La seguente identità non può essere bloccata:" msgstr[1] "Le seguenti identità non possono essere bloccate:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:270 -#: ../libempathy-gtk/empathy-subscription-dialog.c:130 -#: ../libempathy-gtk/empathy-subscription-dialog.c:275 +#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-subscription-dialog.c:129 +#: ../libempathy-gtk/empathy-subscription-dialog.c:274 msgid "_Block" msgstr "_Blocca" -#: ../libempathy-gtk/empathy-individual-dialogs.c:279 -#: ../libempathy-gtk/empathy-subscription-dialog.c:150 +#: ../libempathy-gtk/empathy-individual-dialogs.c:269 +#: ../libempathy-gtk/empathy-subscription-dialog.c:149 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Segnalare abuso da questo contatto" msgstr[1] "_Segnalare abuso da questi contatti" # (ndt) titolo dialogo -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237 msgid "Edit Contact Information" msgstr "Modifica informazioni contatto" #. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:293 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:283 msgid "Linked Contacts" msgstr "Contatti uniti" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:332 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:322 msgid "gnome-contacts not installed" msgstr "Il software «gnome-contacts» non è installato" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:335 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:325 msgid "Please install gnome-contacts to access contacts details." msgstr "Installare «gnome-contacts» per accedere ai dettagli dei contatti." #. 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:177 +#: ../libempathy-gtk/empathy-individual-menu.c:168 #, c-format msgid "%s (%s)" msgstr "%s (%s)" # (ndt) è un titolo... -#: ../libempathy-gtk/empathy-individual-menu.c:353 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Selezione account per la chiamata" # (ndt) è il titolo del dialogo -#: ../libempathy-gtk/empathy-individual-menu.c:357 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-call-window.ui.h:20 msgid "Call" msgstr "Chiamata" -#: ../libempathy-gtk/empathy-individual-menu.c:422 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Cellulare" -#: ../libempathy-gtk/empathy-individual-menu.c:424 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Lavoro" -#: ../libempathy-gtk/empathy-individual-menu.c:426 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "Casa" -#: ../libempathy-gtk/empathy-individual-menu.c:669 +#: ../libempathy-gtk/empathy-individual-menu.c:660 msgid "_Block Contact" msgstr "_Blocca contatto" -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:716 msgid "Delete and _Block" msgstr "Elimina e _blocca" -#: ../libempathy-gtk/empathy-individual-menu.c:787 +#: ../libempathy-gtk/empathy-individual-menu.c:778 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Rimuovere veramente il contatto «%s»?" -#: ../libempathy-gtk/empathy-individual-menu.c:796 +#: ../libempathy-gtk/empathy-individual-menu.c:787 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2084,225 +2083,225 @@ msgstr "" "Rimuovere veramente il contatto unificato «%s»? Questa azione rimuoverà " "tutti i contatti di cui è composto." -#: ../libempathy-gtk/empathy-individual-menu.c:807 +#: ../libempathy-gtk/empathy-individual-menu.c:798 msgid "Removing contact" msgstr "Rimozione contatto" -#: ../libempathy-gtk/empathy-individual-menu.c:871 -#: ../libempathy-gtk/empathy-individual-view.c:2453 +#: ../libempathy-gtk/empathy-individual-menu.c:862 +#: ../libempathy-gtk/empathy-individual-view.c:2440 msgid "_Remove" msgstr "_Rimuovi" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1234 -#: ../libempathy-gtk/empathy-new-message-dialog.c:318 +#: ../libempathy-gtk/empathy-individual-menu.c:1225 +#: ../libempathy-gtk/empathy-new-message-dialog.c:308 msgid "_Chat" msgstr "_Conversazione" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1269 -#: ../libempathy-gtk/empathy-new-message-dialog.c:312 +#: ../libempathy-gtk/empathy-individual-menu.c:1260 +#: ../libempathy-gtk/empathy-new-message-dialog.c:302 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1302 +#: ../libempathy-gtk/empathy-individual-menu.c:1293 msgctxt "menu item" msgid "_Audio Call" msgstr "Chiamata _audio" -#: ../libempathy-gtk/empathy-individual-menu.c:1335 +#: ../libempathy-gtk/empathy-individual-menu.c:1326 msgctxt "menu item" msgid "_Video Call" msgstr "Chiamata _video" -#: ../libempathy-gtk/empathy-individual-menu.c:1376 +#: ../libempathy-gtk/empathy-individual-menu.c:1367 #: ../src/empathy-roster-window-menubar.ui.h:11 msgid "_Previous Conversations" msgstr "Conversazioni _precedenti" -#: ../libempathy-gtk/empathy-individual-menu.c:1405 +#: ../libempathy-gtk/empathy-individual-menu.c:1396 msgid "Send File" msgstr "Invia file" # (ndt) voce di menù -#: ../libempathy-gtk/empathy-individual-menu.c:1435 +#: ../libempathy-gtk/empathy-individual-menu.c:1426 msgid "Share My Desktop" msgstr "Condividi desktop" # (ndt) dovrebbe essere relativo a un contatto -#: ../libempathy-gtk/empathy-individual-menu.c:1461 -#: ../libempathy-gtk/empathy-individual-widget.c:1366 +#: ../libempathy-gtk/empathy-individual-menu.c:1452 +#: ../libempathy-gtk/empathy-individual-widget.c:1356 msgid "Favorite" msgstr "Preferito" -#: ../libempathy-gtk/empathy-individual-menu.c:1490 +#: ../libempathy-gtk/empathy-individual-menu.c:1481 msgid "Infor_mation" msgstr "Informa_zioni" -#: ../libempathy-gtk/empathy-individual-menu.c:1539 +#: ../libempathy-gtk/empathy-individual-menu.c:1530 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Modifica" #. send invitation -#: ../libempathy-gtk/empathy-individual-menu.c:1655 -#: ../src/empathy-chat-window.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1646 +#: ../src/empathy-chat-window.c:1233 msgid "Inviting you to this room" msgstr "Invito per questa stanza" -#: ../libempathy-gtk/empathy-individual-menu.c:1701 +#: ../libempathy-gtk/empathy-individual-menu.c:1692 msgid "_Invite to Chat Room" msgstr "_Invita nella stanza" -#: ../libempathy-gtk/empathy-individual-menu.c:1897 +#: ../libempathy-gtk/empathy-individual-menu.c:1888 msgid "_Add Contact…" msgstr "A_ggiungi contatto..." -#: ../libempathy-gtk/empathy-individual-view.c:2373 +#: ../libempathy-gtk/empathy-individual-view.c:2360 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Rimuovere veramente il gruppo «%s»?" -#: ../libempathy-gtk/empathy-individual-view.c:2376 +#: ../libempathy-gtk/empathy-individual-view.c:2363 msgid "Removing group" msgstr "Rimozione gruppo" -#: ../libempathy-gtk/empathy-individual-view.c:2444 +#: ../libempathy-gtk/empathy-individual-view.c:2431 msgid "Re_name" msgstr "_Rinomina" -#: ../libempathy-gtk/empathy-individual-widget.c:304 +#: ../libempathy-gtk/empathy-individual-widget.c:294 msgid "Channels:" msgstr "Canali:" -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-individual-widget.c:445 msgid "Country ISO Code:" msgstr "Codice ISO del paese:" -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-individual-widget.c:447 msgid "Country:" msgstr "Paese:" -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-individual-widget.c:449 msgid "State:" msgstr "Stato:" -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-individual-widget.c:451 msgid "City:" msgstr "Città :" -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-individual-widget.c:453 msgid "Area:" msgstr "Area:" -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Postal Code:" msgstr "Codice postale:" # (ndt) nome di una colonna -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Street:" msgstr "Via:" -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "Building:" msgstr "Edificio:" # (ndt) questo è prima di una casella di testo # in cui inserire il criterio di ricerca -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "Floor:" msgstr "Piano:" -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Room:" msgstr "Stanza:" -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Text:" msgstr "Testo:" -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Description:" msgstr "Descrizione:" -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Accuracy Level:" msgstr "Livello di precisione:" -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Error:" msgstr "Errore:" -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Vertical Error (meters):" msgstr "Errore verticale (metri):" -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Horizontal Error (meters):" msgstr "Errore orizzontale (metri):" -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "Speed:" msgstr "Velocità :" -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Bearing:" msgstr "Orientamento:" -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Climb Speed:" msgstr "Velocità di salita:" -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Last Updated on:" msgstr "Ultimo aggiornamento:" -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Longitude:" msgstr "Longitudine:" -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Latitude:" msgstr "Latitudine:" -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Altitude:" msgstr "Altitudine:" # (ndt) nome della scheda -#: ../libempathy-gtk/empathy-individual-widget.c:593 -#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../libempathy-gtk/empathy-individual-widget.c:583 +#: ../libempathy-gtk/empathy-individual-widget.c:598 #: ../src/empathy-preferences.ui.h:39 msgid "Location" msgstr "Posizione geografica" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-individual-widget.c:610 +#: ../libempathy-gtk/empathy-individual-widget.c:600 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-individual-widget.c:659 +#: ../libempathy-gtk/empathy-individual-widget.c:649 msgid "%B %e, %Y at %R UTC" msgstr "%-d %B %Y alle %H.%M UTC" #. Alias -#: ../libempathy-gtk/empathy-individual-widget.c:1302 +#: ../libempathy-gtk/empathy-individual-widget.c:1292 msgid "Alias:" msgstr "Pseudonimo:" #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-individual-widget.c:1511 +#: ../libempathy-gtk/empathy-individual-widget.c:1501 msgid "Identifier:" msgstr "Identificatore:" # (ndt) rivedere meta-contact, trovare idee migliori... -#: ../libempathy-gtk/empathy-individual-widget.c:1650 +#: ../libempathy-gtk/empathy-individual-widget.c:1640 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2318,33 +2317,33 @@ msgstr "<b>Posizione</b> alla data" msgid "Online from a phone or mobile device" msgstr "In rete da un telefono o dispositivo portatile" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329 msgid "New Network" msgstr "Nuova rete" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:538 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532 msgid "Choose an IRC network" msgstr "Scegliere una rete IRC" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:621 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615 msgid "Reset _Networks List" msgstr "Ripristina ele_nco reti" # -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:625 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Seleziona" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:271 msgid "new server" msgstr "nuovo server" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:547 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:534 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80 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 " @@ -2354,11 +2353,11 @@ msgstr "" "collegate sulla stessa rete in cui ci si trova. Per utilizzare questa " "funzionalità , assicurarsi che i dettagli sottostanti siano corretti." -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100 msgid "People nearby" msgstr "Persone nelle vicinanze" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115 msgid "" "You can change these details later or disable this feature by choosing <span " "style=\"italic\">Edit → Accounts</span> in the Contact List." @@ -2367,139 +2366,139 @@ msgstr "" "è possibile disabilitare questa funzionalità scegliendo <span style=\"italic" "\">Modifica → Account</span> dall'elenco dei contatti." -#: ../libempathy-gtk/empathy-log-window.c:622 +#: ../libempathy-gtk/empathy-log-window.c:607 msgid "History" msgstr "Cronologia" -#: ../libempathy-gtk/empathy-log-window.c:677 +#: ../libempathy-gtk/empathy-log-window.c:662 msgid "Show" msgstr "Mostra" -#: ../libempathy-gtk/empathy-log-window.c:699 +#: ../libempathy-gtk/empathy-log-window.c:684 msgid "Search" msgstr "Cerca" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1135 #, c-format msgid "Chat in %s" msgstr "Conversazione in %s" -#: ../libempathy-gtk/empathy-log-window.c:1152 +#: ../libempathy-gtk/empathy-log-window.c:1137 #, c-format msgid "Chat with %s" msgstr "Conversazione con %s" # (ndt) domenica 01 ottobre 2007 -#: ../libempathy-gtk/empathy-log-window.c:1202 -#: ../libempathy-gtk/empathy-log-window.c:1351 +#: ../libempathy-gtk/empathy-log-window.c:1187 +#: ../libempathy-gtk/empathy-log-window.c:1331 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A %d %B %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1292 +#: ../libempathy-gtk/empathy-log-window.c:1274 #, c-format msgid "<i>* %s %s</i>" msgstr "<i>* %s %s</i>" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1298 +#: ../libempathy-gtk/empathy-log-window.c:1280 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1375 +#: ../libempathy-gtk/empathy-log-window.c:1355 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s secondo" msgstr[1] "%s secondi" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1362 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s minuto" msgstr[1] "%s minuti" -#: ../libempathy-gtk/empathy-log-window.c:1390 +#: ../libempathy-gtk/empathy-log-window.c:1370 #, c-format msgid "Call took %s, ended at %s" msgstr "Durata della chiamata: %s. Terminata alle: %s" -#: ../libempathy-gtk/empathy-log-window.c:1721 +#: ../libempathy-gtk/empathy-log-window.c:1701 msgid "Today" msgstr "Oggi" -#: ../libempathy-gtk/empathy-log-window.c:1725 +#: ../libempathy-gtk/empathy-log-window.c:1705 msgid "Yesterday" msgstr "Ieri" # (ndt) domenica 01 ottobre 2007 #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1740 +#: ../libempathy-gtk/empathy-log-window.c:1720 msgid "%e %B %Y" msgstr "%d %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1844 -#: ../libempathy-gtk/empathy-log-window.c:3467 +#: ../libempathy-gtk/empathy-log-window.c:1824 +#: ../libempathy-gtk/empathy-log-window.c:3447 msgid "Anytime" msgstr "Qualsiasi ora" -#: ../libempathy-gtk/empathy-log-window.c:1943 -#: ../libempathy-gtk/empathy-log-window.c:2402 +#: ../libempathy-gtk/empathy-log-window.c:1923 +#: ../libempathy-gtk/empathy-log-window.c:2382 msgid "Anyone" msgstr "Chiunque" -#: ../libempathy-gtk/empathy-log-window.c:2715 +#: ../libempathy-gtk/empathy-log-window.c:2695 msgid "Who" msgstr "Chi" -#: ../libempathy-gtk/empathy-log-window.c:2924 +#: ../libempathy-gtk/empathy-log-window.c:2904 msgid "When" msgstr "Quando" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3022 msgid "Anything" msgstr "Qualsiasi cosa" -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3024 msgid "Text chats" msgstr "Testo conversazioni" # (ndt) è il titolo del dialogo -#: ../libempathy-gtk/empathy-log-window.c:3045 +#: ../libempathy-gtk/empathy-log-window.c:3025 #: ../src/empathy-preferences.ui.h:29 msgid "Calls" msgstr "Chiamate" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3029 msgid "Incoming calls" msgstr "Chiamate in arrivo" -#: ../libempathy-gtk/empathy-log-window.c:3050 +#: ../libempathy-gtk/empathy-log-window.c:3030 msgid "Outgoing calls" msgstr "Chiamate in uscita" -#: ../libempathy-gtk/empathy-log-window.c:3051 +#: ../libempathy-gtk/empathy-log-window.c:3031 msgid "Missed calls" msgstr "Chiamate perse" -#: ../libempathy-gtk/empathy-log-window.c:3071 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "What" msgstr "Cosa" -#: ../libempathy-gtk/empathy-log-window.c:3760 +#: ../libempathy-gtk/empathy-log-window.c:3740 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "" "Eliminare veramente tutte le registrazioni delle conversazioni precedenti?" -#: ../libempathy-gtk/empathy-log-window.c:3764 +#: ../libempathy-gtk/empathy-log-window.c:3744 msgid "Clear All" msgstr "Elimina tutto" -#: ../libempathy-gtk/empathy-log-window.c:3771 +#: ../libempathy-gtk/empathy-log-window.c:3751 msgid "Delete from:" msgstr "Elimina da:" @@ -2521,7 +2520,7 @@ msgid "Profile" msgstr "Profilo" #: ../libempathy-gtk/empathy-log-window.ui.h:5 -#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-chat-window.c:1426 ../src/empathy-preferences.ui.h:11 msgid "Chat" msgstr "Conversazione" @@ -2543,77 +2542,77 @@ msgid "What kind of chat account do you have?" msgstr "Che tipo di account è disponibile?" #: ../libempathy-gtk/empathy-new-account-dialog.c:151 -msgid "Adding new account" +msgid "Add new account" msgstr "Aggiunta nuovo account" -#: ../libempathy-gtk/empathy-new-call-dialog.c:199 -#: ../libempathy-gtk/empathy-new-message-dialog.c:289 +#: ../libempathy-gtk/empathy-new-call-dialog.c:189 +#: ../libempathy-gtk/empathy-new-message-dialog.c:279 msgid "Enter a contact identifier or phone number:" msgstr "Inserire un identificatore di contatto o un numero di telefono:" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:222 +#: ../libempathy-gtk/empathy-new-call-dialog.c:212 msgid "_Video Call" msgstr "Chiamata _video" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:232 +#: ../libempathy-gtk/empathy-new-call-dialog.c:222 msgid "_Audio Call" msgstr "Chiamata _audio" # (ndt) è il titolo del dialogo #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:242 +#: ../libempathy-gtk/empathy-new-call-dialog.c:232 msgid "New Call" msgstr "Nuova chiamata" -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:72 msgid "The contact is offline" msgstr "Il contatto è fuori rete" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:74 msgid "The specified contact is either invalid or unknown" msgstr "Il contatto specificato non è valido o non è conosciuto" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:76 msgid "The contact does not support this kind of conversation" msgstr "Il contatto non supporta questo tipo di conversazione" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:78 msgid "The requested functionality is not implemented for this protocol" msgstr "La funzionalità richiesta non è implementata per questo protocollo" -#: ../libempathy-gtk/empathy-new-message-dialog.c:94 +#: ../libempathy-gtk/empathy-new-message-dialog.c:84 msgid "Could not start a conversation with the given contact" msgstr "Impossibile iniziare una conversazione con il contatto fornito" # (ndt) messa così per renderle asessuale -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:86 msgid "You are banned from this channel" msgstr "Impossibile accedere a questo canale (ban)" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:88 msgid "This channel is full" msgstr "Questo canale è pieno" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:90 msgid "You must be invited to join this channel" msgstr "È necessario essere invitati per entrare in questo canale" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:92 msgid "Can't proceed while disconnected" msgstr "Impossibile continuare quando fuori rete" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:94 msgid "Permission denied" msgstr "Permesso negato" -#: ../libempathy-gtk/empathy-new-message-dialog.c:110 +#: ../libempathy-gtk/empathy-new-message-dialog.c:100 msgid "There was an error starting the conversation" msgstr "Si è verificato un errore nell'iniziare la conversazione" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:332 +#: ../libempathy-gtk/empathy-new-message-dialog.c:322 msgid "New Conversation" msgstr "Nuova conversazione" @@ -2623,27 +2622,27 @@ msgstr "Nuova conversazione" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:164 -#: ../libempathy-gtk/empathy-presence-chooser.c:200 +#: ../libempathy-gtk/empathy-presence-chooser.c:157 +#: ../libempathy-gtk/empathy-presence-chooser.c:193 msgid "Custom Message…" msgstr "Messaggio personalizzato..." -#: ../libempathy-gtk/empathy-presence-chooser.c:217 -#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:210 +#: ../libempathy-gtk/empathy-presence-chooser.c:212 msgid "Edit Custom Messages…" msgstr "Modifica messaggio personalizzato..." # (ndt) sono dei suggerimenti, ma indicano l'azione da compiere -#: ../libempathy-gtk/empathy-presence-chooser.c:341 +#: ../libempathy-gtk/empathy-presence-chooser.c:334 msgid "Click to remove this status as a favorite" msgstr "Fare clic per rimuovere questo stato dai preferiti" -#: ../libempathy-gtk/empathy-presence-chooser.c:350 +#: ../libempathy-gtk/empathy-presence-chooser.c:343 msgid "Click to make this status a favorite" msgstr "Fare clic per aggiungere questo stato tra i preferiti" #. Translators: %s is a status message like 'At the pub' for example -#: ../libempathy-gtk/empathy-presence-chooser.c:384 +#: ../libempathy-gtk/empathy-presence-chooser.c:377 #, c-format msgid "" "<b>Current message: %s</b>\n" @@ -2653,12 +2652,12 @@ msgstr "" "<small><i>Premere Invio per impostare il nuovo messaggio o Esc per annullare." "</i></small>" -#: ../libempathy-gtk/empathy-presence-chooser.c:393 +#: ../libempathy-gtk/empathy-presence-chooser.c:386 msgid "Set status" msgstr "Imposta lo stato" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1101 +#: ../libempathy-gtk/empathy-presence-chooser.c:1094 msgid "Custom messages…" msgstr "Messaggi personalizzati..." @@ -2666,12 +2665,12 @@ msgstr "Messaggi personalizzati..." #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../libempathy-gtk/empathy-protocol-chooser.c:608 +#: ../libempathy-gtk/empathy-protocol-chooser.c:603 #, c-format msgid "New %s account" msgstr "Nuovo account %s" -#: ../libempathy-gtk/empathy-search-bar.c:243 +#: ../libempathy-gtk/empathy-search-bar.c:237 msgid "_Match case" msgstr "_Maiuscole/minuscole" @@ -2696,174 +2695,174 @@ msgid "Phrase not found" msgstr "Stringa non trovata" # (ndt) dovrebbero essere gli eventi sonori -#: ../libempathy-gtk/empathy-sound-manager.c:51 +#: ../libempathy-gtk/empathy-sound-manager.c:49 msgid "Received an instant message" msgstr "Messaggio istantaneo ricevuto" -#: ../libempathy-gtk/empathy-sound-manager.c:53 +#: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Sent an instant message" msgstr "Messaggio istantaneo inviato" -#: ../libempathy-gtk/empathy-sound-manager.c:55 +#: ../libempathy-gtk/empathy-sound-manager.c:53 msgid "Incoming chat request" msgstr "Richiesta di conversazione in arrivo" -#: ../libempathy-gtk/empathy-sound-manager.c:57 +#: ../libempathy-gtk/empathy-sound-manager.c:55 msgid "Contact connected" msgstr "Contatto connesso" -#: ../libempathy-gtk/empathy-sound-manager.c:59 +#: ../libempathy-gtk/empathy-sound-manager.c:57 msgid "Contact disconnected" msgstr "Contatto disconnesso" -#: ../libempathy-gtk/empathy-sound-manager.c:61 +#: ../libempathy-gtk/empathy-sound-manager.c:59 msgid "Connected to server" msgstr "Connessi al server" -#: ../libempathy-gtk/empathy-sound-manager.c:63 +#: ../libempathy-gtk/empathy-sound-manager.c:61 msgid "Disconnected from server" msgstr "Disconnessi dal server" -#: ../libempathy-gtk/empathy-sound-manager.c:65 +#: ../libempathy-gtk/empathy-sound-manager.c:63 msgid "Incoming voice call" msgstr "Chiamata vocale in arrivo" -#: ../libempathy-gtk/empathy-sound-manager.c:67 +#: ../libempathy-gtk/empathy-sound-manager.c:65 msgid "Outgoing voice call" msgstr "Chiamata vocale in uscita" -#: ../libempathy-gtk/empathy-sound-manager.c:69 +#: ../libempathy-gtk/empathy-sound-manager.c:67 msgid "Voice call ended" msgstr "Chiamata vocale terminata" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:294 msgid "Edit Custom Messages" msgstr "Modifica messaggi personalizzati" # (ndt) titolo dialogo -#: ../libempathy-gtk/empathy-subscription-dialog.c:234 +#: ../libempathy-gtk/empathy-subscription-dialog.c:233 msgid "Subscription Request" msgstr "Richiesta di approvazione" # (ndt) so che non è impersonale... ma non mi viene niente di buono che sia impersonale... -#: ../libempathy-gtk/empathy-subscription-dialog.c:240 -#: ../src/empathy-event-manager.c:1104 +#: ../libempathy-gtk/empathy-subscription-dialog.c:239 +#: ../src/empathy-event-manager.c:1096 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s vorrebbe poter visualizzare la tua presenza in rete" -#: ../libempathy-gtk/empathy-subscription-dialog.c:281 -#: ../src/empathy-event-manager.c:729 +#: ../libempathy-gtk/empathy-subscription-dialog.c:280 +#: ../src/empathy-event-manager.c:721 msgid "_Decline" msgstr "_Rifiuta" -#: ../libempathy-gtk/empathy-subscription-dialog.c:282 +#: ../libempathy-gtk/empathy-subscription-dialog.c:281 msgid "_Accept" msgstr "Acce_tta" # (ndt) quello che c'è dopo è un timestamp, che ovviamente non è localizzabile... -#: ../libempathy-gtk/empathy-theme-adium.c:1219 +#: ../libempathy-gtk/empathy-theme-adium.c:1211 #, c-format msgid "Message edited at %s" msgstr "Messaggio modificato alle %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1921 +#: ../libempathy-gtk/empathy-theme-adium.c:1913 msgid "Normal" msgstr "Normale" # (ndt) o solo server? -#: ../libempathy-gtk/empathy-tls-dialog.c:150 +#: ../libempathy-gtk/empathy-tls-dialog.c:147 msgid "The identity provided by the chat server cannot be verified." msgstr "" "L'identità fornita dal server di conversazione non può essere verificata." -#: ../libempathy-gtk/empathy-tls-dialog.c:157 +#: ../libempathy-gtk/empathy-tls-dialog.c:154 msgid "The certificate is not signed by a Certification Authority." msgstr "Il certificato non è firmato da un'Autorità di Certificazione" -#: ../libempathy-gtk/empathy-tls-dialog.c:161 +#: ../libempathy-gtk/empathy-tls-dialog.c:158 msgid "The certificate has expired." msgstr "Il certificato è scaduto." -#: ../libempathy-gtk/empathy-tls-dialog.c:164 +#: ../libempathy-gtk/empathy-tls-dialog.c:161 msgid "The certificate hasn't yet been activated." msgstr "Il certificato non è ancora stato attivato." -#: ../libempathy-gtk/empathy-tls-dialog.c:167 +#: ../libempathy-gtk/empathy-tls-dialog.c:164 msgid "The certificate does not have the expected fingerprint." msgstr "Il certificato non contiene l'impronta digitale attesa." -#: ../libempathy-gtk/empathy-tls-dialog.c:170 +#: ../libempathy-gtk/empathy-tls-dialog.c:167 msgid "The hostname verified by the certificate doesn't match the server name." msgstr "" "Il nome host verificato dal certificato non corrisponde al nome del server." -#: ../libempathy-gtk/empathy-tls-dialog.c:174 +#: ../libempathy-gtk/empathy-tls-dialog.c:171 msgid "The certificate is self-signed." msgstr "Il certificato è auto-firmato." -#: ../libempathy-gtk/empathy-tls-dialog.c:177 +#: ../libempathy-gtk/empathy-tls-dialog.c:174 msgid "" "The certificate has been revoked by the issuing Certification Authority." msgstr "Il certificato è stato revocato dall'Autorità di Certificazione." # (ndt) crittograficamente non mi piace... -#: ../libempathy-gtk/empathy-tls-dialog.c:181 +#: ../libempathy-gtk/empathy-tls-dialog.c:178 msgid "The certificate is cryptographically weak." msgstr "Il certificato è cifrato con una chiave debole." -#: ../libempathy-gtk/empathy-tls-dialog.c:184 +#: ../libempathy-gtk/empathy-tls-dialog.c:181 msgid "The certificate length exceeds verifiable limits." msgstr "La lunghezza del certificato supera i limiti verificabili." -#: ../libempathy-gtk/empathy-tls-dialog.c:188 +#: ../libempathy-gtk/empathy-tls-dialog.c:185 msgid "The certificate is malformed." msgstr "Il certificato non è corretto." -#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#: ../libempathy-gtk/empathy-tls-dialog.c:203 #, c-format msgid "Expected hostname: %s" msgstr "Nome host atteso: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#: ../libempathy-gtk/empathy-tls-dialog.c:206 #, c-format msgid "Certificate hostname: %s" msgstr "Nome host del certificato: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:281 +#: ../libempathy-gtk/empathy-tls-dialog.c:278 msgid "C_ontinue" msgstr "C_ontinua" -#: ../libempathy-gtk/empathy-tls-dialog.c:287 +#: ../libempathy-gtk/empathy-tls-dialog.c:284 msgid "Untrusted connection" msgstr "Connessione non sicura" -#: ../libempathy-gtk/empathy-tls-dialog.c:288 +#: ../libempathy-gtk/empathy-tls-dialog.c:285 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Questa connessione non è sicura. Continuare in ogni caso?" -#: ../libempathy-gtk/empathy-tls-dialog.c:298 +#: ../libempathy-gtk/empathy-tls-dialog.c:295 msgid "Remember this choice for future connections" msgstr "Ricordare per le successive connessioni" -#: ../libempathy-gtk/empathy-tls-dialog.c:304 +#: ../libempathy-gtk/empathy-tls-dialog.c:301 msgid "Certificate Details" msgstr "Dettagli certificato" -#: ../libempathy-gtk/empathy-ui-utils.c:1050 +#: ../libempathy-gtk/empathy-ui-utils.c:1078 msgid "Unable to open URI" msgstr "Impossibile aprire l'URI" # (ndt) titolo -#: ../libempathy-gtk/empathy-ui-utils.c:1174 +#: ../libempathy-gtk/empathy-ui-utils.c:1202 msgid "Select a file" msgstr "Seleziona un file" -#: ../libempathy-gtk/empathy-ui-utils.c:1248 +#: ../libempathy-gtk/empathy-ui-utils.c:1276 msgid "Insufficient free space to save file" msgstr "Spazio insufficiente per salvare il file" -#: ../libempathy-gtk/empathy-ui-utils.c:1256 +#: ../libempathy-gtk/empathy-ui-utils.c:1284 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2872,16 +2871,16 @@ msgstr "" "%s di spazio libero sono richiesti per salvare questo file, ma sono " "disponibili solamente %s. Scegliere un'altra posizione." -#: ../libempathy-gtk/empathy-ui-utils.c:1302 +#: ../libempathy-gtk/empathy-ui-utils.c:1330 #, c-format msgid "Incoming file from %s" msgstr "File in arrivo da parte di %s" -#: ../libempathy-gtk/empathy-user-info.c:384 +#: ../libempathy-gtk/empathy-user-info.c:395 msgid "Go online to edit your personal information." msgstr "Andare in rete per modificare le informazioni personali." -#: ../libempathy-gtk/empathy-user-info.c:464 +#: ../libempathy-gtk/empathy-user-info.c:475 msgid "<b>Personal Details</b>" msgstr "<b>Dettagli personali</b>" @@ -2900,198 +2899,198 @@ msgstr "Apri c_ollegamento" msgid "Inspect HTML" msgstr "Ispeziona HTML" -#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +#: ../libempathy-gtk/totem-subtitle-encoding.c:157 msgid "Current Locale" msgstr "Localizzazione corrente" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:160 +#: ../libempathy-gtk/totem-subtitle-encoding.c:162 +#: ../libempathy-gtk/totem-subtitle-encoding.c:164 +#: ../libempathy-gtk/totem-subtitle-encoding.c:166 msgid "Arabic" msgstr "Arabo" -#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +#: ../libempathy-gtk/totem-subtitle-encoding.c:169 msgid "Armenian" msgstr "Armeno" -#: ../libempathy-gtk/totem-subtitle-encoding.c:173 -#: ../libempathy-gtk/totem-subtitle-encoding.c:175 -#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +#: ../libempathy-gtk/totem-subtitle-encoding.c:172 +#: ../libempathy-gtk/totem-subtitle-encoding.c:174 +#: ../libempathy-gtk/totem-subtitle-encoding.c:176 msgid "Baltic" msgstr "Baltico" -#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +#: ../libempathy-gtk/totem-subtitle-encoding.c:179 msgid "Celtic" msgstr "Celtico" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:182 +#: ../libempathy-gtk/totem-subtitle-encoding.c:184 +#: ../libempathy-gtk/totem-subtitle-encoding.c:186 +#: ../libempathy-gtk/totem-subtitle-encoding.c:188 msgid "Central European" msgstr "Europeo centrale" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:191 +#: ../libempathy-gtk/totem-subtitle-encoding.c:193 +#: ../libempathy-gtk/totem-subtitle-encoding.c:195 +#: ../libempathy-gtk/totem-subtitle-encoding.c:197 msgid "Chinese Simplified" msgstr "Cinese semplificato" -#: ../libempathy-gtk/totem-subtitle-encoding.c:201 -#: ../libempathy-gtk/totem-subtitle-encoding.c:203 -#: ../libempathy-gtk/totem-subtitle-encoding.c:205 +#: ../libempathy-gtk/totem-subtitle-encoding.c:200 +#: ../libempathy-gtk/totem-subtitle-encoding.c:202 +#: ../libempathy-gtk/totem-subtitle-encoding.c:204 msgid "Chinese Traditional" msgstr "Cinese tradizionale" -#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +#: ../libempathy-gtk/totem-subtitle-encoding.c:207 msgid "Croatian" msgstr "Croato" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:210 +#: ../libempathy-gtk/totem-subtitle-encoding.c:212 +#: ../libempathy-gtk/totem-subtitle-encoding.c:214 +#: ../libempathy-gtk/totem-subtitle-encoding.c:216 +#: ../libempathy-gtk/totem-subtitle-encoding.c:218 +#: ../libempathy-gtk/totem-subtitle-encoding.c:220 msgid "Cyrillic" msgstr "Cirillico" -#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +#: ../libempathy-gtk/totem-subtitle-encoding.c:223 msgid "Cyrillic/Russian" msgstr "Cirillico/Russo" -#: ../libempathy-gtk/totem-subtitle-encoding.c:227 -#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +#: ../libempathy-gtk/totem-subtitle-encoding.c:226 +#: ../libempathy-gtk/totem-subtitle-encoding.c:228 msgid "Cyrillic/Ukrainian" msgstr "Cirillico/Ucraino" -#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +#: ../libempathy-gtk/totem-subtitle-encoding.c:231 msgid "Georgian" msgstr "Georgiano" -#: ../libempathy-gtk/totem-subtitle-encoding.c:235 -#: ../libempathy-gtk/totem-subtitle-encoding.c:237 -#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +#: ../libempathy-gtk/totem-subtitle-encoding.c:234 +#: ../libempathy-gtk/totem-subtitle-encoding.c:236 +#: ../libempathy-gtk/totem-subtitle-encoding.c:238 msgid "Greek" msgstr "Greco" -#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +#: ../libempathy-gtk/totem-subtitle-encoding.c:241 msgid "Gujarati" msgstr "Gujarati" -#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +#: ../libempathy-gtk/totem-subtitle-encoding.c:244 msgid "Gurmukhi" msgstr "Gurmukhi" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:247 +#: ../libempathy-gtk/totem-subtitle-encoding.c:249 +#: ../libempathy-gtk/totem-subtitle-encoding.c:251 +#: ../libempathy-gtk/totem-subtitle-encoding.c:253 msgid "Hebrew" msgstr "Ebraico" -#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +#: ../libempathy-gtk/totem-subtitle-encoding.c:256 msgid "Hebrew Visual" msgstr "Ebraico visuale" -#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +#: ../libempathy-gtk/totem-subtitle-encoding.c:259 msgid "Hindi" msgstr "Hindi" -#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +#: ../libempathy-gtk/totem-subtitle-encoding.c:262 msgid "Icelandic" msgstr "Islandese" -#: ../libempathy-gtk/totem-subtitle-encoding.c:266 -#: ../libempathy-gtk/totem-subtitle-encoding.c:268 -#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +#: ../libempathy-gtk/totem-subtitle-encoding.c:265 +#: ../libempathy-gtk/totem-subtitle-encoding.c:267 +#: ../libempathy-gtk/totem-subtitle-encoding.c:269 msgid "Japanese" msgstr "Giapponese" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:272 +#: ../libempathy-gtk/totem-subtitle-encoding.c:274 +#: ../libempathy-gtk/totem-subtitle-encoding.c:276 +#: ../libempathy-gtk/totem-subtitle-encoding.c:278 msgid "Korean" msgstr "Coreano" -#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +#: ../libempathy-gtk/totem-subtitle-encoding.c:281 msgid "Nordic" msgstr "Nordico" -#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +#: ../libempathy-gtk/totem-subtitle-encoding.c:284 msgid "Persian" msgstr "Persiano" -#: ../libempathy-gtk/totem-subtitle-encoding.c:288 -#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +#: ../libempathy-gtk/totem-subtitle-encoding.c:287 +#: ../libempathy-gtk/totem-subtitle-encoding.c:289 msgid "Romanian" msgstr "Rumeno" -#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +#: ../libempathy-gtk/totem-subtitle-encoding.c:292 msgid "South European" msgstr "Sud europeo" -#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +#: ../libempathy-gtk/totem-subtitle-encoding.c:295 msgid "Thai" msgstr "Tailandese" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:298 +#: ../libempathy-gtk/totem-subtitle-encoding.c:300 +#: ../libempathy-gtk/totem-subtitle-encoding.c:302 +#: ../libempathy-gtk/totem-subtitle-encoding.c:304 msgid "Turkish" msgstr "Turco" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:307 +#: ../libempathy-gtk/totem-subtitle-encoding.c:309 +#: ../libempathy-gtk/totem-subtitle-encoding.c:311 +#: ../libempathy-gtk/totem-subtitle-encoding.c:313 +#: ../libempathy-gtk/totem-subtitle-encoding.c:315 msgid "Unicode" msgstr "Unicode" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:318 +#: ../libempathy-gtk/totem-subtitle-encoding.c:320 +#: ../libempathy-gtk/totem-subtitle-encoding.c:322 +#: ../libempathy-gtk/totem-subtitle-encoding.c:324 +#: ../libempathy-gtk/totem-subtitle-encoding.c:326 msgid "Western" msgstr "Occidentale" # (ndt) suggerimento -#: ../libempathy-gtk/totem-subtitle-encoding.c:330 -#: ../libempathy-gtk/totem-subtitle-encoding.c:332 -#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +#: ../libempathy-gtk/totem-subtitle-encoding.c:329 +#: ../libempathy-gtk/totem-subtitle-encoding.c:331 +#: ../libempathy-gtk/totem-subtitle-encoding.c:333 msgid "Vietnamese" msgstr "Vietnamita" -#: ../libempathy-gtk/empathy-roster-model.h:29 +#: ../libempathy-gtk/empathy-roster-model.h:27 msgid "Top Contacts" msgstr "Contatti principali" -#: ../libempathy-gtk/empathy-roster-model.h:31 +#: ../libempathy-gtk/empathy-roster-model.h:29 msgid "Ungrouped" msgstr "Non raggruppati" #. Add a prefix explaining that something goes wrong when trying to #. * fetch contact's presence. -#: ../libempathy-gtk/empathy-roster-contact.c:205 +#: ../libempathy-gtk/empathy-roster-contact.c:201 #, c-format msgid "Server cannot find contact: %s" msgstr "Impossibile trovare il contatto: %s" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223 msgid "No error message" msgstr "Nessun messaggio di errore" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296 msgid "Instant Message (Empathy)" msgstr "Messaggio istantaneo (Empathy)" -#: ../src/empathy-about-dialog.c:81 +#: ../src/empathy-about-dialog.c:77 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 " @@ -3103,7 +3102,7 @@ msgstr "" "Free Software Foundation; versione 2 della licenza, o (a scelta) una " "versione più recente." -#: ../src/empathy-about-dialog.c:85 +#: ../src/empathy-about-dialog.c:81 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 " @@ -3115,7 +3114,7 @@ msgstr "" "APPLICABILITÀ PER UNO SCOPO PARTICOLARE. Per maggiori dettagli consultare la " "GNU General Public License." -#: ../src/empathy-about-dialog.c:89 +#: ../src/empathy-about-dialog.c:85 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 " @@ -3125,24 +3124,24 @@ msgstr "" "questo programma. In caso contrario scrivere a: Free Software Foundation, " "Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA" -#: ../src/empathy-about-dialog.c:109 +#: ../src/empathy-about-dialog.c:105 msgid "An Instant Messaging client for GNOME" msgstr "Un client di messaggistica istantanea per GNOME" -#: ../src/empathy-about-dialog.c:115 +#: ../src/empathy-about-dialog.c:111 msgid "translator-credits" msgstr "" "Milo Casagrande <milo@ubuntu.com>\n" "Michele Baldessari\n" "Fabio Bonelli" -#: ../src/empathy-accounts.c:182 +#: ../src/empathy-accounts.c:171 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "" "Non visualizza alcun dialogo, esegue qualsiasi operazione (come " "l'importazione) ed esce" -#: ../src/empathy-accounts.c:186 +#: ../src/empathy-accounts.c:175 msgid "" "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "" @@ -3150,60 +3149,60 @@ msgstr "" "vicinanze\"" # (ndt) spero che una cosa così non si veda mai... -#: ../src/empathy-accounts.c:190 +#: ../src/empathy-accounts.c:179 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "Seleziona l'account fornito (per esempio gabble/jabber/foo_40example_2eorg0)" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:181 msgid "<account-id>" msgstr "<account-id>" -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:186 msgid "- Empathy Accounts" msgstr "- Account Empathy" -#: ../src/empathy-accounts.c:240 +#: ../src/empathy-accounts.c:239 msgid "Empathy Accounts" msgstr "Account Empathy" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:52 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Sono presenti delle modifiche non salvate per l'account %s." #. 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:72 +#: ../src/empathy-accounts-dialog.c:56 msgid "Your new account has not been saved yet." msgstr "Il nuovo account non è ancora stato salvato." -#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279 +#: ../src/empathy-accounts-dialog.c:388 ../src/empathy-call-window.c:1258 msgid "Connecting…" msgstr "Connessione..." -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:429 #, c-format msgid "Offline — %s" msgstr "Fuori rete — %s" # (ndt) plurale per comprendere uomini e donne -#: ../src/empathy-accounts-dialog.c:457 +#: ../src/empathy-accounts-dialog.c:441 #, c-format msgid "Disconnected — %s" msgstr "Disconnessi — %s" -#: ../src/empathy-accounts-dialog.c:468 +#: ../src/empathy-accounts-dialog.c:452 msgid "Offline — No Network Connection" msgstr "Fuori rete — Nessuna connessione di rete" -#: ../src/empathy-accounts-dialog.c:475 +#: ../src/empathy-accounts-dialog.c:459 msgid "Unknown Status" msgstr "Stato sconosciuto" -#: ../src/empathy-accounts-dialog.c:492 +#: ../src/empathy-accounts-dialog.c:476 msgid "" "This account has been disabled because it relies on an old, unsupported " "backend. Please install telepathy-haze and restart your session to migrate " @@ -3213,29 +3212,29 @@ msgstr "" "supportato. Installare «telepathy-haze» e riavviare la sessione o migrare " "l'account." -#: ../src/empathy-accounts-dialog.c:502 +#: ../src/empathy-accounts-dialog.c:486 msgid "Offline — Account Disabled" msgstr "Fuori rete — Account disabilitato" -#: ../src/empathy-accounts-dialog.c:608 +#: ../src/empathy-accounts-dialog.c:592 msgid "Edit Connection Parameters" msgstr "Modifica parametri connessione" -#: ../src/empathy-accounts-dialog.c:735 +#: ../src/empathy-accounts-dialog.c:719 msgid "_Edit Connection Parameters..." msgstr "_Modifica parametri connessione..." -#: ../src/empathy-accounts-dialog.c:1268 +#: ../src/empathy-accounts-dialog.c:1252 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Rimuovere «%s» dal computer?" -#: ../src/empathy-accounts-dialog.c:1272 +#: ../src/empathy-accounts-dialog.c:1256 msgid "This will not remove your account on the server." msgstr "Questo non rimuoverà l'account dal server." # (ndt) messo scartate perché il pulsante nella finestra è "Scarta" -#: ../src/empathy-accounts-dialog.c:1477 +#: ../src/empathy-accounts-dialog.c:1461 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3244,25 +3243,25 @@ msgstr "" "effettuate verranno scartate. Procedere veramente?" #. Menu item: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1668 +#: ../src/empathy-accounts-dialog.c:1652 msgid "_Enabled" msgstr "_Abilitato" #. Menu item: Rename -#: ../src/empathy-accounts-dialog.c:1691 +#: ../src/empathy-accounts-dialog.c:1675 msgid "Rename" msgstr "Rinomina" -#: ../src/empathy-accounts-dialog.c:2107 +#: ../src/empathy-accounts-dialog.c:2091 msgid "_Skip" msgstr "_Salta" -#: ../src/empathy-accounts-dialog.c:2111 +#: ../src/empathy-accounts-dialog.c:2095 msgid "_Connect" msgstr "_Connetti" # (ndt) messo scartate perché il pulsante nella finestra è "Scarta" -#: ../src/empathy-accounts-dialog.c:2290 +#: ../src/empathy-accounts-dialog.c:2274 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3271,7 +3270,7 @@ msgstr "" "effettuate verranno scartate. Procedere veramente?" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:2433 +#: ../src/empathy-accounts-dialog.c:2417 msgid "Messaging and VoIP Accounts" msgstr "Account di messaggistica e VoIP" @@ -3296,33 +3295,33 @@ msgstr "" msgid "No protocol backends installed" msgstr "Nessun protocollo installato" -#: ../src/empathy-auth-client.c:296 +#: ../src/empathy-auth-client.c:285 msgid " - Empathy authentication client" msgstr " - Client autenticazione Empathy" -#: ../src/empathy-auth-client.c:312 +#: ../src/empathy-auth-client.c:301 msgid "Empathy authentication client" msgstr "Client autenticazione Empathy" # (ndt) opzione -#: ../src/empathy.c:427 +#: ../src/empathy.c:407 msgid "Don't connect on startup" msgstr "Non connettere all'avvio" # (ndt) opzione -#: ../src/empathy.c:431 +#: ../src/empathy.c:411 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Non mostrare l'elenco contatti o qualsiasi altro dialogo all'avvio" -#: ../src/empathy.c:447 +#: ../src/empathy.c:440 msgid "- Empathy IM Client" msgstr "- Messaggistica istantanea Empathy" -#: ../src/empathy.c:623 +#: ../src/empathy.c:626 msgid "Error contacting the Account Manager" msgstr "Errore nel contattare il gestore di account" -#: ../src/empathy.c:625 +#: ../src/empathy.c:628 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3334,107 +3333,107 @@ msgstr "" "account Telepathy:\n" "%s" -#: ../src/empathy-call.c:124 +#: ../src/empathy-call.c:115 msgid "In a call" msgstr "Chiamata in corso" -#: ../src/empathy-call.c:224 +#: ../src/empathy-call.c:215 msgid "- Empathy Audio/Video Client" msgstr "- Client audio/video Empathy" -#: ../src/empathy-call.c:248 +#: ../src/empathy-call.c:239 msgid "Empathy Audio/Video Client" msgstr "Client audio/video Empathy" -#: ../src/empathy-call-observer.c:119 +#: ../src/empathy-call-observer.c:110 #, c-format msgid "%s just tried to call you, but you were in another call." msgstr "%s ha appena cercato di chiamare, ma era in corso un'altra chiamata." -#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508 +#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500 msgid "Incoming call" msgstr "Chiamata in arrivo" -#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming video call from %s" msgstr "Chiamata video in arrivo da %s" -#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516 -#: ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming call from %s" msgstr "Chiamata in arrivo da %s" -#: ../src/empathy-call-window.c:1564 -#: ../src/empathy-notifications-approver.c:197 +#: ../src/empathy-call-window.c:1543 +#: ../src/empathy-notifications-approver.c:191 msgid "Reject" msgstr "Rifiuta" -#: ../src/empathy-call-window.c:1565 -#: ../src/empathy-notifications-approver.c:202 -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-call-window.c:1544 +#: ../src/empathy-notifications-approver.c:196 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer" msgstr "Rispondi" # (ndt) quello che c'è dopo è il nome del contatto #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:1934 +#: ../src/empathy-call-window.c:1913 #, c-format msgid "Call with %s" msgstr "Chiamata con %s" -#: ../src/empathy-call-window.c:2186 +#: ../src/empathy-call-window.c:2165 msgid "The IP address as seen by the machine" msgstr "L'indirizzo IP visto dal computer" -#: ../src/empathy-call-window.c:2188 +#: ../src/empathy-call-window.c:2167 msgid "The IP address as seen by a server on the Internet" msgstr "L'indirizzo IP visto da un server su Internet" # (ndt) il lato oscuro... questa è interessante e da rivedere -#: ../src/empathy-call-window.c:2190 +#: ../src/empathy-call-window.c:2169 msgid "The IP address of the peer as seen by the other side" msgstr "L'indirizzo IP del nodo visto dall'altro lato" -#: ../src/empathy-call-window.c:2192 +#: ../src/empathy-call-window.c:2171 msgid "The IP address of a relay server" msgstr "L'indirizzo IP di un relay server" -#: ../src/empathy-call-window.c:2194 +#: ../src/empathy-call-window.c:2173 msgid "The IP address of the multicast group" msgstr "L'indirizzo IP del gruppo multicast" -#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606 -#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608 +#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585 +#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587 #: ../src/empathy-call-window.ui.h:28 msgid "Unknown" msgstr "Sconosciuto" -#: ../src/empathy-call-window.c:2966 +#: ../src/empathy-call-window.c:2946 msgid "On hold" msgstr "In attesa" -#: ../src/empathy-call-window.c:2970 +#: ../src/empathy-call-window.c:2950 msgid "Mute" msgstr "Muto" -#: ../src/empathy-call-window.c:2972 +#: ../src/empathy-call-window.c:2952 msgid "Duration" msgstr "Durata" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2975 +#: ../src/empathy-call-window.c:2955 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d.%02dm" -#: ../src/empathy-call-window.c:3071 +#: ../src/empathy-call-window.c:3051 msgid "Technical Details" msgstr "Dettagli tecnici" -#: ../src/empathy-call-window.c:3110 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3443,7 +3442,7 @@ msgstr "" "Il programma di %s non è in grado di comprendere alcuno dei formati audio " "supportati da questo computer" -#: ../src/empathy-call-window.c:3115 +#: ../src/empathy-call-window.c:3095 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3452,7 +3451,7 @@ msgstr "" "Il programma di %s non è in grado di comprendere alcuno dei formati video " "supportati da questo computer" -#: ../src/empathy-call-window.c:3121 +#: ../src/empathy-call-window.c:3101 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3461,23 +3460,23 @@ msgstr "" "Impossibile stabilire una connessione con %s. Si potrebbe essere collegati a " "una rete che non supporta connessioni dirette." -#: ../src/empathy-call-window.c:3127 +#: ../src/empathy-call-window.c:3107 msgid "There was a failure on the network" msgstr "Si è verificato un problema sulla rete" # (ndt) eliminato volutamente il riferimento a computer -#: ../src/empathy-call-window.c:3131 +#: ../src/empathy-call-window.c:3111 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "I formati audio necessari per eseguire la chiamata non sono installati" # (ndt) eliminato volutamente il riferimento a computer -#: ../src/empathy-call-window.c:3134 +#: ../src/empathy-call-window.c:3114 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "I formati video necessari per eseguire la chiamata non sono installati" -#: ../src/empathy-call-window.c:3146 +#: ../src/empathy-call-window.c:3126 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3488,32 +3487,32 @@ msgstr "" "\"%s\">Segnalare un problema</a> e allegare le informazioni raccolte " "attraverso l'azione «Debug» presente nel menù «Aiuto»." -#: ../src/empathy-call-window.c:3155 +#: ../src/empathy-call-window.c:3135 msgid "There was a failure in the call engine" msgstr "Si è verificato un problema nel motore delle chiamate" -#: ../src/empathy-call-window.c:3158 +#: ../src/empathy-call-window.c:3138 msgid "The end of the stream was reached" msgstr "Raggiunta la fine del flusso" -#: ../src/empathy-call-window.c:3198 +#: ../src/empathy-call-window.c:3178 msgid "Can't establish audio stream" msgstr "Impossibile stabilire il flusso audio" -#: ../src/empathy-call-window.c:3208 +#: ../src/empathy-call-window.c:3188 msgid "Can't establish video stream" msgstr "Impossibile stabilire il flusso video" -#: ../src/empathy-call-window.c:3245 +#: ../src/empathy-call-window.c:3225 #, c-format msgid "Your current balance is %s." msgstr "Il saldo attuale è di %s." -#: ../src/empathy-call-window.c:3249 +#: ../src/empathy-call-window.c:3229 msgid "Sorry, you don’t have enough credit for that call." msgstr "Saldo non sufficiente per effettuare la chiamata." -#: ../src/empathy-call-window.c:3251 +#: ../src/empathy-call-window.c:3231 msgid "Top Up" msgstr "Ricarica" @@ -3634,20 +3633,20 @@ msgstr "Candidato locale:" msgid "Audio" msgstr "Audio" -#: ../src/empathy-chat.c:104 +#: ../src/empathy-chat.c:101 msgid "- Empathy Chat Client" msgstr "- Client chat Empathy" -#: ../src/empathy-chatrooms-window.c:251 +#: ../src/empathy-chatrooms-window.c:243 msgid "Name" msgstr "Nome" -#: ../src/empathy-chatrooms-window.c:269 +#: ../src/empathy-chatrooms-window.c:261 msgid "Room" msgstr "Stanza" # (ndt) dovrebbe essere il nome di una colonna -#: ../src/empathy-chatrooms-window.c:277 +#: ../src/empathy-chatrooms-window.c:269 msgid "Auto-Connect" msgstr "Connessione automatica" @@ -3656,11 +3655,11 @@ msgstr "Connessione automatica" msgid "Manage Favorite Rooms" msgstr "Gestione stanze preferite" -#: ../src/empathy-chat-window.c:287 +#: ../src/empathy-chat-window.c:275 msgid "Close this window?" msgstr "Chiudere la finestra?" -#: ../src/empathy-chat-window.c:293 +#: ../src/empathy-chat-window.c:281 #, c-format msgid "" "Closing this window will leave %s. You will not receive any further messages " @@ -3669,7 +3668,7 @@ msgstr "" "Chiudendo questa finestra, il canale %s verrà abbandonato. Per ricevere " "nuovi messaggi, entrare nuovamente nel canale." -#: ../src/empathy-chat-window.c:306 +#: ../src/empathy-chat-window.c:294 #, c-format msgid "" "Closing this window will leave a chat room. You will not receive any further " @@ -3684,65 +3683,65 @@ msgstr[1] "" "Chiudendo questa finestra verranno abbandonate %u stanze di conversazione. " "Per ricevere nuovi messaggi, entrare nuovamente nelle stanze." -#: ../src/empathy-chat-window.c:317 +#: ../src/empathy-chat-window.c:305 #, c-format msgid "Leave %s?" msgstr "Uscire da %s?" -#: ../src/empathy-chat-window.c:319 +#: ../src/empathy-chat-window.c:307 msgid "" "You will not receive any further messages from this chat room until you " "rejoin it." msgstr "Per ricevere nuovi messaggi, entrare nuovamente nella stanza." -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Close window" msgstr "Chiudi finestra" -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Leave room" msgstr "Lascia stanza" -#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700 +#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d non letto)" msgstr[1] "%s (%d non letti)" -#: ../src/empathy-chat-window.c:692 +#: ../src/empathy-chat-window.c:680 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (e %u altro)" msgstr[1] "%s (e %u altri)" -#: ../src/empathy-chat-window.c:708 +#: ../src/empathy-chat-window.c:696 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d non letto da altri)" msgstr[1] "%s (%d non letti da altri)" -#: ../src/empathy-chat-window.c:717 +#: ../src/empathy-chat-window.c:705 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d non letto da tutti)" msgstr[1] "%s (%d non letti da tutti)" -#: ../src/empathy-chat-window.c:954 +#: ../src/empathy-chat-window.c:942 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:962 +#: ../src/empathy-chat-window.c:950 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "Invio di %d messaggio in corso" msgstr[1] "Invio di %d messaggi in corso" -#: ../src/empathy-chat-window.c:982 +#: ../src/empathy-chat-window.c:970 msgid "Typing a message." msgstr "Scrittura messaggio." @@ -3807,75 +3806,75 @@ msgstr "Sposta scheda a _destra" msgid "_Detach Tab" msgstr "Dist_acca scheda" -#: ../src/empathy-debugger.c:69 +#: ../src/empathy-debugger.c:77 msgid "Show a particular service" msgstr "Mostra un servizio particolare" -#: ../src/empathy-debugger.c:74 +#: ../src/empathy-debugger.c:82 msgid "- Empathy Debugger" msgstr "- Debugger Empathy" -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:142 msgid "Empathy Debugger" msgstr "Debugger Empathy" -#: ../src/empathy-debug-window.c:1599 +#: ../src/empathy-debug-window.c:1589 msgid "Save" msgstr "Salva" -#: ../src/empathy-debug-window.c:1659 +#: ../src/empathy-debug-window.c:1649 msgid "Pastebin link" msgstr "Collegamento Pastebin" -#: ../src/empathy-debug-window.c:1668 +#: ../src/empathy-debug-window.c:1658 msgid "Pastebin response" msgstr "Risposta Pastebin" -#: ../src/empathy-debug-window.c:1675 +#: ../src/empathy-debug-window.c:1665 msgid "Data too large for a single paste. Please save logs to file." msgstr "Troppi dati per una singola operazione. Salvare i registri su file." -#: ../src/empathy-debug-window.c:1857 +#: ../src/empathy-debug-window.c:1847 msgid "Debug Window" msgstr "Finestra di debug" -#: ../src/empathy-debug-window.c:1917 +#: ../src/empathy-debug-window.c:1907 msgid "Send to pastebin" msgstr "Invia a Pastebin" -#: ../src/empathy-debug-window.c:1961 +#: ../src/empathy-debug-window.c:1951 msgid "Pause" msgstr "Pausa" -#: ../src/empathy-debug-window.c:1973 +#: ../src/empathy-debug-window.c:1963 msgid "Level " msgstr "Livello " -#: ../src/empathy-debug-window.c:1992 +#: ../src/empathy-debug-window.c:1982 msgid "Debug" msgstr "Debug" -#: ../src/empathy-debug-window.c:1997 +#: ../src/empathy-debug-window.c:1987 msgid "Info" msgstr "Informazioni" -#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077 +#: ../src/empathy-debug-window.c:1992 ../src/empathy-debug-window.c:2067 msgid "Message" msgstr "Messaggio" -#: ../src/empathy-debug-window.c:2007 +#: ../src/empathy-debug-window.c:1997 msgid "Warning" msgstr "Avviso" -#: ../src/empathy-debug-window.c:2012 +#: ../src/empathy-debug-window.c:2002 msgid "Critical" msgstr "Critico" -#: ../src/empathy-debug-window.c:2017 +#: ../src/empathy-debug-window.c:2007 msgid "Error" msgstr "Errore" -#: ../src/empathy-debug-window.c:2030 +#: ../src/empathy-debug-window.c:2020 msgid "" "Even if they don't display passwords, logs can contain sensitive information " "such as your list of contacts or the messages you recently sent or " @@ -3894,23 +3893,23 @@ msgstr "" "\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">segnalazione</" "a>." -#: ../src/empathy-debug-window.c:2062 +#: ../src/empathy-debug-window.c:2052 msgid "Time" msgstr "Orario" -#: ../src/empathy-debug-window.c:2065 +#: ../src/empathy-debug-window.c:2055 msgid "Domain" msgstr "Dominio" -#: ../src/empathy-debug-window.c:2068 +#: ../src/empathy-debug-window.c:2058 msgid "Category" msgstr "Categoria" -#: ../src/empathy-debug-window.c:2071 +#: ../src/empathy-debug-window.c:2061 msgid "Level" msgstr "Livello" -#: ../src/empathy-debug-window.c:2100 +#: ../src/empathy-debug-window.c:2090 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -3918,71 +3917,71 @@ msgstr "" "Il gestore di connessione selezionato non sembra supportare l'estensione per " "il debug remoto." -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:500 msgid "Incoming video call" msgstr "Chiamata video in arrivo" -#: ../src/empathy-event-manager.c:512 +#: ../src/empathy-event-manager.c:504 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s sta video-chiamando, rispondere?" -#: ../src/empathy-event-manager.c:513 +#: ../src/empathy-event-manager.c:505 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s sta chiamando, rispondere?" -#: ../src/empathy-event-manager.c:541 +#: ../src/empathy-event-manager.c:533 msgid "_Reject" msgstr "Ri_fiuta" -#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549 msgid "_Answer" msgstr "_Rispondi" -#: ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:549 msgid "_Answer with video" msgstr "Rispondi con _video" -#: ../src/empathy-event-manager.c:712 +#: ../src/empathy-event-manager.c:704 msgid "Room invitation" msgstr "Invito in una stanza" -#: ../src/empathy-event-manager.c:714 +#: ../src/empathy-event-manager.c:706 #, c-format msgid "Invitation to join %s" msgstr "Invito per entrare in %s" -#: ../src/empathy-event-manager.c:721 +#: ../src/empathy-event-manager.c:713 #, c-format msgid "%s is inviting you to join %s" msgstr "%s sta inviando un invito per entrare in %s" # (ndt) pulsante -#: ../src/empathy-event-manager.c:734 +#: ../src/empathy-event-manager.c:726 msgid "_Join" msgstr "_Entra" -#: ../src/empathy-event-manager.c:760 +#: ../src/empathy-event-manager.c:752 #, c-format msgid "%s invited you to join %s" msgstr "C'è un invito per entrare in %2$s da parte di %1$s" -#: ../src/empathy-event-manager.c:766 +#: ../src/empathy-event-manager.c:758 #, c-format msgid "You have been invited to join %s" msgstr "C'è un invito per entrare in %s" -#: ../src/empathy-event-manager.c:945 +#: ../src/empathy-event-manager.c:937 #, c-format msgid "Incoming file transfer from %s" msgstr "Trasferimento file in arrivo da %s" -#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227 +#: ../src/empathy-event-manager.c:965 ../src/empathy-roster-window.c:212 msgid "Password required" msgstr "Password richiesta" -#: ../src/empathy-event-manager.c:1110 +#: ../src/empathy-event-manager.c:1102 #, c-format msgid "" "\n" @@ -3992,105 +3991,105 @@ msgstr "" "Messaggio: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:99 +#: ../src/empathy-ft-manager.c:93 #, 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 +#: ../src/empathy-ft-manager.c:96 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:178 +#: ../src/empathy-ft-manager.c:172 msgctxt "file transfer percent" msgid "Unknown" msgstr "Sconosciuta" -#: ../src/empathy-ft-manager.c:273 +#: ../src/empathy-ft-manager.c:267 #, c-format msgid "%s of %s at %s/s" msgstr "%s di %s a %s/s" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:268 #, c-format msgid "%s of %s" msgstr "%s di %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:305 +#: ../src/empathy-ft-manager.c:299 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Ricezione del file «%s» da %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:308 +#: ../src/empathy-ft-manager.c:302 #, c-format msgid "Sending \"%s\" to %s" msgstr "Invio del file «%s» a %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:338 +#: ../src/empathy-ft-manager.c:332 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Errore nel ricevere il file «%s» da %s" -#: ../src/empathy-ft-manager.c:341 +#: ../src/empathy-ft-manager.c:335 msgid "Error receiving a file" msgstr "Errore nel ricevere un file" -#: ../src/empathy-ft-manager.c:346 +#: ../src/empathy-ft-manager.c:340 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Errore nell'inviare il file «%s» a %s" -#: ../src/empathy-ft-manager.c:349 +#: ../src/empathy-ft-manager.c:343 msgid "Error sending a file" msgstr "Errore nell'inviare un file" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:488 +#: ../src/empathy-ft-manager.c:482 #, c-format msgid "\"%s\" received from %s" msgstr "File «%s» ricevuto da %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:493 +#: ../src/empathy-ft-manager.c:487 #, c-format msgid "\"%s\" sent to %s" msgstr "File «%s» inviato a %s" -#: ../src/empathy-ft-manager.c:496 +#: ../src/empathy-ft-manager.c:490 msgid "File transfer completed" msgstr "Trasferimento file completato" -#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 +#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773 msgid "Waiting for the other participant's response" msgstr "Attesa della risposta dell'altro utente" -#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 +#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Verifica dell'integrità del file «%s»" -#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 +#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676 #, c-format msgid "Hashing \"%s\"" msgstr "Calcolo codice di controllo di «%s»" -#: ../src/empathy-ft-manager.c:1025 +#: ../src/empathy-ft-manager.c:1019 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1037 +#: ../src/empathy-ft-manager.c:1031 msgid "File" msgstr "File" -#: ../src/empathy-ft-manager.c:1059 +#: ../src/empathy-ft-manager.c:1053 msgid "Remaining" msgstr "Restante" @@ -4106,11 +4105,11 @@ msgstr "" "riusciti" # (ndt) nome di una colonna -#: ../src/empathy-import-dialog.c:76 +#: ../src/empathy-import-dialog.c:70 msgid "_Import" msgstr "_Importa" -#: ../src/empathy-import-dialog.c:88 +#: ../src/empathy-import-dialog.c:82 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -4119,53 +4118,53 @@ msgstr "" "importare gli account solamente da Pidgin." # (ndt) titolo -#: ../src/empathy-import-dialog.c:209 +#: ../src/empathy-import-dialog.c:203 msgid "Import Accounts" msgstr "Importa account" # (ndt) nome di una colonna #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:302 +#: ../src/empathy-import-widget.c:296 msgid "Import" msgstr "Importa" -#: ../src/empathy-import-widget.c:311 +#: ../src/empathy-import-widget.c:305 msgid "Protocol" msgstr "Protocollo" -#: ../src/empathy-import-widget.c:335 +#: ../src/empathy-import-widget.c:329 msgid "Source" msgstr "Sorgente" -#: ../src/empathy-invite-participant-dialog.c:201 -#: ../src/empathy-invite-participant-dialog.c:229 +#: ../src/empathy-invite-participant-dialog.c:196 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite Participant" msgstr "Invita partecipante" -#: ../src/empathy-invite-participant-dialog.c:202 +#: ../src/empathy-invite-participant-dialog.c:197 msgid "Choose a contact to invite into the conversation:" msgstr "Scegliere un contatto da invitare nella conversazione:" -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:220 msgid "Invite" msgstr "Invita" # (ndt) pare il titolo di una colonna -#: ../src/empathy-new-chatroom-dialog.c:194 +#: ../src/empathy-new-chatroom-dialog.c:184 msgid "Chat Room" msgstr "Stanza" # (ndt) titolo scheda -#: ../src/empathy-new-chatroom-dialog.c:209 +#: ../src/empathy-new-chatroom-dialog.c:199 msgid "Members" msgstr "Membri" # (ndt) un po' libera -#: ../src/empathy-new-chatroom-dialog.c:410 +#: ../src/empathy-new-chatroom-dialog.c:400 msgid "Failed to list rooms" msgstr "Recupero elenco delle stanze non riuscito" -#: ../src/empathy-new-chatroom-dialog.c:439 +#: ../src/empathy-new-chatroom-dialog.c:435 #, c-format msgid "" "%s\n" @@ -4178,17 +4177,17 @@ msgstr "" "Password richiesta: %s\n" "Membri: %s" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:437 +#: ../src/empathy-new-chatroom-dialog.c:438 msgid "Yes" msgstr "Sì" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:437 +#: ../src/empathy-new-chatroom-dialog.c:438 msgid "No" msgstr "No" -#: ../src/empathy-new-chatroom-dialog.c:784 +#: ../src/empathy-new-chatroom-dialog.c:789 msgid "Join Room" msgstr "Entra nella stanza" @@ -4231,106 +4230,106 @@ msgstr "Impossibile caricare l'elenco delle stanze" msgid "Room List" msgstr "Elenco stanze" -#: ../src/empathy-notifications-approver.c:188 +#: ../src/empathy-notifications-approver.c:182 msgid "Respond" msgstr "Rispondi" -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer with video" msgstr "Rispondi con video" -#: ../src/empathy-notifications-approver.c:215 -#: ../src/empathy-notifications-approver.c:225 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:219 msgid "Decline" msgstr "Declina" -#: ../src/empathy-notifications-approver.c:219 -#: ../src/empathy-notifications-approver.c:230 +#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:224 msgid "Accept" msgstr "Accetta" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:240 +#: ../src/empathy-notifications-approver.c:234 msgid "Provide" msgstr "Fornisce" # (ndt) quelli che seguono sono # messaggi di eventi a cui associare un suono -#: ../src/empathy-preferences.c:143 +#: ../src/empathy-preferences.c:134 msgid "Message received" msgstr "Messaggio ricevuto" -#: ../src/empathy-preferences.c:144 +#: ../src/empathy-preferences.c:135 msgid "Message sent" msgstr "Messaggio inviato" -#: ../src/empathy-preferences.c:145 +#: ../src/empathy-preferences.c:136 msgid "New conversation" msgstr "Nuova conversazione" -#: ../src/empathy-preferences.c:146 +#: ../src/empathy-preferences.c:137 msgid "Contact comes online" msgstr "Il contatto entra in rete" -#: ../src/empathy-preferences.c:147 +#: ../src/empathy-preferences.c:138 msgid "Contact goes offline" msgstr "Il contatto va fuori rete" -#: ../src/empathy-preferences.c:148 +#: ../src/empathy-preferences.c:139 msgid "Account connected" msgstr "Account connesso" -#: ../src/empathy-preferences.c:149 +#: ../src/empathy-preferences.c:140 msgid "Account disconnected" msgstr "Account disconnesso" -#: ../src/empathy-preferences.c:386 +#: ../src/empathy-preferences.c:377 msgid "Language" msgstr "Lingua" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:637 +#: ../src/empathy-preferences.c:628 msgid "Juliet" msgstr "Giulietta" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:644 +#: ../src/empathy-preferences.c:635 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:650 +#: ../src/empathy-preferences.c:641 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "O Romeo, Romeo, perché sei tu Romeo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:654 +#: ../src/empathy-preferences.c:645 msgid "Deny thy father and refuse thy name;" msgstr "Rinnega tuo padre e rifiuta il tuo nome;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:657 +#: ../src/empathy-preferences.c:648 msgid "Or if thou wilt not, be but sworn my love" msgstr "o, se non vuoi, legati solo in giuramento all'amor mio" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:660 +#: ../src/empathy-preferences.c:651 msgid "And I'll no longer be a Capulet." msgstr "e io non sarò più una Capuleti." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:663 +#: ../src/empathy-preferences.c:654 msgid "Shall I hear more, or shall I speak at this?" msgstr "Starò ancora ad ascoltare, o rispondo a questo che ha detto?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:666 +#: ../src/empathy-preferences.c:657 msgid "Juliet has disconnected" msgstr "L'utente Giulietta si è disconnesso" -#: ../src/empathy-preferences.c:1032 +#: ../src/empathy-preferences.c:1023 msgid "Preferences" msgstr "Preferenze" @@ -4344,7 +4343,7 @@ msgstr "Mostrare i gruppi" msgid "Show account balances" msgstr "Mostrare i bilanci dell'account" -#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241 +#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2226 msgid "Contact List" msgstr "Elenco contatti" @@ -4451,10 +4450,9 @@ msgid "" "off and restarting the call." msgstr "" "La soppressione dell'eco consente di rendere la propria voce più chiara, ma " -"potrebbe causare alcuni problemi. Se vengono uditi strani suoni o rumori " -"statici localmente o anche dall'altra persona con cui si ha una " -"conversazione, provare a disabilitare la soppressione dell'eco e riavviare " -"la chiamata." +"potrebbe causare alcuni problemi. Se vengono uditi strani suoni o disturbi " +"localmente o anche dall'altra persona con cui si ha una conversazione, " +"provare a disabilitare la soppressione dell'eco e riavviare la chiamata." # (ndt) opzione #: ../src/empathy-preferences.ui.h:30 @@ -4528,91 +4526,91 @@ msgid "Themes" msgstr "Temi" # (ndt) pare tooltip... mah... -#: ../src/empathy-roster-window.c:244 +#: ../src/empathy-roster-window.c:229 msgid "Provide Password" msgstr "Fornisce password" # (ndt) tooltip -#: ../src/empathy-roster-window.c:250 +#: ../src/empathy-roster-window.c:235 msgid "Disconnect" msgstr "Disconnette" -#: ../src/empathy-roster-window.c:493 -msgid "You need to setup an account to see contacts here." +#: ../src/empathy-roster-window.c:478 +msgid "You need to set up an account to see contacts here." msgstr "È necessario configurare un account per poter visualizzare i contatti." -#: ../src/empathy-roster-window.c:569 +#: ../src/empathy-roster-window.c:554 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" "L'account «%s» non può essere utilizzato fino all'aggiornamento del software " "«%s»." -#: ../src/empathy-roster-window.c:670 +#: ../src/empathy-roster-window.c:655 msgid "Windows Live" msgstr "Windows Live" -#: ../src/empathy-roster-window.c:674 +#: ../src/empathy-roster-window.c:659 msgid "Facebook" msgstr "Facebook" #. translators: %s is an account name like 'Facebook' or 'Google Talk' -#: ../src/empathy-roster-window.c:689 +#: ../src/empathy-roster-window.c:674 #, c-format msgid "%s account requires authorisation" msgstr "L'account %s richiede l'autorizzazione" # (ndt) suggerimento -#: ../src/empathy-roster-window.c:700 +#: ../src/empathy-roster-window.c:685 msgid "Online Accounts" msgstr "Account online" -#: ../src/empathy-roster-window.c:747 +#: ../src/empathy-roster-window.c:732 msgid "Update software..." msgstr "Aggiorna software..." # (ndt) suggerimento -#: ../src/empathy-roster-window.c:753 +#: ../src/empathy-roster-window.c:738 msgid "Reconnect" msgstr "Riconnette" # (ndt) suggerimento -#: ../src/empathy-roster-window.c:757 +#: ../src/empathy-roster-window.c:742 msgid "Edit Account" msgstr "Modifica account" # (ndt) suggerimento -#: ../src/empathy-roster-window.c:762 +#: ../src/empathy-roster-window.c:747 msgid "Close" msgstr "Chiude" -#: ../src/empathy-roster-window.c:904 +#: ../src/empathy-roster-window.c:889 msgid "Top up account" msgstr "Ricarica account" -#: ../src/empathy-roster-window.c:1590 +#: ../src/empathy-roster-window.c:1575 msgid "You need to enable one of your accounts to see contacts here." msgstr "È necessario abilitare uno degli account per visualizzare i contatti." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:1598 +#: ../src/empathy-roster-window.c:1583 #, c-format msgid "You need to enable %s to see contacts here." msgstr "È necessario abilitare «%s» per visualizzare i contatti." -#: ../src/empathy-roster-window.c:1676 +#: ../src/empathy-roster-window.c:1661 msgid "Change your presence to see contacts here" msgstr "Modificare la propria presenza per visualizzare i contatti" -#: ../src/empathy-roster-window.c:1685 +#: ../src/empathy-roster-window.c:1670 msgid "No match found" msgstr "Nessun risultato" -#: ../src/empathy-roster-window.c:1692 +#: ../src/empathy-roster-window.c:1677 msgid "You haven't added any contact yet" msgstr "Non è stato aggiunto ancora alcun contatto" -#: ../src/empathy-roster-window.c:1695 +#: ../src/empathy-roster-window.c:1680 msgid "No online contacts" msgstr "Nessun contatto collegato" @@ -4714,12 +4712,12 @@ msgstr "Nuova c_hiamata..." msgid "Status" msgstr "Stato" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126 msgid "Done" msgstr "Fatto" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214 msgid "Please enter your account details" msgstr "Inserire i dettagli dell'account" @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: empathy 3.7.x\n" +"Project-Id-Version: empathy 3.9.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-07 11:29+0100\n" -"PO-Revision-Date: 2013-01-07 11:30+0100\n" +"POT-Creation-Date: 2013-06-20 10:32+0200\n" +"PO-Revision-Date: 2013-06-20 10:32+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian bokmÃ¥l <i18n-nb@lister.ping.uio.no>\n" "Language: no\n" @@ -479,259 +479,259 @@ msgid "" msgstr "" "Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn." -#: ../libempathy/empathy-ft-handler.c:733 +#: ../libempathy/empathy-ft-handler.c:732 msgid "No reason was specified" msgstr "Ingen Ã¥rsak oppgitt" -#: ../libempathy/empathy-ft-handler.c:736 +#: ../libempathy/empathy-ft-handler.c:735 msgid "The change in state was requested" msgstr "Tilstandsendring ble etterspurt" -#: ../libempathy/empathy-ft-handler.c:739 +#: ../libempathy/empathy-ft-handler.c:738 msgid "You canceled the file transfer" msgstr "Du avbrøt filoverføringen" -#: ../libempathy/empathy-ft-handler.c:742 +#: ../libempathy/empathy-ft-handler.c:741 msgid "The other participant canceled the file transfer" msgstr "Avsender avbrøt filoverføringen" -#: ../libempathy/empathy-ft-handler.c:745 +#: ../libempathy/empathy-ft-handler.c:744 msgid "Error while trying to transfer the file" msgstr "Feil under overføring av filen" -#: ../libempathy/empathy-ft-handler.c:748 +#: ../libempathy/empathy-ft-handler.c:747 msgid "The other participant is unable to transfer the file" msgstr "Avsender kan ikke overføre filen" -#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:295 msgid "Unknown reason" msgstr "Ukjent Ã¥rsak" -#: ../libempathy/empathy-ft-handler.c:914 +#: ../libempathy/empathy-ft-handler.c:913 msgid "File transfer completed, but the file was corrupted" msgstr "Filoverføring fullført, men filen ble korrupt" -#: ../libempathy/empathy-ft-handler.c:1200 +#: ../libempathy/empathy-ft-handler.c:1199 msgid "File transfer not supported by remote contact" msgstr "Filoverføring støttes ikke av ekstern kontakt" -#: ../libempathy/empathy-ft-handler.c:1256 +#: ../libempathy/empathy-ft-handler.c:1255 msgid "The selected file is not a regular file" msgstr "Valgt fil er ikke en vanlig fil" -#: ../libempathy/empathy-ft-handler.c:1265 +#: ../libempathy/empathy-ft-handler.c:1264 msgid "The selected file is empty" msgstr "Valgt fil er tom" -#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194 +#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184 msgid "Password not found" msgstr "Passordet ble ikke funnet" -#: ../libempathy/empathy-keyring.c:594 +#: ../libempathy/empathy-keyring.c:584 #, c-format msgid "IM account password for %s (%s)" msgstr "Passord for lynmeldingskonto for %s (%s)" -#: ../libempathy/empathy-keyring.c:631 +#: ../libempathy/empathy-keyring.c:621 #, c-format msgid "Password for chatroom '%s' on account %s (%s)" msgstr "Passord for praterom «%s» pÃ¥ konto %s (%s)" -#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116 +#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107 #, c-format msgid "Missed call from %s" msgstr "Tapt anrop fra %s" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:407 +#: ../libempathy/empathy-message.c:406 #, c-format msgid "Called %s" msgstr "Samtale med %s" -#: ../libempathy/empathy-message.c:410 +#: ../libempathy/empathy-message.c:409 #, c-format msgid "Call from %s" msgstr "Samtale fra %s" -#: ../libempathy/empathy-time.c:90 +#: ../libempathy/empathy-time.c:86 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" msgstr[0] "%d sekund siden" msgstr[1] "%d sekunder siden" -#: ../libempathy/empathy-time.c:96 +#: ../libempathy/empathy-time.c:92 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" msgstr[0] "%d minutt siden" msgstr[1] "%d minutter siden" -#: ../libempathy/empathy-time.c:102 +#: ../libempathy/empathy-time.c:98 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" msgstr[0] "%d time siden" msgstr[1] "%d timer siden" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:104 #, c-format msgid "%d day ago" msgid_plural "%d days ago" msgstr[0] "%d dag siden" msgstr[1] "%d dager siden" -#: ../libempathy/empathy-time.c:114 +#: ../libempathy/empathy-time.c:110 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" msgstr[0] "%d uke siden" msgstr[1] "%d uker siden" -#: ../libempathy/empathy-time.c:120 +#: ../libempathy/empathy-time.c:116 #, c-format msgid "%d month ago" msgid_plural "%d months ago" msgstr[0] "%d mÃ¥ned siden" msgstr[1] "%d mÃ¥neder siden" -#: ../libempathy/empathy-time.c:142 +#: ../libempathy/empathy-time.c:138 msgid "in the future" msgstr "i fremtiden" -#: ../libempathy/empathy-utils.c:226 +#: ../libempathy/empathy-utils.c:215 msgid "Available" msgstr "Tilgjengelig" -#: ../libempathy/empathy-utils.c:228 +#: ../libempathy/empathy-utils.c:217 msgid "Busy" msgstr "Opptatt" -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:220 msgid "Away" msgstr "Borte" -#: ../libempathy/empathy-utils.c:233 +#: ../libempathy/empathy-utils.c:222 msgid "Invisible" msgstr "Usynlig" -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:224 msgid "Offline" msgstr "Frakoblet" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:238 +#: ../libempathy/empathy-utils.c:227 msgctxt "presence" msgid "Unknown" msgstr "Ukjent" -#: ../libempathy/empathy-utils.c:278 +#: ../libempathy/empathy-utils.c:267 msgid "No reason specified" msgstr "Ingen Ã¥rsak oppgitt" -#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:269 ../libempathy/empathy-utils.c:325 msgid "Status is set to offline" msgstr "Status er satt til frakoblet" -#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316 -#: ../libempathy-gtk/empathy-call-utils.c:47 -#: ../libempathy-gtk/empathy-new-message-dialog.c:80 +#: ../libempathy/empathy-utils.c:271 ../libempathy/empathy-utils.c:305 +#: ../libempathy-gtk/empathy-call-utils.c:41 +#: ../libempathy-gtk/empathy-new-message-dialog.c:70 msgid "Network error" msgstr "Nettverksfeil" -#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307 msgid "Authentication failed" msgstr "Autentiseringen feilet" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309 msgid "Encryption error" msgstr "Krypteringsfeil" -#: ../libempathy/empathy-utils.c:288 +#: ../libempathy/empathy-utils.c:277 msgid "Name in use" msgstr "Navn i bruk" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311 msgid "Certificate not provided" msgstr "Sertifikat ikke oppgitt" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313 msgid "Certificate untrusted" msgstr "Stoler ikke pÃ¥ sertifikat" -#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315 msgid "Certificate expired" msgstr "Sertifikat utgÃ¥tt" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317 msgid "Certificate not activated" msgstr "Sertifikat ikke aktivert" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:319 msgid "Certificate hostname mismatch" msgstr "Feil vertsnavn i forhold til sertifikat" -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:321 msgid "Certificate fingerprint mismatch" msgstr "Fingeravtrykk stemmer ikke for sertifikat" -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:323 msgid "Certificate self-signed" msgstr "Selvsignert sertifikat" -#: ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:293 msgid "Certificate error" msgstr "Sertifikatsfeil" -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption is not available" msgstr "Kryptering er ikke tilgjengelig" -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate is invalid" msgstr "Sertifikatet ikke ugyldig" -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:331 msgid "Connection has been refused" msgstr "Tilkobling nektes" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:333 msgid "Connection can't be established" msgstr "Tilkobling kan ikke etableres" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:335 msgid "Connection has been lost" msgstr "Tilkobling mistet" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:337 msgid "This account is already connected to the server" msgstr "Denne kontoen er allerede koblet til tjeneren" -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:339 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "" "Tilkoblingen er erstattet med en ny tilkobling som bruker samme ressurs" -#: ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:342 msgid "The account already exists on the server" msgstr "Kontoen eksisterer allerede pÃ¥ tjeneren" -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:344 msgid "Server is currently too busy to handle the connection" msgstr "Tjeneren er for opptatt til Ã¥ hÃ¥ndtere tilkoblingen" -#: ../libempathy/empathy-utils.c:357 +#: ../libempathy/empathy-utils.c:346 msgid "Certificate has been revoked" msgstr "Sertifikatet er trukket tilbake" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:348 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "Sertifikatet bruker en usikker cipher-algoritme eller er kryptografisk svakt" -#: ../libempathy/empathy-utils.c:362 +#: ../libempathy/empathy-utils.c:351 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -739,32 +739,32 @@ msgstr "" "Lengden pÃ¥ tjenersertifikatet eller dybden pÃ¥ sertifikatkjeden pÃ¥ tjeneren " "oversteg grensen som settes av kryptografibiblioteket" -#: ../libempathy/empathy-utils.c:366 +#: ../libempathy/empathy-utils.c:355 msgid "Your software is too old" msgstr "Programvaren din er for gammel" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:357 msgid "Internal error" msgstr "Intern feil" -#: ../libempathy/empathy-utils.c:497 -#: ../libempathy-gtk/empathy-roster-model.h:30 +#: ../libempathy/empathy-utils.c:486 +#: ../libempathy-gtk/empathy-roster-model.h:28 msgid "People Nearby" msgstr "Personer i nærheten" -#: ../libempathy/empathy-utils.c:502 +#: ../libempathy/empathy-utils.c:491 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:671 +#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:539 +#: ../libempathy/empathy-utils.c:528 msgid "Facebook Chat" msgstr "Facebook-prat" -#: ../libempathy-gtk/empathy-account-chooser.c:689 +#: ../libempathy-gtk/empathy-account-chooser.c:684 msgid "All accounts" msgstr "Alle kontoer" @@ -843,56 +843,56 @@ msgstr "HVa er ditt AIM-passord?" msgid "Remember Password" msgstr "Husk passord" -#: ../libempathy-gtk/empathy-account-widget.c:675 +#: ../libempathy-gtk/empathy-account-widget.c:668 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -#: ../src/empathy-import-widget.c:322 +#: ../src/empathy-import-widget.c:316 msgid "Account" msgstr "Konto" -#: ../libempathy-gtk/empathy-account-widget.c:676 +#: ../libempathy-gtk/empathy-account-widget.c:669 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Password" msgstr "Passord" -#: ../libempathy-gtk/empathy-account-widget.c:677 +#: ../libempathy-gtk/empathy-account-widget.c:670 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:511 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:498 msgid "Server" msgstr "Tjener" -#: ../libempathy-gtk/empathy-account-widget.c:678 +#: ../libempathy-gtk/empathy-account-widget.c:671 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:532 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:519 msgid "Port" msgstr "Port" -#: ../libempathy-gtk/empathy-account-widget.c:762 +#: ../libempathy-gtk/empathy-account-widget.c:755 #, c-format msgid "%s" msgstr "%s" -#: ../libempathy-gtk/empathy-account-widget.c:817 +#: ../libempathy-gtk/empathy-account-widget.c:810 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1429 +#: ../libempathy-gtk/empathy-account-widget.c:1422 msgid "Username:" msgstr "Brukernavn:" -#: ../libempathy-gtk/empathy-account-widget.c:1746 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "A_pply" msgstr "_Bruk" -#: ../libempathy-gtk/empathy-account-widget.c:1775 +#: ../libempathy-gtk/empathy-account-widget.c:1768 msgid "L_og in" msgstr "L_ogg inn" -#: ../libempathy-gtk/empathy-account-widget.c:1845 +#: ../libempathy-gtk/empathy-account-widget.c:1838 msgid "This account already exists on the server" msgstr "Denne kontoen eksisterer allerede pÃ¥ tjeneren" -#: ../libempathy-gtk/empathy-account-widget.c:1849 +#: ../libempathy-gtk/empathy-account-widget.c:1842 msgid "Create a new account on the server" msgstr "Lag en ny konto pÃ¥ tjeneren" @@ -901,19 +901,19 @@ msgstr "Lag en ny konto pÃ¥ tjeneren" #. * 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:2270 +#: ../libempathy-gtk/empathy-account-widget.c:2255 #, c-format msgid "%1$s on %2$s" msgstr "%1$s av %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:2296 +#: ../libempathy-gtk/empathy-account-widget.c:2281 #, c-format msgid "%s Account" msgstr "%s-konto" -#: ../libempathy-gtk/empathy-account-widget.c:2300 +#: ../libempathy-gtk/empathy-account-widget.c:2285 msgid "New account" msgstr "Ny konto" @@ -1136,32 +1136,32 @@ msgstr "Hva er din ID pÃ¥ Windows Live?" msgid "What is your Windows Live password?" msgstr "Hva er ditt passord for Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:207 -#: ../libempathy-gtk/empathy-account-widget-sip.c:240 +#: ../libempathy-gtk/empathy-account-widget-sip.c:198 +#: ../libempathy-gtk/empathy-account-widget-sip.c:231 msgid "Auto" msgstr "Auto" -#: ../libempathy-gtk/empathy-account-widget-sip.c:210 +#: ../libempathy-gtk/empathy-account-widget-sip.c:201 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:213 +#: ../libempathy-gtk/empathy-account-widget-sip.c:204 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:216 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 msgid "TLS" msgstr "TLS" -#: ../libempathy-gtk/empathy-account-widget-sip.c:245 +#: ../libempathy-gtk/empathy-account-widget-sip.c:236 msgid "Register" msgstr "Register" -#: ../libempathy-gtk/empathy-account-widget-sip.c:250 +#: ../libempathy-gtk/empathy-account-widget-sip.c:241 msgid "Options" msgstr "Alternativer" -#: ../libempathy-gtk/empathy-account-widget-sip.c:253 +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 msgid "None" msgstr "Ingen" @@ -1273,55 +1273,55 @@ msgstr "Hva er din Yahoo!-ID?" msgid "What is your Yahoo! password?" msgstr "Hva er ditt passord for Yahoo!?" -#: ../libempathy-gtk/empathy-avatar-chooser.c:545 -#: ../libempathy-gtk/empathy-avatar-chooser.c:630 +#: ../libempathy-gtk/empathy-avatar-chooser.c:539 +#: ../libempathy-gtk/empathy-avatar-chooser.c:624 msgid "Couldn't convert image" msgstr "Kunne ikke konvertere bilde" -#: ../libempathy-gtk/empathy-avatar-chooser.c:546 +#: ../libempathy-gtk/empathy-avatar-chooser.c:540 msgid "None of the accepted image formats are supported on your system" msgstr "Ingen av de godkjente bildeformatene støttes av ditt system" -#: ../libempathy-gtk/empathy-avatar-chooser.c:906 +#: ../libempathy-gtk/empathy-avatar-chooser.c:900 msgid "Couldn't save picture to file" msgstr "Kunne ikke lagre bilde til fil" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1030 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1024 msgid "Select Your Avatar Image" msgstr "Velg personbilde" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1038 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1032 msgid "Take a picture..." msgstr "Ta et bilde …" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1051 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1045 msgid "No Image" msgstr "Ingen bilde" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1108 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1102 msgid "Images" msgstr "Bilder" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1112 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1106 msgid "All Files" msgstr "Alle filer" -#: ../libempathy-gtk/empathy-avatar-image.c:322 +#: ../libempathy-gtk/empathy-avatar-image.c:319 msgid "Click to enlarge" msgstr "Klikk for Ã¥ forstørre" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:128 #, c-format msgid "Authentication failed for account <b>%s</b>" msgstr "Autentisering feilet for konto <b>%s</b>" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 -#: ../libempathy-gtk/empathy-chat.c:3724 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:140 +#: ../libempathy-gtk/empathy-chat.c:3844 msgid "Retry" msgstr "Prøv igjen" #: ../libempathy-gtk/empathy-base-password-dialog.c:224 -#: ../libempathy-gtk/empathy-password-dialog.c:134 +#: ../libempathy-gtk/empathy-password-dialog.c:132 #, c-format msgid "" "Enter your password for account\n" @@ -1330,72 +1330,72 @@ msgstr "" "Oppgi ditt passord for konto\n" "<b>%s</b>" -#: ../libempathy-gtk/empathy-calendar-button.c:66 +#: ../libempathy-gtk/empathy-calendar-button.c:63 msgid "Select..." msgstr "Velg …" -#: ../libempathy-gtk/empathy-calendar-button.c:154 +#: ../libempathy-gtk/empathy-calendar-button.c:151 msgid "_Select" msgstr "_Velg" -#: ../libempathy-gtk/empathy-call-utils.c:42 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:36 +#: ../libempathy-gtk/empathy-call-utils.c:54 msgid "There was an error starting the call" msgstr "Det oppsto en feil ved start av samtalen" -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:43 msgid "The specified contact doesn't support calls" msgstr "Valgt kontakt støtter ikke oppringing" -#: ../libempathy-gtk/empathy-call-utils.c:51 +#: ../libempathy-gtk/empathy-call-utils.c:45 msgid "The specified contact is offline" msgstr "Valgt kontakt er koblet fra" -#: ../libempathy-gtk/empathy-call-utils.c:53 +#: ../libempathy-gtk/empathy-call-utils.c:47 msgid "The specified contact is not valid" msgstr "Valgt kontakt er ugyldig" -#: ../libempathy-gtk/empathy-call-utils.c:55 +#: ../libempathy-gtk/empathy-call-utils.c:49 msgid "Emergency calls are not supported on this protocol" msgstr "Nødsamtaler er ikke støttet pÃ¥ denne protokollen" -#: ../libempathy-gtk/empathy-call-utils.c:57 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "You don't have enough credit in order to place this call" msgstr "Du har ikke nok kreditt til Ã¥ starte denne samtalen" -#: ../libempathy-gtk/empathy-chat.c:727 +#: ../libempathy-gtk/empathy-chat.c:731 msgid "Failed to open private chat" msgstr "Klarte ikke Ã¥ Ã¥pne privat prat" -#: ../libempathy-gtk/empathy-chat.c:785 +#: ../libempathy-gtk/empathy-chat.c:789 msgid "Topic not supported on this conversation" msgstr "Emne er ikke støttet for denne samtalen" -#: ../libempathy-gtk/empathy-chat.c:791 +#: ../libempathy-gtk/empathy-chat.c:795 msgid "You are not allowed to change the topic" msgstr "Du har ikke lov til Ã¥ bytte emne" -#: ../libempathy-gtk/empathy-chat.c:967 +#: ../libempathy-gtk/empathy-chat.c:971 msgid "Invalid contact ID" msgstr "Ugyldig kontakt-ID" -#: ../libempathy-gtk/empathy-chat.c:1054 +#: ../libempathy-gtk/empathy-chat.c:1058 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: tøm alle meldinger fra aktiv samtale" -#: ../libempathy-gtk/empathy-chat.c:1057 +#: ../libempathy-gtk/empathy-chat.c:1061 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <emne>: sett emne for aktiv samtale" -#: ../libempathy-gtk/empathy-chat.c:1060 +#: ../libempathy-gtk/empathy-chat.c:1064 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <ID for praterom>: bli med i et nytt praterom" -#: ../libempathy-gtk/empathy-chat.c:1063 +#: ../libempathy-gtk/empathy-chat.c:1067 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <prateroms-ID>: bli med i et nytt praterom" -#: ../libempathy-gtk/empathy-chat.c:1067 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" @@ -1403,23 +1403,23 @@ msgstr "" "/part [<praterom-ID>] [<Ã¥rsak>]: forlat praterommet, forvalg er det aktive " "rommet" -#: ../libempathy-gtk/empathy-chat.c:1071 +#: ../libempathy-gtk/empathy-chat.c:1075 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <kontakt-ID> [<melding>]: Ã¥pne en privat samtale" -#: ../libempathy-gtk/empathy-chat.c:1074 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <kontakt-ID> <melding>: Ã¥pne en privat samtale" -#: ../libempathy-gtk/empathy-chat.c:1077 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <kallenavn>: bytt kallenavn pÃ¥ denne tjeneren" -#: ../libempathy-gtk/empathy-chat.c:1080 +#: ../libempathy-gtk/empathy-chat.c:1084 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale" -#: ../libempathy-gtk/empathy-chat.c:1083 +#: ../libempathy-gtk/empathy-chat.c:1087 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 " @@ -1429,11 +1429,11 @@ msgstr "" "sende en melding som starter med tegnet «/». For eksempel: «/say /join " "brukes til Ã¥ bli med i et nytt praterom»" -#: ../libempathy-gtk/empathy-chat.c:1088 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/whois <contact ID>: display information about a contact" msgstr "/whois <kontakt-ID>: vis informasjon om en kontakt" -#: ../libempathy-gtk/empathy-chat.c:1091 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1441,126 +1441,126 @@ msgstr "" "/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> " "hvis den er definert." -#: ../libempathy-gtk/empathy-chat.c:1110 +#: ../libempathy-gtk/empathy-chat.c:1114 #, c-format msgid "Usage: %s" msgstr "Bruk: %s" -#: ../libempathy-gtk/empathy-chat.c:1155 +#: ../libempathy-gtk/empathy-chat.c:1159 msgid "Unknown command" msgstr "Ukjent kommando" -#: ../libempathy-gtk/empathy-chat.c:1281 +#: ../libempathy-gtk/empathy-chat.c:1285 msgid "Unknown command; see /help for the available commands" msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer" -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1542 msgid "insufficient balance to send message" msgstr "ikke nok kreditt til Ã¥ sende melding" -#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556 -#: ../libempathy-gtk/empathy-chat.c:1619 +#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560 +#: ../libempathy-gtk/empathy-chat.c:1623 #, c-format msgid "Error sending message '%s': %s" msgstr "Feil ved sending av melding «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561 -#: ../libempathy-gtk/empathy-chat.c:1623 +#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1627 #, c-format msgid "Error sending message: %s" msgstr "Feil ved sending av melding: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1550 +#: ../libempathy-gtk/empathy-chat.c:1554 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "ikke nok kreditt til Ã¥ sende melding. <a href='%s'>Fyll pÃ¥</a>." -#: ../libempathy-gtk/empathy-chat.c:1590 +#: ../libempathy-gtk/empathy-chat.c:1594 msgid "not capable" msgstr "ikke kapabel" -#: ../libempathy-gtk/empathy-chat.c:1597 +#: ../libempathy-gtk/empathy-chat.c:1601 msgid "offline" msgstr "frakoblet" -#: ../libempathy-gtk/empathy-chat.c:1600 +#: ../libempathy-gtk/empathy-chat.c:1604 msgid "invalid contact" msgstr "ugyldig kontakt" -#: ../libempathy-gtk/empathy-chat.c:1603 +#: ../libempathy-gtk/empathy-chat.c:1607 msgid "permission denied" msgstr "tilgang nektet" -#: ../libempathy-gtk/empathy-chat.c:1606 +#: ../libempathy-gtk/empathy-chat.c:1610 msgid "too long message" msgstr "meldingen er for lang" -#: ../libempathy-gtk/empathy-chat.c:1609 +#: ../libempathy-gtk/empathy-chat.c:1613 msgid "not implemented" msgstr "ikke implementert" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1617 msgid "unknown" msgstr "ukjent" -#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979 +#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967 msgid "Topic:" msgstr "Emne:" -#: ../libempathy-gtk/empathy-chat.c:1695 +#: ../libempathy-gtk/empathy-chat.c:1699 #, c-format msgid "Topic set to: %s" msgstr "Emne satt til: %s" -#: ../libempathy-gtk/empathy-chat.c:1697 +#: ../libempathy-gtk/empathy-chat.c:1701 #, c-format msgid "Topic set by %s to: %s" msgstr "Emne satt av %s til: %s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1702 +#: ../libempathy-gtk/empathy-chat.c:1706 msgid "No topic defined" msgstr "Emne ikke definert" -#: ../libempathy-gtk/empathy-chat.c:2218 +#: ../libempathy-gtk/empathy-chat.c:2222 msgid "(No Suggestions)" msgstr "(Ingen forslag)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2286 +#: ../libempathy-gtk/empathy-chat.c:2290 #, c-format msgid "Add '%s' to Dictionary" msgstr "Legg til «%s» i ordboken" #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2323 +#: ../libempathy-gtk/empathy-chat.c:2327 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Legg til «%s» i ordbok for %s" -#: ../libempathy-gtk/empathy-chat.c:2393 +#: ../libempathy-gtk/empathy-chat.c:2397 msgid "Insert Smiley" msgstr "Sett inn smilefjes" #. send button -#: ../libempathy-gtk/empathy-chat.c:2411 -#: ../libempathy-gtk/empathy-ui-utils.c:1180 +#: ../libempathy-gtk/empathy-chat.c:2415 +#: ../libempathy-gtk/empathy-ui-utils.c:1208 msgid "_Send" msgstr "_Send" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2468 +#: ../libempathy-gtk/empathy-chat.c:2472 msgid "_Spelling Suggestions" msgstr "_Staveforslag" -#: ../libempathy-gtk/empathy-chat.c:2574 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Klarte ikke Ã¥ hente siste logger" -#: ../libempathy-gtk/empathy-chat.c:2718 +#: ../libempathy-gtk/empathy-chat.c:2826 #, c-format msgid "%s has disconnected" msgstr "%s har koblet fra" @@ -1568,12 +1568,12 @@ msgstr "%s har koblet fra" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2725 +#: ../libempathy-gtk/empathy-chat.c:2833 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s ble sparket av %2$s" -#: ../libempathy-gtk/empathy-chat.c:2728 +#: ../libempathy-gtk/empathy-chat.c:2836 #, c-format msgid "%s was kicked" msgstr "%s ble sparket" @@ -1581,17 +1581,17 @@ msgstr "%s ble sparket" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2736 +#: ../libempathy-gtk/empathy-chat.c:2844 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s ble bannlyst av %2$s" -#: ../libempathy-gtk/empathy-chat.c:2739 +#: ../libempathy-gtk/empathy-chat.c:2847 #, c-format msgid "%s was banned" msgstr "%s ble bannlyst" -#: ../libempathy-gtk/empathy-chat.c:2743 +#: ../libempathy-gtk/empathy-chat.c:2851 #, c-format msgid "%s has left the room" msgstr "%s har forlatt rommet" @@ -1601,17 +1601,17 @@ msgstr "%s har forlatt rommet" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2752 +#: ../libempathy-gtk/empathy-chat.c:2860 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2777 +#: ../libempathy-gtk/empathy-chat.c:2885 #, c-format msgid "%s has joined the room" msgstr "%s har blitt med i rommet" -#: ../libempathy-gtk/empathy-chat.c:2802 +#: ../libempathy-gtk/empathy-chat.c:2910 #, c-format msgid "%s is now known as %s" msgstr "%s er nÃ¥ kjent som %s" @@ -1619,82 +1619,82 @@ msgstr "%s er nÃ¥ kjent som %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1532 -#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2657 -#: ../src/empathy-call-window.c:2963 ../src/empathy-event-manager.c:1166 +#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516 +#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2641 +#: ../src/empathy-call-window.c:2948 ../src/empathy-event-manager.c:1158 msgid "Disconnected" msgstr "Koblet fra" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3664 +#: ../libempathy-gtk/empathy-chat.c:3784 msgid "Would you like to store this password?" msgstr "Vil du lagre dette passordet?" -#: ../libempathy-gtk/empathy-chat.c:3670 +#: ../libempathy-gtk/empathy-chat.c:3790 msgid "Remember" msgstr "Husk" -#: ../libempathy-gtk/empathy-chat.c:3680 +#: ../libempathy-gtk/empathy-chat.c:3800 msgid "Not now" msgstr "Ikke nÃ¥" -#: ../libempathy-gtk/empathy-chat.c:3728 +#: ../libempathy-gtk/empathy-chat.c:3848 msgid "Wrong password; please try again:" msgstr "Feil passord; vennligst prøv igjen:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3858 +#: ../libempathy-gtk/empathy-chat.c:3972 msgid "This room is protected by a password:" msgstr "Dette rommet er beskyttet med et passord:" -#: ../libempathy-gtk/empathy-chat.c:3885 -#: ../src/empathy-new-chatroom-dialog.c:780 +#: ../libempathy-gtk/empathy-chat.c:3999 +#: ../src/empathy-new-chatroom-dialog.c:785 msgid "Join" msgstr "Bli med" -#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187 +#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1179 msgid "Connected" msgstr "Koblet til" -#: ../libempathy-gtk/empathy-chat.c:4132 +#: ../libempathy-gtk/empathy-chat.c:4246 msgid "Conversation" msgstr "Samtale" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4137 +#: ../libempathy-gtk/empathy-chat.c:4251 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261 msgid "Unknown or invalid identifier" msgstr "Ukjent eller ugyldig identifikator" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263 msgid "Contact blocking temporarily unavailable" msgstr "Blokkering av kontakter midlertidig utilgjengelig" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 msgid "Contact blocking unavailable" msgstr "Blokkering av kontakter er ikke tilgjengelig" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 msgid "Permission Denied" msgstr "Tilgang nektet" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 msgid "Could not block contact" msgstr "Kunne ikke blokkere kontakt" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610 msgid "Edit Blocked Contacts" msgstr "Rediger blokkerte kontakter" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 -#: ../libempathy-gtk/empathy-individual-widget.c:1483 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:528 +#: ../libempathy-gtk/empathy-individual-widget.c:1473 #: ../src/empathy-chatrooms-window.ui.h:2 #: ../src/empathy-new-chatroom-dialog.ui.h:6 msgid "Account:" @@ -1704,120 +1704,120 @@ msgstr "Konto:" msgid "Blocked Contacts" msgstr "Blokkerte kontakter" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:98 msgid "Full name" msgstr "Fullt navn" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:99 msgid "Phone number" msgstr "Telefonnummer" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:100 msgid "E-mail address" msgstr "E-postadresse" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:101 msgid "Website" msgstr "Nettsted" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 msgid "Birthday" msgstr "Fødselsdag" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Last seen:" msgstr "Sist sett:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Server:" msgstr "Tjener:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:109 msgid "Connected from:" msgstr "Tilkoblet fra:" #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Away message:" msgstr "Bortemelding:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:126 msgid "work" msgstr "arbeid" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:127 msgid "home" msgstr "hjemme" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:128 msgid "mobile" msgstr "mobil" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:129 msgid "voice" msgstr "tale" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 msgid "preferred" msgstr "foretrukket" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 msgid "postal" msgstr "post" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "parcel" msgstr "pakke" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:522 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:521 msgid "Search contacts" msgstr "Søk i kontakter" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:552 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:551 msgid "Search: " msgstr "Søk: " -#: ../libempathy-gtk/empathy-contact-search-dialog.c:610 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:609 msgid "_Add Contact" msgstr "_Legg til kontakt" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:628 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 msgid "No contacts found" msgstr "Ingen kontakter funnet" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:644 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:643 msgid "Your message introducing yourself:" msgstr "Melding der du introduserer deg selv:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:652 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:651 msgid "Please let me see when you're online. Thanks!" msgstr "Vennligst la meg sÃ¥ nÃ¥r du er tilkoblet. Takk!" -#: ../libempathy-gtk/empathy-contact-widget.c:168 -#: ../libempathy-gtk/empathy-individual-widget.c:898 +#: ../libempathy-gtk/empathy-contact-widget.c:156 +#: ../libempathy-gtk/empathy-individual-widget.c:888 msgid "Save Avatar" msgstr "Lagre personbilder" -#: ../libempathy-gtk/empathy-contact-widget.c:224 -#: ../libempathy-gtk/empathy-individual-widget.c:956 +#: ../libempathy-gtk/empathy-contact-widget.c:212 +#: ../libempathy-gtk/empathy-individual-widget.c:946 msgid "Unable to save avatar" msgstr "Kan ikke lagre personbilde" #. Identifier to connect to Instant Messaging network #. Setup id label #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-user-info.c:444 +#: ../libempathy-gtk/empathy-user-info.c:455 msgid "Identifier" msgstr "Identifikator" #. Setup nickname entry #: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -#: ../libempathy-gtk/empathy-user-info.c:449 +#: ../libempathy-gtk/empathy-user-info.c:460 msgid "Alias" msgstr "Alias" @@ -1851,11 +1851,11 @@ msgstr "Versjon" msgid "Client" msgstr "Klient" -#: ../libempathy-gtk/empathy-groups-widget.c:327 +#: ../libempathy-gtk/empathy-groups-widget.c:317 msgid "Groups" msgstr "Grupper" -#: ../libempathy-gtk/empathy-groups-widget.c:339 +#: ../libempathy-gtk/empathy-groups-widget.c:329 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -1863,121 +1863,121 @@ msgstr "" "Velg gruppene du ønsker at denne kontakten skal vises i. Du kan velge flere " "eller ingen." -#: ../libempathy-gtk/empathy-groups-widget.c:358 +#: ../libempathy-gtk/empathy-groups-widget.c:348 msgid "_Add Group" msgstr "_Legg til gruppe" -#: ../libempathy-gtk/empathy-groups-widget.c:393 +#: ../libempathy-gtk/empathy-groups-widget.c:383 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Velg" -#: ../libempathy-gtk/empathy-groups-widget.c:403 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgid "Group" msgstr "Gruppe" -#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +#: ../libempathy-gtk/empathy-individual-dialogs.c:108 msgid "New Contact" msgstr "Ny kontakt" -#: ../libempathy-gtk/empathy-individual-dialogs.c:193 -#: ../libempathy-gtk/empathy-subscription-dialog.c:121 +#: ../libempathy-gtk/empathy-individual-dialogs.c:183 +#: ../libempathy-gtk/empathy-subscription-dialog.c:120 #, c-format msgid "Block %s?" msgstr "Blokker %s?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:248 -#: ../libempathy-gtk/empathy-subscription-dialog.c:125 +#: ../libempathy-gtk/empathy-individual-dialogs.c:238 +#: ../libempathy-gtk/empathy-subscription-dialog.c:124 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "Er du sikker pÃ¥ at du vil blokkere «%s» fra Ã¥ kontakte deg igjen?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-individual-dialogs.c:243 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Følgende identitet vil bli blokkert:" msgstr[1] "Følgende identiteter vil bli blokkert:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:250 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Følgende identitet kan ikke blokkeres:" msgstr[1] "Følgende identiteter kan ikke blokkeres:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:270 -#: ../libempathy-gtk/empathy-subscription-dialog.c:130 -#: ../libempathy-gtk/empathy-subscription-dialog.c:275 +#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-subscription-dialog.c:129 +#: ../libempathy-gtk/empathy-subscription-dialog.c:274 msgid "_Block" msgstr "_Blokker" -#: ../libempathy-gtk/empathy-individual-dialogs.c:279 -#: ../libempathy-gtk/empathy-subscription-dialog.c:150 +#: ../libempathy-gtk/empathy-individual-dialogs.c:269 +#: ../libempathy-gtk/empathy-subscription-dialog.c:149 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_Rapporter denne kontakten" msgstr[1] "_Rapporter disse kontaktene" -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237 msgid "Edit Contact Information" msgstr "Endre kontaktinformasjon" #. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:293 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:283 msgid "Linked Contacts" msgstr "Lenkede kontakter" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:332 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:322 msgid "gnome-contacts not installed" msgstr "gnome-contacts er ikke installert" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:335 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:325 msgid "Please install gnome-contacts to access contacts details." msgstr "Vennligst installer gnome-contacts for tilgang til kontaktdetaljer." #. 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:177 +#: ../libempathy-gtk/empathy-individual-menu.c:168 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:353 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Velg en konto til bruk for samtalen" -#: ../libempathy-gtk/empathy-individual-menu.c:357 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-call-window.ui.h:20 msgid "Call" msgstr "Ring" -#: ../libempathy-gtk/empathy-individual-menu.c:422 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Mobil" -#: ../libempathy-gtk/empathy-individual-menu.c:424 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Arbeid" -#: ../libempathy-gtk/empathy-individual-menu.c:426 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "Hjemme" -#: ../libempathy-gtk/empathy-individual-menu.c:669 +#: ../libempathy-gtk/empathy-individual-menu.c:660 msgid "_Block Contact" msgstr "_Blokker kontakt" -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:716 msgid "Delete and _Block" msgstr "Slett og _blokker" -#: ../libempathy-gtk/empathy-individual-menu.c:787 +#: ../libempathy-gtk/empathy-individual-menu.c:778 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Vil du virkelig fjerne kontakten «%s»?" -#: ../libempathy-gtk/empathy-individual-menu.c:796 +#: ../libempathy-gtk/empathy-individual-menu.c:787 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -1986,218 +1986,218 @@ msgstr "" "Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle " "kontaktene den lenkede kontakten bestÃ¥r av." -#: ../libempathy-gtk/empathy-individual-menu.c:807 +#: ../libempathy-gtk/empathy-individual-menu.c:798 msgid "Removing contact" msgstr "Fjerner kontakt" -#: ../libempathy-gtk/empathy-individual-menu.c:871 -#: ../libempathy-gtk/empathy-individual-view.c:2453 +#: ../libempathy-gtk/empathy-individual-menu.c:862 +#: ../libempathy-gtk/empathy-individual-view.c:2440 msgid "_Remove" msgstr "Fje_rn" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1234 -#: ../libempathy-gtk/empathy-new-message-dialog.c:318 +#: ../libempathy-gtk/empathy-individual-menu.c:1225 +#: ../libempathy-gtk/empathy-new-message-dialog.c:308 msgid "_Chat" msgstr "_Prat" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1269 -#: ../libempathy-gtk/empathy-new-message-dialog.c:312 +#: ../libempathy-gtk/empathy-individual-menu.c:1260 +#: ../libempathy-gtk/empathy-new-message-dialog.c:302 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1302 +#: ../libempathy-gtk/empathy-individual-menu.c:1293 msgctxt "menu item" msgid "_Audio Call" msgstr "_Lydsamtale" -#: ../libempathy-gtk/empathy-individual-menu.c:1335 +#: ../libempathy-gtk/empathy-individual-menu.c:1326 msgctxt "menu item" msgid "_Video Call" msgstr "_Videosamtale" -#: ../libempathy-gtk/empathy-individual-menu.c:1376 +#: ../libempathy-gtk/empathy-individual-menu.c:1367 #: ../src/empathy-roster-window-menubar.ui.h:11 msgid "_Previous Conversations" msgstr "_Tidligere samtaler" -#: ../libempathy-gtk/empathy-individual-menu.c:1405 +#: ../libempathy-gtk/empathy-individual-menu.c:1396 msgid "Send File" msgstr "Send fil" -#: ../libempathy-gtk/empathy-individual-menu.c:1435 +#: ../libempathy-gtk/empathy-individual-menu.c:1426 msgid "Share My Desktop" msgstr "Del mitt skrivebord" -#: ../libempathy-gtk/empathy-individual-menu.c:1461 -#: ../libempathy-gtk/empathy-individual-widget.c:1366 +#: ../libempathy-gtk/empathy-individual-menu.c:1452 +#: ../libempathy-gtk/empathy-individual-widget.c:1356 msgid "Favorite" msgstr "Favoritt" -#: ../libempathy-gtk/empathy-individual-menu.c:1490 +#: ../libempathy-gtk/empathy-individual-menu.c:1481 msgid "Infor_mation" msgstr "Infor_masjon" -#: ../libempathy-gtk/empathy-individual-menu.c:1539 +#: ../libempathy-gtk/empathy-individual-menu.c:1530 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "R_ediger" #. send invitation -#: ../libempathy-gtk/empathy-individual-menu.c:1655 -#: ../src/empathy-chat-window.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1646 +#: ../src/empathy-chat-window.c:1233 msgid "Inviting you to this room" msgstr "Inviterer deg til dette rommet" -#: ../libempathy-gtk/empathy-individual-menu.c:1701 +#: ../libempathy-gtk/empathy-individual-menu.c:1692 msgid "_Invite to Chat Room" msgstr "_Inviter til praterom" -#: ../libempathy-gtk/empathy-individual-menu.c:1897 +#: ../libempathy-gtk/empathy-individual-menu.c:1888 msgid "_Add Contact…" msgstr "_Legg til kontakt …" -#: ../libempathy-gtk/empathy-individual-view.c:2373 +#: ../libempathy-gtk/empathy-individual-view.c:2360 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Vil du virkelig fjerne gruppen «%s»?" -#: ../libempathy-gtk/empathy-individual-view.c:2376 +#: ../libempathy-gtk/empathy-individual-view.c:2363 msgid "Removing group" msgstr "Fjerner gruppe" -#: ../libempathy-gtk/empathy-individual-view.c:2444 +#: ../libempathy-gtk/empathy-individual-view.c:2431 msgid "Re_name" msgstr "Endre _navn" -#: ../libempathy-gtk/empathy-individual-widget.c:304 +#: ../libempathy-gtk/empathy-individual-widget.c:294 msgid "Channels:" msgstr "Kanaler:" -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-individual-widget.c:445 msgid "Country ISO Code:" msgstr "ISO-kode for land:" -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-individual-widget.c:447 msgid "Country:" msgstr "Land:" -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-individual-widget.c:449 msgid "State:" msgstr "Tilstand:" -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-individual-widget.c:451 msgid "City:" msgstr "By:" -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-individual-widget.c:453 msgid "Area:" msgstr "OmrÃ¥de:" -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Postal Code:" msgstr "Postkode:" -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Street:" msgstr "Gate:" -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "Building:" msgstr "Bygning:" -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "Floor:" msgstr "Etasje:" -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Room:" msgstr "Rom:" -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Text:" msgstr "Tekst:" -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Description:" msgstr "Beskrivelse:" -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Accuracy Level:" msgstr "NøyaktighetsnivÃ¥:" -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Error:" msgstr "Feil:" -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Vertical Error (meters):" msgstr "Vertikal feil (meter):" -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Horizontal Error (meters):" msgstr "Horisontal feil (meter):" -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "Speed:" msgstr "Hastighet:" -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Bearing:" msgstr "Retning:" -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Climb Speed:" msgstr "Klatrehastighet:" -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Last Updated on:" msgstr "Sist oppdatert:" -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Longitude:" msgstr "Lengdegrad:" -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Latitude:" msgstr "Breddegrad:" -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Altitude:" msgstr "Høyde:" -#: ../libempathy-gtk/empathy-individual-widget.c:593 -#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../libempathy-gtk/empathy-individual-widget.c:583 +#: ../libempathy-gtk/empathy-individual-widget.c:598 #: ../src/empathy-preferences.ui.h:39 msgid "Location" msgstr "Sted" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-individual-widget.c:610 +#: ../libempathy-gtk/empathy-individual-widget.c:600 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-individual-widget.c:659 +#: ../libempathy-gtk/empathy-individual-widget.c:649 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y, %R UTC" #. Alias -#: ../libempathy-gtk/empathy-individual-widget.c:1302 +#: ../libempathy-gtk/empathy-individual-widget.c:1292 msgid "Alias:" msgstr "Alias:" #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-individual-widget.c:1511 +#: ../libempathy-gtk/empathy-individual-widget.c:1501 msgid "Identifier:" msgstr "Identifikator:" -#: ../libempathy-gtk/empathy-individual-widget.c:1650 +#: ../libempathy-gtk/empathy-individual-widget.c:1640 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2212,32 +2212,32 @@ msgstr "<b>Plassering</b> (dato)" msgid "Online from a phone or mobile device" msgstr "Tilkoblet fra en telefon eller mobil enhet" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329 msgid "New Network" msgstr "Nytt nettverk" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532 msgid "Choose an IRC network" msgstr "Velg et IRC-nettverk" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615 msgid "Reset _Networks List" msgstr "Nullstill _nettverksliste" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Velg" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:271 msgid "new server" msgstr "ny tjener" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:547 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:534 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80 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 " @@ -2247,11 +2247,11 @@ msgstr "" "deg automatisk. Hvis du vil bruke denne funksjonen mÃ¥ du sjekke om detaljene " "under er riktige." -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100 msgid "People nearby" msgstr "Personer i nærheten" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115 msgid "" "You can change these details later or disable this feature by choosing <span " "style=\"italic\">Edit → Accounts</span> in the Contact List." @@ -2259,135 +2259,135 @@ msgstr "" "Du kan endre disse detaljene senere eller slÃ¥ av denne funksjonen ved Ã¥ " "velge <span style=\"italic\">Rediger → Kontoer</span> i kontaktlisten." -#: ../libempathy-gtk/empathy-log-window.c:622 +#: ../libempathy-gtk/empathy-log-window.c:607 msgid "History" msgstr "Historikk" -#: ../libempathy-gtk/empathy-log-window.c:677 +#: ../libempathy-gtk/empathy-log-window.c:662 msgid "Show" msgstr "Vis" -#: ../libempathy-gtk/empathy-log-window.c:699 +#: ../libempathy-gtk/empathy-log-window.c:684 msgid "Search" msgstr "Søk" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1135 #, c-format msgid "Chat in %s" msgstr "Prat i %s" -#: ../libempathy-gtk/empathy-log-window.c:1152 +#: ../libempathy-gtk/empathy-log-window.c:1137 #, c-format msgid "Chat with %s" msgstr "Prat med %s" -#: ../libempathy-gtk/empathy-log-window.c:1202 -#: ../libempathy-gtk/empathy-log-window.c:1346 +#: ../libempathy-gtk/empathy-log-window.c:1187 +#: ../libempathy-gtk/empathy-log-window.c:1331 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e %B %Y %X" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1289 +#: ../libempathy-gtk/empathy-log-window.c:1274 #, c-format msgid "<i>* %s %s</i>" msgstr "<i>* %s %s</i>" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1295 +#: ../libempathy-gtk/empathy-log-window.c:1280 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1370 +#: ../libempathy-gtk/empathy-log-window.c:1355 #, c-format msgid "%s second" msgid_plural "%s seconds" msgstr[0] "%s sekund" msgstr[1] "%s sekunder" -#: ../libempathy-gtk/empathy-log-window.c:1377 +#: ../libempathy-gtk/empathy-log-window.c:1362 #, c-format msgid "%s minute" msgid_plural "%s minutes" msgstr[0] "%s minutt" msgstr[1] "%s minutter" -#: ../libempathy-gtk/empathy-log-window.c:1385 +#: ../libempathy-gtk/empathy-log-window.c:1370 #, c-format msgid "Call took %s, ended at %s" msgstr "Samtalen tok %s, avsluttet %s" -#: ../libempathy-gtk/empathy-log-window.c:1716 +#: ../libempathy-gtk/empathy-log-window.c:1701 msgid "Today" msgstr "I dag" -#: ../libempathy-gtk/empathy-log-window.c:1720 +#: ../libempathy-gtk/empathy-log-window.c:1705 msgid "Yesterday" msgstr "I gÃ¥r" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1735 +#: ../libempathy-gtk/empathy-log-window.c:1720 msgid "%e %B %Y" msgstr "%e %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1839 -#: ../libempathy-gtk/empathy-log-window.c:3462 +#: ../libempathy-gtk/empathy-log-window.c:1824 +#: ../libempathy-gtk/empathy-log-window.c:3447 msgid "Anytime" msgstr "NÃ¥r som helst" -#: ../libempathy-gtk/empathy-log-window.c:1938 -#: ../libempathy-gtk/empathy-log-window.c:2397 +#: ../libempathy-gtk/empathy-log-window.c:1923 +#: ../libempathy-gtk/empathy-log-window.c:2382 msgid "Anyone" msgstr "Hvem som helst" -#: ../libempathy-gtk/empathy-log-window.c:2710 +#: ../libempathy-gtk/empathy-log-window.c:2695 msgid "Who" msgstr "Hvem" -#: ../libempathy-gtk/empathy-log-window.c:2919 +#: ../libempathy-gtk/empathy-log-window.c:2904 msgid "When" msgstr "NÃ¥r" -#: ../libempathy-gtk/empathy-log-window.c:3037 +#: ../libempathy-gtk/empathy-log-window.c:3022 msgid "Anything" msgstr "Hva som helst" -#: ../libempathy-gtk/empathy-log-window.c:3039 +#: ../libempathy-gtk/empathy-log-window.c:3024 msgid "Text chats" msgstr "Tekstsamtaler" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3025 #: ../src/empathy-preferences.ui.h:29 msgid "Calls" msgstr "Samtaler" -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3029 msgid "Incoming calls" msgstr "Innkommende samtaler" -#: ../libempathy-gtk/empathy-log-window.c:3045 +#: ../libempathy-gtk/empathy-log-window.c:3030 msgid "Outgoing calls" msgstr "UtgÃ¥ende samtaler" -#: ../libempathy-gtk/empathy-log-window.c:3046 +#: ../libempathy-gtk/empathy-log-window.c:3031 msgid "Missed calls" msgstr "Tapte samtaler" -#: ../libempathy-gtk/empathy-log-window.c:3066 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "What" msgstr "Hva" -#: ../libempathy-gtk/empathy-log-window.c:3755 +#: ../libempathy-gtk/empathy-log-window.c:3740 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Er du sikker pÃ¥ at du vil slette alle logger av tidligere samtaler?" -#: ../libempathy-gtk/empathy-log-window.c:3759 +#: ../libempathy-gtk/empathy-log-window.c:3744 msgid "Clear All" msgstr "Tøm alle" -#: ../libempathy-gtk/empathy-log-window.c:3766 +#: ../libempathy-gtk/empathy-log-window.c:3751 msgid "Delete from:" msgstr "Slett fra:" @@ -2409,7 +2409,7 @@ msgid "Profile" msgstr "Profil" #: ../libempathy-gtk/empathy-log-window.ui.h:5 -#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-chat-window.c:1426 ../src/empathy-preferences.ui.h:11 msgid "Chat" msgstr "Prat" @@ -2431,75 +2431,75 @@ msgid "What kind of chat account do you have?" msgstr "Hvilken type konto har du?" #: ../libempathy-gtk/empathy-new-account-dialog.c:151 -msgid "Adding new account" -msgstr "Legger til ny konto" +msgid "Add new account" +msgstr "Legg til ny konto" -#: ../libempathy-gtk/empathy-new-call-dialog.c:199 -#: ../libempathy-gtk/empathy-new-message-dialog.c:289 +#: ../libempathy-gtk/empathy-new-call-dialog.c:189 +#: ../libempathy-gtk/empathy-new-message-dialog.c:279 msgid "Enter a contact identifier or phone number:" msgstr "Oppgi en kontaktidentifikator eller telefonnummer:" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:222 +#: ../libempathy-gtk/empathy-new-call-dialog.c:212 msgid "_Video Call" msgstr "_Videosamtale" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:232 +#: ../libempathy-gtk/empathy-new-call-dialog.c:222 msgid "_Audio Call" msgstr "_Lydsamtale" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:242 +#: ../libempathy-gtk/empathy-new-call-dialog.c:232 msgid "New Call" msgstr "Ny samtale" -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:72 msgid "The contact is offline" msgstr "Kontakten er koblet fra" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:74 msgid "The specified contact is either invalid or unknown" msgstr "Valgt kontakt er ugyldig eller ukjent" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:76 msgid "The contact does not support this kind of conversation" msgstr "Kontakten støtter ikke denne type samtale" -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:78 msgid "The requested functionality is not implemented for this protocol" msgstr "Forespurt funksjonalitet er ikke implementert for denne protokollen" -#: ../libempathy-gtk/empathy-new-message-dialog.c:94 +#: ../libempathy-gtk/empathy-new-message-dialog.c:84 msgid "Could not start a conversation with the given contact" msgstr "Kunne ikke starte en samtale med oppgitt kontakt" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:86 msgid "You are banned from this channel" msgstr "Du er bannlyst fra denne kanalen" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:88 msgid "This channel is full" msgstr "Kanalen er full" -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:90 msgid "You must be invited to join this channel" msgstr "Du mÃ¥ bli invitert til Ã¥ bli med i denne kanalen" -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:92 msgid "Can't proceed while disconnected" msgstr "Kan ikke fortsette da du er koblet fra" -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:94 msgid "Permission denied" msgstr "Tilgang nektet" -#: ../libempathy-gtk/empathy-new-message-dialog.c:110 +#: ../libempathy-gtk/empathy-new-message-dialog.c:100 msgid "There was an error starting the conversation" msgstr "Det oppsto en feil ved start av samtalen" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:332 +#: ../libempathy-gtk/empathy-new-message-dialog.c:322 msgid "New Conversation" msgstr "Ny samtale" @@ -2509,26 +2509,26 @@ msgstr "Ny samtale" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:164 -#: ../libempathy-gtk/empathy-presence-chooser.c:200 +#: ../libempathy-gtk/empathy-presence-chooser.c:157 +#: ../libempathy-gtk/empathy-presence-chooser.c:193 msgid "Custom Message…" msgstr "Egendefinert melding …" -#: ../libempathy-gtk/empathy-presence-chooser.c:217 -#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:210 +#: ../libempathy-gtk/empathy-presence-chooser.c:212 msgid "Edit Custom Messages…" msgstr "Rediger egendefinerte meldinger …" -#: ../libempathy-gtk/empathy-presence-chooser.c:341 +#: ../libempathy-gtk/empathy-presence-chooser.c:334 msgid "Click to remove this status as a favorite" msgstr "Klikk for Ã¥ fjerne denne statusen som favoritt" -#: ../libempathy-gtk/empathy-presence-chooser.c:350 +#: ../libempathy-gtk/empathy-presence-chooser.c:343 msgid "Click to make this status a favorite" msgstr "Klikk for Ã¥ gjøre denne statusen til en favoritt" #. Translators: %s is a status message like 'At the pub' for example -#: ../libempathy-gtk/empathy-presence-chooser.c:384 +#: ../libempathy-gtk/empathy-presence-chooser.c:377 #, c-format msgid "" "<b>Current message: %s</b>\n" @@ -2538,12 +2538,12 @@ msgstr "" "<small><i>Trykk linjeskift for Ã¥ sette ny melding eller Esc for Ã¥ avbryte.</" "i></small>" -#: ../libempathy-gtk/empathy-presence-chooser.c:393 +#: ../libempathy-gtk/empathy-presence-chooser.c:386 msgid "Set status" msgstr "Sett status" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1101 +#: ../libempathy-gtk/empathy-presence-chooser.c:1094 msgid "Custom messages…" msgstr "Egendefinerte meldinger …" @@ -2551,12 +2551,12 @@ msgstr "Egendefinerte meldinger …" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../libempathy-gtk/empathy-protocol-chooser.c:608 +#: ../libempathy-gtk/empathy-protocol-chooser.c:603 #, c-format msgid "New %s account" msgstr "Ny %s-konto" -#: ../libempathy-gtk/empathy-search-bar.c:243 +#: ../libempathy-gtk/empathy-search-bar.c:237 msgid "_Match case" msgstr "Skill _mellom smÃ¥/store bokstaver" @@ -2580,168 +2580,168 @@ msgstr "_Skill mellom smÃ¥/store bokstaver" msgid "Phrase not found" msgstr "Teksten ble ikke funnet" -#: ../libempathy-gtk/empathy-sound-manager.c:51 +#: ../libempathy-gtk/empathy-sound-manager.c:49 msgid "Received an instant message" msgstr "Mottok en lynmelding" -#: ../libempathy-gtk/empathy-sound-manager.c:53 +#: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Sent an instant message" msgstr "Send en lynmelding" -#: ../libempathy-gtk/empathy-sound-manager.c:55 +#: ../libempathy-gtk/empathy-sound-manager.c:53 msgid "Incoming chat request" msgstr "Innkommende samtaleforespørsel" -#: ../libempathy-gtk/empathy-sound-manager.c:57 +#: ../libempathy-gtk/empathy-sound-manager.c:55 msgid "Contact connected" msgstr "Kontakt koblet til" -#: ../libempathy-gtk/empathy-sound-manager.c:59 +#: ../libempathy-gtk/empathy-sound-manager.c:57 msgid "Contact disconnected" msgstr "Kontakt koblet fra" -#: ../libempathy-gtk/empathy-sound-manager.c:61 +#: ../libempathy-gtk/empathy-sound-manager.c:59 msgid "Connected to server" msgstr "Koblet til tjener" -#: ../libempathy-gtk/empathy-sound-manager.c:63 +#: ../libempathy-gtk/empathy-sound-manager.c:61 msgid "Disconnected from server" msgstr "Koblet fra tjener" -#: ../libempathy-gtk/empathy-sound-manager.c:65 +#: ../libempathy-gtk/empathy-sound-manager.c:63 msgid "Incoming voice call" msgstr "Innkommende samtale" -#: ../libempathy-gtk/empathy-sound-manager.c:67 +#: ../libempathy-gtk/empathy-sound-manager.c:65 msgid "Outgoing voice call" msgstr "UtgÃ¥ende samtale" -#: ../libempathy-gtk/empathy-sound-manager.c:69 +#: ../libempathy-gtk/empathy-sound-manager.c:67 msgid "Voice call ended" msgstr "Samtale avsluttet" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:294 msgid "Edit Custom Messages" msgstr "Rediger egendefinerte meldinger" -#: ../libempathy-gtk/empathy-subscription-dialog.c:234 +#: ../libempathy-gtk/empathy-subscription-dialog.c:233 msgid "Subscription Request" msgstr "Abonnementsforespørsel" -#: ../libempathy-gtk/empathy-subscription-dialog.c:240 -#: ../src/empathy-event-manager.c:1104 +#: ../libempathy-gtk/empathy-subscription-dialog.c:239 +#: ../src/empathy-event-manager.c:1096 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s ønsker rettigheter til Ã¥ se nÃ¥r du er tilkoblet" -#: ../libempathy-gtk/empathy-subscription-dialog.c:281 -#: ../src/empathy-event-manager.c:729 +#: ../libempathy-gtk/empathy-subscription-dialog.c:280 +#: ../src/empathy-event-manager.c:721 msgid "_Decline" msgstr "_AvslÃ¥" -#: ../libempathy-gtk/empathy-subscription-dialog.c:282 +#: ../libempathy-gtk/empathy-subscription-dialog.c:281 msgid "_Accept" msgstr "Godt_a" -#: ../libempathy-gtk/empathy-theme-adium.c:1124 +#: ../libempathy-gtk/empathy-theme-adium.c:1211 #, c-format msgid "Message edited at %s" msgstr "Melding redigert %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1824 +#: ../libempathy-gtk/empathy-theme-adium.c:1913 msgid "Normal" msgstr "Normal" -#: ../libempathy-gtk/empathy-tls-dialog.c:150 +#: ../libempathy-gtk/empathy-tls-dialog.c:147 msgid "The identity provided by the chat server cannot be verified." msgstr "Identiteten som ble oppgitt av pratetjeneren kan ikke verifiseres." -#: ../libempathy-gtk/empathy-tls-dialog.c:157 +#: ../libempathy-gtk/empathy-tls-dialog.c:154 msgid "The certificate is not signed by a Certification Authority." msgstr "Sertifikatet er ikke signert av en sertifikatmyndighet." -#: ../libempathy-gtk/empathy-tls-dialog.c:161 +#: ../libempathy-gtk/empathy-tls-dialog.c:158 msgid "The certificate has expired." msgstr "Sertifikatet er utløpt." -#: ../libempathy-gtk/empathy-tls-dialog.c:164 +#: ../libempathy-gtk/empathy-tls-dialog.c:161 msgid "The certificate hasn't yet been activated." msgstr "Sertifikatet er ikke aktivert ennÃ¥." -#: ../libempathy-gtk/empathy-tls-dialog.c:167 +#: ../libempathy-gtk/empathy-tls-dialog.c:164 msgid "The certificate does not have the expected fingerprint." msgstr "Sertifikatet har ikke forventet fingeravtrykk." -#: ../libempathy-gtk/empathy-tls-dialog.c:170 +#: ../libempathy-gtk/empathy-tls-dialog.c:167 msgid "The hostname verified by the certificate doesn't match the server name." msgstr "" "Vertsnavn verifisert av sertifikatet er ikke det samme som navn pÃ¥ tjener." -#: ../libempathy-gtk/empathy-tls-dialog.c:174 +#: ../libempathy-gtk/empathy-tls-dialog.c:171 msgid "The certificate is self-signed." msgstr "Sertifikatet er selvsignert." -#: ../libempathy-gtk/empathy-tls-dialog.c:177 +#: ../libempathy-gtk/empathy-tls-dialog.c:174 msgid "" "The certificate has been revoked by the issuing Certification Authority." msgstr "" "Sertifikatet har blitt trukket tilbake av utstedende sertifikatmyndighet." -#: ../libempathy-gtk/empathy-tls-dialog.c:181 +#: ../libempathy-gtk/empathy-tls-dialog.c:178 msgid "The certificate is cryptographically weak." msgstr "Sertifikatet er kryptografisk svakt." -#: ../libempathy-gtk/empathy-tls-dialog.c:184 +#: ../libempathy-gtk/empathy-tls-dialog.c:181 msgid "The certificate length exceeds verifiable limits." msgstr "Sertifikatets lengde overstiger verifiserbare grenser." -#: ../libempathy-gtk/empathy-tls-dialog.c:188 +#: ../libempathy-gtk/empathy-tls-dialog.c:185 msgid "The certificate is malformed." msgstr "Sertifikatet ikke feilutformet." -#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#: ../libempathy-gtk/empathy-tls-dialog.c:203 #, c-format msgid "Expected hostname: %s" msgstr "Forventet vertsnavn: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#: ../libempathy-gtk/empathy-tls-dialog.c:206 #, c-format msgid "Certificate hostname: %s" msgstr "Vertsnavn i sertifikat: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:281 +#: ../libempathy-gtk/empathy-tls-dialog.c:278 msgid "C_ontinue" msgstr "F_ortsett" -#: ../libempathy-gtk/empathy-tls-dialog.c:287 +#: ../libempathy-gtk/empathy-tls-dialog.c:284 msgid "Untrusted connection" msgstr "Tilkobling uten tillit" -#: ../libempathy-gtk/empathy-tls-dialog.c:288 +#: ../libempathy-gtk/empathy-tls-dialog.c:285 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Denne tilkoblingen er ikke tiltrodd. Vil du fortsette likevel?" -#: ../libempathy-gtk/empathy-tls-dialog.c:298 +#: ../libempathy-gtk/empathy-tls-dialog.c:295 msgid "Remember this choice for future connections" msgstr "Husk dette valget for fremtidige tilkoblinger" -#: ../libempathy-gtk/empathy-tls-dialog.c:304 +#: ../libempathy-gtk/empathy-tls-dialog.c:301 msgid "Certificate Details" msgstr "Sertifikatdetaljer" -#: ../libempathy-gtk/empathy-ui-utils.c:1050 +#: ../libempathy-gtk/empathy-ui-utils.c:1078 msgid "Unable to open URI" msgstr "Kan ikke Ã¥pne URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1174 +#: ../libempathy-gtk/empathy-ui-utils.c:1202 msgid "Select a file" msgstr "Velg en fil" -#: ../libempathy-gtk/empathy-ui-utils.c:1248 +#: ../libempathy-gtk/empathy-ui-utils.c:1276 msgid "Insufficient free space to save file" msgstr "Ikke nok ledig plass til Ã¥ lagre filen" -#: ../libempathy-gtk/empathy-ui-utils.c:1256 +#: ../libempathy-gtk/empathy-ui-utils.c:1284 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -2750,16 +2750,16 @@ msgstr "" "%s ledig plass kreves for Ã¥ lagre denne filen, men kun %s er tilgjengelig. " "Vennligst velg en annen lokasjon." -#: ../libempathy-gtk/empathy-ui-utils.c:1302 +#: ../libempathy-gtk/empathy-ui-utils.c:1330 #, c-format msgid "Incoming file from %s" msgstr "Innkommende fil fra %s" -#: ../libempathy-gtk/empathy-user-info.c:384 +#: ../libempathy-gtk/empathy-user-info.c:395 msgid "Go online to edit your personal information." msgstr "Rediger din personlige informasjon pÃ¥ nettet." -#: ../libempathy-gtk/empathy-user-info.c:464 +#: ../libempathy-gtk/empathy-user-info.c:475 msgid "<b>Personal Details</b>" msgstr "<b>Personlige detaljer</b>" @@ -2778,197 +2778,197 @@ msgstr "_Ã…pne lenke" msgid "Inspect HTML" msgstr "Inspiser HTML" -#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +#: ../libempathy-gtk/totem-subtitle-encoding.c:157 msgid "Current Locale" msgstr "Aktivt locale" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:160 +#: ../libempathy-gtk/totem-subtitle-encoding.c:162 +#: ../libempathy-gtk/totem-subtitle-encoding.c:164 +#: ../libempathy-gtk/totem-subtitle-encoding.c:166 msgid "Arabic" msgstr "Arabisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +#: ../libempathy-gtk/totem-subtitle-encoding.c:169 msgid "Armenian" msgstr "Armensk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:173 -#: ../libempathy-gtk/totem-subtitle-encoding.c:175 -#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +#: ../libempathy-gtk/totem-subtitle-encoding.c:172 +#: ../libempathy-gtk/totem-subtitle-encoding.c:174 +#: ../libempathy-gtk/totem-subtitle-encoding.c:176 msgid "Baltic" msgstr "Baltisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +#: ../libempathy-gtk/totem-subtitle-encoding.c:179 msgid "Celtic" msgstr "Keltisk" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:182 +#: ../libempathy-gtk/totem-subtitle-encoding.c:184 +#: ../libempathy-gtk/totem-subtitle-encoding.c:186 +#: ../libempathy-gtk/totem-subtitle-encoding.c:188 msgid "Central European" msgstr "Sentraleuropeisk" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:191 +#: ../libempathy-gtk/totem-subtitle-encoding.c:193 +#: ../libempathy-gtk/totem-subtitle-encoding.c:195 +#: ../libempathy-gtk/totem-subtitle-encoding.c:197 msgid "Chinese Simplified" msgstr "Forenklet kinesisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:201 -#: ../libempathy-gtk/totem-subtitle-encoding.c:203 -#: ../libempathy-gtk/totem-subtitle-encoding.c:205 +#: ../libempathy-gtk/totem-subtitle-encoding.c:200 +#: ../libempathy-gtk/totem-subtitle-encoding.c:202 +#: ../libempathy-gtk/totem-subtitle-encoding.c:204 msgid "Chinese Traditional" msgstr "Tradisjonell kinesisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +#: ../libempathy-gtk/totem-subtitle-encoding.c:207 msgid "Croatian" msgstr "Kroatisk" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:210 +#: ../libempathy-gtk/totem-subtitle-encoding.c:212 +#: ../libempathy-gtk/totem-subtitle-encoding.c:214 +#: ../libempathy-gtk/totem-subtitle-encoding.c:216 +#: ../libempathy-gtk/totem-subtitle-encoding.c:218 +#: ../libempathy-gtk/totem-subtitle-encoding.c:220 msgid "Cyrillic" msgstr "Kyrillisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +#: ../libempathy-gtk/totem-subtitle-encoding.c:223 msgid "Cyrillic/Russian" msgstr "Kyrillisk/Russisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:227 -#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +#: ../libempathy-gtk/totem-subtitle-encoding.c:226 +#: ../libempathy-gtk/totem-subtitle-encoding.c:228 msgid "Cyrillic/Ukrainian" msgstr "Kyrillisk/Ukrainsk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +#: ../libempathy-gtk/totem-subtitle-encoding.c:231 msgid "Georgian" msgstr "Georgisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:235 -#: ../libempathy-gtk/totem-subtitle-encoding.c:237 -#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +#: ../libempathy-gtk/totem-subtitle-encoding.c:234 +#: ../libempathy-gtk/totem-subtitle-encoding.c:236 +#: ../libempathy-gtk/totem-subtitle-encoding.c:238 msgid "Greek" msgstr "Gresk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +#: ../libempathy-gtk/totem-subtitle-encoding.c:241 msgid "Gujarati" msgstr "Gujarati" -#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +#: ../libempathy-gtk/totem-subtitle-encoding.c:244 msgid "Gurmukhi" msgstr "Gurmukhi" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:247 +#: ../libempathy-gtk/totem-subtitle-encoding.c:249 +#: ../libempathy-gtk/totem-subtitle-encoding.c:251 +#: ../libempathy-gtk/totem-subtitle-encoding.c:253 msgid "Hebrew" msgstr "Hebraisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +#: ../libempathy-gtk/totem-subtitle-encoding.c:256 msgid "Hebrew Visual" msgstr "Visuell hebraisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +#: ../libempathy-gtk/totem-subtitle-encoding.c:259 msgid "Hindi" msgstr "Hindi" -#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +#: ../libempathy-gtk/totem-subtitle-encoding.c:262 msgid "Icelandic" msgstr "Islandsk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:266 -#: ../libempathy-gtk/totem-subtitle-encoding.c:268 -#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +#: ../libempathy-gtk/totem-subtitle-encoding.c:265 +#: ../libempathy-gtk/totem-subtitle-encoding.c:267 +#: ../libempathy-gtk/totem-subtitle-encoding.c:269 msgid "Japanese" msgstr "Japansk" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:272 +#: ../libempathy-gtk/totem-subtitle-encoding.c:274 +#: ../libempathy-gtk/totem-subtitle-encoding.c:276 +#: ../libempathy-gtk/totem-subtitle-encoding.c:278 msgid "Korean" msgstr "Koreansk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +#: ../libempathy-gtk/totem-subtitle-encoding.c:281 msgid "Nordic" msgstr "Nordisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +#: ../libempathy-gtk/totem-subtitle-encoding.c:284 msgid "Persian" msgstr "Persisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:288 -#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +#: ../libempathy-gtk/totem-subtitle-encoding.c:287 +#: ../libempathy-gtk/totem-subtitle-encoding.c:289 msgid "Romanian" msgstr "Rumensk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +#: ../libempathy-gtk/totem-subtitle-encoding.c:292 msgid "South European" msgstr "Sør-Europeisk" -#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +#: ../libempathy-gtk/totem-subtitle-encoding.c:295 msgid "Thai" msgstr "Thai" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:298 +#: ../libempathy-gtk/totem-subtitle-encoding.c:300 +#: ../libempathy-gtk/totem-subtitle-encoding.c:302 +#: ../libempathy-gtk/totem-subtitle-encoding.c:304 msgid "Turkish" msgstr "Tyrkisk" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:307 +#: ../libempathy-gtk/totem-subtitle-encoding.c:309 +#: ../libempathy-gtk/totem-subtitle-encoding.c:311 +#: ../libempathy-gtk/totem-subtitle-encoding.c:313 +#: ../libempathy-gtk/totem-subtitle-encoding.c:315 msgid "Unicode" msgstr "Unicode" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:318 +#: ../libempathy-gtk/totem-subtitle-encoding.c:320 +#: ../libempathy-gtk/totem-subtitle-encoding.c:322 +#: ../libempathy-gtk/totem-subtitle-encoding.c:324 +#: ../libempathy-gtk/totem-subtitle-encoding.c:326 msgid "Western" msgstr "Vestlig" -#: ../libempathy-gtk/totem-subtitle-encoding.c:330 -#: ../libempathy-gtk/totem-subtitle-encoding.c:332 -#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +#: ../libempathy-gtk/totem-subtitle-encoding.c:329 +#: ../libempathy-gtk/totem-subtitle-encoding.c:331 +#: ../libempathy-gtk/totem-subtitle-encoding.c:333 msgid "Vietnamese" msgstr "Vietnamesisk" -#: ../libempathy-gtk/empathy-roster-model.h:29 +#: ../libempathy-gtk/empathy-roster-model.h:27 msgid "Top Contacts" msgstr "Mest populære kontakter" -#: ../libempathy-gtk/empathy-roster-model.h:31 +#: ../libempathy-gtk/empathy-roster-model.h:29 msgid "Ungrouped" msgstr "Ikke gruppert" #. Add a prefix explaining that something goes wrong when trying to #. * fetch contact's presence. -#: ../libempathy-gtk/empathy-roster-contact.c:205 +#: ../libempathy-gtk/empathy-roster-contact.c:201 #, c-format msgid "Server cannot find contact: %s" msgstr "Tjener finner ikke kontakt: %s" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223 msgid "No error message" msgstr "Ingen feilmelding" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296 msgid "Instant Message (Empathy)" msgstr "Lynmelding (Empathy)" -#: ../src/empathy-about-dialog.c:81 +#: ../src/empathy-about-dialog.c:77 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 " @@ -2980,7 +2980,7 @@ msgstr "" "Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) " "enhver senere versjon." -#: ../src/empathy-about-dialog.c:85 +#: ../src/empathy-about-dialog.c:81 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 " @@ -2991,7 +2991,7 @@ msgstr "" "GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET " "BESTEMT FORMÃ…L. Se GNU General Public License for detaljer." -#: ../src/empathy-about-dialog.c:89 +#: ../src/empathy-about-dialog.c:85 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 " @@ -3001,11 +3001,11 @@ msgstr "" "Hvis ikke sÃ¥ skriv til Free Software Foundation, Inc., 51 Franklin Street, " "Fifth Floor, Boston, MA 02110-1301159, USA." -#: ../src/empathy-about-dialog.c:109 +#: ../src/empathy-about-dialog.c:105 msgid "An Instant Messaging client for GNOME" msgstr "En meldingsklient for GNOME" -#: ../src/empathy-about-dialog.c:115 +#: ../src/empathy-about-dialog.c:111 msgid "translator-credits" msgstr "" "Kjartan Maraas\n" @@ -3013,70 +3013,70 @@ msgstr "" "Espen Stefansen\n" "Torstein Adolf Winterseth <kvikende@fsfe.org>" -#: ../src/empathy-accounts.c:182 +#: ../src/empathy-accounts.c:171 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "Ikke vis noen dialoger. Utfør arbeid (f.eks import) og avslutt" -#: ../src/empathy-accounts.c:186 +#: ../src/empathy-accounts.c:175 msgid "" "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "" "Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-" "kontoer" -#: ../src/empathy-accounts.c:190 +#: ../src/empathy-accounts.c:179 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "Velg en gitt konto ved oppstart (f.eks. gabble/jabber/foo_40eksempel_2eorg0)" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:181 msgid "<account-id>" msgstr "<konto-id>" -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:186 msgid "- Empathy Accounts" msgstr "- Empathy-kontoer" -#: ../src/empathy-accounts.c:240 +#: ../src/empathy-accounts.c:239 msgid "Empathy Accounts" msgstr "Empathy-kontoer" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:52 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Det finnes ikke-lagrede endringer for din %s-konto." #. 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:72 +#: ../src/empathy-accounts-dialog.c:56 msgid "Your new account has not been saved yet." msgstr "Din nye konto er ikke lagret ennÃ¥." -#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274 +#: ../src/empathy-accounts-dialog.c:388 ../src/empathy-call-window.c:1258 msgid "Connecting…" msgstr "Kobler til …" -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:429 #, c-format msgid "Offline — %s" msgstr "Frakoblet - %s" -#: ../src/empathy-accounts-dialog.c:457 +#: ../src/empathy-accounts-dialog.c:441 #, c-format msgid "Disconnected — %s" msgstr "Koblet fra - %s" -#: ../src/empathy-accounts-dialog.c:468 +#: ../src/empathy-accounts-dialog.c:452 msgid "Offline — No Network Connection" msgstr "Frakoblet - Ingen nettverkstilkobling" -#: ../src/empathy-accounts-dialog.c:475 +#: ../src/empathy-accounts-dialog.c:459 msgid "Unknown Status" msgstr "Ukjent status" -#: ../src/empathy-accounts-dialog.c:492 +#: ../src/empathy-accounts-dialog.c:476 msgid "" "This account has been disabled because it relies on an old, unsupported " "backend. Please install telepathy-haze and restart your session to migrate " @@ -3086,28 +3086,28 @@ msgstr "" "som ikke støttes. Vennligst installer telepathy-haze og start økten pÃ¥ nytt " "for Ã¥ migrere kontoen." -#: ../src/empathy-accounts-dialog.c:502 +#: ../src/empathy-accounts-dialog.c:486 msgid "Offline — Account Disabled" msgstr "Frakoblet - Konto deaktivert" -#: ../src/empathy-accounts-dialog.c:608 +#: ../src/empathy-accounts-dialog.c:592 msgid "Edit Connection Parameters" msgstr "Rediger parametere for tilkobling" -#: ../src/empathy-accounts-dialog.c:735 +#: ../src/empathy-accounts-dialog.c:719 msgid "_Edit Connection Parameters..." msgstr "R_ediger parametere for tilkoblingen …" -#: ../src/empathy-accounts-dialog.c:1268 +#: ../src/empathy-accounts-dialog.c:1252 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Vil du fjerne %s fra din datamaskin?" -#: ../src/empathy-accounts-dialog.c:1272 +#: ../src/empathy-accounts-dialog.c:1256 msgid "This will not remove your account on the server." msgstr "Dette vil ikke fjerne din konto pÃ¥ tjeneren." -#: ../src/empathy-accounts-dialog.c:1477 +#: ../src/empathy-accounts-dialog.c:1461 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3116,24 +3116,24 @@ msgstr "" "dine endringer. Er du sikker pÃ¥ at du vil fortsette?" #. Menu item: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1668 +#: ../src/empathy-accounts-dialog.c:1652 msgid "_Enabled" msgstr "SlÃ¥tt _pÃ¥" #. Menu item: Rename -#: ../src/empathy-accounts-dialog.c:1691 +#: ../src/empathy-accounts-dialog.c:1675 msgid "Rename" msgstr "Endre navn" -#: ../src/empathy-accounts-dialog.c:2107 +#: ../src/empathy-accounts-dialog.c:2091 msgid "_Skip" msgstr "_Hopp over" -#: ../src/empathy-accounts-dialog.c:2111 +#: ../src/empathy-accounts-dialog.c:2095 msgid "_Connect" msgstr "_Koble til" -#: ../src/empathy-accounts-dialog.c:2290 +#: ../src/empathy-accounts-dialog.c:2274 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3142,7 +3142,7 @@ msgstr "" "dine endringer. Er du sikker pÃ¥ at du vil fortsette?" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:2433 +#: ../src/empathy-accounts-dialog.c:2417 msgid "Messaging and VoIP Accounts" msgstr "Meldings- og VoIP-kontoer" @@ -3166,31 +3166,31 @@ msgstr "" msgid "No protocol backends installed" msgstr "Ingen protokollmotor installert" -#: ../src/empathy-auth-client.c:296 +#: ../src/empathy-auth-client.c:285 msgid " - Empathy authentication client" msgstr "- Empathy autentiseringsklient" -#: ../src/empathy-auth-client.c:312 +#: ../src/empathy-auth-client.c:301 msgid "Empathy authentication client" msgstr "Empathy autentiseringsklient" -#: ../src/empathy.c:427 +#: ../src/empathy.c:407 msgid "Don't connect on startup" msgstr "Ikke koble til ved oppstart" -#: ../src/empathy.c:431 +#: ../src/empathy.c:411 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart" -#: ../src/empathy.c:447 +#: ../src/empathy.c:440 msgid "- Empathy IM Client" msgstr "- Empathy lynmeldingsprogram" -#: ../src/empathy.c:623 +#: ../src/empathy.c:626 msgid "Error contacting the Account Manager" msgstr "Feil ved forsøk pÃ¥ Ã¥ kontakte kontohÃ¥ndtering" -#: ../src/empathy.c:625 +#: ../src/empathy.c:628 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3203,111 +3203,105 @@ msgstr "" "\n" "%s" -#: ../src/empathy-call.c:124 +#: ../src/empathy-call.c:115 msgid "In a call" msgstr "I en samtale" -#: ../src/empathy-call.c:224 +#: ../src/empathy-call.c:215 msgid "- Empathy Audio/Video Client" msgstr "- Empathy lyd-/bildeklient" -#: ../src/empathy-call.c:248 +#: ../src/empathy-call.c:239 msgid "Empathy Audio/Video Client" msgstr "Empathy lyd-/bildeklient" -#: ../src/empathy-call-observer.c:119 +#: ../src/empathy-call-observer.c:110 #, c-format msgid "%s just tried to call you, but you were in another call." msgstr "%s prøvde Ã¥ ringe deg, men du var i en annen samtale." -#. Translators: this is an "Info" label. It should be as short -#. * as possible. -#: ../src/empathy-call-window.c:1131 ../src/empathy-call-window.c:1147 -msgid "i" -msgstr "i" - -#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508 +#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500 msgid "Incoming call" msgstr "Innkommende samtale" -#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming video call from %s" msgstr "Innkommende videosamtale fra %s" -#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516 -#: ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming call from %s" msgstr "Innkommende samtale fra %s" -#: ../src/empathy-call-window.c:1559 -#: ../src/empathy-notifications-approver.c:197 +#: ../src/empathy-call-window.c:1543 +#: ../src/empathy-notifications-approver.c:191 msgid "Reject" msgstr "Avvis" -#: ../src/empathy-call-window.c:1560 -#: ../src/empathy-notifications-approver.c:202 -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-call-window.c:1544 +#: ../src/empathy-notifications-approver.c:196 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer" msgstr "Svar" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:1929 +#: ../src/empathy-call-window.c:1913 #, c-format msgid "Call with %s" msgstr "Samtale med %s" -#: ../src/empathy-call-window.c:2181 +#: ../src/empathy-call-window.c:2165 msgid "The IP address as seen by the machine" msgstr "IP-adresse som sett av maskinen" -#: ../src/empathy-call-window.c:2183 +#: ../src/empathy-call-window.c:2167 msgid "The IP address as seen by a server on the Internet" msgstr "IP-adresse som sett av en tjener pÃ¥ internett" -#: ../src/empathy-call-window.c:2185 +#: ../src/empathy-call-window.c:2169 msgid "The IP address of the peer as seen by the other side" msgstr "IP-adresse for peer som sett av andre siden" -#: ../src/empathy-call-window.c:2187 +#: ../src/empathy-call-window.c:2171 msgid "The IP address of a relay server" msgstr "IP-adresse for en relay-tjener" -#: ../src/empathy-call-window.c:2189 +#: ../src/empathy-call-window.c:2173 msgid "The IP address of the multicast group" msgstr "IP-adresse for multicast-gruppe" -#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601 -#: ../src/empathy-call-window.c:2602 ../src/empathy-call-window.c:2603 +#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585 +#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587 #: ../src/empathy-call-window.ui.h:28 msgid "Unknown" msgstr "Ukjent" -#: ../src/empathy-call-window.c:2961 +#: ../src/empathy-call-window.c:2946 msgid "On hold" msgstr "PÃ¥ vent" -#: ../src/empathy-call-window.c:2965 +#: ../src/empathy-call-window.c:2950 msgid "Mute" msgstr "Demp" -#: ../src/empathy-call-window.c:2967 +#: ../src/empathy-call-window.c:2952 msgid "Duration" msgstr "Varighet" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2970 +#: ../src/empathy-call-window.c:2955 #, c-format msgid "%s — %d:%02dm" msgstr "%s – %d:%02dm" -#: ../src/empathy-call-window.c:3066 +#: ../src/empathy-call-window.c:3051 msgid "Technical Details" msgstr "Tekniske detaljer" -#: ../src/empathy-call-window.c:3105 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3316,7 +3310,7 @@ msgstr "" "Programvaren til %s forstÃ¥r ikke noen av lydformatene som støttes av din " "datamaskin" -#: ../src/empathy-call-window.c:3110 +#: ../src/empathy-call-window.c:3095 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3325,7 +3319,7 @@ msgstr "" "Programvaren til %s forstÃ¥r ikke noen av videoformatene som støttes av din " "datamaskin" -#: ../src/empathy-call-window.c:3116 +#: ../src/empathy-call-window.c:3101 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3334,25 +3328,25 @@ msgstr "" "Kan ikke etablere tilkobling til %s. En av dere kan være pÃ¥ et nettverk som " "ikke tillater direkte tilkoblinger." -#: ../src/empathy-call-window.c:3122 +#: ../src/empathy-call-window.c:3107 msgid "There was a failure on the network" msgstr "Det oppsto en feil pÃ¥ nettverket" -#: ../src/empathy-call-window.c:3126 +#: ../src/empathy-call-window.c:3111 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "Lydformatene som kreves for denne samtalen er ikke installert pÃ¥ din " "datamaskin" -#: ../src/empathy-call-window.c:3129 +#: ../src/empathy-call-window.c:3114 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Videoformatene som kreves for denne samtalen er ikke installert pÃ¥ din " "datamaskin" -#: ../src/empathy-call-window.c:3141 +#: ../src/empathy-call-window.c:3126 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3363,32 +3357,32 @@ msgstr "" "\">rapporter denne feilen</a> og legg ved loggene som samles inn i " "«Feilsøking»-vinduet i Hjelp-menyen." -#: ../src/empathy-call-window.c:3150 +#: ../src/empathy-call-window.c:3135 msgid "There was a failure in the call engine" msgstr "Det oppsto en feil i samtalemotoren" -#: ../src/empathy-call-window.c:3153 +#: ../src/empathy-call-window.c:3138 msgid "The end of the stream was reached" msgstr "Slutt pÃ¥ strømmen ble nÃ¥dd" -#: ../src/empathy-call-window.c:3193 +#: ../src/empathy-call-window.c:3178 msgid "Can't establish audio stream" msgstr "Kan ikke etablere lydstrøm" -#: ../src/empathy-call-window.c:3203 +#: ../src/empathy-call-window.c:3188 msgid "Can't establish video stream" msgstr "Kan ikke etablere videostrøm" -#: ../src/empathy-call-window.c:3240 +#: ../src/empathy-call-window.c:3225 #, c-format msgid "Your current balance is %s." msgstr "Din saldo er %s." -#: ../src/empathy-call-window.c:3244 +#: ../src/empathy-call-window.c:3229 msgid "Sorry, you don’t have enough credit for that call." msgstr "Du har ikke nok kreditt til Ã¥ starte denne samtalen." -#: ../src/empathy-call-window.c:3246 +#: ../src/empathy-call-window.c:3231 msgid "Top Up" msgstr "Fyll opp" @@ -3504,19 +3498,19 @@ msgstr "Lokal kandidat:" msgid "Audio" msgstr "Lyd" -#: ../src/empathy-chat.c:102 +#: ../src/empathy-chat.c:101 msgid "- Empathy Chat Client" msgstr "- Empathy lynmeldingsprogram" -#: ../src/empathy-chatrooms-window.c:251 +#: ../src/empathy-chatrooms-window.c:243 msgid "Name" msgstr "Navn" -#: ../src/empathy-chatrooms-window.c:269 +#: ../src/empathy-chatrooms-window.c:261 msgid "Room" msgstr "Rom" -#: ../src/empathy-chatrooms-window.c:277 +#: ../src/empathy-chatrooms-window.c:269 msgid "Auto-Connect" msgstr "Koble til automatisk" @@ -3524,11 +3518,11 @@ msgstr "Koble til automatisk" msgid "Manage Favorite Rooms" msgstr "HÃ¥ndter favorittrom" -#: ../src/empathy-chat-window.c:287 +#: ../src/empathy-chat-window.c:275 msgid "Close this window?" msgstr "Lukk dette vinduet?" -#: ../src/empathy-chat-window.c:293 +#: ../src/empathy-chat-window.c:281 #, c-format msgid "" "Closing this window will leave %s. You will not receive any further messages " @@ -3537,7 +3531,7 @@ msgstr "" "Hvis du lukker dette vinduet vil du forlate %s. Du vil ikke motta videre " "meldinger før du blir med igjen." -#: ../src/empathy-chat-window.c:306 +#: ../src/empathy-chat-window.c:294 #, c-format msgid "" "Closing this window will leave a chat room. You will not receive any further " @@ -3552,12 +3546,12 @@ msgstr[1] "" "Hvis du lukker dette vinduet vil du forlate %u praterom. Du vil ikke motta " "videre meldinger før du blir med igjen." -#: ../src/empathy-chat-window.c:317 +#: ../src/empathy-chat-window.c:305 #, c-format msgid "Leave %s?" msgstr "Forlat %s?" -#: ../src/empathy-chat-window.c:319 +#: ../src/empathy-chat-window.c:307 msgid "" "You will not receive any further messages from this chat room until you " "rejoin it." @@ -3565,54 +3559,54 @@ msgstr "" "Du vil ikke motta videre meldinger fra dette praterommet før du blir med " "igjen." -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Close window" msgstr "Lukk vindu" -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Leave room" msgstr "Forlat rom" -#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700 +#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d ulest)" msgstr[1] "%s (%d uleste)" -#: ../src/empathy-chat-window.c:692 +#: ../src/empathy-chat-window.c:680 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (og %u annen)" msgstr[1] "%s (og %u andre)" -#: ../src/empathy-chat-window.c:708 +#: ../src/empathy-chat-window.c:696 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d ulest fra andre)" msgstr[1] "%s (%d uleste fra andre)" -#: ../src/empathy-chat-window.c:717 +#: ../src/empathy-chat-window.c:705 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d ulest fra alle)" msgstr[1] "%s (%d uleste fra alle)" -#: ../src/empathy-chat-window.c:954 +#: ../src/empathy-chat-window.c:942 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:962 +#: ../src/empathy-chat-window.c:950 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" msgstr[0] "Sender %d melding" msgstr[1] "Sender %d meldinger" -#: ../src/empathy-chat-window.c:982 +#: ../src/empathy-chat-window.c:970 msgid "Typing a message." msgstr "Skriver en melding" @@ -3676,77 +3670,77 @@ msgstr "Flytt fane til høy_re" msgid "_Detach Tab" msgstr "Riv _løs fane" -#: ../src/empathy-debugger.c:69 +#: ../src/empathy-debugger.c:77 msgid "Show a particular service" msgstr "Vis en spesiell tjeneste" -#: ../src/empathy-debugger.c:74 +#: ../src/empathy-debugger.c:82 msgid "- Empathy Debugger" msgstr "- Empathy feilsøking" -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:142 msgid "Empathy Debugger" msgstr "Empathy feilsøking" -#: ../src/empathy-debug-window.c:1599 +#: ../src/empathy-debug-window.c:1589 msgid "Save" msgstr "Lagre" -#: ../src/empathy-debug-window.c:1659 +#: ../src/empathy-debug-window.c:1649 msgid "Pastebin link" msgstr "Lenke til Pastebin" -#: ../src/empathy-debug-window.c:1668 +#: ../src/empathy-debug-window.c:1658 msgid "Pastebin response" msgstr "Svar fra Pastebin" -#: ../src/empathy-debug-window.c:1675 +#: ../src/empathy-debug-window.c:1665 msgid "Data too large for a single paste. Please save logs to file." msgstr "" "Data for stor for en enkel klipp-og-lim operasjon. Vennligst lagre loggene " "til en fil." -#: ../src/empathy-debug-window.c:1857 +#: ../src/empathy-debug-window.c:1847 msgid "Debug Window" msgstr "Feilsøkingsvindu" -#: ../src/empathy-debug-window.c:1917 +#: ../src/empathy-debug-window.c:1907 msgid "Send to pastebin" msgstr "Send til Pastebin" -#: ../src/empathy-debug-window.c:1961 +#: ../src/empathy-debug-window.c:1951 msgid "Pause" msgstr "Pause" -#: ../src/empathy-debug-window.c:1973 +#: ../src/empathy-debug-window.c:1963 msgid "Level " msgstr "NivÃ¥ " -#: ../src/empathy-debug-window.c:1992 +#: ../src/empathy-debug-window.c:1982 msgid "Debug" msgstr "Feilsøk" -#: ../src/empathy-debug-window.c:1997 +#: ../src/empathy-debug-window.c:1987 msgid "Info" msgstr "Info" -#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077 +#: ../src/empathy-debug-window.c:1992 ../src/empathy-debug-window.c:2067 msgid "Message" msgstr "Melding" -#: ../src/empathy-debug-window.c:2007 +#: ../src/empathy-debug-window.c:1997 msgid "Warning" msgstr "Advarsel" -#: ../src/empathy-debug-window.c:2012 +#: ../src/empathy-debug-window.c:2002 msgid "Critical" msgstr "Kritisk" -#: ../src/empathy-debug-window.c:2017 +#: ../src/empathy-debug-window.c:2007 msgid "Error" msgstr "Feil" -#: ../src/empathy-debug-window.c:2030 +#: ../src/empathy-debug-window.c:2020 msgid "" "Even if they don't display passwords, logs can contain sensitive information " "such as your list of contacts or the messages you recently sent or " @@ -3764,93 +3758,93 @@ msgstr "" "rapporterer den ved Ã¥ vise avanserte felt i <a href=\"https://bugzilla.gnome." "org/enter_bug.cgi?product=empathy>feilrapporten</a>." -#: ../src/empathy-debug-window.c:2062 +#: ../src/empathy-debug-window.c:2052 msgid "Time" msgstr "Tid" -#: ../src/empathy-debug-window.c:2065 +#: ../src/empathy-debug-window.c:2055 msgid "Domain" msgstr "Domene" -#: ../src/empathy-debug-window.c:2068 +#: ../src/empathy-debug-window.c:2058 msgid "Category" msgstr "Kategori" -#: ../src/empathy-debug-window.c:2071 +#: ../src/empathy-debug-window.c:2061 msgid "Level" msgstr "NivÃ¥" -#: ../src/empathy-debug-window.c:2100 +#: ../src/empathy-debug-window.c:2090 msgid "" "The selected connection manager does not support the remote debugging " "extension." msgstr "" "Valgt tilkoblingshÃ¥ndterer støtter ikke utvidelse for ekstern feilsøking." -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:500 msgid "Incoming video call" msgstr "Innkommende videosamtale" -#: ../src/empathy-event-manager.c:512 +#: ../src/empathy-event-manager.c:504 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s ringer deg med video. Vil du svare?" -#: ../src/empathy-event-manager.c:513 +#: ../src/empathy-event-manager.c:505 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s ringer deg. Vil du svare?" -#: ../src/empathy-event-manager.c:541 +#: ../src/empathy-event-manager.c:533 msgid "_Reject" msgstr "Av_vis" -#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549 msgid "_Answer" msgstr "Sv_ar" -#: ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:549 msgid "_Answer with video" msgstr "Sv_ar med video" -#: ../src/empathy-event-manager.c:712 +#: ../src/empathy-event-manager.c:704 msgid "Room invitation" msgstr "Invitasjon til rom" -#: ../src/empathy-event-manager.c:714 +#: ../src/empathy-event-manager.c:706 #, c-format msgid "Invitation to join %s" msgstr "Invitasjon til Ã¥ bli med i %s" -#: ../src/empathy-event-manager.c:721 +#: ../src/empathy-event-manager.c:713 #, c-format msgid "%s is inviting you to join %s" msgstr "%s inviterer deg til Ã¥ bli med i %s" -#: ../src/empathy-event-manager.c:734 +#: ../src/empathy-event-manager.c:726 msgid "_Join" msgstr "_Bli med" -#: ../src/empathy-event-manager.c:760 +#: ../src/empathy-event-manager.c:752 #, c-format msgid "%s invited you to join %s" msgstr "%s inviterte deg til Ã¥ bli med i %s" -#: ../src/empathy-event-manager.c:766 +#: ../src/empathy-event-manager.c:758 #, c-format msgid "You have been invited to join %s" msgstr "Du har blitt invitert til Ã¥ bli med i %s" -#: ../src/empathy-event-manager.c:945 +#: ../src/empathy-event-manager.c:937 #, c-format msgid "Incoming file transfer from %s" msgstr "Innkommende filoverføring fra %s" -#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227 +#: ../src/empathy-event-manager.c:965 ../src/empathy-roster-window.c:212 msgid "Password required" msgstr "Passord kreves" -#: ../src/empathy-event-manager.c:1110 +#: ../src/empathy-event-manager.c:1102 #, c-format msgid "" "\n" @@ -3860,105 +3854,105 @@ msgstr "" "Melding: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:99 +#: ../src/empathy-ft-manager.c:93 #, 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 +#: ../src/empathy-ft-manager.c:96 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:178 +#: ../src/empathy-ft-manager.c:172 msgctxt "file transfer percent" msgid "Unknown" msgstr "Ukjent" -#: ../src/empathy-ft-manager.c:273 +#: ../src/empathy-ft-manager.c:267 #, c-format msgid "%s of %s at %s/s" msgstr "%s av %s med %s/s" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:268 #, c-format msgid "%s of %s" msgstr "%s av %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:305 +#: ../src/empathy-ft-manager.c:299 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Mottar «%s» fra %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:308 +#: ../src/empathy-ft-manager.c:302 #, c-format msgid "Sending \"%s\" to %s" msgstr "Sender «%s» til %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:338 +#: ../src/empathy-ft-manager.c:332 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Feil ved mottak av «%s» fra %s" -#: ../src/empathy-ft-manager.c:341 +#: ../src/empathy-ft-manager.c:335 msgid "Error receiving a file" msgstr "Feil ved mottak av en fil" -#: ../src/empathy-ft-manager.c:346 +#: ../src/empathy-ft-manager.c:340 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Feil ved sending av «%s» til %s" -#: ../src/empathy-ft-manager.c:349 +#: ../src/empathy-ft-manager.c:343 msgid "Error sending a file" msgstr "Feil ved sending av en fil" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:488 +#: ../src/empathy-ft-manager.c:482 #, c-format msgid "\"%s\" received from %s" msgstr "«%s» mottatt fra %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:493 +#: ../src/empathy-ft-manager.c:487 #, c-format msgid "\"%s\" sent to %s" msgstr "«%s» sendt til %s" -#: ../src/empathy-ft-manager.c:496 +#: ../src/empathy-ft-manager.c:490 msgid "File transfer completed" msgstr "Filoverføring fullført" -#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 +#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773 msgid "Waiting for the other participant's response" msgstr "Venter pÃ¥ svar fra motparten" -#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 +#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Sjekker integriteten for «%s»" -#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 +#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676 #, c-format msgid "Hashing \"%s\"" msgstr "Hasher «%s»" -#: ../src/empathy-ft-manager.c:1025 +#: ../src/empathy-ft-manager.c:1019 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1037 +#: ../src/empathy-ft-manager.c:1031 msgid "File" msgstr "Fil" -#: ../src/empathy-ft-manager.c:1059 +#: ../src/empathy-ft-manager.c:1053 msgid "Remaining" msgstr "GjenstÃ¥r" @@ -3970,59 +3964,59 @@ msgstr "Filoverføringer" msgid "Remove completed, canceled and failed file transfers from the list" msgstr "Fjerning fullført. Filoverføringer fra listen er avbrutt og feilet" -#: ../src/empathy-import-dialog.c:76 +#: ../src/empathy-import-dialog.c:70 msgid "_Import" msgstr "_Importer" -#: ../src/empathy-import-dialog.c:88 +#: ../src/empathy-import-dialog.c:82 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." msgstr "Fant ingen kontoer Ã¥ importere. Empathy støtter kun import fra Pidgin." -#: ../src/empathy-import-dialog.c:209 +#: ../src/empathy-import-dialog.c:203 msgid "Import Accounts" msgstr "Importer kontoer" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:302 +#: ../src/empathy-import-widget.c:296 msgid "Import" msgstr "Importer" -#: ../src/empathy-import-widget.c:311 +#: ../src/empathy-import-widget.c:305 msgid "Protocol" msgstr "Protokoll" -#: ../src/empathy-import-widget.c:335 +#: ../src/empathy-import-widget.c:329 msgid "Source" msgstr "Kilde" -#: ../src/empathy-invite-participant-dialog.c:201 -#: ../src/empathy-invite-participant-dialog.c:229 +#: ../src/empathy-invite-participant-dialog.c:196 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite Participant" msgstr "Inviter deltaker" -#: ../src/empathy-invite-participant-dialog.c:202 +#: ../src/empathy-invite-participant-dialog.c:197 msgid "Choose a contact to invite into the conversation:" msgstr "Velg en kontakt Ã¥ invitere til samtalen:" -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:220 msgid "Invite" msgstr "Inviter" -#: ../src/empathy-new-chatroom-dialog.c:194 +#: ../src/empathy-new-chatroom-dialog.c:184 msgid "Chat Room" msgstr "Samtalerom" -#: ../src/empathy-new-chatroom-dialog.c:209 +#: ../src/empathy-new-chatroom-dialog.c:199 msgid "Members" msgstr "Medlemmer" -#: ../src/empathy-new-chatroom-dialog.c:410 +#: ../src/empathy-new-chatroom-dialog.c:400 msgid "Failed to list rooms" msgstr "Klarte ikke Ã¥ vise rom" -#: ../src/empathy-new-chatroom-dialog.c:439 +#: ../src/empathy-new-chatroom-dialog.c:435 #, c-format msgid "" "%s\n" @@ -4035,17 +4029,17 @@ msgstr "" "Passord kreves: %s\n" "Medlemmer: %s" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:437 +#: ../src/empathy-new-chatroom-dialog.c:438 msgid "Yes" msgstr "Ja" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:437 +#: ../src/empathy-new-chatroom-dialog.c:438 msgid "No" msgstr "Nei" -#: ../src/empathy-new-chatroom-dialog.c:784 +#: ../src/empathy-new-chatroom-dialog.c:789 msgid "Join Room" msgstr "Bli med i rom" @@ -4088,104 +4082,104 @@ msgstr "Kunne ikke laste romliste" msgid "Room List" msgstr "Romliste" -#: ../src/empathy-notifications-approver.c:188 +#: ../src/empathy-notifications-approver.c:182 msgid "Respond" msgstr "Svar" -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer with video" msgstr "Svar med video" -#: ../src/empathy-notifications-approver.c:215 -#: ../src/empathy-notifications-approver.c:225 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:219 msgid "Decline" msgstr "AvslÃ¥" -#: ../src/empathy-notifications-approver.c:219 -#: ../src/empathy-notifications-approver.c:230 +#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:224 msgid "Accept" msgstr "Godta" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:240 +#: ../src/empathy-notifications-approver.c:234 msgid "Provide" msgstr "Oppgi" -#: ../src/empathy-preferences.c:143 +#: ../src/empathy-preferences.c:134 msgid "Message received" msgstr "Melding mottatt" -#: ../src/empathy-preferences.c:144 +#: ../src/empathy-preferences.c:135 msgid "Message sent" msgstr "Melding sendt" -#: ../src/empathy-preferences.c:145 +#: ../src/empathy-preferences.c:136 msgid "New conversation" msgstr "Ny samtale" -#: ../src/empathy-preferences.c:146 +#: ../src/empathy-preferences.c:137 msgid "Contact comes online" msgstr "Kontakt kobler til" -#: ../src/empathy-preferences.c:147 +#: ../src/empathy-preferences.c:138 msgid "Contact goes offline" msgstr "Kontakt kobler fra" -#: ../src/empathy-preferences.c:148 +#: ../src/empathy-preferences.c:139 msgid "Account connected" msgstr "Konto koblet til" -#: ../src/empathy-preferences.c:149 +#: ../src/empathy-preferences.c:140 msgid "Account disconnected" msgstr "Konto koblet fra" -#: ../src/empathy-preferences.c:386 +#: ../src/empathy-preferences.c:377 msgid "Language" msgstr "SprÃ¥k" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:637 +#: ../src/empathy-preferences.c:628 msgid "Juliet" msgstr "Juliet" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:644 +#: ../src/empathy-preferences.c:635 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:650 +#: ../src/empathy-preferences.c:641 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "O Romeo, Romeo, wherefore art thou Romeo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:654 +#: ../src/empathy-preferences.c:645 msgid "Deny thy father and refuse thy name;" msgstr "Deny thy father and refuse thy name;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:657 +#: ../src/empathy-preferences.c:648 msgid "Or if thou wilt not, be but sworn my love" msgstr "Or if thou wilt not, be but sworn my love" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:660 +#: ../src/empathy-preferences.c:651 msgid "And I'll no longer be a Capulet." msgstr "And I'll no longer be a Capulet." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:663 +#: ../src/empathy-preferences.c:654 msgid "Shall I hear more, or shall I speak at this?" msgstr "Shall I hear more, or shall I speak at this?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:666 +#: ../src/empathy-preferences.c:657 msgid "Juliet has disconnected" msgstr "Juliet har koblet fra" -#: ../src/empathy-preferences.c:1032 +#: ../src/empathy-preferences.c:1023 msgid "Preferences" msgstr "Brukervalg" @@ -4197,7 +4191,7 @@ msgstr "Vis grupper" msgid "Show account balances" msgstr "Vis saldo for konto" -#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2240 +#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2226 msgid "Contact List" msgstr "Kontaktliste" @@ -4362,84 +4356,84 @@ msgstr "Variant:" msgid "Themes" msgstr "Temaer" -#: ../src/empathy-roster-window.c:244 +#: ../src/empathy-roster-window.c:229 msgid "Provide Password" msgstr "Oppgi passord" -#: ../src/empathy-roster-window.c:250 +#: ../src/empathy-roster-window.c:235 msgid "Disconnect" msgstr "Koble fra" -#: ../src/empathy-roster-window.c:493 -msgid "You need to setup an account to see contacts here." +#: ../src/empathy-roster-window.c:478 +msgid "You need to set up an account to see contacts here." msgstr "Du mÃ¥ sette opp en konto for Ã¥ se kontakter her." -#: ../src/empathy-roster-window.c:569 +#: ../src/empathy-roster-window.c:554 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "Beklager %s-kontoer kan ikke brukes før %s-programvaren er oppdatert." -#: ../src/empathy-roster-window.c:669 +#: ../src/empathy-roster-window.c:655 msgid "Windows Live" msgstr "Windows Live" -#: ../src/empathy-roster-window.c:673 +#: ../src/empathy-roster-window.c:659 msgid "Facebook" msgstr "Facebook" #. translators: %s is an account name like 'Facebook' or 'Google Talk' -#: ../src/empathy-roster-window.c:688 +#: ../src/empathy-roster-window.c:674 #, c-format msgid "%s account requires authorisation" msgstr "%s-konto krever autorisering" -#: ../src/empathy-roster-window.c:699 +#: ../src/empathy-roster-window.c:685 msgid "Online Accounts" msgstr "Kontoer pÃ¥ nettet" -#: ../src/empathy-roster-window.c:746 +#: ../src/empathy-roster-window.c:732 msgid "Update software..." msgstr "Oppdater programvare …" -#: ../src/empathy-roster-window.c:752 +#: ../src/empathy-roster-window.c:738 msgid "Reconnect" msgstr "Koble til pÃ¥ nytt" -#: ../src/empathy-roster-window.c:756 +#: ../src/empathy-roster-window.c:742 msgid "Edit Account" msgstr "Rediger konto" -#: ../src/empathy-roster-window.c:761 +#: ../src/empathy-roster-window.c:747 msgid "Close" msgstr "Lukk" -#: ../src/empathy-roster-window.c:903 +#: ../src/empathy-roster-window.c:889 msgid "Top up account" msgstr "Fyll opp konto" -#: ../src/empathy-roster-window.c:1589 +#: ../src/empathy-roster-window.c:1575 msgid "You need to enable one of your accounts to see contacts here." msgstr "Du mÃ¥ slÃ¥ pÃ¥ en av kontoene for Ã¥ se kontakter her." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:1597 +#: ../src/empathy-roster-window.c:1583 #, c-format msgid "You need to enable %s to see contacts here." msgstr "Du mÃ¥ slÃ¥ pÃ¥ %s for Ã¥ se kontakter her." -#: ../src/empathy-roster-window.c:1675 +#: ../src/empathy-roster-window.c:1661 msgid "Change your presence to see contacts here" msgstr "Endre din tilstedeværelse for Ã¥ se kontakter her" -#: ../src/empathy-roster-window.c:1684 +#: ../src/empathy-roster-window.c:1670 msgid "No match found" msgstr "Ingen treff funnet" -#: ../src/empathy-roster-window.c:1691 +#: ../src/empathy-roster-window.c:1677 msgid "You haven't added any contact yet" msgstr "Du har ikke lagt til kontakter ennÃ¥" -#: ../src/empathy-roster-window.c:1694 +#: ../src/empathy-roster-window.c:1680 msgid "No online contacts" msgstr "Ingen kontakter tilkoblet" @@ -4536,12 +4530,12 @@ msgstr "Ny _samtale …" msgid "Status" msgstr "Status" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126 msgid "Done" msgstr "Ferdig" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214 msgid "Please enter your account details" msgstr "Vennligst oppgi detaljer om din konto" @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: empathy master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2013-03-19 19:47+0000\n" -"PO-Revision-Date: 2013-03-20 10:18+0000\n" +"POT-Creation-Date: 2013-05-24 14:02+0000\n" +"PO-Revision-Date: 2013-05-08 12:34+0100\n" "Last-Translator: Pavol KlaÄanský <pavol@klacansky.com>\n" "Language-Team: Slovak <gnome-sk-list@gnome.org>\n" "Language: sk\n" @@ -598,82 +598,82 @@ msgstr "" "ÄŒi má Empathy znÞiÅ¥ presnosÅ¥ urÄenia polohy z dôvodu ochrany súkromia." # Chyby ktoré vzniknú zmenou stavu -#: ../libempathy/empathy-ft-handler.c:733 +#: ../libempathy/empathy-ft-handler.c:732 msgid "No reason was specified" msgstr "Nebol Å¡pecifikovaný žiaden dôvod" -#: ../libempathy/empathy-ft-handler.c:736 +#: ../libempathy/empathy-ft-handler.c:735 msgid "The change in state was requested" msgstr "Bola vyžiadaná zmena stavu" -#: ../libempathy/empathy-ft-handler.c:739 +#: ../libempathy/empathy-ft-handler.c:738 msgid "You canceled the file transfer" msgstr "ZruÅ¡ili ste prenos súboru" -#: ../libempathy/empathy-ft-handler.c:742 +#: ../libempathy/empathy-ft-handler.c:741 msgid "The other participant canceled the file transfer" msgstr "Druhý úÄastnÃk zruÅ¡il prenos súboru" -#: ../libempathy/empathy-ft-handler.c:745 +#: ../libempathy/empathy-ft-handler.c:744 msgid "Error while trying to transfer the file" msgstr "Chyba poÄas pokusu o prenos súboru" -#: ../libempathy/empathy-ft-handler.c:748 +#: ../libempathy/empathy-ft-handler.c:747 msgid "The other participant is unable to transfer the file" msgstr "Druhý úÄastnÃk nie je schopný preniesÅ¥ súbor" -#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:295 msgid "Unknown reason" msgstr "Neznámy dôvod" -#: ../libempathy/empathy-ft-handler.c:914 +#: ../libempathy/empathy-ft-handler.c:913 msgid "File transfer completed, but the file was corrupted" msgstr "Prenos súboru bol dokonÄený, ale súbor bol poÅ¡kodený" # znie to viac slovensky -#: ../libempathy/empathy-ft-handler.c:1200 +#: ../libempathy/empathy-ft-handler.c:1199 msgid "File transfer not supported by remote contact" msgstr "Vzdialený kontakt nepodporuje prenos súboru" -#: ../libempathy/empathy-ft-handler.c:1256 +#: ../libempathy/empathy-ft-handler.c:1255 msgid "The selected file is not a regular file" msgstr "Vybraný súbor nie je obyÄajný súbor" -#: ../libempathy/empathy-ft-handler.c:1265 +#: ../libempathy/empathy-ft-handler.c:1264 msgid "The selected file is empty" msgstr "Vybraný súbor je prázdny" -#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194 +#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184 msgid "Password not found" msgstr "Heslo sa nenaÅ¡lo" -#: ../libempathy/empathy-keyring.c:594 +#: ../libempathy/empathy-keyring.c:584 #, c-format msgid "IM account password for %s (%s)" msgstr "Heslo pre úÄet internetovej komunikácie %s (%s)" -#: ../libempathy/empathy-keyring.c:631 +#: ../libempathy/empathy-keyring.c:621 #, c-format msgid "Password for chatroom '%s' on account %s (%s)" msgstr "Heslo pre diskusnú miestnosÅ¥ „%s“ na úÄte %s (%s)" -#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116 +#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107 #, c-format msgid "Missed call from %s" msgstr "ZmeÅ¡kaný hovor od %s" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:407 +#: ../libempathy/empathy-message.c:406 #, c-format msgid "Called %s" msgstr "Hovor s kontaktom %s" -#: ../libempathy/empathy-message.c:410 +#: ../libempathy/empathy-message.c:409 #, c-format msgid "Call from %s" msgstr "Hovor od %s" -#: ../libempathy/empathy-time.c:90 +#: ../libempathy/empathy-time.c:86 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" @@ -681,7 +681,7 @@ msgstr[0] "pred %d sekundami" msgstr[1] "pred %d sekundou" msgstr[2] "pred %d sekundami" -#: ../libempathy/empathy-time.c:96 +#: ../libempathy/empathy-time.c:92 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -689,7 +689,7 @@ msgstr[0] "pred %d minútami" msgstr[1] "pred %d minútou" msgstr[2] "pred %d minútami" -#: ../libempathy/empathy-time.c:102 +#: ../libempathy/empathy-time.c:98 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -697,7 +697,7 @@ msgstr[0] "pred %d hodinami" msgstr[1] "pred %d hodinou" msgstr[2] "pred %d hodinami" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:104 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -705,7 +705,7 @@ msgstr[0] "pred %d dňami" msgstr[1] "pred %d dňom" msgstr[2] "pred %d dňami" -#: ../libempathy/empathy-time.c:114 +#: ../libempathy/empathy-time.c:110 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -713,7 +713,7 @@ msgstr[0] "pred %d týždňami" msgstr[1] "pred %d týždňom" msgstr[2] "pred %d týždňami" -#: ../libempathy/empathy-time.c:120 +#: ../libempathy/empathy-time.c:116 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -721,175 +721,175 @@ msgstr[0] "pred %d mesiacmi" msgstr[1] "pred %d mesiacom" msgstr[2] "pred %d mesiacmi" -#: ../libempathy/empathy-time.c:142 +#: ../libempathy/empathy-time.c:138 msgid "in the future" msgstr "v budúcnosti" # stav prÃtomnosti -#: ../libempathy/empathy-utils.c:226 +#: ../libempathy/empathy-utils.c:215 msgid "Available" msgstr "PrÃtomný" # stav prÃtomnosti -#: ../libempathy/empathy-utils.c:228 +#: ../libempathy/empathy-utils.c:217 msgid "Busy" msgstr "Zaneprázdnený" # stav prÃtomnosti -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:220 msgid "Away" msgstr "PreÄ" # stav prÃtomnosti -#: ../libempathy/empathy-utils.c:233 +#: ../libempathy/empathy-utils.c:222 msgid "Invisible" msgstr "Neviditeľný" # stav prÃtomnosti -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:224 msgid "Offline" msgstr "Odhlásený" # stav prÃtomnosti #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:238 +#: ../libempathy/empathy-utils.c:227 msgctxt "presence" msgid "Unknown" msgstr "Neznámy" # status reason message -#: ../libempathy/empathy-utils.c:278 +#: ../libempathy/empathy-utils.c:267 msgid "No reason specified" msgstr "Nebol uvedený žiadny dôvod" # status reason message -#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:269 ../libempathy/empathy-utils.c:325 msgid "Status is set to offline" msgstr "Stav je nastavený na odhlásený" # status reason message -#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316 -#: ../libempathy-gtk/empathy-call-utils.c:47 -#: ../libempathy-gtk/empathy-new-message-dialog.c:80 +#: ../libempathy/empathy-utils.c:271 ../libempathy/empathy-utils.c:305 +#: ../libempathy-gtk/empathy-call-utils.c:41 +#: ../libempathy-gtk/empathy-new-message-dialog.c:70 msgid "Network error" msgstr "Chyba siete" # status reason message -#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307 msgid "Authentication failed" msgstr "Overenie totožnosti zlyhalo" # status reason message -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309 msgid "Encryption error" msgstr "Chyba Å¡ifrovania" # status reason message -#: ../libempathy/empathy-utils.c:288 +#: ../libempathy/empathy-utils.c:277 msgid "Name in use" msgstr "Meno sa použÃva" # status reason message -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311 msgid "Certificate not provided" msgstr "Certifikát nebol poskytnutý" # status reason message -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313 msgid "Certificate untrusted" msgstr "Nedôveryhodný certifikát" # status reason message -#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315 msgid "Certificate expired" msgstr "Certifikát vyprÅ¡al" # status reason message -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317 msgid "Certificate not activated" msgstr "Certifikát nie je aktivovaný" # status reason message -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:319 msgid "Certificate hostname mismatch" msgstr "Názov hostiteľa certifikátu nesúhlasÃ" # status reason message -#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:321 msgid "Certificate fingerprint mismatch" msgstr "OdtlaÄok certifikátu sa nezhoduje" # status reason message -#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:323 msgid "Certificate self-signed" msgstr "Certifikát podpÃsaný sám sebou" # status reason message -#: ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:293 msgid "Certificate error" msgstr "Chyba certifikátu" # error -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption is not available" msgstr "Å ifrovanie nie je dostupné" # error -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate is invalid" msgstr "Certifikát je neplatný" # error -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:331 msgid "Connection has been refused" msgstr "Spojenie bolo zamietnuté" # error -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:333 msgid "Connection can't be established" msgstr "Spojenie sa nedá vytvoriÅ¥" # error -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:335 msgid "Connection has been lost" msgstr "Spojenie bolo preruÅ¡ené" # error -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:337 msgid "This account is already connected to the server" msgstr "Tento úÄet už je pripojený k serveru" # error -#: ../libempathy/empathy-utils.c:350 +#: ../libempathy/empathy-utils.c:339 msgid "" "Connection has been replaced by a new connection using the same resource" msgstr "Pôvodné spojenie bolo nahradené novým použitÃm rovnakého zdroja" # error -#: ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:342 msgid "The account already exists on the server" msgstr "ÚÄet už na serveri existuje" # error -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:344 msgid "Server is currently too busy to handle the connection" msgstr "" "Server je teraz prÃliÅ¡ zaneprázdnený, a preto nemôže obslúžiÅ¥ pripojenie" # error -#: ../libempathy/empathy-utils.c:357 +#: ../libempathy/empathy-utils.c:346 msgid "Certificate has been revoked" msgstr "Certifikát mal zruÅ¡enú platnosÅ¥" # error -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:348 msgid "" "Certificate uses an insecure cipher algorithm or is cryptographically weak" msgstr "" "Certifikát použÃva nedostatoÄne bezpeÄný Å¡ifrovacà algoritmus alebo je slabý" # error -#: ../libempathy/empathy-utils.c:362 +#: ../libempathy/empathy-utils.c:351 msgid "" "The length of the server certificate, or the depth of the server certificate " "chain, exceed the limits imposed by the cryptography library" @@ -898,38 +898,38 @@ msgstr "" "hranice vynútené kryptografickou knižnicou" # error -#: ../libempathy/empathy-utils.c:366 +#: ../libempathy/empathy-utils.c:355 msgid "Your software is too old" msgstr "Váš softvér je prÃliÅ¡ zastaralý" # error -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:357 msgid "Internal error" msgstr "Vnútorná chyba" # protocol name -#: ../libempathy/empathy-utils.c:497 -#: ../libempathy-gtk/empathy-roster-model.h:30 +#: ../libempathy/empathy-utils.c:486 +#: ../libempathy-gtk/empathy-roster-model.h:28 msgid "People Nearby" msgstr "Ľudia v okolÃ" # protocol name -#: ../libempathy/empathy-utils.c:502 +#: ../libempathy/empathy-utils.c:491 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" # service name -#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672 +#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657 msgid "Google Talk" msgstr "Google Talk" # service name -#: ../libempathy/empathy-utils.c:539 +#: ../libempathy/empathy-utils.c:528 msgid "Facebook Chat" msgstr "Facebook Chat" # gtk_list_store -#: ../libempathy-gtk/empathy-account-chooser.c:689 +#: ../libempathy-gtk/empathy-account-chooser.c:684 msgid "All accounts" msgstr "VÅ¡etky úÄty" @@ -1019,66 +1019,66 @@ msgid "Remember Password" msgstr "ZapamätaÅ¥ heslo" # hash table -#: ../libempathy-gtk/empathy-account-widget.c:675 +#: ../libempathy-gtk/empathy-account-widget.c:668 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -#: ../src/empathy-import-widget.c:322 +#: ../src/empathy-import-widget.c:316 msgid "Account" msgstr "ÚÄet" # hash table -#: ../libempathy-gtk/empathy-account-widget.c:676 +#: ../libempathy-gtk/empathy-account-widget.c:669 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Password" msgstr "Heslo" # hash table -#: ../libempathy-gtk/empathy-account-widget.c:677 +#: ../libempathy-gtk/empathy-account-widget.c:670 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:511 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:498 msgid "Server" msgstr "Server" # hash table -#: ../libempathy-gtk/empathy-account-widget.c:678 +#: ../libempathy-gtk/empathy-account-widget.c:671 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:532 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:519 msgid "Port" msgstr "Port" # * https://bugzilla.gnome.org/show_bug.cgi?id=694486 -#: ../libempathy-gtk/empathy-account-widget.c:762 +#: ../libempathy-gtk/empathy-account-widget.c:755 #, c-format msgid "%s" msgstr "%s" # * https://bugzilla.gnome.org/show_bug.cgi?id=694486 -#: ../libempathy-gtk/empathy-account-widget.c:817 +#: ../libempathy-gtk/empathy-account-widget.c:810 #, c-format msgid "%s:" msgstr "%s:" # gtk_label -#: ../libempathy-gtk/empathy-account-widget.c:1429 +#: ../libempathy-gtk/empathy-account-widget.c:1422 msgid "Username:" msgstr "PoužÃvateľské meno:" # gtk_button -#: ../libempathy-gtk/empathy-account-widget.c:1746 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "A_pply" msgstr "Po_užiÅ¥" # gtk_button -#: ../libempathy-gtk/empathy-account-widget.c:1775 +#: ../libempathy-gtk/empathy-account-widget.c:1768 msgid "L_og in" msgstr "_PrihlásiÅ¥ sa" # gtk_radio_button -#: ../libempathy-gtk/empathy-account-widget.c:1845 +#: ../libempathy-gtk/empathy-account-widget.c:1838 msgid "This account already exists on the server" msgstr "Tento úÄet už na serveri existuje" # gtk_radio_button -#: ../libempathy-gtk/empathy-account-widget.c:1849 +#: ../libempathy-gtk/empathy-account-widget.c:1842 msgid "Create a new account on the server" msgstr "VytvoriÅ¥ na serveri nový úÄet" @@ -1090,19 +1090,19 @@ msgstr "VytvoriÅ¥ na serveri nový úÄet" #. * 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:2270 +#: ../libempathy-gtk/empathy-account-widget.c:2255 #, c-format msgid "%1$s on %2$s" msgstr "%1$s na %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:2296 +#: ../libempathy-gtk/empathy-account-widget.c:2281 #, c-format msgid "%s Account" msgstr "ÚÄet %s" -#: ../libempathy-gtk/empathy-account-widget.c:2300 +#: ../libempathy-gtk/empathy-account-widget.c:2285 msgid "New account" msgstr "Nový úÄet" @@ -1378,42 +1378,42 @@ msgstr "Aké je vaÅ¡e heslo pre Windows Live?" #  PM: V tom prvom iprÃpade je to OK v tom druhom nechápem súvislosÅ¥ medzi auto, register, options a none # * https://bugzilla.gnome.org/show_bug.cgi?id=694486 # gtk_list_store -#: ../libempathy-gtk/empathy-account-widget-sip.c:207 -#: ../libempathy-gtk/empathy-account-widget-sip.c:240 +#: ../libempathy-gtk/empathy-account-widget-sip.c:198 +#: ../libempathy-gtk/empathy-account-widget-sip.c:231 msgid "Auto" msgstr "Automaticky" # gtk_list_store -#: ../libempathy-gtk/empathy-account-widget-sip.c:210 +#: ../libempathy-gtk/empathy-account-widget-sip.c:201 msgid "UDP" msgstr "UDP" # gtk_list_store -#: ../libempathy-gtk/empathy-account-widget-sip.c:213 +#: ../libempathy-gtk/empathy-account-widget-sip.c:204 msgid "TCP" msgstr "TCP" # gtk_list_store -#: ../libempathy-gtk/empathy-account-widget-sip.c:216 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 msgid "TLS" msgstr "TLS" # PK: v zdrojaku je ze by sa to nemalo prekladat # * https://bugzilla.gnome.org/show_bug.cgi?id=694486 # gtk_list_store -#: ../libempathy-gtk/empathy-account-widget-sip.c:245 +#: ../libempathy-gtk/empathy-account-widget-sip.c:236 msgid "Register" msgstr "Register" # PK: v zdrojaku je ze by sa to nemalo prekladat # * https://bugzilla.gnome.org/show_bug.cgi?id=694486 # gtk_list_store -#: ../libempathy-gtk/empathy-account-widget-sip.c:250 +#: ../libempathy-gtk/empathy-account-widget-sip.c:241 msgid "Options" msgstr "Options" # gtk_list_store -#: ../libempathy-gtk/empathy-account-widget-sip.c:253 +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 msgid "None" msgstr "Žiadne" @@ -1552,63 +1552,63 @@ msgstr "Aký je váš identifikátor pre Yahoo!?" msgid "What is your Yahoo! password?" msgstr "Aké je vaÅ¡e heslo pre Yahoo!?" -#: ../libempathy-gtk/empathy-avatar-chooser.c:545 -#: ../libempathy-gtk/empathy-avatar-chooser.c:630 +#: ../libempathy-gtk/empathy-avatar-chooser.c:539 +#: ../libempathy-gtk/empathy-avatar-chooser.c:624 msgid "Couldn't convert image" msgstr "Nepodarilo sa previesÅ¥ obrázok" -#: ../libempathy-gtk/empathy-avatar-chooser.c:546 +#: ../libempathy-gtk/empathy-avatar-chooser.c:540 msgid "None of the accepted image formats are supported on your system" msgstr "" "Žiadny z prÃpustných formátov obrázkov nie je podporovaný vo vaÅ¡om systéme" -#: ../libempathy-gtk/empathy-avatar-chooser.c:906 +#: ../libempathy-gtk/empathy-avatar-chooser.c:900 msgid "Couldn't save picture to file" msgstr "Nepodarilo sa uložiÅ¥ obrázok do súboru" # filechoser dialog title -#: ../libempathy-gtk/empathy-avatar-chooser.c:1030 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1024 msgid "Select Your Avatar Image" msgstr "Výber obrázka podobizne" # button -#: ../libempathy-gtk/empathy-avatar-chooser.c:1038 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1032 msgid "Take a picture..." msgstr "Odfotografovať…" # button -#: ../libempathy-gtk/empathy-avatar-chooser.c:1051 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1045 msgid "No Image" msgstr "Bez obrázka" # file filter name -#: ../libempathy-gtk/empathy-avatar-chooser.c:1108 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1102 msgid "Images" msgstr "Obrázky" # file filter name -#: ../libempathy-gtk/empathy-avatar-chooser.c:1112 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1106 msgid "All Files" msgstr "VÅ¡etky súbory" # tooltip -#: ../libempathy-gtk/empathy-avatar-image.c:322 +#: ../libempathy-gtk/empathy-avatar-image.c:319 msgid "Click to enlarge" msgstr "KliknutÃm zväÄÅ¡Ãte" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:128 #, c-format msgid "Authentication failed for account <b>%s</b>" msgstr "Overenie totožnosti zlyhalo pre úÄet <b>%s</b>" # button -#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 -#: ../libempathy-gtk/empathy-chat.c:3853 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:140 +#: ../libempathy-gtk/empathy-chat.c:3844 msgid "Retry" msgstr "OpakovaÅ¥" #: ../libempathy-gtk/empathy-base-password-dialog.c:224 -#: ../libempathy-gtk/empathy-password-dialog.c:134 +#: ../libempathy-gtk/empathy-password-dialog.c:132 #, c-format msgid "" "Enter your password for account\n" @@ -1618,85 +1618,85 @@ msgstr "" "<b>%s</b>" # button -#: ../libempathy-gtk/empathy-calendar-button.c:66 +#: ../libempathy-gtk/empathy-calendar-button.c:63 msgid "Select..." msgstr "Vybrať…" # button -#: ../libempathy-gtk/empathy-calendar-button.c:154 +#: ../libempathy-gtk/empathy-calendar-button.c:151 msgid "_Select" msgstr "_VybraÅ¥" # error message -#: ../libempathy-gtk/empathy-call-utils.c:42 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:36 +#: ../libempathy-gtk/empathy-call-utils.c:54 msgid "There was an error starting the call" msgstr "PoÄas vytvárania hovoru nastala chyba" # error message -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:43 msgid "The specified contact doesn't support calls" msgstr "Zvolený kontakt nepodporuje hovory" # error message -#: ../libempathy-gtk/empathy-call-utils.c:51 +#: ../libempathy-gtk/empathy-call-utils.c:45 msgid "The specified contact is offline" msgstr "Zvolený kontakt je odhlásený" # error message -#: ../libempathy-gtk/empathy-call-utils.c:53 +#: ../libempathy-gtk/empathy-call-utils.c:47 msgid "The specified contact is not valid" msgstr "Zvolený kontakt nie je platný" # error message -#: ../libempathy-gtk/empathy-call-utils.c:55 +#: ../libempathy-gtk/empathy-call-utils.c:49 msgid "Emergency calls are not supported on this protocol" msgstr "Tiesňové volania nie sú podporované týmto protokolom" # error message -#: ../libempathy-gtk/empathy-call-utils.c:57 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "You don't have enough credit in order to place this call" msgstr "Nemáte dostatok kreditu na uskutoÄnenie tohto hovoru" -#: ../libempathy-gtk/empathy-chat.c:740 +#: ../libempathy-gtk/empathy-chat.c:731 msgid "Failed to open private chat" msgstr "Zlyhalo otvorenie súkromného rozhovoru" -#: ../libempathy-gtk/empathy-chat.c:798 +#: ../libempathy-gtk/empathy-chat.c:789 msgid "Topic not supported on this conversation" msgstr "Téma nie je pri tejto konverzácii podporovaná" -#: ../libempathy-gtk/empathy-chat.c:804 +#: ../libempathy-gtk/empathy-chat.c:795 msgid "You are not allowed to change the topic" msgstr "Nie je vám dovolené meniÅ¥ tému" -#: ../libempathy-gtk/empathy-chat.c:980 +#: ../libempathy-gtk/empathy-chat.c:971 msgid "Invalid contact ID" msgstr "Neplatný identifikátor kontaktu" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1067 +#: ../libempathy-gtk/empathy-chat.c:1058 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: vymaže vÅ¡etky správy z aktuálnej konverzácie" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1070 +#: ../libempathy-gtk/empathy-chat.c:1061 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <téma>: nastavà tému aktuálnej konverzácie" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1073 +#: ../libempathy-gtk/empathy-chat.c:1064 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <ID diskusnej miestnosti>: vstúpi do novej diskusnej miestnosti" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1076 +#: ../libempathy-gtk/empathy-chat.c:1067 msgid "/j <chat room ID>: join a new chat room" msgstr "" "/j <identifikátor diskusnej miestnosti>: vstúpi do novej diskusnej miestnosti" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1080 +#: ../libempathy-gtk/empathy-chat.c:1071 msgid "" "/part [<chat room ID>] [<reason>]: leave the chat room, by default the " "current one" @@ -1705,27 +1705,27 @@ msgstr "" "miestnosÅ¥, predvolene aktuálnu" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1084 +#: ../libempathy-gtk/empathy-chat.c:1075 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <identifikátor kontaktu> [<správa>]: otvorà súkromný rozhovor" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1087 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <identifikátor kontaktu> <správa>: otvorà súkromný rozhovor" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1090 +#: ../libempathy-gtk/empathy-chat.c:1081 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <prezývka>: zmenà vaÅ¡u prezývku na aktuálnom serveri" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1093 +#: ../libempathy-gtk/empathy-chat.c:1084 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <správa>: poÅ¡le ACTION správu do aktuálnej konverzácie" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1096 +#: ../libempathy-gtk/empathy-chat.c:1087 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 " @@ -1736,12 +1736,12 @@ msgstr "" "vstúpenie do novej diskusnej miestnosti“" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1101 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/whois <contact ID>: display information about a contact" msgstr "/whois <identifikátor kontaktu>: zobrazà informácie o kontakte" # chat command item -#: ../libempathy-gtk/empathy-chat.c:1104 +#: ../libempathy-gtk/empathy-chat.c:1095 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1750,107 +1750,107 @@ msgstr "" "zadaný aj <prÃkaz>, zobrazà sa jeho použitie." # %s item->help -#: ../libempathy-gtk/empathy-chat.c:1123 +#: ../libempathy-gtk/empathy-chat.c:1114 #, c-format msgid "Usage: %s" msgstr "Použitie: %s" -#: ../libempathy-gtk/empathy-chat.c:1168 +#: ../libempathy-gtk/empathy-chat.c:1159 msgid "Unknown command" msgstr "Neznámy prÃkaz" -#: ../libempathy-gtk/empathy-chat.c:1294 +#: ../libempathy-gtk/empathy-chat.c:1285 msgid "Unknown command; see /help for the available commands" msgstr "Neznámy prÃkaz; použite /help na zobrazenie dostupných prÃkazov" -#: ../libempathy-gtk/empathy-chat.c:1551 +#: ../libempathy-gtk/empathy-chat.c:1542 msgid "insufficient balance to send message" msgstr "nedostatoÄný kredit na poslanie správy" -#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569 -#: ../libempathy-gtk/empathy-chat.c:1632 +#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560 +#: ../libempathy-gtk/empathy-chat.c:1623 #, c-format msgid "Error sending message '%s': %s" msgstr "Chyba pri posielanà správy „%s“: %s" -#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574 -#: ../libempathy-gtk/empathy-chat.c:1636 +#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1627 #, c-format msgid "Error sending message: %s" msgstr "Chyba pri posielanà správy: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1563 +#: ../libempathy-gtk/empathy-chat.c:1554 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." msgstr "nedostatoÄný kredit na poslanie správy. <a href='%s'>DobiÅ¥</a>." # chat_send_error TP_ERROR_STR_NOT_CAPABLE -#: ../libempathy-gtk/empathy-chat.c:1603 +#: ../libempathy-gtk/empathy-chat.c:1594 msgid "not capable" msgstr "neschopný" # chat_send_error -#: ../libempathy-gtk/empathy-chat.c:1610 +#: ../libempathy-gtk/empathy-chat.c:1601 msgid "offline" msgstr "odpojený" # chat_send_error -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1604 msgid "invalid contact" msgstr "neplatný kontakt" # chat_send_error -#: ../libempathy-gtk/empathy-chat.c:1616 +#: ../libempathy-gtk/empathy-chat.c:1607 msgid "permission denied" msgstr "prÃstup zamietnutý" # chat_send_error -#: ../libempathy-gtk/empathy-chat.c:1619 +#: ../libempathy-gtk/empathy-chat.c:1610 msgid "too long message" msgstr "prÃliÅ¡ dlhá správa" # chat_send_error -#: ../libempathy-gtk/empathy-chat.c:1622 +#: ../libempathy-gtk/empathy-chat.c:1613 msgid "not implemented" msgstr "nie je implementované" # Error sending message : %s # chat_send_error -#: ../libempathy-gtk/empathy-chat.c:1626 +#: ../libempathy-gtk/empathy-chat.c:1617 msgid "unknown" msgstr "neznáma" -#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979 +#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967 msgid "Topic:" msgstr "Téma:" # %s priv->subject -#: ../libempathy-gtk/empathy-chat.c:1708 +#: ../libempathy-gtk/empathy-chat.c:1699 #, c-format msgid "Topic set to: %s" msgstr "Téma nastavená na: %s" # %s actor, priv->subject -#: ../libempathy-gtk/empathy-chat.c:1710 +#: ../libempathy-gtk/empathy-chat.c:1701 #, c-format msgid "Topic set by %s to: %s" msgstr "Téma nastavená použÃvateľom %s na: %s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1715 +#: ../libempathy-gtk/empathy-chat.c:1706 msgid "No topic defined" msgstr "Nebola nastavená žiadna téma" # gtk_menu_item -#: ../libempathy-gtk/empathy-chat.c:2231 +#: ../libempathy-gtk/empathy-chat.c:2222 msgid "(No Suggestions)" msgstr "(Žiadne návrhy)" # gtk_image_menu_item #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2299 +#: ../libempathy-gtk/empathy-chat.c:2290 #, c-format msgid "Add '%s' to Dictionary" msgstr "PridaÅ¥ „%s“ do slovnÃka" @@ -1859,35 +1859,35 @@ msgstr "PridaÅ¥ „%s“ do slovnÃka" #  gtk_image_menu_item #. translators: first %s is the selected word, #. * second %s is the language name of the target dictionary -#: ../libempathy-gtk/empathy-chat.c:2336 +#: ../libempathy-gtk/empathy-chat.c:2327 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "PridaÅ¥ „%s“ do slovnÃka pre jazyk %s" #  http://live.gnome.org/SlovakTranslation/Others/JULS # gtk_image_menu_item -#: ../libempathy-gtk/empathy-chat.c:2406 +#: ../libempathy-gtk/empathy-chat.c:2397 msgid "Insert Smiley" msgstr "VložiÅ¥ smejka" #. send button -#: ../libempathy-gtk/empathy-chat.c:2424 -#: ../libempathy-gtk/empathy-ui-utils.c:1180 +#: ../libempathy-gtk/empathy-chat.c:2415 +#: ../libempathy-gtk/empathy-ui-utils.c:1208 msgid "_Send" msgstr "_PoslaÅ¥" # gtk_image_menu_item #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2481 +#: ../libempathy-gtk/empathy-chat.c:2472 msgid "_Spelling Suggestions" msgstr "_Návrhy kontroly pravopisu" -#: ../libempathy-gtk/empathy-chat.c:2592 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Zlyhalo zÃskavanie nedávnych záznamov" # chat_members_changed -#: ../libempathy-gtk/empathy-chat.c:2835 +#: ../libempathy-gtk/empathy-chat.c:2826 #, c-format msgid "%s has disconnected" msgstr "ÚÄastnÃk %s sa odpojil" @@ -1896,13 +1896,13 @@ msgstr "ÚÄastnÃk %s sa odpojil" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2842 +#: ../libempathy-gtk/empathy-chat.c:2833 #, c-format msgid "%1$s was kicked by %2$s" msgstr "ÚÄastnÃk %1$s bol vykopnutý úÄastnÃkom %2$s" # chat_members_changed -#: ../libempathy-gtk/empathy-chat.c:2845 +#: ../libempathy-gtk/empathy-chat.c:2836 #, c-format msgid "%s was kicked" msgstr "ÚÄastnÃk %s bol vykopnutý" @@ -1911,19 +1911,19 @@ msgstr "ÚÄastnÃk %s bol vykopnutý" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:2853 +#: ../libempathy-gtk/empathy-chat.c:2844 #, c-format msgid "%1$s was banned by %2$s" msgstr "ÚÄastnÃk %1$s dostal zákaz od úÄastnÃka %2$s" # chat_members_changed -#: ../libempathy-gtk/empathy-chat.c:2856 +#: ../libempathy-gtk/empathy-chat.c:2847 #, c-format msgid "%s was banned" msgstr "ÚÄastnÃk %s dostal zákaz" # chat_members_changed -#: ../libempathy-gtk/empathy-chat.c:2860 +#: ../libempathy-gtk/empathy-chat.c:2851 #, c-format msgid "%s has left the room" msgstr "ÚÄastnÃk %s opustil miestnosÅ¥" @@ -1933,17 +1933,17 @@ msgstr "ÚÄastnÃk %s opustil miestnosÅ¥" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:2869 +#: ../libempathy-gtk/empathy-chat.c:2860 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2894 +#: ../libempathy-gtk/empathy-chat.c:2885 #, c-format msgid "%s has joined the room" msgstr "ÚÄastnÃk %s vstúpil do miestnosti" -#: ../libempathy-gtk/empathy-chat.c:2919 +#: ../libempathy-gtk/empathy-chat.c:2910 #, c-format msgid "%s is now known as %s" msgstr "ÚÄastnÃk %s je teraz známy ako %s" @@ -1951,96 +1951,96 @@ msgstr "ÚÄastnÃk %s je teraz známy ako %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:3106 ../src/empathy-call-window.c:1537 -#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662 -#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166 +#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516 +#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2641 +#: ../src/empathy-call-window.c:2948 ../src/empathy-event-manager.c:1158 msgid "Disconnected" msgstr "Odpojený" # label #. Add message -#: ../libempathy-gtk/empathy-chat.c:3793 +#: ../libempathy-gtk/empathy-chat.c:3784 msgid "Would you like to store this password?" msgstr "Želáte si uložiÅ¥ toto heslo?" # button -#: ../libempathy-gtk/empathy-chat.c:3799 +#: ../libempathy-gtk/empathy-chat.c:3790 msgid "Remember" msgstr "ZapamätaÅ¥" # button -#: ../libempathy-gtk/empathy-chat.c:3809 +#: ../libempathy-gtk/empathy-chat.c:3800 msgid "Not now" msgstr "Teraz nie" # label -#: ../libempathy-gtk/empathy-chat.c:3857 +#: ../libempathy-gtk/empathy-chat.c:3848 msgid "Wrong password; please try again:" msgstr "Nesprávne heslo; prosÃm, skúste to znova:" # label #. Add message -#: ../libempathy-gtk/empathy-chat.c:3987 +#: ../libempathy-gtk/empathy-chat.c:3972 msgid "This room is protected by a password:" msgstr "MiestnosÅ¥ je chránená heslom:" # button -#: ../libempathy-gtk/empathy-chat.c:4014 -#: ../src/empathy-new-chatroom-dialog.c:780 +#: ../libempathy-gtk/empathy-chat.c:3999 +#: ../src/empathy-new-chatroom-dialog.c:770 msgid "Join" msgstr "VstúpiÅ¥" -#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187 +#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1179 msgid "Connected" msgstr "Pripojený" # empathy_chat_dup_name -#: ../libempathy-gtk/empathy-chat.c:4261 +#: ../libempathy-gtk/empathy-chat.c:4246 msgid "Conversation" msgstr "Konverzácia" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4266 +#: ../libempathy-gtk/empathy-chat.c:4251 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" # label -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261 msgid "Unknown or invalid identifier" msgstr "Neznámy alebo neplatný identifikátor" # label -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263 msgid "Contact blocking temporarily unavailable" msgstr "Blokovanie kontaktu je doÄasne nedostupné" # label -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 msgid "Contact blocking unavailable" msgstr "Blokovanie kontaktu je nedostupné" # label -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 msgid "Permission Denied" msgstr "PrÃstup zamietnutý" # label -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 msgid "Could not block contact" msgstr "Nepodarilo sa zablokovaÅ¥ kontakt" # windows title -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610 msgid "Edit Blocked Contacts" msgstr "Úprava blokovaných kontaktov" # GtkLabel #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 -#: ../libempathy-gtk/empathy-individual-widget.c:1483 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:528 +#: ../libempathy-gtk/empathy-individual-widget.c:1473 #: ../src/empathy-chatrooms-window.ui.h:2 #: ../src/empathy-new-chatroom-dialog.ui.h:6 msgid "Account:" @@ -2052,27 +2052,27 @@ msgid "Blocked Contacts" msgstr "Zablokované kontakty" # info_field_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:98 msgid "Full name" msgstr "Celé meno" # info_field_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:99 msgid "Phone number" msgstr "Telefónne ÄÃslo" # info_field_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:100 msgid "E-mail address" msgstr "Emailová adresa" # info_field_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:101 msgid "Website" msgstr "Webová stránka" # info_field_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 msgid "Birthday" msgstr "Narodeniny" @@ -2080,100 +2080,100 @@ msgstr "Narodeniny" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Last seen:" msgstr "Naposledy videný:" # info_field_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Server:" msgstr "Server:" # info_field_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:109 msgid "Connected from:" msgstr "Pripojený z:" # info_field_data #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Away message:" msgstr "Správa pri odchode:" # info_parameter_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:126 msgid "work" msgstr "pracovný" # info_parameter_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:127 msgid "home" msgstr "domov" # info_parameter_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:128 msgid "mobile" msgstr "mobilný" # info_parameter_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:129 msgid "voice" msgstr "hlasový" # info_parameter_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 msgid "preferred" msgstr "prednostný" # info_parameter_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 msgid "postal" msgstr "poÅ¡tový" # info_parameter_data -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "parcel" msgstr "doruÄovacÃ" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:522 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:521 msgid "Search contacts" msgstr "Hľadanie kontaktov" # label -#: ../libempathy-gtk/empathy-contact-search-dialog.c:552 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:551 msgid "Search: " msgstr "HľadaÅ¥: " # button -#: ../libempathy-gtk/empathy-contact-search-dialog.c:610 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:609 msgid "_Add Contact" msgstr "_PridaÅ¥ kontakt" # label -#: ../libempathy-gtk/empathy-contact-search-dialog.c:628 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 msgid "No contacts found" msgstr "NenaÅ¡iel sa žiadny kontakt" # label -#: ../libempathy-gtk/empathy-contact-search-dialog.c:644 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:643 msgid "Your message introducing yourself:" msgstr "Správa, ktorá vás predstavÃ:" # label -#: ../libempathy-gtk/empathy-contact-search-dialog.c:652 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:651 msgid "Please let me see when you're online. Thanks!" msgstr "ProsÃm, dovoľte mi vidieÅ¥, že ste prihlásený. ÄŽakujem!" # filechooser title -#: ../libempathy-gtk/empathy-contact-widget.c:168 -#: ../libempathy-gtk/empathy-individual-widget.c:898 +#: ../libempathy-gtk/empathy-contact-widget.c:156 +#: ../libempathy-gtk/empathy-individual-widget.c:888 msgid "Save Avatar" msgstr "Uloženie podobizne" -#: ../libempathy-gtk/empathy-contact-widget.c:224 -#: ../libempathy-gtk/empathy-individual-widget.c:956 +#: ../libempathy-gtk/empathy-contact-widget.c:212 +#: ../libempathy-gtk/empathy-individual-widget.c:946 msgid "Unable to save avatar" msgstr "Podobizeň sa nedá uložiÅ¥" @@ -2181,14 +2181,14 @@ msgstr "Podobizeň sa nedá uložiÅ¥" #. Identifier to connect to Instant Messaging network #. Setup id label #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 -#: ../libempathy-gtk/empathy-user-info.c:444 +#: ../libempathy-gtk/empathy-user-info.c:455 msgid "Identifier" msgstr "Identifikátor" # GtkLabel #. Setup nickname entry #: ../libempathy-gtk/empathy-contact-widget.ui.h:4 -#: ../libempathy-gtk/empathy-user-info.c:449 +#: ../libempathy-gtk/empathy-user-info.c:460 msgid "Alias" msgstr "Prezývka" @@ -2230,12 +2230,12 @@ msgid "Client" msgstr "Klient" # label -#: ../libempathy-gtk/empathy-groups-widget.c:327 +#: ../libempathy-gtk/empathy-groups-widget.c:317 msgid "Groups" msgstr "Skupiny" # label -#: ../libempathy-gtk/empathy-groups-widget.c:339 +#: ../libempathy-gtk/empathy-groups-widget.c:329 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -2244,47 +2244,47 @@ msgstr "" "jednu skupinu alebo nevybraÅ¥ žiadnu skupinu." # button -#: ../libempathy-gtk/empathy-groups-widget.c:358 +#: ../libempathy-gtk/empathy-groups-widget.c:348 msgid "_Add Group" msgstr "_PridaÅ¥ skupinu" #  treeviewcolumn -#: ../libempathy-gtk/empathy-groups-widget.c:393 +#: ../libempathy-gtk/empathy-groups-widget.c:383 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "VybraÅ¥" #  treeviewcolumn -#: ../libempathy-gtk/empathy-groups-widget.c:403 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgid "Group" msgstr "Skupina" # window title -#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +#: ../libempathy-gtk/empathy-individual-dialogs.c:108 msgid "New Contact" msgstr "Nový kontakt" -#: ../libempathy-gtk/empathy-individual-dialogs.c:193 -#: ../libempathy-gtk/empathy-subscription-dialog.c:121 +#: ../libempathy-gtk/empathy-individual-dialogs.c:183 +#: ../libempathy-gtk/empathy-subscription-dialog.c:120 #, c-format msgid "Block %s?" msgstr "ZablokovaÅ¥ kontakt %s?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:248 -#: ../libempathy-gtk/empathy-subscription-dialog.c:125 +#: ../libempathy-gtk/empathy-individual-dialogs.c:238 +#: ../libempathy-gtk/empathy-subscription-dialog.c:124 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" msgstr "" "Naozaj chcete zablokovaÅ¥ kontakt „%s“, aby vás už nemohol znovu kontaktovaÅ¥?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-individual-dialogs.c:243 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Nasledujúce identity budú zablokované:" msgstr[1] "Nasledujúca identita bude zablokovaná:" msgstr[2] "Nasledujúce identity budú zablokované:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:250 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Nasledujúce identity sa nedajú zablokovaÅ¥:" @@ -2292,15 +2292,15 @@ msgstr[1] "Nasledujúca identita sa nedá zablokovaÅ¥:" msgstr[2] "Nasledujúce identity sa nedajú zablokovaÅ¥:" # button -#: ../libempathy-gtk/empathy-individual-dialogs.c:270 -#: ../libempathy-gtk/empathy-subscription-dialog.c:130 -#: ../libempathy-gtk/empathy-subscription-dialog.c:275 +#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-subscription-dialog.c:129 +#: ../libempathy-gtk/empathy-subscription-dialog.c:274 msgid "_Block" msgstr "Za_blokovaÅ¥" # checkbutton -#: ../libempathy-gtk/empathy-individual-dialogs.c:279 -#: ../libempathy-gtk/empathy-subscription-dialog.c:150 +#: ../libempathy-gtk/empathy-individual-dialogs.c:269 +#: ../libempathy-gtk/empathy-subscription-dialog.c:149 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_NahlásiÅ¥ tieto kontakty ako obÅ¥ažujúce" @@ -2308,22 +2308,22 @@ msgstr[1] "_NahlásiÅ¥ tento kontakt ako obÅ¥ažujúci" msgstr[2] "_NahlásiÅ¥ tieto kontakty ako obÅ¥ažujúce" # window title -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237 msgid "Edit Contact Information" msgstr "Úprava informácià o kontakte" # label #. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:293 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:283 msgid "Linked Contacts" msgstr "Prepojené kontakty" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:332 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:322 msgid "gnome-contacts not installed" msgstr "balÃk gnome-contacts nie je nainÅ¡talovaný" # PM: znie to neprirodzene dal by som Aby sa mohli zobrazovaÅ¥... prosÃm, nainÅ¡talujte... -#: ../libempathy-gtk/empathy-individual-information-dialog.c:335 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:325 msgid "Please install gnome-contacts to access contacts details." msgstr "" "ProsÃm, nainÅ¡talujte balÃk gnome-contacts pre zobrazenie podrobnostà o " @@ -2333,7 +2333,7 @@ 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:177 +#: ../libempathy-gtk/empathy-individual-menu.c:168 #, c-format msgid "%s (%s)" msgstr "%s (%s)" @@ -2341,12 +2341,12 @@ msgstr "%s (%s)" # MÄŒ: stratil som sa. Vyberám si tam svoj úÄet pomocou ktorého sa vykoná volanie, alebo, ktorému sa zavolá? #  PK: preklad by mal byt spravny, nepodarilo sa mi to ale overit v programe # window title -#: ../libempathy-gtk/empathy-individual-menu.c:353 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Výber úÄtu, s ktorým sa uskutoÄnà hovor" # button -#: ../libempathy-gtk/empathy-individual-menu.c:357 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-call-window.ui.h:20 msgid "Call" @@ -2354,38 +2354,38 @@ msgstr "Hovor" # Call %s (%s); second %s # phone type -#: ../libempathy-gtk/empathy-individual-menu.c:422 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Mobil" # Call %s (%s); second %s # phone type -#: ../libempathy-gtk/empathy-individual-menu.c:424 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Práca" # Call %s (%s); second %s # phone type -#: ../libempathy-gtk/empathy-individual-menu.c:426 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "Domov" # gtk_check_menu_item -#: ../libempathy-gtk/empathy-individual-menu.c:669 +#: ../libempathy-gtk/empathy-individual-menu.c:660 msgid "_Block Contact" msgstr "Za_blokovaÅ¥ kontakt" # button -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:716 msgid "Delete and _Block" msgstr "OdstrániÅ¥ a za_blokovaÅ¥" -#: ../libempathy-gtk/empathy-individual-menu.c:787 +#: ../libempathy-gtk/empathy-individual-menu.c:778 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Naozaj chcete odstrániÅ¥ kontakt „%s“?" -#: ../libempathy-gtk/empathy-individual-menu.c:796 +#: ../libempathy-gtk/empathy-individual-menu.c:787 #, c-format msgid "" "Do you really want to remove the linked contact '%s'? Note that this will " @@ -2395,69 +2395,69 @@ msgstr "" "odstráni vÅ¡etky kontakty, ktoré tvoria tento prepojený kontakt." # dialog title -#: ../libempathy-gtk/empathy-individual-menu.c:807 +#: ../libempathy-gtk/empathy-individual-menu.c:798 msgid "Removing contact" msgstr "odstránenie kontaktu" # gtk_image_menu_item -#: ../libempathy-gtk/empathy-individual-menu.c:871 -#: ../libempathy-gtk/empathy-individual-view.c:2453 +#: ../libempathy-gtk/empathy-individual-menu.c:862 +#: ../libempathy-gtk/empathy-individual-view.c:2440 msgid "_Remove" msgstr "O_dstrániÅ¥" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1234 -#: ../libempathy-gtk/empathy-new-message-dialog.c:318 +#: ../libempathy-gtk/empathy-individual-menu.c:1225 +#: ../libempathy-gtk/empathy-new-message-dialog.c:308 msgid "_Chat" msgstr "_Rozhovor" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1269 -#: ../libempathy-gtk/empathy-new-message-dialog.c:312 +#: ../libempathy-gtk/empathy-individual-menu.c:1260 +#: ../libempathy-gtk/empathy-new-message-dialog.c:302 msgid "_SMS" msgstr "_SMS" # PÅ : navrhujem Hlasový -#: ../libempathy-gtk/empathy-individual-menu.c:1302 +#: ../libempathy-gtk/empathy-individual-menu.c:1293 msgctxt "menu item" msgid "_Audio Call" msgstr "_Zvukový hovor" -#: ../libempathy-gtk/empathy-individual-menu.c:1335 +#: ../libempathy-gtk/empathy-individual-menu.c:1326 msgctxt "menu item" msgid "_Video Call" msgstr "_Videohovor" # gtk_image_menu_item -#: ../libempathy-gtk/empathy-individual-menu.c:1376 +#: ../libempathy-gtk/empathy-individual-menu.c:1367 #: ../src/empathy-roster-window-menubar.ui.h:11 msgid "_Previous Conversations" msgstr "P_redchádzajúce konverzácie" # gtk_image_menu_item -#: ../libempathy-gtk/empathy-individual-menu.c:1405 +#: ../libempathy-gtk/empathy-individual-menu.c:1396 msgid "Send File" msgstr "PoslaÅ¥ súbor" # gtk_image_menu_item -#: ../libempathy-gtk/empathy-individual-menu.c:1435 +#: ../libempathy-gtk/empathy-individual-menu.c:1426 msgid "Share My Desktop" -msgstr "Poskytnúť plochu" +msgstr "SprÃstupniÅ¥ moju plochu" #  vÅ¥ahuje sa ku slovu kontakt # gtk_check_menu_item; gtk_check_button -#: ../libempathy-gtk/empathy-individual-menu.c:1461 -#: ../libempathy-gtk/empathy-individual-widget.c:1366 +#: ../libempathy-gtk/empathy-individual-menu.c:1452 +#: ../libempathy-gtk/empathy-individual-widget.c:1356 msgid "Favorite" msgstr "Obľúbený" # gtk_check_menu_item; -#: ../libempathy-gtk/empathy-individual-menu.c:1490 +#: ../libempathy-gtk/empathy-individual-menu.c:1481 msgid "Infor_mation" msgstr "_Informácie" # gtk_check_menu_item; -#: ../libempathy-gtk/empathy-individual-menu.c:1539 +#: ../libempathy-gtk/empathy-individual-menu.c:1530 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_UpraviÅ¥" @@ -2465,190 +2465,190 @@ msgstr "_UpraviÅ¥" # PM: Ako sa táto správa zobrazÃ? kde je meno toho Äo pozýva? Nie je to pokraÄovanie dajakej vety? jeto dosÅ¥ Äudné. # PK: kontakt #. send invitation -#: ../libempathy-gtk/empathy-individual-menu.c:1655 -#: ../src/empathy-chat-window.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1646 +#: ../src/empathy-chat-window.c:1233 msgid "Inviting you to this room" msgstr "Vás pozýva do tejto miestnosti" # gtk_image_menu_item -#: ../libempathy-gtk/empathy-individual-menu.c:1701 +#: ../libempathy-gtk/empathy-individual-menu.c:1692 msgid "_Invite to Chat Room" msgstr "_PozvaÅ¥ do diskusnej miestnosti" # gtk_image_menu_item -#: ../libempathy-gtk/empathy-individual-menu.c:1897 +#: ../libempathy-gtk/empathy-individual-menu.c:1888 msgid "_Add Contact…" msgstr "_PridaÅ¥ kontakt…" -#: ../libempathy-gtk/empathy-individual-view.c:2373 +#: ../libempathy-gtk/empathy-individual-view.c:2360 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Naozaj chcete odstrániÅ¥ skupinu „%s“?" # dialog title -#: ../libempathy-gtk/empathy-individual-view.c:2376 +#: ../libempathy-gtk/empathy-individual-view.c:2363 msgid "Removing group" msgstr "Odstránenie skupiny" # gtk_menu_item -#: ../libempathy-gtk/empathy-individual-view.c:2444 +#: ../libempathy-gtk/empathy-individual-view.c:2431 msgid "Re_name" msgstr "P_remenovaÅ¥" # label -#: ../libempathy-gtk/empathy-individual-widget.c:304 +#: ../libempathy-gtk/empathy-individual-widget.c:294 msgid "Channels:" msgstr "Kanály:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-individual-widget.c:445 msgid "Country ISO Code:" msgstr "ISO kód krajiny:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-individual-widget.c:447 msgid "Country:" msgstr "Krajina:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-individual-widget.c:449 msgid "State:" msgstr "Å tát:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-individual-widget.c:451 msgid "City:" msgstr "Mesto:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-individual-widget.c:453 msgid "Area:" msgstr "OblasÅ¥:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Postal Code:" msgstr "PSÄŒ:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Street:" msgstr "Ulica:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "Building:" msgstr "Budova:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "Floor:" msgstr "Poschodie:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Room:" msgstr "MiestnosÅ¥:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Text:" msgstr "Text:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Description:" msgstr "Popis:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "URI:" msgstr "URI:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Accuracy Level:" msgstr "Stupeň presnosti:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Error:" msgstr "Chyba:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Vertical Error (meters):" msgstr "Vertikálna chyba (v metroch):" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Horizontal Error (meters):" msgstr "Horizontálna chyba (v metroch):" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "Speed:" msgstr "RýchlosÅ¥:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Bearing:" msgstr "Azimut:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Climb Speed:" msgstr "RýchlosÅ¥ stúpania:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Last Updated on:" msgstr "Posledná aktualizácia:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Longitude:" msgstr "Zemepisná dĺžka:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Latitude:" msgstr "Zemepisná Å¡Ãrka:" # location_key_to_label -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Altitude:" msgstr "Nadmorská výška:" -#: ../libempathy-gtk/empathy-individual-widget.c:593 -#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../libempathy-gtk/empathy-individual-widget.c:583 +#: ../libempathy-gtk/empathy-individual-widget.c:598 #: ../src/empathy-preferences.ui.h:39 msgid "Location" msgstr "Poloha" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-individual-widget.c:610 +#: ../libempathy-gtk/empathy-individual-widget.c:600 #, c-format msgid "%s, %s" msgstr "%s dňa %s" -#: ../libempathy-gtk/empathy-individual-widget.c:659 +#: ../libempathy-gtk/empathy-individual-widget.c:649 msgid "%B %e, %Y at %R UTC" msgstr "%d. %B %Y, %R UTC" # label #. Alias -#: ../libempathy-gtk/empathy-individual-widget.c:1302 +#: ../libempathy-gtk/empathy-individual-widget.c:1292 msgid "Alias:" msgstr "Prezývka:" # label #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-individual-widget.c:1511 +#: ../libempathy-gtk/empathy-individual-widget.c:1501 msgid "Identifier:" msgstr "Identifikátor:" -#: ../libempathy-gtk/empathy-individual-widget.c:1650 +#: ../libempathy-gtk/empathy-individual-widget.c:1640 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2666,38 +2666,38 @@ msgstr "<b>Poloha</b> dňa (dátum)" msgid "Online from a phone or mobile device" msgstr "Prihlásený z telefónu alebo mobilného zariadenia" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329 msgid "New Network" msgstr "Nová sieÅ¥" # window title -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:538 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532 msgid "Choose an IRC network" msgstr "Výber siete IRC" # button -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:621 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615 msgid "Reset _Networks List" msgstr "ObnoviÅ¥ zoznam _sietÃ" # button -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:625 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "VybraÅ¥" # niekde v nejakej tabuľke -#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:271 msgid "new server" msgstr "nový server" # niekde v nejakej tabuľke -#: ../libempathy-gtk/empathy-irc-network-dialog.c:547 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:534 msgid "SSL" msgstr "SSL" # label -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80 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 " @@ -2707,12 +2707,12 @@ msgstr "" "rovnakej sieti, ako ste vy. Ak chcete túto funkciu použÃvaÅ¥, skontrolujte, " "prosÃm, správnosÅ¥ údajov uvedených nižšie." -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100 msgid "People nearby" msgstr "Ľudia v okolÃ" # label -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115 msgid "" "You can change these details later or disable this feature by choosing <span " "style=\"italic\">Edit → Accounts</span> in the Contact List." @@ -2721,32 +2721,32 @@ msgstr "" "<span style=\"italic\">UpraviÅ¥ → ÚÄty</span> v zozname kontaktov." # window title -#: ../libempathy-gtk/empathy-log-window.c:622 +#: ../libempathy-gtk/empathy-log-window.c:607 msgid "History" msgstr "História" # label -#: ../libempathy-gtk/empathy-log-window.c:677 +#: ../libempathy-gtk/empathy-log-window.c:662 msgid "Show" msgstr "ZobraziÅ¥" # label -#: ../libempathy-gtk/empathy-log-window.c:699 +#: ../libempathy-gtk/empathy-log-window.c:684 msgid "Search" msgstr "HľadaÅ¥" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1135 #, c-format msgid "Chat in %s" msgstr "Rozhovor v miestnosti %s" -#: ../libempathy-gtk/empathy-log-window.c:1152 +#: ../libempathy-gtk/empathy-log-window.c:1137 #, c-format msgid "Chat with %s" msgstr "Rozhovor s kontaktom %s" -#: ../libempathy-gtk/empathy-log-window.c:1202 -#: ../libempathy-gtk/empathy-log-window.c:1351 +#: ../libempathy-gtk/empathy-log-window.c:1187 +#: ../libempathy-gtk/empathy-log-window.c:1331 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %e. %B %Y" @@ -2754,19 +2754,19 @@ msgstr "%A, %e. %B %Y" # PM: Bude to tu dobre takto vyzeraÅ¥? Daj sem prosÃm niekoľko prÃkladov ako to bude vyzeraÅ¥ v slovenÄine. # PK: netusim, pozeral som log viewer ale nikde som to nenasiel #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1292 +#: ../libempathy-gtk/empathy-log-window.c:1274 #, c-format msgid "<i>* %s %s</i>" msgstr "<i>* %s %s</i>" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1298 +#: ../libempathy-gtk/empathy-log-window.c:1280 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1375 +#: ../libempathy-gtk/empathy-log-window.c:1355 #, c-format msgid "%s second" msgid_plural "%s seconds" @@ -2774,7 +2774,7 @@ msgstr[0] "%s sekúnd" msgstr[1] "%s sekunda" msgstr[2] "%s sekundy" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1362 #, c-format msgid "%s minute" msgid_plural "%s minutes" @@ -2782,83 +2782,83 @@ msgstr[0] "%s minút" msgstr[1] "%s minúta" msgstr[2] "%s minúty" -#: ../libempathy-gtk/empathy-log-window.c:1390 +#: ../libempathy-gtk/empathy-log-window.c:1370 #, c-format msgid "Call took %s, ended at %s" msgstr "Hovor trval %s, skonÄil o %s" -#: ../libempathy-gtk/empathy-log-window.c:1721 +#: ../libempathy-gtk/empathy-log-window.c:1701 msgid "Today" msgstr "Dnes" -#: ../libempathy-gtk/empathy-log-window.c:1725 +#: ../libempathy-gtk/empathy-log-window.c:1705 msgid "Yesterday" msgstr "VÄera" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1740 +#: ../libempathy-gtk/empathy-log-window.c:1720 msgid "%e %B %Y" msgstr "%e. %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1844 -#: ../libempathy-gtk/empathy-log-window.c:3467 +#: ../libempathy-gtk/empathy-log-window.c:1824 +#: ../libempathy-gtk/empathy-log-window.c:3447 msgid "Anytime" msgstr "Hocikedy" -#: ../libempathy-gtk/empathy-log-window.c:1943 -#: ../libempathy-gtk/empathy-log-window.c:2402 +#: ../libempathy-gtk/empathy-log-window.c:1923 +#: ../libempathy-gtk/empathy-log-window.c:2382 msgid "Anyone" msgstr "VÅ¡etci" -#: ../libempathy-gtk/empathy-log-window.c:2715 +#: ../libempathy-gtk/empathy-log-window.c:2695 msgid "Who" msgstr "Kto" -#: ../libempathy-gtk/empathy-log-window.c:2924 +#: ../libempathy-gtk/empathy-log-window.c:2904 msgid "When" msgstr "Kedy" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3022 msgid "Anything" msgstr "VÅ¡etko" -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3024 msgid "Text chats" msgstr "Textové rozhovory" -#: ../libempathy-gtk/empathy-log-window.c:3045 +#: ../libempathy-gtk/empathy-log-window.c:3025 #: ../src/empathy-preferences.ui.h:29 msgid "Calls" msgstr "Hovory" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3029 msgid "Incoming calls" msgstr "Prichádzajúce hovory" -#: ../libempathy-gtk/empathy-log-window.c:3050 +#: ../libempathy-gtk/empathy-log-window.c:3030 msgid "Outgoing calls" msgstr "Odchádzajúce hovory" -#: ../libempathy-gtk/empathy-log-window.c:3051 +#: ../libempathy-gtk/empathy-log-window.c:3031 msgid "Missed calls" msgstr "ZmeÅ¡kané hovory" -#: ../libempathy-gtk/empathy-log-window.c:3071 +#: ../libempathy-gtk/empathy-log-window.c:3051 msgid "What" msgstr "ÄŒo" -#: ../libempathy-gtk/empathy-log-window.c:3760 +#: ../libempathy-gtk/empathy-log-window.c:3740 msgid "Are you sure you want to delete all logs of previous conversations?" msgstr "Naozaj chcete odstrániÅ¥ vÅ¡etky záznamy predchádzajúcich konverzáciÃ?" # button -#: ../libempathy-gtk/empathy-log-window.c:3764 +#: ../libempathy-gtk/empathy-log-window.c:3744 msgid "Clear All" msgstr "VymazaÅ¥ vÅ¡etko" # label # nazov uctu alebo vsetky ucty -#: ../libempathy-gtk/empathy-log-window.c:3771 +#: ../libempathy-gtk/empathy-log-window.c:3751 msgid "Delete from:" msgstr "OdstrániÅ¥ z:" @@ -2885,7 +2885,7 @@ msgstr "Profil" #  GtkToolButton label #: ../libempathy-gtk/empathy-log-window.ui.h:5 -#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-chat-window.c:1426 ../src/empathy-preferences.ui.h:11 msgid "Chat" msgstr "Rozhovor" @@ -2916,84 +2916,84 @@ msgid "Adding new account" msgstr "Pridanie nového úÄtu" # label -#: ../libempathy-gtk/empathy-new-call-dialog.c:199 -#: ../libempathy-gtk/empathy-new-message-dialog.c:289 +#: ../libempathy-gtk/empathy-new-call-dialog.c:189 +#: ../libempathy-gtk/empathy-new-message-dialog.c:279 msgid "Enter a contact identifier or phone number:" msgstr "Zadajte identifikátor kontaktu alebo telefónne ÄÃslo:" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:222 +#: ../libempathy-gtk/empathy-new-call-dialog.c:212 msgid "_Video Call" msgstr "_Videohovor" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:232 +#: ../libempathy-gtk/empathy-new-call-dialog.c:222 msgid "_Audio Call" msgstr "_Hlasový hovor" # window title #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:242 +#: ../libempathy-gtk/empathy-new-call-dialog.c:232 msgid "New Call" msgstr "Nový hovor" # error message -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:72 msgid "The contact is offline" msgstr "Kontakt je odhlásený" # error message -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:74 msgid "The specified contact is either invalid or unknown" msgstr "Zvolený kontakt je buÄ neplatný alebo neznámy" # error message -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:76 msgid "The contact does not support this kind of conversation" msgstr "Kontakt nie je podporovaný pri tomto type konverzácie" # error message -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:78 msgid "The requested functionality is not implemented for this protocol" msgstr "Požadovaná funkcia nie je zahrnutá v tomto protokole" # error message -#: ../libempathy-gtk/empathy-new-message-dialog.c:94 +#: ../libempathy-gtk/empathy-new-message-dialog.c:84 msgid "Could not start a conversation with the given contact" msgstr "Nepodarilo sa zaÄaÅ¥ konverzáciu s daným kontaktom" # error message -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:86 msgid "You are banned from this channel" msgstr "Ste zablokovaný v tomto kanáli" # error message -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:88 msgid "This channel is full" msgstr "Tento kanál je plný" # error message -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:90 msgid "You must be invited to join this channel" msgstr "Boli ste pozvaný na vstup do tohto kanálu" # error message -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:92 msgid "Can't proceed while disconnected" msgstr "Pre pokraÄovanie sa musÃte pripojiÅ¥" # error message -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:94 msgid "Permission denied" msgstr "PrÃstup zamietnutý" -#: ../libempathy-gtk/empathy-new-message-dialog.c:110 +#: ../libempathy-gtk/empathy-new-message-dialog.c:100 msgid "There was an error starting the conversation" msgstr "PoÄas vytvárania konverzácie nastala chyba." # window title #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:332 +#: ../libempathy-gtk/empathy-new-message-dialog.c:322 msgid "New Conversation" msgstr "Nová konverzácia" @@ -3005,29 +3005,29 @@ msgstr "Nová konverzácia" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:164 -#: ../libempathy-gtk/empathy-presence-chooser.c:200 +#: ../libempathy-gtk/empathy-presence-chooser.c:157 +#: ../libempathy-gtk/empathy-presence-chooser.c:193 msgid "Custom Message…" msgstr "Vlastná správa…" -#: ../libempathy-gtk/empathy-presence-chooser.c:217 -#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:210 +#: ../libempathy-gtk/empathy-presence-chooser.c:212 msgid "Edit Custom Messages…" msgstr "UpraviÅ¥ vlastné správy…" # tooltip -#: ../libempathy-gtk/empathy-presence-chooser.c:341 +#: ../libempathy-gtk/empathy-presence-chooser.c:334 msgid "Click to remove this status as a favorite" msgstr "KliknutÃm odstránite tento stav z obľúbených" # tooltip -#: ../libempathy-gtk/empathy-presence-chooser.c:350 +#: ../libempathy-gtk/empathy-presence-chooser.c:343 msgid "Click to make this status a favorite" msgstr "KliknutÃm nastavÃte tento stav ako obľúbený" # tooltip #. Translators: %s is a status message like 'At the pub' for example -#: ../libempathy-gtk/empathy-presence-chooser.c:384 +#: ../libempathy-gtk/empathy-presence-chooser.c:377 #, c-format msgid "" "<b>Current message: %s</b>\n" @@ -3038,13 +3038,13 @@ msgstr "" "Esc.</i></small>" # tooltip -#: ../libempathy-gtk/empathy-presence-chooser.c:393 +#: ../libempathy-gtk/empathy-presence-chooser.c:386 msgid "Set status" msgstr "Nastavte stav" # gtk_image_menu_item #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1101 +#: ../libempathy-gtk/empathy-presence-chooser.c:1094 msgid "Custom messages…" msgstr "Vlastné správy…" @@ -3052,13 +3052,13 @@ msgstr "Vlastné správy…" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../libempathy-gtk/empathy-protocol-chooser.c:608 +#: ../libempathy-gtk/empathy-protocol-chooser.c:603 #, c-format msgid "New %s account" msgstr "Nový úÄet %s" # gtk_check_menu_item -#: ../libempathy-gtk/empathy-search-bar.c:243 +#: ../libempathy-gtk/empathy-search-bar.c:237 msgid "_Match case" msgstr "_RozliÅ¡ovaÅ¥ veľkosÅ¥" @@ -3089,197 +3089,197 @@ msgid "Phrase not found" msgstr "Fráza sa nenaÅ¡la" # sound_entries -#: ../libempathy-gtk/empathy-sound-manager.c:51 +#: ../libempathy-gtk/empathy-sound-manager.c:49 msgid "Received an instant message" msgstr "Prijatá okamžitá správa" # sound_entries -#: ../libempathy-gtk/empathy-sound-manager.c:53 +#: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Sent an instant message" msgstr "Odoslaná okamžitá správa" # sound_entries -#: ../libempathy-gtk/empathy-sound-manager.c:55 +#: ../libempathy-gtk/empathy-sound-manager.c:53 msgid "Incoming chat request" msgstr "Prichádzajúca žiadosÅ¥ o rozhovor" # sound_entries -#: ../libempathy-gtk/empathy-sound-manager.c:57 +#: ../libempathy-gtk/empathy-sound-manager.c:55 msgid "Contact connected" msgstr "Kontakt sa pripojil" # sound_entries -#: ../libempathy-gtk/empathy-sound-manager.c:59 +#: ../libempathy-gtk/empathy-sound-manager.c:57 msgid "Contact disconnected" msgstr "Kontakt sa odpojil" # sound_entries -#: ../libempathy-gtk/empathy-sound-manager.c:61 +#: ../libempathy-gtk/empathy-sound-manager.c:59 msgid "Connected to server" msgstr "Pripojenie k serveru" # sound_entries -#: ../libempathy-gtk/empathy-sound-manager.c:63 +#: ../libempathy-gtk/empathy-sound-manager.c:61 msgid "Disconnected from server" msgstr "Odpojenie od servera" # sound_entries -#: ../libempathy-gtk/empathy-sound-manager.c:65 +#: ../libempathy-gtk/empathy-sound-manager.c:63 msgid "Incoming voice call" msgstr "Prichádzajúci hovor" # sound_entries -#: ../libempathy-gtk/empathy-sound-manager.c:67 +#: ../libempathy-gtk/empathy-sound-manager.c:65 msgid "Outgoing voice call" msgstr "Odchádzajúci hovor" # sound_entries -#: ../libempathy-gtk/empathy-sound-manager.c:69 +#: ../libempathy-gtk/empathy-sound-manager.c:67 msgid "Voice call ended" msgstr "Hlasový hovor bol ukonÄený" # window title -#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:294 msgid "Edit Custom Messages" msgstr "Úprava vlastných správ" # window title -#: ../libempathy-gtk/empathy-subscription-dialog.c:234 +#: ../libempathy-gtk/empathy-subscription-dialog.c:233 msgid "Subscription Request" msgstr "ŽiadosÅ¥ o zapÃsanie" -#: ../libempathy-gtk/empathy-subscription-dialog.c:240 -#: ../src/empathy-event-manager.c:1104 +#: ../libempathy-gtk/empathy-subscription-dialog.c:239 +#: ../src/empathy-event-manager.c:1096 #, c-format msgid "%s would like permission to see when you are online" msgstr "Kontakt %s by rád videl, kedy ste prihlásený" # button -#: ../libempathy-gtk/empathy-subscription-dialog.c:281 -#: ../src/empathy-event-manager.c:729 +#: ../libempathy-gtk/empathy-subscription-dialog.c:280 +#: ../src/empathy-event-manager.c:721 msgid "_Decline" msgstr "_OdmietnuÅ¥" # button -#: ../libempathy-gtk/empathy-subscription-dialog.c:282 +#: ../libempathy-gtk/empathy-subscription-dialog.c:281 msgid "_Accept" msgstr "_PrijaÅ¥" # %s je cas vo formate "%H:%M:%S" # tooltip -#: ../libempathy-gtk/empathy-theme-adium.c:1219 +#: ../libempathy-gtk/empathy-theme-adium.c:1211 #, c-format msgid "Message edited at %s" msgstr "Správa upravená o %s" # Variant: -#: ../libempathy-gtk/empathy-theme-adium.c:1921 +#: ../libempathy-gtk/empathy-theme-adium.c:1913 msgid "Normal" msgstr "Normálny" -#: ../libempathy-gtk/empathy-tls-dialog.c:150 +#: ../libempathy-gtk/empathy-tls-dialog.c:147 msgid "The identity provided by the chat server cannot be verified." msgstr "Identita poskytnutá serverom pre rozhovory sa nedá overiÅ¥." # reason -#: ../libempathy-gtk/empathy-tls-dialog.c:157 +#: ../libempathy-gtk/empathy-tls-dialog.c:154 msgid "The certificate is not signed by a Certification Authority." msgstr "Certifikát nie je podpÃsaný certifikaÄnou autoritou." # reason -#: ../libempathy-gtk/empathy-tls-dialog.c:161 +#: ../libempathy-gtk/empathy-tls-dialog.c:158 msgid "The certificate has expired." msgstr "Certifikátu vyprÅ¡ala platnosÅ¥." # reason -#: ../libempathy-gtk/empathy-tls-dialog.c:164 +#: ../libempathy-gtk/empathy-tls-dialog.c:161 msgid "The certificate hasn't yet been activated." msgstr "Certifikát nie je aktivovaný." # reason -#: ../libempathy-gtk/empathy-tls-dialog.c:167 +#: ../libempathy-gtk/empathy-tls-dialog.c:164 msgid "The certificate does not have the expected fingerprint." msgstr "Certifikát nemá oÄakávaný odtlaÄok." # reason -#: ../libempathy-gtk/empathy-tls-dialog.c:170 +#: ../libempathy-gtk/empathy-tls-dialog.c:167 msgid "The hostname verified by the certificate doesn't match the server name." msgstr "Názov hostiteľa overený certifikátom sa nezhoduje s názvom servera." # reason -#: ../libempathy-gtk/empathy-tls-dialog.c:174 +#: ../libempathy-gtk/empathy-tls-dialog.c:171 msgid "The certificate is self-signed." msgstr "Certifikát je podpÃsaný sám sebou." # reason -#: ../libempathy-gtk/empathy-tls-dialog.c:177 +#: ../libempathy-gtk/empathy-tls-dialog.c:174 msgid "" "The certificate has been revoked by the issuing Certification Authority." msgstr "Certifikát bol odvolaný certifikaÄnou autoritou." # reason -#: ../libempathy-gtk/empathy-tls-dialog.c:181 +#: ../libempathy-gtk/empathy-tls-dialog.c:178 msgid "The certificate is cryptographically weak." msgstr "Certifikát je kryptograficky slabý." # reason -#: ../libempathy-gtk/empathy-tls-dialog.c:184 +#: ../libempathy-gtk/empathy-tls-dialog.c:181 msgid "The certificate length exceeds verifiable limits." msgstr "Dĺžka certifikátu presahuje hranicu overiteľnosti." # reason -#: ../libempathy-gtk/empathy-tls-dialog.c:188 +#: ../libempathy-gtk/empathy-tls-dialog.c:185 msgid "The certificate is malformed." msgstr "Certifikát je poÅ¡kodený." -#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#: ../libempathy-gtk/empathy-tls-dialog.c:203 #, c-format msgid "Expected hostname: %s" msgstr "OÄakávaný názov hostiteľa: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#: ../libempathy-gtk/empathy-tls-dialog.c:206 #, c-format msgid "Certificate hostname: %s" msgstr "Názov hostiteľa certifikátu: %s" # button -#: ../libempathy-gtk/empathy-tls-dialog.c:281 +#: ../libempathy-gtk/empathy-tls-dialog.c:278 msgid "C_ontinue" msgstr "P_okraÄovaÅ¥" # dialog title -#: ../libempathy-gtk/empathy-tls-dialog.c:287 +#: ../libempathy-gtk/empathy-tls-dialog.c:284 msgid "Untrusted connection" msgstr "Nedôveryhodné spojenie" -#: ../libempathy-gtk/empathy-tls-dialog.c:288 +#: ../libempathy-gtk/empathy-tls-dialog.c:285 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Toto spojenie je nedôveryhodné. Želáte si napriek tomu pokraÄovaÅ¥?" # checkbox -#: ../libempathy-gtk/empathy-tls-dialog.c:298 +#: ../libempathy-gtk/empathy-tls-dialog.c:295 msgid "Remember this choice for future connections" msgstr "ZapamätaÅ¥ si túto voľbu pre budúce spojenia" # expander -#: ../libempathy-gtk/empathy-tls-dialog.c:304 +#: ../libempathy-gtk/empathy-tls-dialog.c:301 msgid "Certificate Details" msgstr "Podrobnosti certifikátu" -#: ../libempathy-gtk/empathy-ui-utils.c:1050 +#: ../libempathy-gtk/empathy-ui-utils.c:1078 msgid "Unable to open URI" msgstr "Nie je možné otvoriÅ¥ URI" # filechooser dialog title -#: ../libempathy-gtk/empathy-ui-utils.c:1174 +#: ../libempathy-gtk/empathy-ui-utils.c:1202 msgid "Select a file" msgstr "Výber súboru" -#: ../libempathy-gtk/empathy-ui-utils.c:1248 +#: ../libempathy-gtk/empathy-ui-utils.c:1276 msgid "Insufficient free space to save file" msgstr "Nedostatok voľného miesta na uloženie súboru" -#: ../libempathy-gtk/empathy-ui-utils.c:1256 +#: ../libempathy-gtk/empathy-ui-utils.c:1284 #, c-format msgid "" "%s of free space are required to save this file, but only %s is available. " @@ -3288,18 +3288,18 @@ msgstr "" "Na uloženie tohto súboru je vyžadované %s voľného miesta, ale dostupných je " "len %s. ProsÃm, zvoľte iné umiestnenie." -#: ../libempathy-gtk/empathy-ui-utils.c:1302 +#: ../libempathy-gtk/empathy-ui-utils.c:1330 #, c-format msgid "Incoming file from %s" msgstr "Prichádzajúci súbor od kontaktu %s" # label -#: ../libempathy-gtk/empathy-user-info.c:384 +#: ../libempathy-gtk/empathy-user-info.c:395 msgid "Go online to edit your personal information." msgstr "Aby ste mohli upraviÅ¥ vaÅ¡e osobné údaje musÃte byÅ¥ prihlásený." # label -#: ../libempathy-gtk/empathy-user-info.c:464 +#: ../libempathy-gtk/empathy-user-info.c:475 msgid "<b>Personal Details</b>" msgstr "<b>Osobné údaje</b>" @@ -3319,198 +3319,198 @@ msgid "Inspect HTML" msgstr "PreskúmaÅ¥ HTML" # PM: podľa dohody v ML treba zmeniÅ¥ -#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +#: ../libempathy-gtk/totem-subtitle-encoding.c:157 msgid "Current Locale" msgstr "Aktuálne miestne nastavenia" # prebraté z modulu totem -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:160 +#: ../libempathy-gtk/totem-subtitle-encoding.c:162 +#: ../libempathy-gtk/totem-subtitle-encoding.c:164 +#: ../libempathy-gtk/totem-subtitle-encoding.c:166 msgid "Arabic" msgstr "Arabské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +#: ../libempathy-gtk/totem-subtitle-encoding.c:169 msgid "Armenian" msgstr "Arménske" -#: ../libempathy-gtk/totem-subtitle-encoding.c:173 -#: ../libempathy-gtk/totem-subtitle-encoding.c:175 -#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +#: ../libempathy-gtk/totem-subtitle-encoding.c:172 +#: ../libempathy-gtk/totem-subtitle-encoding.c:174 +#: ../libempathy-gtk/totem-subtitle-encoding.c:176 msgid "Baltic" msgstr "Baltské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +#: ../libempathy-gtk/totem-subtitle-encoding.c:179 msgid "Celtic" msgstr "Keltské" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:182 +#: ../libempathy-gtk/totem-subtitle-encoding.c:184 +#: ../libempathy-gtk/totem-subtitle-encoding.c:186 +#: ../libempathy-gtk/totem-subtitle-encoding.c:188 msgid "Central European" msgstr "Stredoeurópske" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:191 +#: ../libempathy-gtk/totem-subtitle-encoding.c:193 +#: ../libempathy-gtk/totem-subtitle-encoding.c:195 +#: ../libempathy-gtk/totem-subtitle-encoding.c:197 msgid "Chinese Simplified" msgstr "ÄŒÃnske - zjednoduÅ¡ené" -#: ../libempathy-gtk/totem-subtitle-encoding.c:201 -#: ../libempathy-gtk/totem-subtitle-encoding.c:203 -#: ../libempathy-gtk/totem-subtitle-encoding.c:205 +#: ../libempathy-gtk/totem-subtitle-encoding.c:200 +#: ../libempathy-gtk/totem-subtitle-encoding.c:202 +#: ../libempathy-gtk/totem-subtitle-encoding.c:204 msgid "Chinese Traditional" msgstr "ÄŒÃnske - tradiÄné" -#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +#: ../libempathy-gtk/totem-subtitle-encoding.c:207 msgid "Croatian" msgstr "Chorvátske" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:210 +#: ../libempathy-gtk/totem-subtitle-encoding.c:212 +#: ../libempathy-gtk/totem-subtitle-encoding.c:214 +#: ../libempathy-gtk/totem-subtitle-encoding.c:216 +#: ../libempathy-gtk/totem-subtitle-encoding.c:218 +#: ../libempathy-gtk/totem-subtitle-encoding.c:220 msgid "Cyrillic" msgstr "Cyrilika" -#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +#: ../libempathy-gtk/totem-subtitle-encoding.c:223 msgid "Cyrillic/Russian" msgstr "Cyrilika/Ruské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:227 -#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +#: ../libempathy-gtk/totem-subtitle-encoding.c:226 +#: ../libempathy-gtk/totem-subtitle-encoding.c:228 msgid "Cyrillic/Ukrainian" msgstr "Cyrilika/Ukrajinské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +#: ../libempathy-gtk/totem-subtitle-encoding.c:231 msgid "Georgian" msgstr "GruzÃnske" -#: ../libempathy-gtk/totem-subtitle-encoding.c:235 -#: ../libempathy-gtk/totem-subtitle-encoding.c:237 -#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +#: ../libempathy-gtk/totem-subtitle-encoding.c:234 +#: ../libempathy-gtk/totem-subtitle-encoding.c:236 +#: ../libempathy-gtk/totem-subtitle-encoding.c:238 msgid "Greek" msgstr "Grécke" -#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +#: ../libempathy-gtk/totem-subtitle-encoding.c:241 msgid "Gujarati" msgstr "Gudžarátske" -#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +#: ../libempathy-gtk/totem-subtitle-encoding.c:244 msgid "Gurmukhi" msgstr "Gurmukhi" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:247 +#: ../libempathy-gtk/totem-subtitle-encoding.c:249 +#: ../libempathy-gtk/totem-subtitle-encoding.c:251 +#: ../libempathy-gtk/totem-subtitle-encoding.c:253 msgid "Hebrew" msgstr "Hebrejské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +#: ../libempathy-gtk/totem-subtitle-encoding.c:256 msgid "Hebrew Visual" msgstr "Hebrejské vizuálne" -#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +#: ../libempathy-gtk/totem-subtitle-encoding.c:259 msgid "Hindi" msgstr "Hindské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +#: ../libempathy-gtk/totem-subtitle-encoding.c:262 msgid "Icelandic" msgstr "Islandské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:266 -#: ../libempathy-gtk/totem-subtitle-encoding.c:268 -#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +#: ../libempathy-gtk/totem-subtitle-encoding.c:265 +#: ../libempathy-gtk/totem-subtitle-encoding.c:267 +#: ../libempathy-gtk/totem-subtitle-encoding.c:269 msgid "Japanese" msgstr "Japonské" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:272 +#: ../libempathy-gtk/totem-subtitle-encoding.c:274 +#: ../libempathy-gtk/totem-subtitle-encoding.c:276 +#: ../libempathy-gtk/totem-subtitle-encoding.c:278 msgid "Korean" msgstr "Kórejské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +#: ../libempathy-gtk/totem-subtitle-encoding.c:281 msgid "Nordic" msgstr "Å kandinávske" -#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +#: ../libempathy-gtk/totem-subtitle-encoding.c:284 msgid "Persian" msgstr "Perzské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:288 -#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +#: ../libempathy-gtk/totem-subtitle-encoding.c:287 +#: ../libempathy-gtk/totem-subtitle-encoding.c:289 msgid "Romanian" msgstr "Rumunské" -#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +#: ../libempathy-gtk/totem-subtitle-encoding.c:292 msgid "South European" msgstr "Juhoeurópske" -#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +#: ../libempathy-gtk/totem-subtitle-encoding.c:295 msgid "Thai" msgstr "Thajské" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:298 +#: ../libempathy-gtk/totem-subtitle-encoding.c:300 +#: ../libempathy-gtk/totem-subtitle-encoding.c:302 +#: ../libempathy-gtk/totem-subtitle-encoding.c:304 msgid "Turkish" msgstr "Turecké" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:307 +#: ../libempathy-gtk/totem-subtitle-encoding.c:309 +#: ../libempathy-gtk/totem-subtitle-encoding.c:311 +#: ../libempathy-gtk/totem-subtitle-encoding.c:313 +#: ../libempathy-gtk/totem-subtitle-encoding.c:315 msgid "Unicode" msgstr "Unicode" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:318 +#: ../libempathy-gtk/totem-subtitle-encoding.c:320 +#: ../libempathy-gtk/totem-subtitle-encoding.c:322 +#: ../libempathy-gtk/totem-subtitle-encoding.c:324 +#: ../libempathy-gtk/totem-subtitle-encoding.c:326 msgid "Western" msgstr "Západné" -#: ../libempathy-gtk/totem-subtitle-encoding.c:330 -#: ../libempathy-gtk/totem-subtitle-encoding.c:332 -#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +#: ../libempathy-gtk/totem-subtitle-encoding.c:329 +#: ../libempathy-gtk/totem-subtitle-encoding.c:331 +#: ../libempathy-gtk/totem-subtitle-encoding.c:333 msgid "Vietnamese" msgstr "Vietnamské" -#: ../libempathy-gtk/empathy-roster-model.h:29 +#: ../libempathy-gtk/empathy-roster-model.h:27 msgid "Top Contacts" msgstr "Obľúbené kontakty" -#: ../libempathy-gtk/empathy-roster-model.h:31 +#: ../libempathy-gtk/empathy-roster-model.h:29 msgid "Ungrouped" msgstr "Bez skupiny" #. Add a prefix explaining that something goes wrong when trying to #. * fetch contact's presence. -#: ../libempathy-gtk/empathy-roster-contact.c:205 +#: ../libempathy-gtk/empathy-roster-contact.c:201 #, c-format msgid "Server cannot find contact: %s" msgstr "Server nemôže nájsÅ¥ kontakt: %s" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223 msgid "No error message" msgstr "Žiadna chybová správa" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296 msgid "Instant Message (Empathy)" msgstr "Okamžitá správa (Empathy)" -#: ../src/empathy-about-dialog.c:81 +#: ../src/empathy-about-dialog.c:77 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 " @@ -3523,7 +3523,7 @@ msgstr "" "verzie tejto licencie, alebo (podľa vášho uváženia) ktorejkoľvek neskorÅ¡ej " "verzie." -#: ../src/empathy-about-dialog.c:85 +#: ../src/empathy-about-dialog.c:81 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 " @@ -3535,7 +3535,7 @@ msgstr "" "alebo VHODNOSTI NA URÄŒITà ÚČEL. ÄŽalÅ¡ie podrobnosti hľadajte v vlicencii " "General Public License." -#: ../src/empathy-about-dialog.c:89 +#: ../src/empathy-about-dialog.c:85 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 " @@ -3545,93 +3545,93 @@ msgstr "" "Totem. Ak sa tak nestalo, napÃÅ¡te na adresu Free Software Foundation, Inc., " "51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:109 +#: ../src/empathy-about-dialog.c:105 msgid "An Instant Messaging client for GNOME" msgstr "Klient na odosielanie okamžitých správ pre GNOME" -#: ../src/empathy-about-dialog.c:115 +#: ../src/empathy-about-dialog.c:111 msgid "translator-credits" msgstr "" "Miroslav Biňas <mirek@host.sk>\n" "Pavol KlaÄanský <pavol@klacansky.com>" # cmd desc -#: ../src/empathy-accounts.c:182 +#: ../src/empathy-accounts.c:171 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "" "Nezobrazà žiadne dialógové okná; urobà nejakú ÄinnosÅ¥ (napr. importovanie) a " "skonÄÃ" # cmd desc -#: ../src/empathy-accounts.c:186 +#: ../src/empathy-accounts.c:175 msgid "" "Don't display any dialogs unless there are only \"People Nearby\" accounts" msgstr "" "Zobrazà dialógové okná v prÃpade ak sú dostupné iba úÄty typu „Ľudia v okolÓ" # cmd desc -#: ../src/empathy-accounts.c:190 +#: ../src/empathy-accounts.c:179 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "PoÄiatoÄne vyberie zadaný úÄet (napr. gabble/jabber/foo_40example_2eorg0)" # cmd desc -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:181 msgid "<account-id>" msgstr "<identifikátor-úÄtu>" # g_option_context -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:186 msgid "- Empathy Accounts" msgstr "- úÄty pre Empathy" # application_name -#: ../src/empathy-accounts.c:240 +#: ../src/empathy-accounts.c:239 msgid "Empathy Accounts" msgstr "ÚÄty pre Empathy" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:52 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Vo vaÅ¡om úÄte %s máte neuložené zmeny." #. 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:72 +#: ../src/empathy-accounts-dialog.c:56 msgid "Your new account has not been saved yet." msgstr "Váš nový úÄet eÅ¡te nebol uložený." # status infobar message -#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279 +#: ../src/empathy-accounts-dialog.c:388 ../src/empathy-call-window.c:1258 msgid "Connecting…" msgstr "Pripája sa…" # status infobar message -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:429 #, c-format msgid "Offline — %s" msgstr "Odhlásený — %s" # status infobar message -#: ../src/empathy-accounts-dialog.c:457 +#: ../src/empathy-accounts-dialog.c:441 #, c-format msgid "Disconnected — %s" msgstr "Odpojený — %s" # status infobar message -#: ../src/empathy-accounts-dialog.c:468 +#: ../src/empathy-accounts-dialog.c:452 msgid "Offline — No Network Connection" msgstr "Odhlásený — Bez sieÅ¥ového pripojenia" # status infobar message -#: ../src/empathy-accounts-dialog.c:475 +#: ../src/empathy-accounts-dialog.c:459 msgid "Unknown Status" msgstr "Neznámy stav" # status infobar message -#: ../src/empathy-accounts-dialog.c:492 +#: ../src/empathy-accounts-dialog.c:476 msgid "" "This account has been disabled because it relies on an old, unsupported " "backend. Please install telepathy-haze and restart your session to migrate " @@ -3642,30 +3642,30 @@ msgstr "" "reláciu aby sa úÄet premigroval." # status infobar message -#: ../src/empathy-accounts-dialog.c:502 +#: ../src/empathy-accounts-dialog.c:486 msgid "Offline — Account Disabled" msgstr "Odhlásený — Zablokovaný úÄet" # window title -#: ../src/empathy-accounts-dialog.c:608 +#: ../src/empathy-accounts-dialog.c:592 msgid "Edit Connection Parameters" msgstr "Úprava parametrov pripojenia" # button -#: ../src/empathy-accounts-dialog.c:735 +#: ../src/empathy-accounts-dialog.c:719 msgid "_Edit Connection Parameters..." msgstr "_UpraviÅ¥ parametre pripojenia…" -#: ../src/empathy-accounts-dialog.c:1268 +#: ../src/empathy-accounts-dialog.c:1252 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Naozaj chcete odstrániÅ¥ úÄet %s z vášho poÄÃtaÄa?" -#: ../src/empathy-accounts-dialog.c:1272 +#: ../src/empathy-accounts-dialog.c:1256 msgid "This will not remove your account on the server." msgstr "Toto neodstráni váš úÄet na serveri." -#: ../src/empathy-accounts-dialog.c:1477 +#: ../src/empathy-accounts-dialog.c:1461 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3674,26 +3674,26 @@ msgstr "" "Naozaj chcete pokraÄovaÅ¥?" #. Menu item: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1668 +#: ../src/empathy-accounts-dialog.c:1652 msgid "_Enabled" msgstr "_Povolený" #. Menu item: Rename -#: ../src/empathy-accounts-dialog.c:1691 +#: ../src/empathy-accounts-dialog.c:1675 msgid "Rename" msgstr "PremenovaÅ¥" # button -#: ../src/empathy-accounts-dialog.c:2107 +#: ../src/empathy-accounts-dialog.c:2091 msgid "_Skip" msgstr "_PreskoÄiÅ¥" # button -#: ../src/empathy-accounts-dialog.c:2111 +#: ../src/empathy-accounts-dialog.c:2095 msgid "_Connect" msgstr "P_ripojiÅ¥" -#: ../src/empathy-accounts-dialog.c:2290 +#: ../src/empathy-accounts-dialog.c:2274 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3703,7 +3703,7 @@ msgstr "" # window title #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:2433 +#: ../src/empathy-accounts-dialog.c:2417 msgid "Messaging and VoIP Accounts" msgstr "Rozhovory a úÄty VoIP" @@ -3732,36 +3732,36 @@ msgid "No protocol backends installed" msgstr "Žiadny obslužný program protokolu nie je nainÅ¡talovaný" # g_option_context -#: ../src/empathy-auth-client.c:296 +#: ../src/empathy-auth-client.c:285 msgid " - Empathy authentication client" msgstr " - Klient Empathy pre overenie totožnosti" # application_name -#: ../src/empathy-auth-client.c:312 +#: ../src/empathy-auth-client.c:301 msgid "Empathy authentication client" msgstr "Empathy - klient overenia totožnosti" # cmd desc -#: ../src/empathy.c:427 +#: ../src/empathy.c:407 msgid "Don't connect on startup" msgstr "Nepripojà sa po spustenÃ" # cmd desc -#: ../src/empathy.c:431 +#: ../src/empathy.c:411 msgid "Don't display the contact list or any other dialogs on startup" msgstr "" "Nezobrazà zoznam kontaktov alebo akékoľvek iné dialógové okno pri spustenÃ" # g_option_context -#: ../src/empathy.c:447 +#: ../src/empathy.c:440 msgid "- Empathy IM Client" msgstr "- Klient Empathy pre rýchle správy" -#: ../src/empathy.c:623 +#: ../src/empathy.c:626 msgid "Error contacting the Account Manager" msgstr "Chyba pri spájanà sa so Správcom úÄtov" -#: ../src/empathy.c:625 +#: ../src/empathy.c:628 #, c-format msgid "" "There was an error while trying to connect to the Telepathy Account Manager. " @@ -3775,119 +3775,119 @@ msgstr "" "%s" # Správa pre dbus potlaÄenie spánku -#: ../src/empathy-call.c:124 +#: ../src/empathy-call.c:115 msgid "In a call" msgstr "Prebieha hovor" # g_option_context -#: ../src/empathy-call.c:224 +#: ../src/empathy-call.c:215 msgid "- Empathy Audio/Video Client" msgstr "- Klient Empathy pre zvukový hovor a videohovor" # application_name -#: ../src/empathy-call.c:248 +#: ../src/empathy-call.c:239 msgid "Empathy Audio/Video Client" msgstr "Empathy - klient pre zvukový hovor a videohovor" -#: ../src/empathy-call-observer.c:119 +#: ../src/empathy-call-observer.c:110 #, c-format msgid "%s just tried to call you, but you were in another call." msgstr "Kontakt %s sa vám pokúšal dovolaÅ¥, ale mali ste iný hovor." -#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508 +#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500 msgid "Incoming call" msgstr "Prichádzajúci hovor" -#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming video call from %s" msgstr "Prichádzajúci videohovor od kontaktu %s" -#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516 -#: ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming call from %s" msgstr "Prichádzajúci hovor od kontaktu %s" # button -#: ../src/empathy-call-window.c:1564 -#: ../src/empathy-notifications-approver.c:197 +#: ../src/empathy-call-window.c:1543 +#: ../src/empathy-notifications-approver.c:191 msgid "Reject" msgstr "OdmietnuÅ¥" # button -#: ../src/empathy-call-window.c:1565 -#: ../src/empathy-notifications-approver.c:202 -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-call-window.c:1544 +#: ../src/empathy-notifications-approver.c:196 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer" msgstr "PrijaÅ¥" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:1934 +#: ../src/empathy-call-window.c:1913 #, c-format msgid "Call with %s" msgstr "Hovor s kontaktom %s" # candidate_type -#: ../src/empathy-call-window.c:2186 +#: ../src/empathy-call-window.c:2165 msgid "The IP address as seen by the machine" msgstr "Adresa IP v tvare v akom ju vidà stroj" # candidate_type -#: ../src/empathy-call-window.c:2188 +#: ../src/empathy-call-window.c:2167 msgid "The IP address as seen by a server on the Internet" msgstr "Adresa IP v tvare v akom ju vidà server na internete" # candidate_type -#: ../src/empathy-call-window.c:2190 +#: ../src/empathy-call-window.c:2169 msgid "The IP address of the peer as seen by the other side" msgstr "Adresa IP v tvare v akom ju vidà partner na druhej strane" # candidate_type -#: ../src/empathy-call-window.c:2192 +#: ../src/empathy-call-window.c:2171 msgid "The IP address of a relay server" msgstr "Adresa IP prenosového serveru" # candidate_type -#: ../src/empathy-call-window.c:2194 +#: ../src/empathy-call-window.c:2173 msgid "The IP address of the multicast group" msgstr "Adresa IP skupiny multicast" # kodek -#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606 -#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608 +#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585 +#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587 #: ../src/empathy-call-window.ui.h:28 msgid "Unknown" msgstr "Neznámy" # status -#: ../src/empathy-call-window.c:2966 +#: ../src/empathy-call-window.c:2946 msgid "On hold" msgstr "Podržaný" # status -#: ../src/empathy-call-window.c:2970 +#: ../src/empathy-call-window.c:2950 msgid "Mute" msgstr "Stlmený" # status -#: ../src/empathy-call-window.c:2972 +#: ../src/empathy-call-window.c:2952 msgid "Duration" msgstr "Trvanie" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2975 +#: ../src/empathy-call-window.c:2955 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d min %02d s" # expander -#: ../src/empathy-call-window.c:3071 +#: ../src/empathy-call-window.c:3051 msgid "Technical Details" msgstr "Technické podrobnosti" -#: ../src/empathy-call-window.c:3110 +#: ../src/empathy-call-window.c:3090 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3896,7 +3896,7 @@ msgstr "" "Softvér kontaktu %s nepodporuje žiaden z audio formátov podporovaných vo " "vaÅ¡om poÄÃtaÄi" -#: ../src/empathy-call-window.c:3115 +#: ../src/empathy-call-window.c:3095 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3905,7 +3905,7 @@ msgstr "" "Softvér kontaktu %s nepodporuje žiaden z video formátov podporovaných vo " "vaÅ¡om poÄÃtaÄi" -#: ../src/empathy-call-window.c:3121 +#: ../src/empathy-call-window.c:3101 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3914,23 +3914,23 @@ msgstr "" "Spojenie s kontaktom %s sa nedá nadviazaÅ¥. Jeden z vás môže byÅ¥ v sieti, " "ktorá neumožňuje priame pripojenie." -#: ../src/empathy-call-window.c:3127 +#: ../src/empathy-call-window.c:3107 msgid "There was a failure on the network" msgstr "DoÅ¡lo k výpadku v sieti" -#: ../src/empathy-call-window.c:3131 +#: ../src/empathy-call-window.c:3111 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "Audio formáty potrebné pre tento hovor nie sú nainÅ¡talované vo vaÅ¡om poÄÃtaÄi" -#: ../src/empathy-call-window.c:3134 +#: ../src/empathy-call-window.c:3114 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "Video formáty potrebné pre tento hovor nie sú nainÅ¡talované vo vaÅ¡om poÄÃtaÄi" -#: ../src/empathy-call-window.c:3146 +#: ../src/empathy-call-window.c:3126 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3941,32 +3941,32 @@ msgstr "" "prosÃm, túto chybu</a> a pripojte k nej záznamy zÃskané z okna 'Ladenie' z " "ponuky PomocnÃk." -#: ../src/empathy-call-window.c:3155 +#: ../src/empathy-call-window.c:3135 msgid "There was a failure in the call engine" msgstr "DoÅ¡lo k výpadku súÄasti pre volanie" -#: ../src/empathy-call-window.c:3158 +#: ../src/empathy-call-window.c:3138 msgid "The end of the stream was reached" msgstr "Bol dosiahnutý koniec streamu" -#: ../src/empathy-call-window.c:3198 +#: ../src/empathy-call-window.c:3178 msgid "Can't establish audio stream" msgstr "Audio spojenie sa nedá nadviazaÅ¥" -#: ../src/empathy-call-window.c:3208 +#: ../src/empathy-call-window.c:3188 msgid "Can't establish video stream" msgstr "Video spojenie sa nedá nadviazaÅ¥" -#: ../src/empathy-call-window.c:3245 +#: ../src/empathy-call-window.c:3225 #, c-format msgid "Your current balance is %s." msgstr "Váš aktuálny kredit je %s." -#: ../src/empathy-call-window.c:3249 +#: ../src/empathy-call-window.c:3229 msgid "Sorry, you don’t have enough credit for that call." msgstr "PrepáÄte, nemáte dostatok kreditu na tento hovor." -#: ../src/empathy-call-window.c:3251 +#: ../src/empathy-call-window.c:3231 msgid "Top Up" msgstr "DobiÅ¥" @@ -4111,22 +4111,22 @@ msgid "Audio" msgstr "Zvuk" # g_option_context -#: ../src/empathy-chat.c:104 +#: ../src/empathy-chat.c:101 msgid "- Empathy Chat Client" msgstr "- Klient Empathy pre rozhovor" # gtk_tree_view_column -#: ../src/empathy-chatrooms-window.c:251 +#: ../src/empathy-chatrooms-window.c:243 msgid "Name" msgstr "Názov" # gtk_tree_view_column -#: ../src/empathy-chatrooms-window.c:269 +#: ../src/empathy-chatrooms-window.c:261 msgid "Room" msgstr "MiestnosÅ¥" # gtk_tree_view_column -#: ../src/empathy-chatrooms-window.c:277 +#: ../src/empathy-chatrooms-window.c:269 msgid "Auto-Connect" msgstr "PripojiÅ¥ sa automaticky" @@ -4135,11 +4135,11 @@ msgstr "PripojiÅ¥ sa automaticky" msgid "Manage Favorite Rooms" msgstr "Správa obľúbených miestnostÃ" -#: ../src/empathy-chat-window.c:287 +#: ../src/empathy-chat-window.c:275 msgid "Close this window?" msgstr "ZavrieÅ¥ toto okno?" -#: ../src/empathy-chat-window.c:293 +#: ../src/empathy-chat-window.c:281 #, c-format msgid "" "Closing this window will leave %s. You will not receive any further messages " @@ -4148,7 +4148,7 @@ msgstr "" "ZatvorenÃm tohto okna opustÃte diskusnú miestnosÅ¥ %s. Nebudete dostávaÅ¥ " "žiadne ÄalÅ¡ie správy pokým do nej znovu nevstúpite." -#: ../src/empathy-chat-window.c:306 +#: ../src/empathy-chat-window.c:294 #, c-format msgid "" "Closing this window will leave a chat room. You will not receive any further " @@ -4166,12 +4166,12 @@ msgstr[2] "" "ZatvorenÃm tohto okna opustÃte %u diskusné miestnosti. Nebudete dostávaÅ¥ " "žiadne ÄalÅ¡ie správy pokým do nich znovu nevstúpite." -#: ../src/empathy-chat-window.c:317 +#: ../src/empathy-chat-window.c:305 #, c-format msgid "Leave %s?" msgstr "OpustiÅ¥ diskusnú miestnosÅ¥ %s?" -#: ../src/empathy-chat-window.c:319 +#: ../src/empathy-chat-window.c:307 msgid "" "You will not receive any further messages from this chat room until you " "rejoin it." @@ -4180,16 +4180,16 @@ msgstr "" "nej znovu nevstúpite." # button -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Close window" msgstr "ZavrieÅ¥ okno" # button -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Leave room" msgstr "OpustiÅ¥ miestnosÅ¥" -#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700 +#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -4198,7 +4198,7 @@ msgstr[1] "%s (%d nepreÄÃtaná)" msgstr[2] "%s (%d nepreÄÃtané)" # PM: %u je poÄet otvorených kariet nie sú to ľudia -#: ../src/empathy-chat-window.c:692 +#: ../src/empathy-chat-window.c:680 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -4207,7 +4207,7 @@ msgstr[1] "%s (a %u ÄalÅ¡ia)" msgstr[2] "%s (a %u ÄalÅ¡ie)" # PM: myslia sa karty takže "na" alebo "v" nie "od" -#: ../src/empathy-chat-window.c:708 +#: ../src/empathy-chat-window.c:696 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -4215,7 +4215,7 @@ msgstr[0] "%s (%d nepreÄÃtaných na ÄalÅ¡Ãch)" msgstr[1] "%s (%d nepreÄÃtaná na ÄalÅ¡Ãch)" msgstr[2] "%s (%d nepreÄÃtané na ÄalÅ¡Ãch)" -#: ../src/empathy-chat-window.c:717 +#: ../src/empathy-chat-window.c:705 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -4224,12 +4224,12 @@ msgstr[1] "%s (%d nepreÄÃtaná na vÅ¡etkých)" msgstr[2] "%s (%d nepreÄÃtané na vÅ¡etkých)" # tooltip -#: ../src/empathy-chat-window.c:954 +#: ../src/empathy-chat-window.c:942 msgid "SMS:" msgstr "SMS:" # tooltip -#: ../src/empathy-chat-window.c:962 +#: ../src/empathy-chat-window.c:950 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -4238,7 +4238,7 @@ msgstr[1] "Posiela sa %d správa" msgstr[2] "Posielajú sa %d správy" # tooltip -#: ../src/empathy-chat-window.c:982 +#: ../src/empathy-chat-window.c:970 msgid "Typing a message." msgstr "PÃÅ¡e správu." @@ -4319,89 +4319,89 @@ msgid "_Detach Tab" msgstr "_OddeliÅ¥ kartu" # cmd desc -#: ../src/empathy-debugger.c:69 +#: ../src/empathy-debugger.c:77 msgid "Show a particular service" msgstr "Zobrazà urÄitú službu" # g_option_context -#: ../src/empathy-debugger.c:74 +#: ../src/empathy-debugger.c:82 msgid "- Empathy Debugger" msgstr "- OdlaÄovaÄ Empathy" # application_name -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:142 msgid "Empathy Debugger" msgstr "OdlaÄovaÄ Empathy" -#: ../src/empathy-debug-window.c:1599 +#: ../src/empathy-debug-window.c:1588 msgid "Save" msgstr "UložiÅ¥" -#: ../src/empathy-debug-window.c:1659 +#: ../src/empathy-debug-window.c:1648 msgid "Pastebin link" msgstr "Odkaz na pastebin" -#: ../src/empathy-debug-window.c:1668 +#: ../src/empathy-debug-window.c:1657 msgid "Pastebin response" msgstr "OdpoveÄ z pastebin" -#: ../src/empathy-debug-window.c:1675 +#: ../src/empathy-debug-window.c:1664 msgid "Data too large for a single paste. Please save logs to file." msgstr "" "Údaje sú prÃliÅ¡ veľké, aby boli poslané naraz. ProsÃm, uložte záznamy do " "súboru." # window title -#: ../src/empathy-debug-window.c:1857 +#: ../src/empathy-debug-window.c:1846 msgid "Debug Window" msgstr "Okno ladenia" # gtk_tool_button -#: ../src/empathy-debug-window.c:1917 +#: ../src/empathy-debug-window.c:1906 msgid "Send to pastebin" msgstr "PoslaÅ¥ na pastebin" # gtk_tool_button -#: ../src/empathy-debug-window.c:1961 +#: ../src/empathy-debug-window.c:1950 msgid "Pause" msgstr "PozastaviÅ¥" # label -#: ../src/empathy-debug-window.c:1973 +#: ../src/empathy-debug-window.c:1962 msgid "Level " msgstr "Úroveň" # gtk_list_store -#: ../src/empathy-debug-window.c:1992 +#: ../src/empathy-debug-window.c:1981 msgid "Debug" msgstr "Ladenie" # gtk_list_store -#: ../src/empathy-debug-window.c:1997 +#: ../src/empathy-debug-window.c:1986 msgid "Info" msgstr "Informácie" # gtk_list_store -#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077 +#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066 msgid "Message" msgstr "Správa" # gtk_list_store -#: ../src/empathy-debug-window.c:2007 +#: ../src/empathy-debug-window.c:1996 msgid "Warning" msgstr "Upozornenie" # gtk_list_store -#: ../src/empathy-debug-window.c:2012 +#: ../src/empathy-debug-window.c:2001 msgid "Critical" msgstr "Kritická" # gtk_list_store -#: ../src/empathy-debug-window.c:2017 +#: ../src/empathy-debug-window.c:2006 msgid "Error" msgstr "Chyba" -#: ../src/empathy-debug-window.c:2030 +#: ../src/empathy-debug-window.c:2019 msgid "" "Even if they don't display passwords, logs can contain sensitive information " "such as your list of contacts or the messages you recently sent or " @@ -4419,100 +4419,100 @@ msgstr "" "cgi?product=empathy\">hlásenia o chybe</a>." # gtk_tree_view -#: ../src/empathy-debug-window.c:2062 +#: ../src/empathy-debug-window.c:2051 msgid "Time" msgstr "ÄŒas" # gtk_tree_view -#: ../src/empathy-debug-window.c:2065 +#: ../src/empathy-debug-window.c:2054 msgid "Domain" msgstr "Doména" # gtk_tree_view -#: ../src/empathy-debug-window.c:2068 +#: ../src/empathy-debug-window.c:2057 msgid "Category" msgstr "Kategória" # gtk_tree_view -#: ../src/empathy-debug-window.c:2071 +#: ../src/empathy-debug-window.c:2060 msgid "Level" msgstr "Úroveň" -#: ../src/empathy-debug-window.c:2100 +#: ../src/empathy-debug-window.c:2089 msgid "" "The selected connection manager does not support the remote debugging " "extension." msgstr "" "Zvolený správca pripojenia nepodporuje rozÅ¡Ãrenie pre vzdialené ladenie." -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:500 msgid "Incoming video call" msgstr "Prichádzajúci videohovor" -#: ../src/empathy-event-manager.c:512 +#: ../src/empathy-event-manager.c:504 #, c-format msgid "%s is video calling you. Do you want to answer?" msgstr "%s vám volá. Chcete prijaÅ¥ videohovor?" -#: ../src/empathy-event-manager.c:513 +#: ../src/empathy-event-manager.c:505 #, c-format msgid "%s is calling you. Do you want to answer?" msgstr "%s vám volá. Chcete prijaÅ¥ hovor?" # button -#: ../src/empathy-event-manager.c:541 +#: ../src/empathy-event-manager.c:533 msgid "_Reject" msgstr "_OdmietnuÅ¥" # button -#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549 msgid "_Answer" msgstr "_PrijaÅ¥" -#: ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:549 msgid "_Answer with video" msgstr "_PrijaÅ¥ a zapnúť video" -#: ../src/empathy-event-manager.c:712 +#: ../src/empathy-event-manager.c:704 msgid "Room invitation" msgstr "Pozvanie do miestnosti" # window title -#: ../src/empathy-event-manager.c:714 +#: ../src/empathy-event-manager.c:706 #, c-format msgid "Invitation to join %s" msgstr "Pozvánka na vstup do miestnosti %s" -#: ../src/empathy-event-manager.c:721 +#: ../src/empathy-event-manager.c:713 #, c-format msgid "%s is inviting you to join %s" msgstr "ÚÄastnÃk %s vás pozýva, aby ste vstúpili do miestnosti %s" # button -#: ../src/empathy-event-manager.c:734 +#: ../src/empathy-event-manager.c:726 msgid "_Join" msgstr "_VstúpiÅ¥" -#: ../src/empathy-event-manager.c:760 +#: ../src/empathy-event-manager.c:752 #, c-format msgid "%s invited you to join %s" msgstr "ÚÄastnÃk %s vás pozval do miestnosti %s" -#: ../src/empathy-event-manager.c:766 +#: ../src/empathy-event-manager.c:758 #, c-format msgid "You have been invited to join %s" msgstr "Boli ste pozvaný do miestnosti %s" -#: ../src/empathy-event-manager.c:945 +#: ../src/empathy-event-manager.c:937 #, c-format msgid "Incoming file transfer from %s" msgstr "Prichádzajúci prenos súboru od kontaktu %s" -#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227 +#: ../src/empathy-event-manager.c:965 ../src/empathy-roster-window.c:212 msgid "Password required" msgstr "Vyžaduje sa heslo" -#: ../src/empathy-event-manager.c:1110 +#: ../src/empathy-event-manager.c:1102 #, c-format msgid "" "\n" @@ -4522,108 +4522,108 @@ msgstr "" "Správa: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:99 +#: ../src/empathy-ft-manager.c:93 #, 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 +#: ../src/empathy-ft-manager.c:96 #, c-format msgid "%02u.%02u" msgstr "0:%02u:%02u" -#: ../src/empathy-ft-manager.c:178 +#: ../src/empathy-ft-manager.c:172 msgctxt "file transfer percent" msgid "Unknown" msgstr "Neznámy" -#: ../src/empathy-ft-manager.c:273 +#: ../src/empathy-ft-manager.c:267 #, c-format msgid "%s of %s at %s/s" msgstr "%s z %s pri %s/s" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:268 #, c-format msgid "%s of %s" msgstr "%s z %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:305 +#: ../src/empathy-ft-manager.c:299 #, c-format msgid "Receiving \"%s\" from %s" msgstr "PrijÃma sa súbor „%s“ od kontaktu %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:308 +#: ../src/empathy-ft-manager.c:302 #, c-format msgid "Sending \"%s\" to %s" msgstr "Odosiela sa súbor „%s“ pre kontakt %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:338 +#: ../src/empathy-ft-manager.c:332 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Chyba pri prijÃmanà súboru „%s“ od kontaktu %s" -#: ../src/empathy-ft-manager.c:341 +#: ../src/empathy-ft-manager.c:335 msgid "Error receiving a file" msgstr "Chyba pri prijÃmanà súboru" -#: ../src/empathy-ft-manager.c:346 +#: ../src/empathy-ft-manager.c:340 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Chyba pri odosielanà súboru „%s“ pre kontakt %s" -#: ../src/empathy-ft-manager.c:349 +#: ../src/empathy-ft-manager.c:343 msgid "Error sending a file" msgstr "Chyba pri odosielanà súboru" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:488 +#: ../src/empathy-ft-manager.c:482 #, c-format msgid "\"%s\" received from %s" msgstr "Súbor „%s“ bol prijatý od kontaktu %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:493 +#: ../src/empathy-ft-manager.c:487 #, c-format msgid "\"%s\" sent to %s" msgstr "Súbor „%s“ bol odoslaný pre kontakt %s" -#: ../src/empathy-ft-manager.c:496 +#: ../src/empathy-ft-manager.c:490 msgid "File transfer completed" msgstr "Prenos súboru bol dokonÄený" -#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779 +#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773 msgid "Waiting for the other participant's response" msgstr "ÄŒaká sa na odpoveÄ od druhého úÄastnÃka" -#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679 +#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Kontrola integrity súboru „%s“" -#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 +#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676 #, c-format msgid "Hashing \"%s\"" msgstr "Vytvára sa kontrolný súÄet súboru „%s“" # gtk_tree_view -#: ../src/empathy-ft-manager.c:1025 +#: ../src/empathy-ft-manager.c:1019 msgid "%" msgstr "%" # gtk_tree_view -#: ../src/empathy-ft-manager.c:1037 +#: ../src/empathy-ft-manager.c:1031 msgid "File" msgstr "Súbor" # gtk_tree_view -#: ../src/empathy-ft-manager.c:1059 +#: ../src/empathy-ft-manager.c:1053 msgid "Remaining" msgstr "Zostáva" @@ -4638,11 +4638,11 @@ msgid "Remove completed, canceled and failed file transfers from the list" msgstr "Odstráni dokonÄené, zruÅ¡ené a chybné prenosy súborov zo zoznamu" # button -#: ../src/empathy-import-dialog.c:76 +#: ../src/empathy-import-dialog.c:70 msgid "_Import" msgstr "_ImportovaÅ¥" -#: ../src/empathy-import-dialog.c:88 +#: ../src/empathy-import-dialog.c:82 msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." @@ -4651,61 +4651,61 @@ msgstr "" "import úÄtov iba z programu Pidgin." # window title -#: ../src/empathy-import-dialog.c:209 +#: ../src/empathy-import-dialog.c:203 msgid "Import Accounts" msgstr "Import úÄtov" # column name; contents are checkboxes # gtk_tree_view #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:302 +#: ../src/empathy-import-widget.c:296 msgid "Import" msgstr "ImportovaÅ¥" # column name # gtk_tree_view -#: ../src/empathy-import-widget.c:311 +#: ../src/empathy-import-widget.c:305 msgid "Protocol" msgstr "Protokol" # column name # gtk_tree_view -#: ../src/empathy-import-widget.c:335 +#: ../src/empathy-import-widget.c:329 msgid "Source" msgstr "Zdroj" # window title -#: ../src/empathy-invite-participant-dialog.c:201 -#: ../src/empathy-invite-participant-dialog.c:229 +#: ../src/empathy-invite-participant-dialog.c:196 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite Participant" msgstr "Pozvanie úÄastnÃka" -#: ../src/empathy-invite-participant-dialog.c:202 +#: ../src/empathy-invite-participant-dialog.c:197 msgid "Choose a contact to invite into the conversation:" msgstr "Vyberte kontakt, ktorý chcete pozvaÅ¥ do konverzácie:" # button -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:220 msgid "Invite" msgstr "PozvaÅ¥" # gtk_tree_view -#: ../src/empathy-new-chatroom-dialog.c:194 +#: ../src/empathy-new-chatroom-dialog.c:184 msgid "Chat Room" msgstr "Diskusná miestnosÅ¥" # gtk_tree_view -#: ../src/empathy-new-chatroom-dialog.c:209 +#: ../src/empathy-new-chatroom-dialog.c:199 msgid "Members" msgstr "ÚÄastnÃci" # label -#: ../src/empathy-new-chatroom-dialog.c:410 +#: ../src/empathy-new-chatroom-dialog.c:400 msgid "Failed to list rooms" msgstr "Zlyhalo vypÃsanie miestnostÃ" # tooltip -#: ../src/empathy-new-chatroom-dialog.c:439 +#: ../src/empathy-new-chatroom-dialog.c:429 #, c-format msgid "" "%s\n" @@ -4718,18 +4718,18 @@ msgstr "" "Vyžaduje sa heslo: %s\n" "ÚÄastnÃkov: %s" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "Yes" msgstr "Ãno" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "No" msgstr "Nie" # window title -#: ../src/empathy-new-chatroom-dialog.c:784 +#: ../src/empathy-new-chatroom-dialog.c:774 msgid "Join Room" msgstr "Vstup do miestnosti" @@ -4780,116 +4780,116 @@ msgid "Room List" msgstr "Zoznam miestnostÃ" # notification action -#: ../src/empathy-notifications-approver.c:188 +#: ../src/empathy-notifications-approver.c:182 msgid "Respond" msgstr "OdpovedaÅ¥" # notification action -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer with video" msgstr "PrijaÅ¥ a zapnúť video" # notification action -#: ../src/empathy-notifications-approver.c:215 -#: ../src/empathy-notifications-approver.c:225 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:219 msgid "Decline" msgstr "OdmietnuÅ¥" # notification action -#: ../src/empathy-notifications-approver.c:219 -#: ../src/empathy-notifications-approver.c:230 +#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:224 msgid "Accept" msgstr "PrijaÅ¥" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:240 +#: ../src/empathy-notifications-approver.c:234 msgid "Provide" msgstr "Poskytnúť" # sound_entries -#: ../src/empathy-preferences.c:143 +#: ../src/empathy-preferences.c:134 msgid "Message received" msgstr "Prijatá správa" # sound_entries -#: ../src/empathy-preferences.c:144 +#: ../src/empathy-preferences.c:135 msgid "Message sent" msgstr "Odoslaná správa" # sound_entries -#: ../src/empathy-preferences.c:145 +#: ../src/empathy-preferences.c:136 msgid "New conversation" msgstr "Nová konverzácia" # sound_entries -#: ../src/empathy-preferences.c:146 +#: ../src/empathy-preferences.c:137 msgid "Contact comes online" msgstr "Kontakt sa prihlásil" # sound_entries -#: ../src/empathy-preferences.c:147 +#: ../src/empathy-preferences.c:138 msgid "Contact goes offline" msgstr "Kontakt sa odpojil" # sound_entries -#: ../src/empathy-preferences.c:148 +#: ../src/empathy-preferences.c:139 msgid "Account connected" msgstr "ÚÄet pripojený" # sound_entries -#: ../src/empathy-preferences.c:149 +#: ../src/empathy-preferences.c:140 msgid "Account disconnected" msgstr "ÚÄet odpojený" # gtk_tree_view -#: ../src/empathy-preferences.c:386 +#: ../src/empathy-preferences.c:377 msgid "Language" msgstr "Jazyk" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:637 +#: ../src/empathy-preferences.c:628 msgid "Juliet" msgstr "Júlia" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:644 +#: ../src/empathy-preferences.c:635 msgid "Romeo" msgstr "Rómeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:650 +#: ../src/empathy-preferences.c:641 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "Rómeo, Rómeo, preÄo si ty Rómeo?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:654 +#: ../src/empathy-preferences.c:645 msgid "Deny thy father and refuse thy name;" msgstr "Zapri otca, odriekni sa mena;" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:657 +#: ../src/empathy-preferences.c:648 msgid "Or if thou wilt not, be but sworn my love" msgstr "A Äi, ak nechceÅ¡, prisahaj mi lásku" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:660 +#: ../src/empathy-preferences.c:651 msgid "And I'll no longer be a Capulet." msgstr "A ja prestanem byÅ¥ Capulettová." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:663 +#: ../src/empathy-preferences.c:654 msgid "Shall I hear more, or shall I speak at this?" msgstr "Mám poÄúvaÅ¥, a Äi hneÄ odvetiÅ¥?" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:666 +#: ../src/empathy-preferences.c:657 msgid "Juliet has disconnected" msgstr "Kontakt Júlia sa odpojil" # window title -#: ../src/empathy-preferences.c:1032 +#: ../src/empathy-preferences.c:1023 msgid "Preferences" msgstr "Nastavenia" @@ -4904,7 +4904,7 @@ msgid "Show account balances" msgstr "ZobraziÅ¥ množstvo kreditu na úÄtoch" # GtkLabel -#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241 +#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2226 msgid "Contact List" msgstr "Zoznam kontaktov" @@ -5110,94 +5110,94 @@ msgstr "Témy" # PK: to je ked mas nespravne heslo a zobrazi sa ti tam hore v zozname upozornenie # PK: tu mi sedi skor otvori okno na poskytnutie hesla # tooltip -#: ../src/empathy-roster-window.c:244 +#: ../src/empathy-roster-window.c:229 msgid "Provide Password" msgstr "Otvorà okno na poskytnutie hesla" #  tooltip -#: ../src/empathy-roster-window.c:250 +#: ../src/empathy-roster-window.c:235 msgid "Disconnect" msgstr "OdpojÃ" -#: ../src/empathy-roster-window.c:493 -msgid "You need to setup an account to see contacts here." +#: ../src/empathy-roster-window.c:478 +msgid "You need to set up an account to see contacts here." msgstr "Aby ste tu videli kontakty, musÃte nastaviÅ¥ úÄet." -#: ../src/empathy-roster-window.c:569 +#: ../src/empathy-roster-window.c:554 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." msgstr "" "PrepáÄte, %s úÄty nemôžu byt použÃvané pokým nebude aktualizovaný softvér %s." # service name -#: ../src/empathy-roster-window.c:670 +#: ../src/empathy-roster-window.c:655 msgid "Windows Live" msgstr "Windows Live" # service name -#: ../src/empathy-roster-window.c:674 +#: ../src/empathy-roster-window.c:659 msgid "Facebook" msgstr "Facebook" #. translators: %s is an account name like 'Facebook' or 'Google Talk' -#: ../src/empathy-roster-window.c:689 +#: ../src/empathy-roster-window.c:674 #, c-format msgid "%s account requires authorisation" msgstr "ÚÄet %s vyžaduje potvrdenie prÃstupu" # tooltip -#: ../src/empathy-roster-window.c:700 +#: ../src/empathy-roster-window.c:685 msgid "Online Accounts" msgstr "Online úÄty" # button -#: ../src/empathy-roster-window.c:747 +#: ../src/empathy-roster-window.c:732 msgid "Update software..." msgstr "AktualizovaÅ¥ softvér…" # tooltip -#: ../src/empathy-roster-window.c:753 +#: ../src/empathy-roster-window.c:738 msgid "Reconnect" msgstr "Obnovà spojenie" # tooltip -#: ../src/empathy-roster-window.c:757 +#: ../src/empathy-roster-window.c:742 msgid "Edit Account" msgstr "Otvorà okno na úpravu úÄtu" # tooltip -#: ../src/empathy-roster-window.c:762 +#: ../src/empathy-roster-window.c:747 msgid "Close" msgstr "Zavrie" # tooltip -#: ../src/empathy-roster-window.c:904 +#: ../src/empathy-roster-window.c:889 msgid "Top up account" msgstr "Dobije kredit na úÄte" -#: ../src/empathy-roster-window.c:1590 +#: ../src/empathy-roster-window.c:1575 msgid "You need to enable one of your accounts to see contacts here." msgstr "Aby ste tu videli kontakty musÃte povoliÅ¥ jeden z vaÅ¡ich úÄtov." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:1598 +#: ../src/empathy-roster-window.c:1583 #, c-format msgid "You need to enable %s to see contacts here." msgstr "Aby ste tu videli kontakty musÃte povoliÅ¥ %s úÄet." -#: ../src/empathy-roster-window.c:1676 +#: ../src/empathy-roster-window.c:1661 msgid "Change your presence to see contacts here" msgstr "Prihláste sa aby ste tu videli kontakty" -#: ../src/empathy-roster-window.c:1685 +#: ../src/empathy-roster-window.c:1670 msgid "No match found" msgstr "Nenájdená žiadna zhoda" -#: ../src/empathy-roster-window.c:1692 +#: ../src/empathy-roster-window.c:1677 msgid "You haven't added any contact yet" msgstr "Nepridali ste eÅ¡te žiadny kontakt" -#: ../src/empathy-roster-window.c:1695 +#: ../src/empathy-roster-window.c:1680 msgid "No online contacts" msgstr "Žiadne prihlásené kontakty" @@ -5318,12 +5318,12 @@ msgid "Status" msgstr "Stav" # button -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126 msgid "Done" msgstr "DokonÄiÅ¥" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214 msgid "Please enter your account details" msgstr "Zadajte, prosÃm, podrobnosti o vaÅ¡om úÄte" @@ -5336,6 +5336,3 @@ msgstr "UpraviÅ¥ voľby úÄtu %s" #: ../ubuntu-online-accounts/empathy.application.in.h:1 msgid "Integrate your IM accounts" msgstr "Integruje vaÅ¡e úÄty pre internetovú komunikáciu" - -#~ msgid "i" -#~ msgstr "i" @@ -9,16 +9,18 @@ msgid "" msgstr "" "Project-Id-Version: empathy master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2013-01-11 12:18+0000\n" -"PO-Revision-Date: 2013-03-23 08:41+0100\n" -"Last-Translator: Andrej ŽnidarÅ¡iÄ <andrej.znidarsic@gmail.com>\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=empathy&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2013-05-03 16:15+0000\n" +"PO-Revision-Date: 2013-05-04 21:08+0100\n" +"Last-Translator: Matej UrbanÄiÄ <mateju@svn.gnome.org>\n" "Language-Team: SlovenÅ¡Äina <gnome-si@googlegroups.com>\n" "Language: sl_SI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\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-SourceCharset: utf-8\n" "X-Generator: Poedit 1.5.4\n" @@ -36,7 +38,9 @@ msgstr "Empathy hipno sporoÄanje" #: ../data/empathy.desktop.in.in.h:4 msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih storitvah." +msgstr "" +"Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih " +"storitvah." #: ../data/empathy.desktop.in.in.h:5 msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;" @@ -47,7 +51,9 @@ msgid "Connection managers should be used" msgstr "Uporabljen naj bo upravljalnik omrežja" #: ../data/org.gnome.Empathy.gschema.xml.h:2 -msgid "Whether connectivity managers should be used to automatically disconnect/reconnect." +msgid "" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." msgstr "Ali naj upravljalnik omrežja samodejno vzpostavi in prekine povezavo." #: ../data/org.gnome.Empathy.gschema.xml.h:3 @@ -63,8 +69,11 @@ msgid "Empathy should auto-away when idle" msgstr "Ob nedejavnosti samodejno preklopi na stanje odsotnosti" #: ../data/org.gnome.Empathy.gschema.xml.h:6 -msgid "Whether Empathy should go into away mode automatically if the user is idle." -msgstr "Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje odsotnosti." +msgid "" +"Whether Empathy should go into away mode automatically if the user is idle." +msgstr "" +"Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje " +"odsotnosti." #: ../data/org.gnome.Empathy.gschema.xml.h:7 msgid "Empathy default download folder" @@ -77,11 +86,17 @@ msgstr "Privzeta mapa za shranjevanje prejetih datotek." #. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once. #: ../data/org.gnome.Empathy.gschema.xml.h:10 msgid "Magic number used to check if sanity cleaning tasks should be run" -msgstr "MagiÄno Å¡tevilo, uporabljeno za preverjanje ali naj se naloge ÄiÅ¡Äenja izvedejo" +msgstr "" +"MagiÄno Å¡tevilo, uporabljeno za preverjanje ali naj se naloge ÄiÅ¡Äenja " +"izvedejo" #: ../data/org.gnome.Empathy.gschema.xml.h:11 -msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually." -msgstr "Å tevilo empathy-sanity-cleaning.c preverja ali naj se naloge ÄiÅ¡Äenja izvedejo ali ne. Tega kljuÄa ni priporoÄljivo spreminjati roÄno." +msgid "" +"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks " +"should be executed or not. Users should not change this key manually." +msgstr "" +"Å tevilo empathy-sanity-cleaning.c preverja ali naj se naloge ÄiÅ¡Äenja " +"izvedejo ali ne. Tega kljuÄa ni priporoÄljivo spreminjati roÄno." #: ../data/org.gnome.Empathy.gschema.xml.h:12 #: ../src/empathy-preferences.ui.h:1 @@ -129,8 +144,12 @@ msgid "Display incoming events in the status area" msgstr "Prikaz prihajajoÄih dogodkov v vrstici stanja." #: ../data/org.gnome.Empathy.gschema.xml.h:23 -msgid "Display incoming events in the status area. If false, present them to the user immediately." -msgstr "Prikaz prihajajoÄih dogodkov v vrstici stanja. V primeru da možnost ni izbrana, bodo prikazani takoj." +msgid "" +"Display incoming events in the status area. If false, present them to the " +"user immediately." +msgstr "" +"Prikaz prihajajoÄih dogodkov v vrstici stanja. V primeru da možnost ni " +"izbrana, bodo prikazani takoj." #: ../data/org.gnome.Empathy.gschema.xml.h:24 msgid "The position for the chat window side pane" @@ -201,7 +220,8 @@ msgid "Play a sound when a contact logs out" msgstr "Predvajaj zvok ob odjavi stika" #: ../data/org.gnome.Empathy.gschema.xml.h:41 -msgid "Whether to play a sound to notify of contacts logging out of the network." +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." msgstr "Ali naj se predvaja zvok ob odjavi stika iz omrežja." #: ../data/org.gnome.Empathy.gschema.xml.h:42 @@ -234,15 +254,20 @@ msgstr "OnemogoÄi pojavna obvestila ob odsotnosti" #: ../data/org.gnome.Empathy.gschema.xml.h:49 msgid "Whether to show popup notifications when away or busy." -msgstr "Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti." +msgstr "" +"Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti." #: ../data/org.gnome.Empathy.gschema.xml.h:50 msgid "Pop up notifications if the chat isn't focused" msgstr "Pokaži pojavna obvestila, ko klepetalno okno ni v žariÅ¡Äu." #: ../data/org.gnome.Empathy.gschema.xml.h:51 -msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused." -msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporoÄila tudi, kadar je klepetalno okno že odprto, vendar ni v žariÅ¡Äu." +msgid "" +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." +msgstr "" +"Ali naj se pojavi obvestilo ob prejetju novega sporoÄila tudi, kadar je " +"klepetalno okno že odprto, vendar ni v žariÅ¡Äu." #: ../data/org.gnome.Empathy.gschema.xml.h:52 msgid "Pop up notifications when a contact logs in" @@ -289,32 +314,45 @@ msgid "Chat window theme variant" msgstr "RazliÄica teme klepetalnega okna" #: ../data/org.gnome.Empathy.gschema.xml.h:63 -msgid "The theme variant that is used to display the conversation in chat windows." -msgstr "RazliÄica teme, ki je uporabljena za prikaz pogovorov v klepetalnih oknih." +msgid "" +"The theme variant that is used to display the conversation in chat windows." +msgstr "" +"RazliÄica teme, ki je uporabljena za prikaz pogovorov v klepetalnih oknih." #: ../data/org.gnome.Empathy.gschema.xml.h:64 msgid "Path of the Adium theme to use" msgstr "Pot do želene teme Adium " #: ../data/org.gnome.Empathy.gschema.xml.h:65 -msgid "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated." -msgstr "Pot do želene teme Adium, kadar je ta doloÄena za klepet. Možnost je opuÅ¡Äena." +msgid "" +"Path of the Adium theme to use if the theme used for chat is Adium. " +"Deprecated." +msgstr "" +"Pot do želene teme Adium, kadar je ta doloÄena za klepet. Možnost je " +"opuÅ¡Äena." #: ../data/org.gnome.Empathy.gschema.xml.h:66 msgid "Enable WebKit Developer Tools" msgstr "OmogoÄi razvojna orodja WebKit" #: ../data/org.gnome.Empathy.gschema.xml.h:67 -msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "Ali naj bodo vkljuÄena razvijalna orodja WebKit kot je na primer Web Inspector." +msgid "" +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." +msgstr "" +"Ali naj bodo vkljuÄena razvijalna orodja WebKit kot je na primer Web " +"Inspector." #: ../data/org.gnome.Empathy.gschema.xml.h:68 msgid "Inform other users when you are typing to them" msgstr "Obvesti druge uporabnike, da jim tipkate besedilo" #: ../data/org.gnome.Empathy.gschema.xml.h:69 -msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state." -msgstr "Ali naj se poÅ¡ilja tudi stanje klepeta 'vpisovanje' ali pa 'v premoru'. Trenutno ne vpliva na stanje 'odsoten'." +msgid "" +"Whether to send the 'composing' or 'paused' chat states. Does not currently " +"affect the 'gone' state." +msgstr "" +"Ali naj se poÅ¡ilja tudi stanje klepeta 'vpisovanje' ali pa 'v premoru'. " +"Trenutno ne vpliva na stanje 'odsoten'." #: ../data/org.gnome.Empathy.gschema.xml.h:70 msgid "Use theme for chat rooms" @@ -329,15 +367,18 @@ msgid "Spell checking languages" msgstr "Jeziki za Ärkovanje" #: ../data/org.gnome.Empathy.gschema.xml.h:73 -msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." -msgstr "Z vejico loÄen seznam uporabljenih Ärkovalnikov (primer: \"sl, en, fr\")." +msgid "" +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." +msgstr "" +"Z vejico loÄen seznam uporabljenih Ärkovalnikov (primer: \"sl, en, fr\")." #: ../data/org.gnome.Empathy.gschema.xml.h:74 msgid "Enable spell checker" msgstr "OmogoÄi Ärkovalnik" #: ../data/org.gnome.Empathy.gschema.xml.h:75 -msgid "Whether to check words typed against the languages you want to check with." +msgid "" +"Whether to check words typed against the languages you want to check with." msgstr "Ali naj se preverja Ärkovanje besed v želenih jezikih." #: ../data/org.gnome.Empathy.gschema.xml.h:76 @@ -345,16 +386,22 @@ msgid "Nick completed character" msgstr "Znak na koncu vzdevka" #: ../data/org.gnome.Empathy.gschema.xml.h:77 -msgid "Character to add after nickname when using nick completion (tab) in group chat." -msgstr "Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov (zavihek) v skupinskem klepetu." +msgid "" +"Character to add after nickname when using nick completion (tab) in group " +"chat." +msgstr "" +"Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov " +"(zavihek) v skupinskem klepetu." #: ../data/org.gnome.Empathy.gschema.xml.h:78 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "Program naj uporabi podobo stika kot ikono klepetalnega okna" #: ../data/org.gnome.Empathy.gschema.xml.h:79 -msgid "Whether Empathy should use the avatar of the contact as the chat window icon." -msgstr "Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken." +msgid "" +"Whether Empathy should use the avatar of the contact as the chat window icon." +msgstr "" +"Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken." #: ../data/org.gnome.Empathy.gschema.xml.h:80 msgid "Last account selected in Join Room dialog" @@ -362,7 +409,9 @@ msgstr "Zadnji izbran raÄun v pogovornem oknu pridruženja klepetalnici" #: ../data/org.gnome.Empathy.gschema.xml.h:81 msgid "D-Bus object path of the last account selected to join a room." -msgstr "Pot predmeta vodila D-Bus zadnjega izbranega raÄuna pri pridruženju klepetalnici." +msgstr "" +"Pot predmeta vodila D-Bus zadnjega izbranega raÄuna pri pridruženju " +"klepetalnici." #: ../data/org.gnome.Empathy.gschema.xml.h:82 msgid "Camera device" @@ -370,7 +419,8 @@ msgstr "Naprava kamere" #: ../data/org.gnome.Empathy.gschema.xml.h:83 msgid "Default camera device to use in video calls, e.g. /dev/video0." -msgstr "Privzeta naprava kamere za uporabo pri video klicih, na primer /dev/video0." +msgstr "" +"Privzeta naprava kamere za uporabo pri video klicih, na primer /dev/video0." #: ../data/org.gnome.Empathy.gschema.xml.h:84 msgid "Camera position" @@ -393,8 +443,12 @@ msgid "Show hint about closing the main window" msgstr "Pokaži namig ob zapiranju glavnega okna" #: ../data/org.gnome.Empathy.gschema.xml.h:89 -msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar." -msgstr "Ali naj bo pogovorno okno sporoÄila o zapiranju glavnega okna prikazano z gumbom 'x' v nazivni vrstici." +msgid "" +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." +msgstr "" +"Ali naj bo pogovorno okno sporoÄila o zapiranju glavnega okna prikazano z " +"gumbom 'x' v nazivni vrstici." #: ../data/org.gnome.Empathy.gschema.xml.h:90 msgid "Empathy can publish the user's location" @@ -402,7 +456,8 @@ msgstr "Program Empathy lahko objavi mesto nahajanja uporabnika" #: ../data/org.gnome.Empathy.gschema.xml.h:91 msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom." +msgstr "" +"Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom." #: ../data/org.gnome.Empathy.gschema.xml.h:92 msgid "Empathy can use the network to guess the location" @@ -414,11 +469,14 @@ msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja omrežje." #: ../data/org.gnome.Empathy.gschema.xml.h:94 msgid "Empathy can use the cellular network to guess the location" -msgstr "Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja" +msgstr "" +"Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja" #: ../data/org.gnome.Empathy.gschema.xml.h:95 msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega omrežja." +msgstr "" +"Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega " +"omrežja." #: ../data/org.gnome.Empathy.gschema.xml.h:96 msgid "Empathy can use the GPS to guess the location" @@ -433,87 +491,86 @@ msgid "Empathy should reduce the location's accuracy" msgstr "Program Empathy naj zmanjÅ¡a natanÄnost doloÄevanja nahajanja" #: ../data/org.gnome.Empathy.gschema.xml.h:99 -msgid "Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "Ali naj program Empathy zaradi zasebnosti zmanjÅ¡uje natanÄnost položaja." +msgid "" +"Whether Empathy should reduce the location's accuracy for privacy reasons." +msgstr "" +"Ali naj program Empathy zaradi zasebnosti zmanjÅ¡uje natanÄnost položaja." -#: ../libempathy/empathy-ft-handler.c:733 +#: ../libempathy/empathy-ft-handler.c:732 msgid "No reason was specified" msgstr "Ni navedenega vzroka" -#: ../libempathy/empathy-ft-handler.c:736 +#: ../libempathy/empathy-ft-handler.c:735 msgid "The change in state was requested" msgstr "Zahtevana je bila zamenjava stanja" -#: ../libempathy/empathy-ft-handler.c:739 +#: ../libempathy/empathy-ft-handler.c:738 msgid "You canceled the file transfer" msgstr "Prenos datoteke ste preklicali" -#: ../libempathy/empathy-ft-handler.c:742 +#: ../libempathy/empathy-ft-handler.c:741 msgid "The other participant canceled the file transfer" msgstr "Drug uporabnik je preklical prenos datoteke" -#: ../libempathy/empathy-ft-handler.c:745 +#: ../libempathy/empathy-ft-handler.c:744 msgid "Error while trying to transfer the file" msgstr "PriÅ¡lo je do napake med prenosom datoteke" -#: ../libempathy/empathy-ft-handler.c:748 +#: ../libempathy/empathy-ft-handler.c:747 msgid "The other participant is unable to transfer the file" msgstr "Drug uporabnik ne more prenesti datoteke" -#: ../libempathy/empathy-ft-handler.c:751 -#: ../libempathy/empathy-utils.c:306 +#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:295 msgid "Unknown reason" msgstr "Neznan vzrok" -#: ../libempathy/empathy-ft-handler.c:914 +#: ../libempathy/empathy-ft-handler.c:913 msgid "File transfer completed, but the file was corrupted" msgstr "Prenos datoteke je konÄan, vendar je datoteka pokvarjena" -#: ../libempathy/empathy-ft-handler.c:1200 +#: ../libempathy/empathy-ft-handler.c:1199 msgid "File transfer not supported by remote contact" msgstr "Prenos datotek s strani oddaljenega stika ni podprt" -#: ../libempathy/empathy-ft-handler.c:1256 +#: ../libempathy/empathy-ft-handler.c:1255 msgid "The selected file is not a regular file" msgstr "Izbrana datoteka ni obiÄajna datoteka" -#: ../libempathy/empathy-ft-handler.c:1265 +#: ../libempathy/empathy-ft-handler.c:1264 msgid "The selected file is empty" msgstr "Izbrana datoteka je prazna" -#: ../libempathy/empathy-keyring.c:85 -#: ../libempathy/empathy-keyring.c:194 +#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184 msgid "Password not found" msgstr "Gesla ni mogoÄe najti" -#: ../libempathy/empathy-keyring.c:594 +#: ../libempathy/empathy-keyring.c:584 #, c-format msgid "IM account password for %s (%s)" msgstr "Geslo raÄuna hipnega sporoÄanja za %s (%s)" -#: ../libempathy/empathy-keyring.c:631 +#: ../libempathy/empathy-keyring.c:621 #, c-format msgid "Password for chatroom '%s' on account %s (%s)" msgstr "Geslo za klepetalnico '%s' na raÄunu %s (%s)" -#: ../libempathy/empathy-message.c:403 -#: ../src/empathy-call-observer.c:116 +#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107 #, c-format msgid "Missed call from %s" msgstr "ZgreÅ¡en klic od %s" #. Translators: this is an outgoing call, e.g. 'Called Alice' -#: ../libempathy/empathy-message.c:407 +#: ../libempathy/empathy-message.c:406 #, c-format msgid "Called %s" msgstr "Klicanje uporabnika %s" -#: ../libempathy/empathy-message.c:410 +#: ../libempathy/empathy-message.c:409 #, c-format msgid "Call from %s" msgstr "Klic uporabnika %s" -#: ../libempathy/empathy-time.c:90 +#: ../libempathy/empathy-time.c:86 #, c-format msgid "%d second ago" msgid_plural "%d seconds ago" @@ -522,7 +579,7 @@ msgstr[1] "Pred %d sekundo" msgstr[2] "Pred %d sekundama" msgstr[3] "Pred %d sekundami" -#: ../libempathy/empathy-time.c:96 +#: ../libempathy/empathy-time.c:92 #, c-format msgid "%d minute ago" msgid_plural "%d minutes ago" @@ -531,7 +588,7 @@ msgstr[1] "Pred %d minuto" msgstr[2] "Pred %d minutama" msgstr[3] "Pred %d minutami" -#: ../libempathy/empathy-time.c:102 +#: ../libempathy/empathy-time.c:98 #, c-format msgid "%d hour ago" msgid_plural "%d hours ago" @@ -540,7 +597,7 @@ msgstr[1] "Pred %d uro" msgstr[2] "Pred %d urama" msgstr[3] "Pred %d urami" -#: ../libempathy/empathy-time.c:108 +#: ../libempathy/empathy-time.c:104 #, c-format msgid "%d day ago" msgid_plural "%d days ago" @@ -549,7 +606,7 @@ msgstr[1] "Pred %d dnevom" msgstr[2] "Pred %d dnevoma" msgstr[3] "Pred %d dnevi" -#: ../libempathy/empathy-time.c:114 +#: ../libempathy/empathy-time.c:110 #, c-format msgid "%d week ago" msgid_plural "%d weeks ago" @@ -558,7 +615,7 @@ msgstr[1] "Pred %d tednom" msgstr[2] "Pred %d tednoma" msgstr[3] "Pred %d tedni" -#: ../libempathy/empathy-time.c:120 +#: ../libempathy/empathy-time.c:116 #, c-format msgid "%d month ago" msgid_plural "%d months ago" @@ -567,180 +624,175 @@ msgstr[1] "Pred %d mesecem" msgstr[2] "Pred %d mesecema" msgstr[3] "Pred %d meseci" -#: ../libempathy/empathy-time.c:142 +#: ../libempathy/empathy-time.c:138 msgid "in the future" msgstr "v prihodnosti" -#: ../libempathy/empathy-utils.c:226 +#: ../libempathy/empathy-utils.c:215 msgid "Available" msgstr "Na voljo" -#: ../libempathy/empathy-utils.c:228 +#: ../libempathy/empathy-utils.c:217 msgid "Busy" msgstr "Zaposleno" -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:220 msgid "Away" msgstr "Odsotno" -#: ../libempathy/empathy-utils.c:233 +#: ../libempathy/empathy-utils.c:222 msgid "Invisible" msgstr "Nevidno" -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:224 msgid "Offline" msgstr "Nepovezano" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:238 +#: ../libempathy/empathy-utils.c:227 msgctxt "presence" msgid "Unknown" msgstr "Neznano" -#: ../libempathy/empathy-utils.c:278 +#: ../libempathy/empathy-utils.c:267 msgid "No reason specified" msgstr "Ni doloÄenega razloga" -#: ../libempathy/empathy-utils.c:280 -#: ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:269 ../libempathy/empathy-utils.c:325 msgid "Status is set to offline" msgstr "Stanje je nastavljeno na brez povezave" -#: ../libempathy/empathy-utils.c:282 -#: ../libempathy/empathy-utils.c:316 -#: ../libempathy-gtk/empathy-call-utils.c:47 -#: ../libempathy-gtk/empathy-new-message-dialog.c:80 +#: ../libempathy/empathy-utils.c:271 ../libempathy/empathy-utils.c:305 +#: ../libempathy-gtk/empathy-call-utils.c:41 +#: ../libempathy-gtk/empathy-new-message-dialog.c:70 msgid "Network error" msgstr "Napaka omrežja" -#: ../libempathy/empathy-utils.c:284 -#: ../libempathy/empathy-utils.c:318 +#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307 msgid "Authentication failed" msgstr "Overitev ni uspela" -#: ../libempathy/empathy-utils.c:286 -#: ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309 msgid "Encryption error" msgstr "Napaka Å¡ifriranja" -#: ../libempathy/empathy-utils.c:288 +#: ../libempathy/empathy-utils.c:277 msgid "Name in use" msgstr "Ime je v uporabi" -#: ../libempathy/empathy-utils.c:290 -#: ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311 msgid "Certificate not provided" msgstr "Potrdilo ni na voljo" -#: ../libempathy/empathy-utils.c:292 -#: ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313 msgid "Certificate untrusted" msgstr "Potrdilo ni overjeno" -#: ../libempathy/empathy-utils.c:294 -#: ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315 msgid "Certificate expired" msgstr "Potrdilo je preteklo" -#: ../libempathy/empathy-utils.c:296 -#: ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317 msgid "Certificate not activated" msgstr "Potrdilo ni potrjeno" -#: ../libempathy/empathy-utils.c:298 -#: ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:319 msgid "Certificate hostname mismatch" msgstr "Neustrezno potrdilo gostitelja" -#: ../libempathy/empathy-utils.c:300 -#: ../libempathy/empathy-utils.c:332 +#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:321 msgid "Certificate fingerprint mismatch" msgstr "Neustrezen prstni odtis potrdila" -#: ../libempathy/empathy-utils.c:302 -#: ../libempathy/empathy-utils.c:334 +#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:323 msgid "Certificate self-signed" msgstr "Potrdilo je samo-podpisano" -#: ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:293 msgid "Certificate error" msgstr "Napaka potrdila" -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:327 msgid "Encryption is not available" msgstr "Å ifriranje ni na voljo." -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:329 msgid "Certificate is invalid" msgstr "Potrdilo je neveljavno." -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:331 msgid "Connection has been refused" msgstr "Omrežna povezava je zavrnjena." -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:333 msgid "Connection can't be established" msgstr "Povezave ni mogoÄe vzpostaviti." -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:335 msgid "Connection has been lost" msgstr "Povezava je prekinjena." -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:337 msgid "This account is already connected to the server" msgstr "RaÄun je s strežnikom že povezan" -#: ../libempathy/empathy-utils.c:350 -msgid "Connection has been replaced by a new connection using the same resource" +#: ../libempathy/empathy-utils.c:339 +msgid "" +"Connection has been replaced by a new connection using the same resource" msgstr "Povezava je zamenjana z novo povezavo, ki uporablja isti vir." -#: ../libempathy/empathy-utils.c:353 +#: ../libempathy/empathy-utils.c:342 msgid "The account already exists on the server" msgstr "RaÄun na strežniku že obstaja" -#: ../libempathy/empathy-utils.c:355 +#: ../libempathy/empathy-utils.c:344 msgid "Server is currently too busy to handle the connection" msgstr "Strežnik je trenutno preveÄ zaposlen za upravljanje s povezavo." -#: ../libempathy/empathy-utils.c:357 +#: ../libempathy/empathy-utils.c:346 msgid "Certificate has been revoked" msgstr "Potrdilo je preklicano" -#: ../libempathy/empathy-utils.c:359 -msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak" -msgstr "Potrdilo ne uporablja varnega algoritma ali pa uporablja Å¡ibko Å¡ifriranje." +#: ../libempathy/empathy-utils.c:348 +msgid "" +"Certificate uses an insecure cipher algorithm or is cryptographically weak" +msgstr "" +"Potrdilo ne uporablja varnega algoritma ali pa uporablja Å¡ibko Å¡ifriranje." -#: ../libempathy/empathy-utils.c:362 -msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library" -msgstr "Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, ki je doloÄena s Å¡ifrirno knjižnico." +#: ../libempathy/empathy-utils.c:351 +msgid "" +"The length of the server certificate, or the depth of the server certificate " +"chain, exceed the limits imposed by the cryptography library" +msgstr "" +"Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, " +"ki je doloÄena s Å¡ifrirno knjižnico." -#: ../libempathy/empathy-utils.c:366 +#: ../libempathy/empathy-utils.c:355 msgid "Your software is too old" msgstr "Programska oprema je prestara" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:357 msgid "Internal error" msgstr "Notranja napaka" -#: ../libempathy/empathy-utils.c:497 -#: ../libempathy-gtk/empathy-roster-model.h:30 +#: ../libempathy/empathy-utils.c:486 +#: ../libempathy-gtk/empathy-roster-model.h:28 msgid "People Nearby" msgstr "Uporabniki v bližini" -#: ../libempathy/empathy-utils.c:502 +#: ../libempathy/empathy-utils.c:491 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:538 -#: ../src/empathy-roster-window.c:672 +#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:539 +#: ../libempathy/empathy-utils.c:528 msgid "Facebook Chat" msgstr "Facebook klepetanje" -#: ../libempathy-gtk/empathy-account-chooser.c:689 +#: ../libempathy-gtk/empathy-account-chooser.c:684 msgid "All accounts" msgstr "Vsi raÄuni" @@ -819,56 +871,56 @@ msgstr "KakÅ¡no je vaÅ¡e geslo AIM?" msgid "Remember Password" msgstr "Zapomni si geslo" -#: ../libempathy-gtk/empathy-account-widget.c:675 +#: ../libempathy-gtk/empathy-account-widget.c:668 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 -#: ../src/empathy-import-widget.c:322 +#: ../src/empathy-import-widget.c:316 msgid "Account" msgstr "RaÄun" -#: ../libempathy-gtk/empathy-account-widget.c:676 +#: ../libempathy-gtk/empathy-account-widget.c:669 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12 msgid "Password" msgstr "Geslo" -#: ../libempathy-gtk/empathy-account-widget.c:677 +#: ../libempathy-gtk/empathy-account-widget.c:670 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:511 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:498 msgid "Server" msgstr "Strežnik" -#: ../libempathy-gtk/empathy-account-widget.c:678 +#: ../libempathy-gtk/empathy-account-widget.c:671 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 -#: ../libempathy-gtk/empathy-irc-network-dialog.c:532 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:519 msgid "Port" msgstr "Vrata" -#: ../libempathy-gtk/empathy-account-widget.c:762 +#: ../libempathy-gtk/empathy-account-widget.c:755 #, c-format msgid "%s" msgstr "%s" -#: ../libempathy-gtk/empathy-account-widget.c:817 +#: ../libempathy-gtk/empathy-account-widget.c:810 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1429 +#: ../libempathy-gtk/empathy-account-widget.c:1422 msgid "Username:" msgstr "UporabniÅ¡ko ime:" -#: ../libempathy-gtk/empathy-account-widget.c:1746 +#: ../libempathy-gtk/empathy-account-widget.c:1739 msgid "A_pply" msgstr "_Uveljavi" -#: ../libempathy-gtk/empathy-account-widget.c:1775 +#: ../libempathy-gtk/empathy-account-widget.c:1768 msgid "L_og in" msgstr "_Prijava" -#: ../libempathy-gtk/empathy-account-widget.c:1845 +#: ../libempathy-gtk/empathy-account-widget.c:1838 msgid "This account already exists on the server" msgstr "Ta raÄun na strežniku že obstaja" -#: ../libempathy-gtk/empathy-account-widget.c:1849 +#: ../libempathy-gtk/empathy-account-widget.c:1842 msgid "Create a new account on the server" msgstr "Ustvari nov raÄun na strežniku" @@ -877,19 +929,19 @@ msgstr "Ustvari nov raÄun na strežniku" #. * 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:2270 +#: ../libempathy-gtk/empathy-account-widget.c:2255 #, c-format msgid "%1$s on %2$s" msgstr "%1$s na %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:2296 +#: ../libempathy-gtk/empathy-account-widget.c:2281 #, c-format msgid "%s Account" msgstr "%s raÄun" -#: ../libempathy-gtk/empathy-account-widget.c:2300 +#: ../libempathy-gtk/empathy-account-widget.c:2285 msgid "New account" msgstr "Nov raÄun" @@ -968,8 +1020,12 @@ msgid "Servers" msgstr "Strežniki" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10 -msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password." -msgstr "VeÄina strežnikov IRC ne zahteva gesla, zato ga, Äe niste prepriÄani, ne uporabite." +msgid "" +"Most IRC servers don't need a password, so if you're not sure, don't enter a " +"password." +msgstr "" +"VeÄina strežnikov IRC ne zahteva gesla, zato ga, Äe niste prepriÄani, ne " +"uporabite." #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11 msgid "Nickname" @@ -1004,11 +1060,13 @@ msgstr "kakÅ¡no je vaÅ¡e uporabniÅ¡ko ime Facebook?" 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." +"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a " +"Facebook username if you don't have one." msgstr "" "To je vaÅ¡e uporabniÅ¡ko ime in ne obiÄajna Facebook prijava.\n" "V primeru da ste facebook.com/<b>badger</b>, vnesite <b>badger</b>.\n" -"Uporabite <a href=\"http://www.facebook.com/username/\">to stran</a> za izbor uporabniÅ¡kega imena, v kolikor ga Å¡e nimate." +"Uporabite <a href=\"http://www.facebook.com/username/\">to stran</a> za " +"izbor uporabniÅ¡kega imena, v kolikor ga Å¡e nimate." #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 msgid "What is your Facebook password?" @@ -1106,32 +1164,32 @@ msgstr "KakÅ¡en je vaÅ¡ ID Windows Live?" msgid "What is your Windows Live password?" msgstr "KakÅ¡no je vaÅ¡e geslo Windows Live?" -#: ../libempathy-gtk/empathy-account-widget-sip.c:207 -#: ../libempathy-gtk/empathy-account-widget-sip.c:240 +#: ../libempathy-gtk/empathy-account-widget-sip.c:198 +#: ../libempathy-gtk/empathy-account-widget-sip.c:231 msgid "Auto" msgstr "Samodejno" -#: ../libempathy-gtk/empathy-account-widget-sip.c:210 +#: ../libempathy-gtk/empathy-account-widget-sip.c:201 msgid "UDP" msgstr "UDP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:213 +#: ../libempathy-gtk/empathy-account-widget-sip.c:204 msgid "TCP" msgstr "TCP" -#: ../libempathy-gtk/empathy-account-widget-sip.c:216 +#: ../libempathy-gtk/empathy-account-widget-sip.c:207 msgid "TLS" msgstr "TLS" -#: ../libempathy-gtk/empathy-account-widget-sip.c:245 +#: ../libempathy-gtk/empathy-account-widget-sip.c:236 msgid "Register" msgstr "VpiÅ¡i se" -#: ../libempathy-gtk/empathy-account-widget-sip.c:250 +#: ../libempathy-gtk/empathy-account-widget-sip.c:241 msgid "Options" msgstr "Možnosti" -#: ../libempathy-gtk/empathy-account-widget-sip.c:253 +#: ../libempathy-gtk/empathy-account-widget-sip.c:244 msgid "None" msgstr "Brez" @@ -1243,55 +1301,55 @@ msgstr "KakÅ¡en je vaÅ¡ uporabniÅ¡ki ID Yahoo!?" msgid "What is your Yahoo! password?" msgstr "KakÅ¡no je vaÅ¡e geslo Yahoo!?" -#: ../libempathy-gtk/empathy-avatar-chooser.c:545 -#: ../libempathy-gtk/empathy-avatar-chooser.c:630 +#: ../libempathy-gtk/empathy-avatar-chooser.c:539 +#: ../libempathy-gtk/empathy-avatar-chooser.c:624 msgid "Couldn't convert image" msgstr "Ni bilo mogoÄe pretvoriti slike" -#: ../libempathy-gtk/empathy-avatar-chooser.c:546 +#: ../libempathy-gtk/empathy-avatar-chooser.c:540 msgid "None of the accepted image formats are supported on your system" msgstr "VaÅ¡ sistem ne podpira nobene izmed sprejetih vrst slik" -#: ../libempathy-gtk/empathy-avatar-chooser.c:906 +#: ../libempathy-gtk/empathy-avatar-chooser.c:900 msgid "Couldn't save picture to file" msgstr "Ni mogoÄe shraniti slike v datoteko" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1030 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1024 msgid "Select Your Avatar Image" msgstr "Izberite sliko za svojo podobo" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1038 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1032 msgid "Take a picture..." msgstr "Zajem slike ..." -#: ../libempathy-gtk/empathy-avatar-chooser.c:1051 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1045 msgid "No Image" msgstr "Brez slike" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1108 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1102 msgid "Images" msgstr "Slike" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1112 +#: ../libempathy-gtk/empathy-avatar-chooser.c:1106 msgid "All Files" msgstr "Vse datoteke" -#: ../libempathy-gtk/empathy-avatar-image.c:322 +#: ../libempathy-gtk/empathy-avatar-image.c:319 msgid "Click to enlarge" msgstr "Kliknite za poveÄavo" -#: ../libempathy-gtk/empathy-bad-password-dialog.c:130 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:128 #, c-format msgid "Authentication failed for account <b>%s</b>" msgstr "Overitev za raÄun <b>%s</b> je spodletela." -#: ../libempathy-gtk/empathy-bad-password-dialog.c:142 -#: ../libempathy-gtk/empathy-chat.c:3724 +#: ../libempathy-gtk/empathy-bad-password-dialog.c:140 +#: ../libempathy-gtk/empathy-chat.c:3844 msgid "Retry" msgstr "Poskusi znova" #: ../libempathy-gtk/empathy-base-password-dialog.c:224 -#: ../libempathy-gtk/empathy-password-dialog.c:134 +#: ../libempathy-gtk/empathy-password-dialog.c:132 #, c-format msgid "" "Enter your password for account\n" @@ -1300,226 +1358,237 @@ msgstr "" "Treba je vnesti geslo za raÄun\n" "<b>%s</b>" -#: ../libempathy-gtk/empathy-calendar-button.c:66 +#: ../libempathy-gtk/empathy-calendar-button.c:63 msgid "Select..." msgstr "Izberi ..." -#: ../libempathy-gtk/empathy-calendar-button.c:154 +#: ../libempathy-gtk/empathy-calendar-button.c:151 msgid "_Select" msgstr "_Izberi" -#: ../libempathy-gtk/empathy-call-utils.c:42 -#: ../libempathy-gtk/empathy-call-utils.c:60 +#: ../libempathy-gtk/empathy-call-utils.c:36 +#: ../libempathy-gtk/empathy-call-utils.c:54 msgid "There was an error starting the call" msgstr "PriÅ¡lo je do napake med zaÄenjanjem klica" -#: ../libempathy-gtk/empathy-call-utils.c:49 +#: ../libempathy-gtk/empathy-call-utils.c:43 msgid "The specified contact doesn't support calls" msgstr "DoloÄen stik ne podpira klicev." -#: ../libempathy-gtk/empathy-call-utils.c:51 +#: ../libempathy-gtk/empathy-call-utils.c:45 msgid "The specified contact is offline" msgstr "Izbrani stik ni povezan v omrežje" -#: ../libempathy-gtk/empathy-call-utils.c:53 +#: ../libempathy-gtk/empathy-call-utils.c:47 msgid "The specified contact is not valid" msgstr "Izbrani stik ni veljaven" -#: ../libempathy-gtk/empathy-call-utils.c:55 +#: ../libempathy-gtk/empathy-call-utils.c:49 msgid "Emergency calls are not supported on this protocol" msgstr "Klic v sili ni podprt s tem protokolom" -#: ../libempathy-gtk/empathy-call-utils.c:57 +#: ../libempathy-gtk/empathy-call-utils.c:51 msgid "You don't have enough credit in order to place this call" msgstr "Na raÄunu ni dovolj visokega zneska za vzpostavitev klica" -#: ../libempathy-gtk/empathy-chat.c:727 +#: ../libempathy-gtk/empathy-chat.c:731 msgid "Failed to open private chat" msgstr "Napaka med odpiranjem zasebnega klepeta" -#: ../libempathy-gtk/empathy-chat.c:785 +#: ../libempathy-gtk/empathy-chat.c:789 msgid "Topic not supported on this conversation" msgstr "Tema ni podprta pri tem pogovoru" -#: ../libempathy-gtk/empathy-chat.c:791 +#: ../libempathy-gtk/empathy-chat.c:795 msgid "You are not allowed to change the topic" msgstr "Za spreminjanje teme nimate ustreznih dovoljenj." -#: ../libempathy-gtk/empathy-chat.c:967 +#: ../libempathy-gtk/empathy-chat.c:971 msgid "Invalid contact ID" msgstr "Neveljaven ID stika" -#: ../libempathy-gtk/empathy-chat.c:1054 +#: ../libempathy-gtk/empathy-chat.c:1058 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: poÄisti vsa sporoÄila trenutnega pogovora" -#: ../libempathy-gtk/empathy-chat.c:1057 +#: ../libempathy-gtk/empathy-chat.c:1061 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <tema>: doloÄi temo trenutnega pogovora" -#: ../libempathy-gtk/empathy-chat.c:1060 +#: ../libempathy-gtk/empathy-chat.c:1064 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici" -#: ../libempathy-gtk/empathy-chat.c:1063 +#: ../libempathy-gtk/empathy-chat.c:1067 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici" -#: ../libempathy-gtk/empathy-chat.c:1067 -msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one" -msgstr "/part [<ID klepetalnice>] [<razlog>]: zapusti klepetalnico, privzeto je to trenutna klepetalnica" - #: ../libempathy-gtk/empathy-chat.c:1071 +msgid "" +"/part [<chat room ID>] [<reason>]: leave the chat room, by default the " +"current one" +msgstr "" +"/part [<ID klepetalnice>] [<razlog>]: zapusti klepetalnico, privzeto je to " +"trenutna klepetalnica" + +#: ../libempathy-gtk/empathy-chat.c:1075 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <ID stika> [<sporoÄilo>]: odpre zasebni klepet" -#: ../libempathy-gtk/empathy-chat.c:1074 +#: ../libempathy-gtk/empathy-chat.c:1078 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <ID stika> <sporoÄilo>: odpre zasebni klepet" -#: ../libempathy-gtk/empathy-chat.c:1077 +#: ../libempathy-gtk/empathy-chat.c:1081 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:1080 +#: ../libempathy-gtk/empathy-chat.c:1084 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:1083 -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:1087 +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:1088 +#: ../libempathy-gtk/empathy-chat.c:1092 msgid "/whois <contact ID>: display information about a contact" msgstr "/whois <ID stika>: pokaže podrobnosti stika" -#: ../libempathy-gtk/empathy-chat.c:1091 -msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage." +#: ../libempathy-gtk/empathy-chat.c:1095 +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:1110 +#: ../libempathy-gtk/empathy-chat.c:1114 #, c-format msgid "Usage: %s" msgstr "Uporaba: %s" -#: ../libempathy-gtk/empathy-chat.c:1155 +#: ../libempathy-gtk/empathy-chat.c:1159 msgid "Unknown command" msgstr "Neznan ukaz" -#: ../libempathy-gtk/empathy-chat.c:1281 +#: ../libempathy-gtk/empathy-chat.c:1285 msgid "Unknown command; see /help for the available commands" msgstr "Neznan ukaz, za veÄ si vpiÅ¡ite /help" -#: ../libempathy-gtk/empathy-chat.c:1538 +#: ../libempathy-gtk/empathy-chat.c:1542 msgid "insufficient balance to send message" msgstr "nezadostno stanje na raÄunu za poÅ¡iljanje sporoÄil" -#: ../libempathy-gtk/empathy-chat.c:1542 -#: ../libempathy-gtk/empathy-chat.c:1556 -#: ../libempathy-gtk/empathy-chat.c:1619 +#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560 +#: ../libempathy-gtk/empathy-chat.c:1623 #, c-format msgid "Error sending message '%s': %s" msgstr "Napaka med poÅ¡iljanjem sporoÄila '%s': %s" -#: ../libempathy-gtk/empathy-chat.c:1544 -#: ../libempathy-gtk/empathy-chat.c:1561 -#: ../libempathy-gtk/empathy-chat.c:1623 +#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565 +#: ../libempathy-gtk/empathy-chat.c:1627 #, c-format msgid "Error sending message: %s" msgstr "Napaka med poÅ¡iljanjem sporoÄila: %s" #. translators: error used when user doesn't have enough credit on his #. * account to send the message. -#: ../libempathy-gtk/empathy-chat.c:1550 +#: ../libempathy-gtk/empathy-chat.c:1554 #, c-format msgid "insufficient balance to send message. <a href='%s'>Top up</a>." -msgstr "Nezadostno stanje na raÄuni za poÅ¡iljanje sporoÄila. <a href='%s'>PoviÅ¡aj</a>." +msgstr "" +"Nezadostno stanje na raÄuni za poÅ¡iljanje sporoÄila. <a href='%s'>PoviÅ¡aj</" +"a>." -#: ../libempathy-gtk/empathy-chat.c:1590 +#: ../libempathy-gtk/empathy-chat.c:1594 msgid "not capable" msgstr "ni mogoÄe" -#: ../libempathy-gtk/empathy-chat.c:1597 +#: ../libempathy-gtk/empathy-chat.c:1601 msgid "offline" msgstr "brez povezave" -#: ../libempathy-gtk/empathy-chat.c:1600 +#: ../libempathy-gtk/empathy-chat.c:1604 msgid "invalid contact" msgstr "neveljaven stik" -#: ../libempathy-gtk/empathy-chat.c:1603 +#: ../libempathy-gtk/empathy-chat.c:1607 msgid "permission denied" msgstr "ni dovoljenja" -#: ../libempathy-gtk/empathy-chat.c:1606 +#: ../libempathy-gtk/empathy-chat.c:1610 msgid "too long message" msgstr "predolgo sporoÄilo" -#: ../libempathy-gtk/empathy-chat.c:1609 +#: ../libempathy-gtk/empathy-chat.c:1613 msgid "not implemented" msgstr "ni del programa" -#: ../libempathy-gtk/empathy-chat.c:1613 +#: ../libempathy-gtk/empathy-chat.c:1617 msgid "unknown" msgstr "neznano" -#: ../libempathy-gtk/empathy-chat.c:1680 -#: ../src/empathy-chat-window.c:979 +#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967 msgid "Topic:" msgstr "Tema:" -#: ../libempathy-gtk/empathy-chat.c:1695 +#: ../libempathy-gtk/empathy-chat.c:1699 #, c-format msgid "Topic set to: %s" msgstr "Tema je doloÄena na: %s" -#: ../libempathy-gtk/empathy-chat.c:1697 +#: ../libempathy-gtk/empathy-chat.c:1701 #, c-format msgid "Topic set by %s to: %s" msgstr "%s doloÄa vsebino: %s" #. No need to display this 'event' is no topic can be defined anyway -#: ../libempathy-gtk/empathy-chat.c:1702 +#: ../libempathy-gtk/empathy-chat.c:1706 msgid "No topic defined" msgstr "Ni doloÄene teme" -#: ../libempathy-gtk/empathy-chat.c:2218 +#: ../libempathy-gtk/empathy-chat.c:2222 msgid "(No Suggestions)" msgstr "(Ni predlogov)" #. translators: %s is the selected word -#: ../libempathy-gtk/empathy-chat.c:2286 +#: ../libempathy-gtk/empathy-chat.c:2290 #, 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:2323 +#: ../libempathy-gtk/empathy-chat.c:2327 #, c-format msgid "Add '%s' to %s Dictionary" msgstr "Dodaj '%s' v slovar %s" -#: ../libempathy-gtk/empathy-chat.c:2393 +#: ../libempathy-gtk/empathy-chat.c:2397 msgid "Insert Smiley" msgstr "Vstavi smeÅ¡ka" #. send button -#: ../libempathy-gtk/empathy-chat.c:2411 -#: ../libempathy-gtk/empathy-ui-utils.c:1180 +#: ../libempathy-gtk/empathy-chat.c:2415 +#: ../libempathy-gtk/empathy-ui-utils.c:1208 msgid "_Send" msgstr "_PoÅ¡lji" #. Spelling suggestions -#: ../libempathy-gtk/empathy-chat.c:2468 +#: ../libempathy-gtk/empathy-chat.c:2472 msgid "_Spelling Suggestions" msgstr "Predlogi Är_kovalnika" -#: ../libempathy-gtk/empathy-chat.c:2574 +#: ../libempathy-gtk/empathy-chat.c:2583 msgid "Failed to retrieve recent logs" msgstr "Napaka med pridobivanjem nedavnih dnevnikov" -#: ../libempathy-gtk/empathy-chat.c:2718 +#: ../libempathy-gtk/empathy-chat.c:2826 #, c-format msgid "%s has disconnected" msgstr "%s je prekinil povezavo" @@ -1527,12 +1596,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:2725 +#: ../libempathy-gtk/empathy-chat.c:2833 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s je izgnal %1$s" -#: ../libempathy-gtk/empathy-chat.c:2728 +#: ../libempathy-gtk/empathy-chat.c:2836 #, c-format msgid "%s was kicked" msgstr "%s je bil izgnan" @@ -1540,17 +1609,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:2736 +#: ../libempathy-gtk/empathy-chat.c:2844 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s je izobÄil %1$s" -#: ../libempathy-gtk/empathy-chat.c:2739 +#: ../libempathy-gtk/empathy-chat.c:2847 #, c-format msgid "%s was banned" msgstr "%s je izobÄen" -#: ../libempathy-gtk/empathy-chat.c:2743 +#: ../libempathy-gtk/empathy-chat.c:2851 #, c-format msgid "%s has left the room" msgstr "%s je zapustil klepetalnico" @@ -1560,17 +1629,17 @@ 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:2752 +#: ../libempathy-gtk/empathy-chat.c:2860 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:2777 +#: ../libempathy-gtk/empathy-chat.c:2885 #, c-format msgid "%s has joined the room" msgstr "%s je vstopil v klepetalnico" -#: ../libempathy-gtk/empathy-chat.c:2802 +#: ../libempathy-gtk/empathy-chat.c:2910 #, c-format msgid "%s is now known as %s" msgstr "%s je preimenovan v %s" @@ -1578,86 +1647,82 @@ msgstr "%s je preimenovan v %s" #. We don't know if the incoming call has been accepted or not, so we #. * assume it hasn't and if it has, we'll set the proper status when #. * we get the new handler. -#: ../libempathy-gtk/empathy-chat.c:2989 -#: ../src/empathy-call-window.c:1537 -#: ../src/empathy-call-window.c:1587 -#: ../src/empathy-call-window.c:2662 -#: ../src/empathy-call-window.c:2968 -#: ../src/empathy-event-manager.c:1166 +#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516 +#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2641 +#: ../src/empathy-call-window.c:2948 ../src/empathy-event-manager.c:1158 msgid "Disconnected" msgstr "Prekinjena povezava" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3664 +#: ../libempathy-gtk/empathy-chat.c:3784 msgid "Would you like to store this password?" msgstr "Ali želite shraniti geslo?" -#: ../libempathy-gtk/empathy-chat.c:3670 +#: ../libempathy-gtk/empathy-chat.c:3790 msgid "Remember" msgstr "Zapomni si" -#: ../libempathy-gtk/empathy-chat.c:3680 +#: ../libempathy-gtk/empathy-chat.c:3800 msgid "Not now" msgstr "Ne zdaj" -#: ../libempathy-gtk/empathy-chat.c:3728 +#: ../libempathy-gtk/empathy-chat.c:3848 msgid "Wrong password; please try again:" msgstr "NapaÄno geslo; poskusite znova:" #. Add message -#: ../libempathy-gtk/empathy-chat.c:3858 +#: ../libempathy-gtk/empathy-chat.c:3972 msgid "This room is protected by a password:" msgstr "Klepetalnica je zaÅ¡Äitena z geslom:" -#: ../libempathy-gtk/empathy-chat.c:3885 -#: ../src/empathy-new-chatroom-dialog.c:780 +#: ../libempathy-gtk/empathy-chat.c:3999 +#: ../src/empathy-new-chatroom-dialog.c:770 msgid "Join" msgstr "Pridruži se" -#: ../libempathy-gtk/empathy-chat.c:4077 -#: ../src/empathy-event-manager.c:1187 +#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1179 msgid "Connected" msgstr "Povezano" -#: ../libempathy-gtk/empathy-chat.c:4132 +#: ../libempathy-gtk/empathy-chat.c:4246 msgid "Conversation" msgstr "Pogovor" #. Translators: this string is a something like #. * "Escher Cat (SMS)" -#: ../libempathy-gtk/empathy-chat.c:4137 +#: ../libempathy-gtk/empathy-chat.c:4251 #, c-format msgid "%s (SMS)" msgstr "%s (SMS)" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261 msgid "Unknown or invalid identifier" msgstr "Neznano ali neveljavno doloÄilo" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263 msgid "Contact blocking temporarily unavailable" msgstr "Blokiranje stikov zaÄasno ni na voljo" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265 msgid "Contact blocking unavailable" msgstr "Blokiranje stika ni na voljo" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267 msgid "Permission Denied" msgstr "Dovoljenje je zavrnjeno" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271 msgid "Could not block contact" msgstr "Stika ni mogoÄe blokirati" -#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611 +#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610 msgid "Edit Blocked Contacts" msgstr "Uredi blokirane stike" #. Account and Identifier #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1 -#: ../libempathy-gtk/empathy-contact-search-dialog.c:529 -#: ../libempathy-gtk/empathy-individual-widget.c:1483 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:528 +#: ../libempathy-gtk/empathy-individual-widget.c:1473 #: ../src/empathy-chatrooms-window.ui.h:2 #: ../src/empathy-new-chatroom-dialog.ui.h:6 msgid "Account:" @@ -1667,107 +1732,107 @@ msgstr "RaÄun:" msgid "Blocked Contacts" msgstr "Blokirani stiki" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:98 msgid "Full name" msgstr "Polno Ime" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:103 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:99 msgid "Phone number" msgstr "Telefonska Å¡tevilka" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:104 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:100 msgid "E-mail address" msgstr "Elektronski naslov" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:105 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:101 msgid "Website" msgstr "SpletiÅ¡Äe" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:106 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:102 msgid "Birthday" msgstr "Rojstni dan" #. Note to translators: this is the caption for a string of the form "5 #. * minutes ago", and refers to the time since the contact last interacted #. * with their IM client. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:111 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:107 msgid "Last seen:" msgstr "ZadnjiÄ viden:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:112 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:108 msgid "Server:" msgstr "Strežnik:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:109 msgid "Connected from:" msgstr "Povezan od:" #. FIXME: once Idle implements SimplePresence using this information, we can #. * and should bin this. -#: ../libempathy-gtk/empathy-contactinfo-utils.c:117 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:113 msgid "Away message:" msgstr "SporoÄilo odsotnosti:" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:126 msgid "work" msgstr "delovno" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:127 msgid "home" msgstr "domaÄe" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:128 msgid "mobile" msgstr "prenosni telefon" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:133 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:129 msgid "voice" msgstr "glasovno" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:134 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:130 msgid "preferred" msgstr "prednostno" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:135 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:131 msgid "postal" msgstr "poÅ¡tno" -#: ../libempathy-gtk/empathy-contactinfo-utils.c:136 +#: ../libempathy-gtk/empathy-contactinfo-utils.c:132 msgid "parcel" msgstr "paketno" #. Title -#: ../libempathy-gtk/empathy-contact-search-dialog.c:522 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:521 msgid "Search contacts" msgstr "Iskanje stikov" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:552 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:551 msgid "Search: " msgstr "PoiÅ¡Äi:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:610 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:609 msgid "_Add Contact" msgstr "_Dodaj stik" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:628 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:627 msgid "No contacts found" msgstr "Ni najdenih stikov." -#: ../libempathy-gtk/empathy-contact-search-dialog.c:644 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:643 msgid "Your message introducing yourself:" msgstr "Predstavitveno sporoÄilo:" -#: ../libempathy-gtk/empathy-contact-search-dialog.c:652 +#: ../libempathy-gtk/empathy-contact-search-dialog.c:651 msgid "Please let me see when you're online. Thanks!" msgstr "Želel bi videti, kdaj ste prisotni v klepetu. Hvala!" -#: ../libempathy-gtk/empathy-contact-widget.c:168 -#: ../libempathy-gtk/empathy-individual-widget.c:898 +#: ../libempathy-gtk/empathy-contact-widget.c:156 +#: ../libempathy-gtk/empathy-individual-widget.c:888 msgid "Save Avatar" msgstr "Shrani podobo" -#: ../libempathy-gtk/empathy-contact-widget.c:224 -#: ../libempathy-gtk/empathy-individual-widget.c:956 +#: ../libempathy-gtk/empathy-contact-widget.c:212 +#: ../libempathy-gtk/empathy-individual-widget.c:946 msgid "Unable to save avatar" msgstr "Ni mogoÄe shraniti podobe" @@ -1814,44 +1879,50 @@ msgstr "RazliÄica" msgid "Client" msgstr "Odjemalec:" -#: ../libempathy-gtk/empathy-groups-widget.c:327 +#: ../libempathy-gtk/empathy-groups-widget.c:317 msgid "Groups" msgstr "Skupine" -#: ../libempathy-gtk/empathy-groups-widget.c:339 -msgid "Select the groups you want this contact to appear in. Note that you can select more than one group or no groups." -msgstr "Izbor skupin, ki jim stik pripada. Izbrati je mogoÄe eno ali veÄ skupin, lahko pa tudi nobene." +#: ../libempathy-gtk/empathy-groups-widget.c:329 +msgid "" +"Select the groups you want this contact to appear in. Note that you can " +"select more than one group or no groups." +msgstr "" +"Izbor skupin, ki jim stik pripada. Izbrati je mogoÄe eno ali veÄ skupin, " +"lahko pa tudi nobene." -#: ../libempathy-gtk/empathy-groups-widget.c:358 +#: ../libempathy-gtk/empathy-groups-widget.c:348 msgid "_Add Group" msgstr "_Dodaj skupino" -#: ../libempathy-gtk/empathy-groups-widget.c:393 +#: ../libempathy-gtk/empathy-groups-widget.c:383 msgctxt "verb in a column header displaying group names" msgid "Select" msgstr "Izbor" -#: ../libempathy-gtk/empathy-groups-widget.c:403 +#: ../libempathy-gtk/empathy-groups-widget.c:393 msgid "Group" msgstr "Skupina" -#: ../libempathy-gtk/empathy-individual-dialogs.c:118 +#: ../libempathy-gtk/empathy-individual-dialogs.c:108 msgid "New Contact" msgstr "Nov stik" -#: ../libempathy-gtk/empathy-individual-dialogs.c:193 -#: ../libempathy-gtk/empathy-subscription-dialog.c:121 +#: ../libempathy-gtk/empathy-individual-dialogs.c:183 +#: ../libempathy-gtk/empathy-subscription-dialog.c:120 #, c-format msgid "Block %s?" msgstr "Ali želite blokirati %s?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:248 -#: ../libempathy-gtk/empathy-subscription-dialog.c:125 +#: ../libempathy-gtk/empathy-individual-dialogs.c:238 +#: ../libempathy-gtk/empathy-subscription-dialog.c:124 #, c-format msgid "Are you sure you want to block '%s' from contacting you again?" -msgstr "Ali ste prepriÄani, da želite blokirati ponovno vzpostavitev stika med '%s' in vami?" +msgstr "" +"Ali ste prepriÄani, da želite blokirati ponovno vzpostavitev stika med '%s' " +"in vami?" -#: ../libempathy-gtk/empathy-individual-dialogs.c:253 +#: ../libempathy-gtk/empathy-individual-dialogs.c:243 msgid "The following identity will be blocked:" msgid_plural "The following identities will be blocked:" msgstr[0] "Naslednje identitete bodo blokirane:" @@ -1859,7 +1930,7 @@ msgstr[1] "Naslednja identiteta bo blokirana:" msgstr[2] "Naslednji identiteti bosta blokirani:" msgstr[3] "Naslednje identitete bodo blokirane:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-individual-dialogs.c:250 msgid "The following identity can not be blocked:" msgid_plural "The following identities can not be blocked:" msgstr[0] "Naslednjih identitet ni mogoÄe blokirati:" @@ -1867,14 +1938,14 @@ msgstr[1] "Naslednje identitete ni mogoÄe blokirati:" msgstr[2] "Naslednjih identitet ni mogoÄe blokirati:" msgstr[3] "Naslednjih identitet ni mogoÄe blokirati:" -#: ../libempathy-gtk/empathy-individual-dialogs.c:270 -#: ../libempathy-gtk/empathy-subscription-dialog.c:130 -#: ../libempathy-gtk/empathy-subscription-dialog.c:275 +#: ../libempathy-gtk/empathy-individual-dialogs.c:260 +#: ../libempathy-gtk/empathy-subscription-dialog.c:129 +#: ../libempathy-gtk/empathy-subscription-dialog.c:274 msgid "_Block" msgstr "_Blokiraj" -#: ../libempathy-gtk/empathy-individual-dialogs.c:279 -#: ../libempathy-gtk/empathy-subscription-dialog.c:150 +#: ../libempathy-gtk/empathy-individual-dialogs.c:269 +#: ../libempathy-gtk/empathy-subscription-dialog.c:149 msgid "_Report this contact as abusive" msgid_plural "_Report these contacts as abusive" msgstr[0] "_PoroÄaj te stike kot žaljive" @@ -1882,283 +1953,288 @@ msgstr[1] "_PoroÄaj ta stik kot žaljiv" msgstr[2] "_PoroÄaj ta stika kot žaljiva" msgstr[3] "_PoroÄaj te stike kot žaljive" -#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247 +#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237 msgid "Edit Contact Information" msgstr "Uredi podrobnosti stika" #. Translators: the heading at the top of the Information dialogue -#: ../libempathy-gtk/empathy-individual-information-dialog.c:293 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:283 msgid "Linked Contacts" msgstr "Povezani stiki" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:332 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:322 msgid "gnome-contacts not installed" msgstr "Paket gnome-contacts ni nameÅ¡Äen" -#: ../libempathy-gtk/empathy-individual-information-dialog.c:335 +#: ../libempathy-gtk/empathy-individual-information-dialog.c:325 msgid "Please install gnome-contacts to access contacts details." -msgstr "Namestiti je treba paket gnome-contacts za dostop do podrobnosti stikov." +msgstr "" +"Namestiti je treba paket gnome-contacts za dostop do podrobnosti stikov." #. 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:177 +#: ../libempathy-gtk/empathy-individual-menu.c:168 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../libempathy-gtk/empathy-individual-menu.c:353 +#: ../libempathy-gtk/empathy-individual-menu.c:344 msgid "Select account to use to place the call" msgstr "Izbor raÄuna za klicanje" -#: ../libempathy-gtk/empathy-individual-menu.c:357 +#: ../libempathy-gtk/empathy-individual-menu.c:348 #: ../libempathy-gtk/empathy-log-window.ui.h:6 #: ../src/empathy-call-window.ui.h:20 msgid "Call" msgstr "KliÄi" -#: ../libempathy-gtk/empathy-individual-menu.c:422 +#: ../libempathy-gtk/empathy-individual-menu.c:413 msgid "Mobile" msgstr "Mobilni telefon" -#: ../libempathy-gtk/empathy-individual-menu.c:424 +#: ../libempathy-gtk/empathy-individual-menu.c:415 msgid "Work" msgstr "Delo" -#: ../libempathy-gtk/empathy-individual-menu.c:426 +#: ../libempathy-gtk/empathy-individual-menu.c:417 msgid "HOME" msgstr "DomaÄa mapa" -#: ../libempathy-gtk/empathy-individual-menu.c:669 +#: ../libempathy-gtk/empathy-individual-menu.c:660 msgid "_Block Contact" msgstr "_Blokiraj stik" -#: ../libempathy-gtk/empathy-individual-menu.c:725 +#: ../libempathy-gtk/empathy-individual-menu.c:716 msgid "Delete and _Block" msgstr "IzbriÅ¡i in _blokiraj" -#: ../libempathy-gtk/empathy-individual-menu.c:787 +#: ../libempathy-gtk/empathy-individual-menu.c:778 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Ali zares želite odstraniti stik '%s'?" -#: ../libempathy-gtk/empathy-individual-menu.c:796 +#: ../libempathy-gtk/empathy-individual-menu.c:787 #, c-format -msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact." -msgstr "Ali res želite odstraniti povezan stik '%s'? S tem bo odstranjeni tudi vsi stiki, ki so opredeljeni kot povezani." +msgid "" +"Do you really want to remove the linked contact '%s'? Note that this will " +"remove all the contacts which make up this linked contact." +msgstr "" +"Ali res želite odstraniti povezan stik '%s'? S tem bo odstranjeni tudi vsi " +"stiki, ki so opredeljeni kot povezani." -#: ../libempathy-gtk/empathy-individual-menu.c:807 +#: ../libempathy-gtk/empathy-individual-menu.c:798 msgid "Removing contact" msgstr "Odstranjevanje stika" -#: ../libempathy-gtk/empathy-individual-menu.c:871 -#: ../libempathy-gtk/empathy-individual-view.c:2453 +#: ../libempathy-gtk/empathy-individual-menu.c:862 +#: ../libempathy-gtk/empathy-individual-view.c:2440 msgid "_Remove" msgstr "_Odstrani" #. add chat button -#: ../libempathy-gtk/empathy-individual-menu.c:1234 -#: ../libempathy-gtk/empathy-new-message-dialog.c:318 +#: ../libempathy-gtk/empathy-individual-menu.c:1225 +#: ../libempathy-gtk/empathy-new-message-dialog.c:308 msgid "_Chat" msgstr "_Klepet" #. add SMS button -#: ../libempathy-gtk/empathy-individual-menu.c:1269 -#: ../libempathy-gtk/empathy-new-message-dialog.c:312 +#: ../libempathy-gtk/empathy-individual-menu.c:1260 +#: ../libempathy-gtk/empathy-new-message-dialog.c:302 msgid "_SMS" msgstr "_SMS" -#: ../libempathy-gtk/empathy-individual-menu.c:1302 +#: ../libempathy-gtk/empathy-individual-menu.c:1293 msgctxt "menu item" msgid "_Audio Call" msgstr "_ZvoÄni klic" -#: ../libempathy-gtk/empathy-individual-menu.c:1335 +#: ../libempathy-gtk/empathy-individual-menu.c:1326 msgctxt "menu item" msgid "_Video Call" msgstr "_Video klic" -#: ../libempathy-gtk/empathy-individual-menu.c:1376 +#: ../libempathy-gtk/empathy-individual-menu.c:1367 #: ../src/empathy-roster-window-menubar.ui.h:11 msgid "_Previous Conversations" msgstr "Predhodni po_govori" -#: ../libempathy-gtk/empathy-individual-menu.c:1405 +#: ../libempathy-gtk/empathy-individual-menu.c:1396 msgid "Send File" msgstr "PoÅ¡lji datoteko" -#: ../libempathy-gtk/empathy-individual-menu.c:1435 +#: ../libempathy-gtk/empathy-individual-menu.c:1426 msgid "Share My Desktop" msgstr "Souporaba namizja" -#: ../libempathy-gtk/empathy-individual-menu.c:1461 -#: ../libempathy-gtk/empathy-individual-widget.c:1366 +#: ../libempathy-gtk/empathy-individual-menu.c:1452 +#: ../libempathy-gtk/empathy-individual-widget.c:1356 msgid "Favorite" msgstr "Priljubljeno" -#: ../libempathy-gtk/empathy-individual-menu.c:1490 +#: ../libempathy-gtk/empathy-individual-menu.c:1481 msgid "Infor_mation" msgstr "_Podrobnosti" -#: ../libempathy-gtk/empathy-individual-menu.c:1539 +#: ../libempathy-gtk/empathy-individual-menu.c:1530 msgctxt "Edit individual (contextual menu)" msgid "_Edit" msgstr "_Uredi" #. send invitation -#: ../libempathy-gtk/empathy-individual-menu.c:1655 -#: ../src/empathy-chat-window.c:1245 +#: ../libempathy-gtk/empathy-individual-menu.c:1646 +#: ../src/empathy-chat-window.c:1233 msgid "Inviting you to this room" msgstr "Vabila v klepetalnico" -#: ../libempathy-gtk/empathy-individual-menu.c:1701 +#: ../libempathy-gtk/empathy-individual-menu.c:1692 msgid "_Invite to Chat Room" msgstr "_Povabi v klepetalnico" -#: ../libempathy-gtk/empathy-individual-menu.c:1897 +#: ../libempathy-gtk/empathy-individual-menu.c:1888 msgid "_Add Contact…" msgstr "_Dodaj stik ..." -#: ../libempathy-gtk/empathy-individual-view.c:2373 +#: ../libempathy-gtk/empathy-individual-view.c:2360 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Ali zares želite odstraniti skupino '%s'?" -#: ../libempathy-gtk/empathy-individual-view.c:2376 +#: ../libempathy-gtk/empathy-individual-view.c:2363 msgid "Removing group" msgstr "Odstranjevanje skupine" -#: ../libempathy-gtk/empathy-individual-view.c:2444 +#: ../libempathy-gtk/empathy-individual-view.c:2431 msgid "Re_name" msgstr "P_reimenuj" -#: ../libempathy-gtk/empathy-individual-widget.c:304 +#: ../libempathy-gtk/empathy-individual-widget.c:294 msgid "Channels:" msgstr "Kanali:" -#: ../libempathy-gtk/empathy-individual-widget.c:455 +#: ../libempathy-gtk/empathy-individual-widget.c:445 msgid "Country ISO Code:" msgstr "ISO oznaka države:" -#: ../libempathy-gtk/empathy-individual-widget.c:457 +#: ../libempathy-gtk/empathy-individual-widget.c:447 msgid "Country:" msgstr "Država:" -#: ../libempathy-gtk/empathy-individual-widget.c:459 +#: ../libempathy-gtk/empathy-individual-widget.c:449 msgid "State:" msgstr "Okraj:" -#: ../libempathy-gtk/empathy-individual-widget.c:461 +#: ../libempathy-gtk/empathy-individual-widget.c:451 msgid "City:" msgstr "Mesto:" -#: ../libempathy-gtk/empathy-individual-widget.c:463 +#: ../libempathy-gtk/empathy-individual-widget.c:453 msgid "Area:" msgstr "PodroÄje:" -#: ../libempathy-gtk/empathy-individual-widget.c:465 +#: ../libempathy-gtk/empathy-individual-widget.c:455 msgid "Postal Code:" msgstr "PoÅ¡tna Å¡tevilka:" -#: ../libempathy-gtk/empathy-individual-widget.c:467 +#: ../libempathy-gtk/empathy-individual-widget.c:457 msgid "Street:" msgstr "Ulica:" -#: ../libempathy-gtk/empathy-individual-widget.c:469 +#: ../libempathy-gtk/empathy-individual-widget.c:459 msgid "Building:" msgstr "Stavba:" -#: ../libempathy-gtk/empathy-individual-widget.c:471 +#: ../libempathy-gtk/empathy-individual-widget.c:461 msgid "Floor:" msgstr "Nadstropje:" -#: ../libempathy-gtk/empathy-individual-widget.c:473 +#: ../libempathy-gtk/empathy-individual-widget.c:463 msgid "Room:" msgstr "Klepetalnica:" -#: ../libempathy-gtk/empathy-individual-widget.c:475 +#: ../libempathy-gtk/empathy-individual-widget.c:465 msgid "Text:" msgstr "Besedilo:" -#: ../libempathy-gtk/empathy-individual-widget.c:477 +#: ../libempathy-gtk/empathy-individual-widget.c:467 msgid "Description:" msgstr "Opis:" -#: ../libempathy-gtk/empathy-individual-widget.c:479 +#: ../libempathy-gtk/empathy-individual-widget.c:469 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-individual-widget.c:481 +#: ../libempathy-gtk/empathy-individual-widget.c:471 msgid "Accuracy Level:" msgstr "Raven natanÄnosti:" -#: ../libempathy-gtk/empathy-individual-widget.c:483 +#: ../libempathy-gtk/empathy-individual-widget.c:473 msgid "Error:" msgstr "Napaka:" -#: ../libempathy-gtk/empathy-individual-widget.c:485 +#: ../libempathy-gtk/empathy-individual-widget.c:475 msgid "Vertical Error (meters):" msgstr "Napaka navpiÄno (v metrih):" -#: ../libempathy-gtk/empathy-individual-widget.c:487 +#: ../libempathy-gtk/empathy-individual-widget.c:477 msgid "Horizontal Error (meters):" msgstr "Napaka vodoravno (v metrih):" -#: ../libempathy-gtk/empathy-individual-widget.c:489 +#: ../libempathy-gtk/empathy-individual-widget.c:479 msgid "Speed:" msgstr "Hitrost:" -#: ../libempathy-gtk/empathy-individual-widget.c:491 +#: ../libempathy-gtk/empathy-individual-widget.c:481 msgid "Bearing:" msgstr "Smer:" -#: ../libempathy-gtk/empathy-individual-widget.c:493 +#: ../libempathy-gtk/empathy-individual-widget.c:483 msgid "Climb Speed:" msgstr "Hitrost dviganja:" -#: ../libempathy-gtk/empathy-individual-widget.c:495 +#: ../libempathy-gtk/empathy-individual-widget.c:485 msgid "Last Updated on:" msgstr "ZadnjiÄ posodobljeno:" -#: ../libempathy-gtk/empathy-individual-widget.c:497 +#: ../libempathy-gtk/empathy-individual-widget.c:487 msgid "Longitude:" msgstr "Zemljepisna dolžina:" -#: ../libempathy-gtk/empathy-individual-widget.c:499 +#: ../libempathy-gtk/empathy-individual-widget.c:489 msgid "Latitude:" msgstr "Zemljepisna Å¡irina:" -#: ../libempathy-gtk/empathy-individual-widget.c:501 +#: ../libempathy-gtk/empathy-individual-widget.c:491 msgid "Altitude:" msgstr "Nadmorska viÅ¡ina:" -#: ../libempathy-gtk/empathy-individual-widget.c:593 -#: ../libempathy-gtk/empathy-individual-widget.c:608 +#: ../libempathy-gtk/empathy-individual-widget.c:583 +#: ../libempathy-gtk/empathy-individual-widget.c:598 #: ../src/empathy-preferences.ui.h:39 msgid "Location" msgstr "Mesto" #. translators: format is "Location, $date" -#: ../libempathy-gtk/empathy-individual-widget.c:610 +#: ../libempathy-gtk/empathy-individual-widget.c:600 #, c-format msgid "%s, %s" msgstr "%s, %s" -#: ../libempathy-gtk/empathy-individual-widget.c:659 +#: ../libempathy-gtk/empathy-individual-widget.c:649 msgid "%B %e, %Y at %R UTC" msgstr "%e.%B %Y ob %R UTC" #. Alias -#: ../libempathy-gtk/empathy-individual-widget.c:1302 +#: ../libempathy-gtk/empathy-individual-widget.c:1292 msgid "Alias:" msgstr "Vzdevek:" #. Translators: Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-individual-widget.c:1511 +#: ../libempathy-gtk/empathy-individual-widget.c:1501 msgid "Identifier:" msgstr "DoloÄilo:" -#: ../libempathy-gtk/empathy-individual-widget.c:1650 +#: ../libempathy-gtk/empathy-individual-widget.c:1640 #, c-format msgid "Linked contact containing %u contact" msgid_plural "Linked contacts containing %u contacts" @@ -2175,85 +2251,95 @@ msgstr "<b>Mesto</b> na (datum)" msgid "Online from a phone or mobile device" msgstr "Povezava je vzpostavljena preko telefona ali druge mobilne naprave" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329 msgid "New Network" msgstr "Novo omrežje" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532 msgid "Choose an IRC network" msgstr "Izbor IRC omrežja" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615 msgid "Reset _Networks List" msgstr "Ponastavi seznam _omrežij" -#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635 +#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619 msgctxt "verb displayed on a button to select an IRC network" msgid "Select" msgstr "Izbor" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:271 msgid "new server" msgstr "nov strežnik" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:547 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:534 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81 -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." -msgstr "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki v istem omrežju. V primeru da želite uporabljati to možnost, preverite spodnje podatke." +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80 +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." +msgstr "" +"Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki v " +"istem omrežju. V primeru da želite uporabljati to možnost, preverite spodnje " +"podatke." -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101 +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100 msgid "People nearby" msgstr "Uporabniki v bližini" -#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116 -msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List." -msgstr "Te podrobnosti je mogoÄe spreminjati in onemogoÄiti tudi kasneje preko menija <span style=\"italic\">Uredi → RaÄuni</span> v seznamu stikov." +#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115 +msgid "" +"You can change these details later or disable this feature by choosing <span " +"style=\"italic\">Edit → Accounts</span> in the Contact List." +msgstr "" +"Te podrobnosti je mogoÄe spreminjati in onemogoÄiti tudi kasneje preko " +"menija <span style=\"italic\">Uredi → RaÄuni</span> v seznamu stikov." -#: ../libempathy-gtk/empathy-log-window.c:622 +#: ../libempathy-gtk/empathy-log-window.c:607 msgid "History" msgstr "Zgodovina" -#: ../libempathy-gtk/empathy-log-window.c:677 +#: ../libempathy-gtk/empathy-log-window.c:662 msgid "Show" msgstr "Pokaži" -#: ../libempathy-gtk/empathy-log-window.c:699 +#: ../libempathy-gtk/empathy-log-window.c:684 msgid "Search" msgstr "PoiÅ¡Äi" -#: ../libempathy-gtk/empathy-log-window.c:1150 +#: ../libempathy-gtk/empathy-log-window.c:1135 #, c-format msgid "Chat in %s" msgstr "Klepet v %s" -#: ../libempathy-gtk/empathy-log-window.c:1152 +#: ../libempathy-gtk/empathy-log-window.c:1137 #, c-format msgid "Chat with %s" msgstr "Klepet s stikom %s" -#: ../libempathy-gtk/empathy-log-window.c:1202 -#: ../libempathy-gtk/empathy-log-window.c:1351 +#: ../libempathy-gtk/empathy-log-window.c:1187 +#: ../libempathy-gtk/empathy-log-window.c:1336 msgctxt "A date with the time" msgid "%A, %e %B %Y %X" msgstr "%A, %d. %B %Y" #. Translators: this is an emote: '* Danielle waves' -#: ../libempathy-gtk/empathy-log-window.c:1292 +#: ../libempathy-gtk/empathy-log-window.c:1277 #, c-format msgid "<i>* %s %s</i>" msgstr "<i>* %s %s</i>" #. Translators: this is a message: 'Danielle: hello' #. * The string in bold is the sender's name -#: ../libempathy-gtk/empathy-log-window.c:1298 +#: ../libempathy-gtk/empathy-log-window.c:1283 #, c-format msgid "<b>%s:</b> %s" msgstr "<b>%s:</b> %s" -#: ../libempathy-gtk/empathy-log-window.c:1375 +#: ../libempathy-gtk/empathy-log-window.c:1360 #, c-format msgid "%s second" msgid_plural "%s seconds" @@ -2262,7 +2348,7 @@ msgstr[1] "%s sekunda" msgstr[2] "%s sekundi" msgstr[3] "%s sekunde" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1367 #, c-format msgid "%s minute" msgid_plural "%s minutes" @@ -2271,80 +2357,82 @@ msgstr[1] "%s minuta" msgstr[2] "%s minuti" msgstr[3] "%s minute" -#: ../libempathy-gtk/empathy-log-window.c:1390 +#: ../libempathy-gtk/empathy-log-window.c:1375 #, c-format msgid "Call took %s, ended at %s" msgstr "Klic zaÄet %s, konÄan %s" -#: ../libempathy-gtk/empathy-log-window.c:1721 +#: ../libempathy-gtk/empathy-log-window.c:1706 msgid "Today" msgstr "Danes" -#: ../libempathy-gtk/empathy-log-window.c:1725 +#: ../libempathy-gtk/empathy-log-window.c:1710 msgid "Yesterday" msgstr "VÄeraj" #. Translators: A date such as '23 May 2010' (strftime format) -#: ../libempathy-gtk/empathy-log-window.c:1740 +#: ../libempathy-gtk/empathy-log-window.c:1725 msgid "%e %B %Y" msgstr "%e. %B %Y" -#: ../libempathy-gtk/empathy-log-window.c:1844 -#: ../libempathy-gtk/empathy-log-window.c:3467 +#: ../libempathy-gtk/empathy-log-window.c:1829 +#: ../libempathy-gtk/empathy-log-window.c:3452 msgid "Anytime" msgstr "Kadarkoli" -#: ../libempathy-gtk/empathy-log-window.c:1943 -#: ../libempathy-gtk/empathy-log-window.c:2402 +#: ../libempathy-gtk/empathy-log-window.c:1928 +#: ../libempathy-gtk/empathy-log-window.c:2387 msgid "Anyone" msgstr "Kdorkoli" -#: ../libempathy-gtk/empathy-log-window.c:2715 +#: ../libempathy-gtk/empathy-log-window.c:2700 msgid "Who" msgstr "Kdo" -#: ../libempathy-gtk/empathy-log-window.c:2924 +#: ../libempathy-gtk/empathy-log-window.c:2909 msgid "When" msgstr "Kdaj" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3027 msgid "Anything" msgstr "Karkoli" -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3029 msgid "Text chats" msgstr "Besedilni klepet" -#: ../libempathy-gtk/empathy-log-window.c:3045 +#: ../libempathy-gtk/empathy-log-window.c:3030 #: ../src/empathy-preferences.ui.h:29 msgid "Calls" msgstr "Klici" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3034 msgid "Incoming calls" msgstr "Dohodni klici" -#: ../libempathy-gtk/empathy-log-window.c:3050 +#: ../libempathy-gtk/empathy-log-window.c:3035 msgid "Outgoing calls" msgstr "Odhodni klici" -#: ../libempathy-gtk/empathy-log-window.c:3051 +#: ../libempathy-gtk/empathy-log-window.c:3036 msgid "Missed calls" msgstr "Prezrti klici" -#: ../libempathy-gtk/empathy-log-window.c:3071 +#: ../libempathy-gtk/empathy-log-window.c:3056 msgid "What" msgstr "Kaj" -#: ../libempathy-gtk/empathy-log-window.c:3760 +#: ../libempathy-gtk/empathy-log-window.c:3745 msgid "Are you sure you want to delete all logs of previous conversations?" -msgstr "Ali ste prepriÄani, da želite izbrisati vse podatke beležanja predhodnih pogovorov?" +msgstr "" +"Ali ste prepriÄani, da želite izbrisati vse podatke beležanja predhodnih " +"pogovorov?" -#: ../libempathy-gtk/empathy-log-window.c:3764 +#: ../libempathy-gtk/empathy-log-window.c:3749 msgid "Clear All" msgstr "PoÄisti vse" -#: ../libempathy-gtk/empathy-log-window.c:3771 +#: ../libempathy-gtk/empathy-log-window.c:3756 msgid "Delete from:" msgstr "IzbriÅ¡i iz:" @@ -2353,8 +2441,7 @@ msgid "_File" msgstr "_Datoteka" #: ../libempathy-gtk/empathy-log-window.ui.h:2 -#: ../src/empathy-call-window.ui.h:2 -#: ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9 msgid "_Edit" msgstr "_Uredi" @@ -2367,8 +2454,7 @@ msgid "Profile" msgstr "Profil" #: ../libempathy-gtk/empathy-log-window.ui.h:5 -#: ../src/empathy-chat-window.c:1438 -#: ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-chat-window.c:1426 ../src/empathy-preferences.ui.h:11 msgid "Chat" msgstr "Klepet" @@ -2393,72 +2479,72 @@ msgstr "KakÅ¡no vrsto klepetalnega raÄuna imate?" msgid "Adding new account" msgstr "Dodajanje novega raÄuna" -#: ../libempathy-gtk/empathy-new-call-dialog.c:199 -#: ../libempathy-gtk/empathy-new-message-dialog.c:289 +#: ../libempathy-gtk/empathy-new-call-dialog.c:189 +#: ../libempathy-gtk/empathy-new-message-dialog.c:279 msgid "Enter a contact identifier or phone number:" msgstr "Vnesite doloÄilo stika ali pa telefonsko Å¡tevilko:" #. add video button -#: ../libempathy-gtk/empathy-new-call-dialog.c:222 +#: ../libempathy-gtk/empathy-new-call-dialog.c:212 msgid "_Video Call" msgstr "_Video klic" #. add audio button -#: ../libempathy-gtk/empathy-new-call-dialog.c:232 +#: ../libempathy-gtk/empathy-new-call-dialog.c:222 msgid "_Audio Call" msgstr "_ZvoÄni klic" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-call-dialog.c:242 +#: ../libempathy-gtk/empathy-new-call-dialog.c:232 msgid "New Call" msgstr "Nov klic" -#: ../libempathy-gtk/empathy-new-message-dialog.c:82 +#: ../libempathy-gtk/empathy-new-message-dialog.c:72 msgid "The contact is offline" msgstr "Stik ni povezan v omrežje" -#: ../libempathy-gtk/empathy-new-message-dialog.c:84 +#: ../libempathy-gtk/empathy-new-message-dialog.c:74 msgid "The specified contact is either invalid or unknown" msgstr "Izbrani stik ni veljaven ali pa ni znan" -#: ../libempathy-gtk/empathy-new-message-dialog.c:86 +#: ../libempathy-gtk/empathy-new-message-dialog.c:76 msgid "The contact does not support this kind of conversation" msgstr "Stik ne podpira te vrste pogovora." -#: ../libempathy-gtk/empathy-new-message-dialog.c:88 +#: ../libempathy-gtk/empathy-new-message-dialog.c:78 msgid "The requested functionality is not implemented for this protocol" msgstr "Zahtevana zmožnost ni podprta s tem protokolom" -#: ../libempathy-gtk/empathy-new-message-dialog.c:94 +#: ../libempathy-gtk/empathy-new-message-dialog.c:84 msgid "Could not start a conversation with the given contact" msgstr "S podanim stikom ni mogoÄe zaÄeti pogovora" -#: ../libempathy-gtk/empathy-new-message-dialog.c:96 +#: ../libempathy-gtk/empathy-new-message-dialog.c:86 msgid "You are banned from this channel" msgstr "S tega kanala ste izobÄeni" -#: ../libempathy-gtk/empathy-new-message-dialog.c:98 +#: ../libempathy-gtk/empathy-new-message-dialog.c:88 msgid "This channel is full" msgstr "Kanal je polno zaseden." -#: ../libempathy-gtk/empathy-new-message-dialog.c:100 +#: ../libempathy-gtk/empathy-new-message-dialog.c:90 msgid "You must be invited to join this channel" msgstr "Sodelovanje na kanalu je mogoÄe le s povabilom." -#: ../libempathy-gtk/empathy-new-message-dialog.c:102 +#: ../libempathy-gtk/empathy-new-message-dialog.c:92 msgid "Can't proceed while disconnected" msgstr "Brez povezave ni mogoÄe nadaljevati." -#: ../libempathy-gtk/empathy-new-message-dialog.c:104 +#: ../libempathy-gtk/empathy-new-message-dialog.c:94 msgid "Permission denied" msgstr "Dovoljenje je zavrnjeno" -#: ../libempathy-gtk/empathy-new-message-dialog.c:110 +#: ../libempathy-gtk/empathy-new-message-dialog.c:100 msgid "There was an error starting the conversation" msgstr "PriÅ¡lo je do napake med zaÄenjanjem pogovora" #. Tweak the dialog -#: ../libempathy-gtk/empathy-new-message-dialog.c:332 +#: ../libempathy-gtk/empathy-new-message-dialog.c:322 msgid "New Conversation" msgstr "Nov pogovor" @@ -2468,40 +2554,41 @@ msgstr "Nov pogovor" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:164 -#: ../libempathy-gtk/empathy-presence-chooser.c:200 +#: ../libempathy-gtk/empathy-presence-chooser.c:157 +#: ../libempathy-gtk/empathy-presence-chooser.c:193 msgid "Custom Message…" msgstr "SporoÄilo po meri ..." -#: ../libempathy-gtk/empathy-presence-chooser.c:217 -#: ../libempathy-gtk/empathy-presence-chooser.c:219 +#: ../libempathy-gtk/empathy-presence-chooser.c:210 +#: ../libempathy-gtk/empathy-presence-chooser.c:212 msgid "Edit Custom Messages…" msgstr "Uredi sporoÄilo po meri ..." -#: ../libempathy-gtk/empathy-presence-chooser.c:341 +#: ../libempathy-gtk/empathy-presence-chooser.c:334 msgid "Click to remove this status as a favorite" msgstr "S klikom odstranite stanje kot priljubljeno" -#: ../libempathy-gtk/empathy-presence-chooser.c:350 +#: ../libempathy-gtk/empathy-presence-chooser.c:343 msgid "Click to make this status a favorite" msgstr "S klikom naredite to stanje priljubljeno" #. Translators: %s is a status message like 'At the pub' for example -#: ../libempathy-gtk/empathy-presence-chooser.c:384 +#: ../libempathy-gtk/empathy-presence-chooser.c:377 #, c-format msgid "" "<b>Current message: %s</b>\n" "<small><i>Press Enter to set the new message or Esc to cancel.</i></small>" msgstr "" "<b>Trenutno sporoÄilo: %s</b>\n" -"<small><i>Pritisnite vnosno tipko za nastavitev novega sporoÄila, ali pa pritisnite tipko Esc za preklic dejanja.</i></small>" +"<small><i>Pritisnite vnosno tipko za nastavitev novega sporoÄila, ali pa " +"pritisnite tipko Esc za preklic dejanja.</i></small>" -#: ../libempathy-gtk/empathy-presence-chooser.c:393 +#: ../libempathy-gtk/empathy-presence-chooser.c:386 msgid "Set status" msgstr "Nastavi stanje" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1101 +#: ../libempathy-gtk/empathy-presence-chooser.c:1094 msgid "Custom messages…" msgstr "SporoÄila po meri ..." @@ -2509,12 +2596,12 @@ msgstr "SporoÄila po meri ..." #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../libempathy-gtk/empathy-protocol-chooser.c:608 +#: ../libempathy-gtk/empathy-protocol-chooser.c:603 #, c-format msgid "New %s account" msgstr "Nov raÄun %s" -#: ../libempathy-gtk/empathy-search-bar.c:243 +#: ../libempathy-gtk/empathy-search-bar.c:237 msgid "_Match case" msgstr "_UpoÅ¡tevaj velikost Ärk" @@ -2538,170 +2625,175 @@ msgstr "UpoÅ¡tevaj _velikost Ärk" msgid "Phrase not found" msgstr "Rekla ni mogoÄe najti" -#: ../libempathy-gtk/empathy-sound-manager.c:51 +#: ../libempathy-gtk/empathy-sound-manager.c:49 msgid "Received an instant message" msgstr "Prejeto je bilo hipno sporoÄilo" -#: ../libempathy-gtk/empathy-sound-manager.c:53 +#: ../libempathy-gtk/empathy-sound-manager.c:51 msgid "Sent an instant message" msgstr "Poslano je bilo hipno sporoÄilo" -#: ../libempathy-gtk/empathy-sound-manager.c:55 +#: ../libempathy-gtk/empathy-sound-manager.c:53 msgid "Incoming chat request" msgstr "Prejeta je bila zahteva za klepet" -#: ../libempathy-gtk/empathy-sound-manager.c:57 +#: ../libempathy-gtk/empathy-sound-manager.c:55 msgid "Contact connected" msgstr "Povezava s stikom je bila vzpostavljena" -#: ../libempathy-gtk/empathy-sound-manager.c:59 +#: ../libempathy-gtk/empathy-sound-manager.c:57 msgid "Contact disconnected" msgstr "Povezava s stikom je bila prekinjena" -#: ../libempathy-gtk/empathy-sound-manager.c:61 +#: ../libempathy-gtk/empathy-sound-manager.c:59 msgid "Connected to server" msgstr "Povezano s strežnikom" -#: ../libempathy-gtk/empathy-sound-manager.c:63 +#: ../libempathy-gtk/empathy-sound-manager.c:61 msgid "Disconnected from server" msgstr "Povezava s strežnikom je bila prekinjena" -#: ../libempathy-gtk/empathy-sound-manager.c:65 +#: ../libempathy-gtk/empathy-sound-manager.c:63 msgid "Incoming voice call" msgstr "Dohodni klic" -#: ../libempathy-gtk/empathy-sound-manager.c:67 +#: ../libempathy-gtk/empathy-sound-manager.c:65 msgid "Outgoing voice call" msgstr "Odhodni klic" -#: ../libempathy-gtk/empathy-sound-manager.c:69 +#: ../libempathy-gtk/empathy-sound-manager.c:67 msgid "Voice call ended" msgstr "Klic je konÄan" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:296 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:294 msgid "Edit Custom Messages" msgstr "Urejanje sporoÄila po meri" -#: ../libempathy-gtk/empathy-subscription-dialog.c:234 +#: ../libempathy-gtk/empathy-subscription-dialog.c:233 msgid "Subscription Request" msgstr "Zahteva po naroÄilu" -#: ../libempathy-gtk/empathy-subscription-dialog.c:240 -#: ../src/empathy-event-manager.c:1104 +#: ../libempathy-gtk/empathy-subscription-dialog.c:239 +#: ../src/empathy-event-manager.c:1096 #, c-format msgid "%s would like permission to see when you are online" msgstr "%s želi dovoljenje za pogled dosegljivosti" -#: ../libempathy-gtk/empathy-subscription-dialog.c:281 -#: ../src/empathy-event-manager.c:729 +#: ../libempathy-gtk/empathy-subscription-dialog.c:280 +#: ../src/empathy-event-manager.c:721 msgid "_Decline" msgstr "_Odkloni" -#: ../libempathy-gtk/empathy-subscription-dialog.c:282 +#: ../libempathy-gtk/empathy-subscription-dialog.c:281 msgid "_Accept" msgstr "_Sprejmi" -#: ../libempathy-gtk/empathy-theme-adium.c:1124 +#: ../libempathy-gtk/empathy-theme-adium.c:1211 #, c-format msgid "Message edited at %s" msgstr "SporoÄilo je bilo nazadnje spremenjeno ob %s" -#: ../libempathy-gtk/empathy-theme-adium.c:1824 +#: ../libempathy-gtk/empathy-theme-adium.c:1913 msgid "Normal" msgstr "ObiÄajno" -#: ../libempathy-gtk/empathy-tls-dialog.c:150 +#: ../libempathy-gtk/empathy-tls-dialog.c:147 msgid "The identity provided by the chat server cannot be verified." msgstr "Istovetnosti strežnika klepetalnice ni mogoÄe preveriti." -#: ../libempathy-gtk/empathy-tls-dialog.c:157 +#: ../libempathy-gtk/empathy-tls-dialog.c:154 msgid "The certificate is not signed by a Certification Authority." msgstr "Potrdilo je brez ustreznega podpisa overitelja potrdil." -#: ../libempathy-gtk/empathy-tls-dialog.c:161 +#: ../libempathy-gtk/empathy-tls-dialog.c:158 msgid "The certificate has expired." msgstr "Potrdilo je poteklo." -#: ../libempathy-gtk/empathy-tls-dialog.c:164 +#: ../libempathy-gtk/empathy-tls-dialog.c:161 msgid "The certificate hasn't yet been activated." msgstr "Potrdilo Å¡e ni omogoÄeno." -#: ../libempathy-gtk/empathy-tls-dialog.c:167 +#: ../libempathy-gtk/empathy-tls-dialog.c:164 msgid "The certificate does not have the expected fingerprint." msgstr "Potrdilo nima priÄakovanega prstnega odtisa." -#: ../libempathy-gtk/empathy-tls-dialog.c:170 +#: ../libempathy-gtk/empathy-tls-dialog.c:167 msgid "The hostname verified by the certificate doesn't match the server name." msgstr "Ime overjenega strežnika gostitelja ni skladno z imenom strežnika." -#: ../libempathy-gtk/empathy-tls-dialog.c:174 +#: ../libempathy-gtk/empathy-tls-dialog.c:171 msgid "The certificate is self-signed." msgstr "Potrdilo je samo-podpisano." -#: ../libempathy-gtk/empathy-tls-dialog.c:177 -msgid "The certificate has been revoked by the issuing Certification Authority." +#: ../libempathy-gtk/empathy-tls-dialog.c:174 +msgid "" +"The certificate has been revoked by the issuing Certification Authority." msgstr "Potrdilo je preklicano s strani izdajatelja in overitelja potrdila." -#: ../libempathy-gtk/empathy-tls-dialog.c:181 +#: ../libempathy-gtk/empathy-tls-dialog.c:178 msgid "The certificate is cryptographically weak." msgstr "Potrdilo uporablja Å¡ibko Å¡ifriranje." -#: ../libempathy-gtk/empathy-tls-dialog.c:184 +#: ../libempathy-gtk/empathy-tls-dialog.c:181 msgid "The certificate length exceeds verifiable limits." msgstr "Dolžina potrdila presega preverljivo obmoÄje." -#: ../libempathy-gtk/empathy-tls-dialog.c:188 +#: ../libempathy-gtk/empathy-tls-dialog.c:185 msgid "The certificate is malformed." msgstr "Potrdilo je nepravilno oblikovano." -#: ../libempathy-gtk/empathy-tls-dialog.c:206 +#: ../libempathy-gtk/empathy-tls-dialog.c:203 #, c-format msgid "Expected hostname: %s" msgstr "PriÄakovan gostitelj: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:209 +#: ../libempathy-gtk/empathy-tls-dialog.c:206 #, c-format msgid "Certificate hostname: %s" msgstr "Gostitelj potrdila: %s" -#: ../libempathy-gtk/empathy-tls-dialog.c:281 +#: ../libempathy-gtk/empathy-tls-dialog.c:278 msgid "C_ontinue" msgstr "_Nadaljuj" -#: ../libempathy-gtk/empathy-tls-dialog.c:287 +#: ../libempathy-gtk/empathy-tls-dialog.c:284 msgid "Untrusted connection" msgstr "Nepreverjena povezava" -#: ../libempathy-gtk/empathy-tls-dialog.c:288 +#: ../libempathy-gtk/empathy-tls-dialog.c:285 msgid "This connection is untrusted. Would you like to continue anyway?" msgstr "Povezava ni varna. Ali želite vseeno nadaljevati?" -#: ../libempathy-gtk/empathy-tls-dialog.c:298 +#: ../libempathy-gtk/empathy-tls-dialog.c:295 msgid "Remember this choice for future connections" msgstr "Zapomni si izbor za prihodnje povezave" -#: ../libempathy-gtk/empathy-tls-dialog.c:304 +#: ../libempathy-gtk/empathy-tls-dialog.c:301 msgid "Certificate Details" msgstr "Podrobnosti potrdila" -#: ../libempathy-gtk/empathy-ui-utils.c:1050 +#: ../libempathy-gtk/empathy-ui-utils.c:1078 msgid "Unable to open URI" msgstr "Ni mogoÄe odpreti naslova URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1174 +#: ../libempathy-gtk/empathy-ui-utils.c:1202 msgid "Select a file" msgstr "Izbor datoteke" -#: ../libempathy-gtk/empathy-ui-utils.c:1248 +#: ../libempathy-gtk/empathy-ui-utils.c:1276 msgid "Insufficient free space to save file" msgstr "Ni dovolj prostora za shranjevanje datoteke" -#: ../libempathy-gtk/empathy-ui-utils.c:1256 +#: ../libempathy-gtk/empathy-ui-utils.c:1284 #, c-format -msgid "%s of free space are required to save this file, but only %s is available. Please choose another location." -msgstr "%s prostora mora biti na voljo za shranjevanje te datoteke, vendar je na voljo le %s. Izbrati bo treba drugo mesto." +msgid "" +"%s of free space are required to save this file, but only %s is available. " +"Please choose another location." +msgstr "" +"%s prostora mora biti na voljo za shranjevanje te datoteke, vendar je na " +"voljo le %s. Izbrati bo treba drugo mesto." -#: ../libempathy-gtk/empathy-ui-utils.c:1302 +#: ../libempathy-gtk/empathy-ui-utils.c:1330 #, c-format msgid "Incoming file from %s" msgstr "PrihajajoÄa datoteka od %s" @@ -2729,302 +2821,334 @@ msgstr "_Odpri povezavo" msgid "Inspect HTML" msgstr "Pregled HTML" -#: ../libempathy-gtk/totem-subtitle-encoding.c:158 +#: ../libempathy-gtk/totem-subtitle-encoding.c:157 msgid "Current Locale" msgstr "Trenutne jezikovne nastavitve" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:160 +#: ../libempathy-gtk/totem-subtitle-encoding.c:162 +#: ../libempathy-gtk/totem-subtitle-encoding.c:164 +#: ../libempathy-gtk/totem-subtitle-encoding.c:166 msgid "Arabic" msgstr "arabska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:170 +#: ../libempathy-gtk/totem-subtitle-encoding.c:169 msgid "Armenian" msgstr "armenska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:173 -#: ../libempathy-gtk/totem-subtitle-encoding.c:175 -#: ../libempathy-gtk/totem-subtitle-encoding.c:177 +#: ../libempathy-gtk/totem-subtitle-encoding.c:172 +#: ../libempathy-gtk/totem-subtitle-encoding.c:174 +#: ../libempathy-gtk/totem-subtitle-encoding.c:176 msgid "Baltic" msgstr "baltska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:180 +#: ../libempathy-gtk/totem-subtitle-encoding.c:179 msgid "Celtic" msgstr "keltska" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:182 +#: ../libempathy-gtk/totem-subtitle-encoding.c:184 +#: ../libempathy-gtk/totem-subtitle-encoding.c:186 +#: ../libempathy-gtk/totem-subtitle-encoding.c:188 msgid "Central European" msgstr "srednjeevropska" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:191 +#: ../libempathy-gtk/totem-subtitle-encoding.c:193 +#: ../libempathy-gtk/totem-subtitle-encoding.c:195 +#: ../libempathy-gtk/totem-subtitle-encoding.c:197 msgid "Chinese Simplified" msgstr "kitajska poenostavljena" -#: ../libempathy-gtk/totem-subtitle-encoding.c:201 -#: ../libempathy-gtk/totem-subtitle-encoding.c:203 -#: ../libempathy-gtk/totem-subtitle-encoding.c:205 +#: ../libempathy-gtk/totem-subtitle-encoding.c:200 +#: ../libempathy-gtk/totem-subtitle-encoding.c:202 +#: ../libempathy-gtk/totem-subtitle-encoding.c:204 msgid "Chinese Traditional" msgstr "kitajska tradicionalna" -#: ../libempathy-gtk/totem-subtitle-encoding.c:208 +#: ../libempathy-gtk/totem-subtitle-encoding.c:207 msgid "Croatian" msgstr "hrvaÅ¡ka" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:210 +#: ../libempathy-gtk/totem-subtitle-encoding.c:212 +#: ../libempathy-gtk/totem-subtitle-encoding.c:214 +#: ../libempathy-gtk/totem-subtitle-encoding.c:216 +#: ../libempathy-gtk/totem-subtitle-encoding.c:218 +#: ../libempathy-gtk/totem-subtitle-encoding.c:220 msgid "Cyrillic" msgstr "cirilica" -#: ../libempathy-gtk/totem-subtitle-encoding.c:224 +#: ../libempathy-gtk/totem-subtitle-encoding.c:223 msgid "Cyrillic/Russian" msgstr "cirilica / ruska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:227 -#: ../libempathy-gtk/totem-subtitle-encoding.c:229 +#: ../libempathy-gtk/totem-subtitle-encoding.c:226 +#: ../libempathy-gtk/totem-subtitle-encoding.c:228 msgid "Cyrillic/Ukrainian" msgstr "cirilica / ukrajinska " -#: ../libempathy-gtk/totem-subtitle-encoding.c:232 +#: ../libempathy-gtk/totem-subtitle-encoding.c:231 msgid "Georgian" msgstr "gruzijska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:235 -#: ../libempathy-gtk/totem-subtitle-encoding.c:237 -#: ../libempathy-gtk/totem-subtitle-encoding.c:239 +#: ../libempathy-gtk/totem-subtitle-encoding.c:234 +#: ../libempathy-gtk/totem-subtitle-encoding.c:236 +#: ../libempathy-gtk/totem-subtitle-encoding.c:238 msgid "Greek" msgstr "grÅ¡ka" -#: ../libempathy-gtk/totem-subtitle-encoding.c:242 +#: ../libempathy-gtk/totem-subtitle-encoding.c:241 msgid "Gujarati" msgstr "gudžarati" -#: ../libempathy-gtk/totem-subtitle-encoding.c:245 +#: ../libempathy-gtk/totem-subtitle-encoding.c:244 msgid "Gurmukhi" msgstr "gurmuki" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:247 +#: ../libempathy-gtk/totem-subtitle-encoding.c:249 +#: ../libempathy-gtk/totem-subtitle-encoding.c:251 +#: ../libempathy-gtk/totem-subtitle-encoding.c:253 msgid "Hebrew" msgstr "hebrejska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:257 +#: ../libempathy-gtk/totem-subtitle-encoding.c:256 msgid "Hebrew Visual" msgstr "hebrejska predoÄena" -#: ../libempathy-gtk/totem-subtitle-encoding.c:260 +#: ../libempathy-gtk/totem-subtitle-encoding.c:259 msgid "Hindi" msgstr "hindujska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:263 +#: ../libempathy-gtk/totem-subtitle-encoding.c:262 msgid "Icelandic" msgstr "islandska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:266 -#: ../libempathy-gtk/totem-subtitle-encoding.c:268 -#: ../libempathy-gtk/totem-subtitle-encoding.c:270 +#: ../libempathy-gtk/totem-subtitle-encoding.c:265 +#: ../libempathy-gtk/totem-subtitle-encoding.c:267 +#: ../libempathy-gtk/totem-subtitle-encoding.c:269 msgid "Japanese" msgstr "japonska" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:272 +#: ../libempathy-gtk/totem-subtitle-encoding.c:274 +#: ../libempathy-gtk/totem-subtitle-encoding.c:276 +#: ../libempathy-gtk/totem-subtitle-encoding.c:278 msgid "Korean" msgstr "korejska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:282 +#: ../libempathy-gtk/totem-subtitle-encoding.c:281 msgid "Nordic" msgstr "nordijska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:285 +#: ../libempathy-gtk/totem-subtitle-encoding.c:284 msgid "Persian" msgstr "perzijska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:288 -#: ../libempathy-gtk/totem-subtitle-encoding.c:290 +#: ../libempathy-gtk/totem-subtitle-encoding.c:287 +#: ../libempathy-gtk/totem-subtitle-encoding.c:289 msgid "Romanian" msgstr "romunska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:293 +#: ../libempathy-gtk/totem-subtitle-encoding.c:292 msgid "South European" msgstr "južnoevropska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:296 +#: ../libempathy-gtk/totem-subtitle-encoding.c:295 msgid "Thai" msgstr "tajska" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:298 +#: ../libempathy-gtk/totem-subtitle-encoding.c:300 +#: ../libempathy-gtk/totem-subtitle-encoding.c:302 +#: ../libempathy-gtk/totem-subtitle-encoding.c:304 msgid "Turkish" msgstr "turÅ¡ka" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:307 +#: ../libempathy-gtk/totem-subtitle-encoding.c:309 +#: ../libempathy-gtk/totem-subtitle-encoding.c:311 +#: ../libempathy-gtk/totem-subtitle-encoding.c:313 +#: ../libempathy-gtk/totem-subtitle-encoding.c:315 msgid "Unicode" msgstr "Unicode" -#: ../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 +#: ../libempathy-gtk/totem-subtitle-encoding.c:318 +#: ../libempathy-gtk/totem-subtitle-encoding.c:320 +#: ../libempathy-gtk/totem-subtitle-encoding.c:322 +#: ../libempathy-gtk/totem-subtitle-encoding.c:324 +#: ../libempathy-gtk/totem-subtitle-encoding.c:326 msgid "Western" msgstr "zahodnoevropska" -#: ../libempathy-gtk/totem-subtitle-encoding.c:330 -#: ../libempathy-gtk/totem-subtitle-encoding.c:332 -#: ../libempathy-gtk/totem-subtitle-encoding.c:334 +#: ../libempathy-gtk/totem-subtitle-encoding.c:329 +#: ../libempathy-gtk/totem-subtitle-encoding.c:331 +#: ../libempathy-gtk/totem-subtitle-encoding.c:333 msgid "Vietnamese" msgstr "vietnamska" -#: ../libempathy-gtk/empathy-roster-model.h:29 +#: ../libempathy-gtk/empathy-roster-model.h:27 msgid "Top Contacts" msgstr "NajpogostejÅ¡i stiki" -#: ../libempathy-gtk/empathy-roster-model.h:31 +#: ../libempathy-gtk/empathy-roster-model.h:29 msgid "Ungrouped" msgstr "Brez skupine" #. Add a prefix explaining that something goes wrong when trying to #. * fetch contact's presence. -#: ../libempathy-gtk/empathy-roster-contact.c:205 +#: ../libempathy-gtk/empathy-roster-contact.c:201 #, c-format msgid "Server cannot find contact: %s" msgstr "Stika ni mogoÄe najti: %s" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223 msgid "No error message" msgstr "Ni sporoÄil o napakah" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296 msgid "Instant Message (Empathy)" msgstr "Hipno sporoÄanje (Empathy)" +#: ../src/empathy-about-dialog.c:77 +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 "" +"Empathy je prosta programska oprema; program lahko razÅ¡irjate oz. " +"spreminjate pod pogoji SploÅ¡nega dovoljenja GNU (GNU General Public " +"License), objavljenega pri Free Software Foundation; bodisi razliÄice 2 ali " +"(po svoji izbiri) katerekoli poznejÅ¡e razliÄice." + #: ../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 "Empathy je prosta programska oprema; program lahko razÅ¡irjate oz. spreminjate pod pogoji SploÅ¡nega dovoljenja GNU (GNU General Public License), objavljenega pri Free Software Foundation; bodisi razliÄice 2 ali (po svoji izbiri) katerekoli poznejÅ¡e razliÄice." +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 "" +"Empathy se razÅ¡irja v upanju, da bo uporaben, vendar BREZ VSAKRÅ NEGA " +"JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA " +"DOLOÄŒEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License." #: ../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 "Empathy se razÅ¡irja v upanju, da bo uporaben, vendar BREZ VSAKRÅ NEGA JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOÄŒEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License." - -#: ../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 "Skupaj s tem programom bi morali prejeti izvod SploÅ¡nega javnega dovoljenja GNU (GNU General Public License); v nasprotnem primeru piÅ¡ite na: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" +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 "" +"Skupaj s tem programom bi morali prejeti izvod SploÅ¡nega javnega dovoljenja " +"GNU (GNU General Public License); v nasprotnem primeru piÅ¡ite na: Free " +"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " +"02110-130159 USA" -#: ../src/empathy-about-dialog.c:109 +#: ../src/empathy-about-dialog.c:105 msgid "An Instant Messaging client for GNOME" msgstr "Odjemalec hipnega sporoÄanja za namizje GNOME" -#: ../src/empathy-about-dialog.c:115 +#: ../src/empathy-about-dialog.c:111 msgid "translator-credits" msgstr "Matej UrbanÄiÄ <mateju@svn.gnome.org>" -#: ../src/empathy-accounts.c:182 +#: ../src/empathy-accounts.c:171 msgid "Don't display any dialogs; do any work (eg, importing) and exit" -msgstr "Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in konÄaj" +msgstr "" +"Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in konÄaj" -#: ../src/empathy-accounts.c:186 -msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts" -msgstr "Ne prikaži pogovornega okna, Äe so na voljo le raÄunov \"uporabnikov v bližini\" " +#: ../src/empathy-accounts.c:175 +msgid "" +"Don't display any dialogs unless there are only \"People Nearby\" accounts" +msgstr "" +"Ne prikaži pogovornega okna, Äe so na voljo le raÄunov \"uporabnikov v " +"bližini\" " -#: ../src/empathy-accounts.c:190 +#: ../src/empathy-accounts.c:179 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" -msgstr "Predhodno izberite raÄun (na primer: gabble/jabber/foo_40primer_2eorg0)" +msgstr "" +"Predhodno izberite raÄun (na primer: gabble/jabber/foo_40primer_2eorg0)" -#: ../src/empathy-accounts.c:192 +#: ../src/empathy-accounts.c:181 msgid "<account-id>" msgstr "<id-raÄuna>" -#: ../src/empathy-accounts.c:197 +#: ../src/empathy-accounts.c:186 msgid "- Empathy Accounts" msgstr "- Empathy raÄuni" -#: ../src/empathy-accounts.c:240 +#: ../src/empathy-accounts.c:239 msgid "Empathy Accounts" msgstr "Empathy raÄuni" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:68 +#: ../src/empathy-accounts-dialog.c:52 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Obstajajo neshranjene spremembe vaÅ¡ega %s raÄuna." #. 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:72 +#: ../src/empathy-accounts-dialog.c:56 msgid "Your new account has not been saved yet." msgstr "Novi raÄun Å¡e ni bil shranjen." -#: ../src/empathy-accounts-dialog.c:404 -#: ../src/empathy-call-window.c:1279 +#: ../src/empathy-accounts-dialog.c:388 ../src/empathy-call-window.c:1258 msgid "Connecting…" msgstr "Povezovanje ..." -#: ../src/empathy-accounts-dialog.c:445 +#: ../src/empathy-accounts-dialog.c:429 #, c-format msgid "Offline — %s" msgstr "Brez povezave - %s" -#: ../src/empathy-accounts-dialog.c:457 +#: ../src/empathy-accounts-dialog.c:441 #, c-format msgid "Disconnected — %s" msgstr "Prekinjena povezava - %s" -#: ../src/empathy-accounts-dialog.c:468 +#: ../src/empathy-accounts-dialog.c:452 msgid "Offline — No Network Connection" msgstr "Brez povezave - ni omrežne povezave" -#: ../src/empathy-accounts-dialog.c:475 +#: ../src/empathy-accounts-dialog.c:459 msgid "Unknown Status" msgstr "Neznano stanje" -#: ../src/empathy-accounts-dialog.c:492 -msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account." -msgstr "Ta raÄun je onemogoÄen, ker deluje na starem, nepodprtem ozadnjem programu. Namestiti je treba paket telepathy-haze in ponovno zagnati sejo za prenos raÄuna." +#: ../src/empathy-accounts-dialog.c:476 +msgid "" +"This account has been disabled because it relies on an old, unsupported " +"backend. Please install telepathy-haze and restart your session to migrate " +"the account." +msgstr "" +"Ta raÄun je onemogoÄen, ker deluje na starem, nepodprtem ozadnjem programu. " +"Namestiti je treba paket telepathy-haze in ponovno zagnati sejo za prenos " +"raÄuna." -#: ../src/empathy-accounts-dialog.c:502 +#: ../src/empathy-accounts-dialog.c:486 msgid "Offline — Account Disabled" msgstr "Brez povezave - raÄun je onemogoÄen" -#: ../src/empathy-accounts-dialog.c:608 +#: ../src/empathy-accounts-dialog.c:592 msgid "Edit Connection Parameters" msgstr "Uredi parametre povezave" -#: ../src/empathy-accounts-dialog.c:735 +#: ../src/empathy-accounts-dialog.c:719 msgid "_Edit Connection Parameters..." msgstr "_Uredi parametre povezave ..." -#: ../src/empathy-accounts-dialog.c:1268 +#: ../src/empathy-accounts-dialog.c:1252 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Ali želite odstraniti %s iz raÄunalnika?" -#: ../src/empathy-accounts-dialog.c:1272 +#: ../src/empathy-accounts-dialog.c:1256 msgid "This will not remove your account on the server." msgstr "To ne bo odstranilo vaÅ¡ega raÄuna s strežnika." -#: ../src/empathy-accounts-dialog.c:1477 +#: ../src/empathy-accounts-dialog.c:1461 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3033,24 +3157,24 @@ msgstr "" "Ali ste prepriÄani, da želite nadaljevati?" #. Menu item: to enabled/disable the account -#: ../src/empathy-accounts-dialog.c:1668 +#: ../src/empathy-accounts-dialog.c:1652 msgid "_Enabled" msgstr "_OmogoÄi" #. Menu item: Rename -#: ../src/empathy-accounts-dialog.c:1691 +#: ../src/empathy-accounts-dialog.c:1675 msgid "Rename" msgstr "Preimenuj" -#: ../src/empathy-accounts-dialog.c:2107 +#: ../src/empathy-accounts-dialog.c:2091 msgid "_Skip" msgstr "Pre_skoÄi" -#: ../src/empathy-accounts-dialog.c:2111 +#: ../src/empathy-accounts-dialog.c:2095 msgid "_Connect" msgstr "_Poveži" -#: ../src/empathy-accounts-dialog.c:2290 +#: ../src/empathy-accounts-dialog.c:2274 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -3059,7 +3183,7 @@ msgstr "" "Ali ste prepriÄani, da želite nadaljevati?" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:2433 +#: ../src/empathy-accounts-dialog.c:2417 msgid "Messaging and VoIP Accounts" msgstr "SporoÄanje in raÄuni VoIP" @@ -3072,208 +3196,225 @@ msgid "Loading account information" msgstr "Nalaganje podrobnosti raÄuna" #: ../src/empathy-accounts-dialog.ui.h:5 -msgid "To add a new account, you first have to install a backend for each protocol you want to use." -msgstr "Za dodajanje novega raÄuna morate najprej namestiti zaledje za vsak protokol, ki ga želite uporabiti." +msgid "" +"To add a new account, you first have to install a backend for each protocol " +"you want to use." +msgstr "" +"Za dodajanje novega raÄuna je treba najprej namestiti zaledje za vsak " +"protokol, ki naj bo uporabljen." #: ../src/empathy-accounts-dialog.ui.h:6 msgid "No protocol backends installed" msgstr "Ni nameÅ¡Äenega ozadnjega protokola" -#: ../src/empathy-auth-client.c:296 +#: ../src/empathy-auth-client.c:285 msgid " - Empathy authentication client" msgstr "- Empathy odjemalec overitve" -#: ../src/empathy-auth-client.c:312 +#: ../src/empathy-auth-client.c:301 msgid "Empathy authentication client" msgstr "Empathy odjemalec overitve" -#: ../src/empathy.c:427 +#: ../src/empathy.c:407 msgid "Don't connect on startup" msgstr "Brez samodejne povezave ob zagonu" -#: ../src/empathy.c:431 +#: ../src/empathy.c:411 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Ne prikaži seznama stikov in drugih pogovornih oken ob zagonu" -#: ../src/empathy.c:447 +#: ../src/empathy.c:440 msgid "- Empathy IM Client" msgstr "- Empathy sporoÄilnik" -#: ../src/empathy.c:623 +#: ../src/empathy.c:626 msgid "Error contacting the Account Manager" msgstr "Napaka delovanja upravljalnika raÄunov" -#: ../src/empathy.c:625 +#: ../src/empathy.c:628 #, c-format msgid "" -"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n" +"There was an error while trying to connect to the Telepathy Account Manager. " +"The error was:\n" "\n" "%s" msgstr "" -"PriÅ¡lo je do napake med povezovanjem z upravljalnikom raÄunov Telepathy. Javljena je napaka:\n" +"PriÅ¡lo je do napake med povezovanjem z upravljalnikom raÄunov Telepathy. " +"Javljena je napaka:\n" "%s" -#: ../src/empathy-call.c:124 +#: ../src/empathy-call.c:115 msgid "In a call" msgstr "V pogovoru" -#: ../src/empathy-call.c:224 +#: ../src/empathy-call.c:215 msgid "- Empathy Audio/Video Client" msgstr "- Empathy odjemalec zvoka in slike" -#: ../src/empathy-call.c:248 +#: ../src/empathy-call.c:239 msgid "Empathy Audio/Video Client" msgstr "Empathy odjemalec zvoka in slike" -#: ../src/empathy-call-observer.c:119 +#: ../src/empathy-call-observer.c:110 #, c-format msgid "%s just tried to call you, but you were in another call." msgstr "%s je klical med drugim pogovorom." -#: ../src/empathy-call-window.c:1554 -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500 msgid "Incoming call" msgstr "Dohodni klic" -#: ../src/empathy-call-window.c:1560 -#: ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming video call from %s" msgstr "Dohodni video klic od %s" -#: ../src/empathy-call-window.c:1560 -#: ../src/empathy-event-manager.c:516 -#: ../src/empathy-event-manager.c:913 +#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:905 #, c-format msgid "Incoming call from %s" msgstr "Dohodni klic od %s" -#: ../src/empathy-call-window.c:1564 -#: ../src/empathy-notifications-approver.c:197 +#: ../src/empathy-call-window.c:1543 +#: ../src/empathy-notifications-approver.c:191 msgid "Reject" msgstr "Zavrni" -#: ../src/empathy-call-window.c:1565 -#: ../src/empathy-notifications-approver.c:202 -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-call-window.c:1544 +#: ../src/empathy-notifications-approver.c:196 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer" msgstr "Odgovori" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:1934 +#: ../src/empathy-call-window.c:1913 #, c-format msgid "Call with %s" msgstr "Klic z %s" -#: ../src/empathy-call-window.c:2186 +#: ../src/empathy-call-window.c:2165 msgid "The IP address as seen by the machine" msgstr "Naslov IP kot ga zazna strojna oprema" -#: ../src/empathy-call-window.c:2188 +#: ../src/empathy-call-window.c:2167 msgid "The IP address as seen by a server on the Internet" msgstr "Naslov IP kot ga zazna strežnik v omrežju" -#: ../src/empathy-call-window.c:2190 +#: ../src/empathy-call-window.c:2169 msgid "The IP address of the peer as seen by the other side" msgstr "Naslov IP kot ga zazna uporabnik na drugi strani" -#: ../src/empathy-call-window.c:2192 +#: ../src/empathy-call-window.c:2171 msgid "The IP address of a relay server" msgstr "Naslov IP posredovalnega strežnika" -#: ../src/empathy-call-window.c:2194 +#: ../src/empathy-call-window.c:2173 msgid "The IP address of the multicast group" msgstr "Naslov IP skupine za veÄsmerno oddajanje" -#: ../src/empathy-call-window.c:2605 -#: ../src/empathy-call-window.c:2606 -#: ../src/empathy-call-window.c:2607 -#: ../src/empathy-call-window.c:2608 +#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585 +#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587 #: ../src/empathy-call-window.ui.h:28 msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-call-window.c:2966 +#: ../src/empathy-call-window.c:2946 msgid "On hold" msgstr "Zadržano" -#: ../src/empathy-call-window.c:2970 +#: ../src/empathy-call-window.c:2950 msgid "Mute" msgstr "UtiÅ¡aj" -#: ../src/empathy-call-window.c:2972 +#: ../src/empathy-call-window.c:2952 msgid "Duration" msgstr "Trajanje" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2975 +#: ../src/empathy-call-window.c:2955 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d:%02dm" -#: ../src/empathy-call-window.c:3071 +#: ../src/empathy-call-window.c:3051 msgid "Technical Details" msgstr "TehniÄne podrobnosti" -#: ../src/empathy-call-window.c:3110 +#: ../src/empathy-call-window.c:3090 #, c-format -msgid "%s's software does not understand any of the audio formats supported by your computer" +msgid "" +"%s's software does not understand any of the audio formats supported by your " +"computer" msgstr "Program stika %s ne prepozna zvoÄnih zapisov podprtih na vaÅ¡em sistemu" -#: ../src/empathy-call-window.c:3115 +#: ../src/empathy-call-window.c:3095 #, c-format -msgid "%s's software does not understand any of the video formats supported by your computer" +msgid "" +"%s's software does not understand any of the video formats supported by your " +"computer" msgstr "Program stika %s ne prepozna video zapisov podprtih na vaÅ¡em sistemu" -#: ../src/empathy-call-window.c:3121 +#: ../src/empathy-call-window.c:3101 #, c-format -msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections." -msgstr "Ni mogoÄe vzpostaviti povezave z %s. Morda je eden od odjemalcev je v omrežju, ki ne dovoli neposrednih povezav." +msgid "" +"Can't establish a connection to %s. One of you might be on a network that " +"does not allow direct connections." +msgstr "" +"Ni mogoÄe vzpostaviti povezave z %s. Morda je eden od odjemalcev je v " +"omrežju, ki ne dovoli neposrednih povezav." -#: ../src/empathy-call-window.c:3127 +#: ../src/empathy-call-window.c:3107 msgid "There was a failure on the network" msgstr "PriÅ¡lo je do napake na omrežju" -#: ../src/empathy-call-window.c:3131 -msgid "The audio formats necessary for this call are not installed on your computer" +#: ../src/empathy-call-window.c:3111 +msgid "" +"The audio formats necessary for this call are not installed on your computer" msgstr "ZvoÄni zapisi za ta klic niso nameÅ¡Äeni" -#: ../src/empathy-call-window.c:3134 -msgid "The video formats necessary for this call are not installed on your computer" +#: ../src/empathy-call-window.c:3114 +msgid "" +"The video formats necessary for this call are not installed on your computer" msgstr "Video zapisi za ta klic niso nameÅ¡Äeni" -#: ../src/empathy-call-window.c:3146 +#: ../src/empathy-call-window.c:3126 #, c-format -msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu." -msgstr "PriÅ¡lo je do nepriÄakovane napake v delu programa Telepathy. PoÅ¡ljite <a href=\"%s\">poroÄilo o hroÅ¡Äu</a> in pripnite dnevnik razhroÅ¡Äevanja iz menija pomoÄi." +msgid "" +"Something unexpected happened in a Telepathy component. Please <a href=\"%s" +"\">report this bug</a> and attach logs gathered from the 'Debug' window in " +"the Help menu." +msgstr "" +"PriÅ¡lo je do nepriÄakovane napake v delu programa Telepathy. PoÅ¡ljite <a " +"href=\"%s\">poroÄilo o hroÅ¡Äu</a> in pripnite dnevnik razhroÅ¡Äevanja iz " +"menija pomoÄi." -#: ../src/empathy-call-window.c:3155 +#: ../src/empathy-call-window.c:3135 msgid "There was a failure in the call engine" msgstr "PriÅ¡lo je do napake v klicnem programniku" -#: ../src/empathy-call-window.c:3158 +#: ../src/empathy-call-window.c:3138 msgid "The end of the stream was reached" msgstr "Dosežen je konec pretoka" -#: ../src/empathy-call-window.c:3198 +#: ../src/empathy-call-window.c:3178 msgid "Can't establish audio stream" msgstr "Ni mogoÄe vzpostaviti zvoÄnega pretoka" -#: ../src/empathy-call-window.c:3208 +#: ../src/empathy-call-window.c:3188 msgid "Can't establish video stream" msgstr "Ni mogoÄe vzpostaviti video pretoka" -#: ../src/empathy-call-window.c:3245 +#: ../src/empathy-call-window.c:3225 #, c-format msgid "Your current balance is %s." msgstr "Trenutno stanje je %s." -#: ../src/empathy-call-window.c:3249 +#: ../src/empathy-call-window.c:3229 msgid "Sorry, you don’t have enough credit for that call." msgstr "Na raÄunu ni dovolj visokega zneska za vzpostavitev klica." -#: ../src/empathy-call-window.c:3251 +#: ../src/empathy-call-window.c:3231 msgid "Top Up" msgstr "PoviÅ¡aj" @@ -3297,13 +3438,11 @@ msgstr "_Nastavitve" msgid "_View" msgstr "_Pogled" -#: ../src/empathy-call-window.ui.h:7 -#: ../src/empathy-chat-window.ui.h:17 +#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17 msgid "_Help" msgstr "Pomo_Ä" -#: ../src/empathy-call-window.ui.h:8 -#: ../src/empathy-chat-window.ui.h:18 +#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18 msgid "_Contents" msgstr "_Vsebina" @@ -3387,24 +3526,23 @@ msgstr "Oddaljeni odjemalec:" msgid "Local Candidate:" msgstr "Krajevni odjemalec:" -#: ../src/empathy-call-window.ui.h:32 -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28 msgid "Audio" msgstr "Zvok" -#: ../src/empathy-chat.c:102 +#: ../src/empathy-chat.c:101 msgid "- Empathy Chat Client" msgstr "- sporoÄilnik Empathy" -#: ../src/empathy-chatrooms-window.c:251 +#: ../src/empathy-chatrooms-window.c:243 msgid "Name" msgstr "Ime" -#: ../src/empathy-chatrooms-window.c:269 +#: ../src/empathy-chatrooms-window.c:261 msgid "Room" msgstr "Klepetalnica" -#: ../src/empathy-chatrooms-window.c:277 +#: ../src/empathy-chatrooms-window.c:269 msgid "Auto-Connect" msgstr "Samodejno povezovanje" @@ -3412,43 +3550,61 @@ msgstr "Samodejno povezovanje" msgid "Manage Favorite Rooms" msgstr "Upravljanje priljubljenih klepetalnic" -#: ../src/empathy-chat-window.c:287 +#: ../src/empathy-chat-window.c:275 msgid "Close this window?" msgstr "Ali naj se okno zapre?" -#: ../src/empathy-chat-window.c:293 +#: ../src/empathy-chat-window.c:281 #, c-format -msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it." -msgstr "Z zapiranjem tega okna se prekine tudi povezava s klepetalnico %s. Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave." +msgid "" +"Closing this window will leave %s. You will not receive any further messages " +"until you rejoin it." +msgstr "" +"Z zapiranjem tega okna se prekine tudi povezava s klepetalnico %s. Nadaljnja " +"sporoÄila ne bodo prikazana do ponovne povezave." -#: ../src/empathy-chat-window.c:306 +#: ../src/empathy-chat-window.c:294 #, c-format -msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it." -msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them." -msgstr[0] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave." -msgstr[1] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnico. Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave." -msgstr[2] "Z zapiranjem tega okna se prekine tudi povezava z %u klepetalnicama. Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave." -msgstr[3] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave." - -#: ../src/empathy-chat-window.c:317 +msgid "" +"Closing this window will leave a chat room. You will not receive any further " +"messages until you rejoin it." +msgid_plural "" +"Closing this window will leave %u chat rooms. You will not receive any " +"further messages until you rejoin them." +msgstr[0] "" +"Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. " +"Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave." +msgstr[1] "" +"Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnico. Nadaljnja " +"sporoÄila ne bodo prikazana do ponovne povezave." +msgstr[2] "" +"Z zapiranjem tega okna se prekine tudi povezava z %u klepetalnicama. " +"Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave." +msgstr[3] "" +"Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. " +"Nadaljnja sporoÄila ne bodo prikazana do ponovne povezave." + +#: ../src/empathy-chat-window.c:305 #, c-format msgid "Leave %s?" msgstr "Ali naj se prekine povezava s klepetalnico %s?" -#: ../src/empathy-chat-window.c:319 -msgid "You will not receive any further messages from this chat room until you rejoin it." -msgstr "Nadaljnja sporoÄila s te klepetalnice ne bodo prikazana do ponovne povezave." +#: ../src/empathy-chat-window.c:307 +msgid "" +"You will not receive any further messages from this chat room until you " +"rejoin it." +msgstr "" +"Nadaljnja sporoÄila s te klepetalnice ne bodo prikazana do ponovne povezave." -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Close window" msgstr "Zapri okno" -#: ../src/empathy-chat-window.c:338 +#: ../src/empathy-chat-window.c:326 msgid "Leave room" msgstr "Zapusti klepetalnico" -#: ../src/empathy-chat-window.c:677 -#: ../src/empathy-chat-window.c:700 +#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" @@ -3457,7 +3613,7 @@ msgstr[1] "%s (%d neprebrano)" msgstr[2] "%s (%d neprebrani)" msgstr[3] "%s (%d neprebrana)" -#: ../src/empathy-chat-window.c:692 +#: ../src/empathy-chat-window.c:680 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" @@ -3466,7 +3622,7 @@ msgstr[1] "%s (in %u drug)" msgstr[2] "%s (in %u druga)" msgstr[3] "%s (in %u drugi)" -#: ../src/empathy-chat-window.c:708 +#: ../src/empathy-chat-window.c:696 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" @@ -3475,7 +3631,7 @@ msgstr[1] "%s (%d neprebrano od drugih)" msgstr[2] "%s (%d neprebrani od drugih)" msgstr[3] "%s (%d neprebrana od drugih)" -#: ../src/empathy-chat-window.c:717 +#: ../src/empathy-chat-window.c:705 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" @@ -3484,11 +3640,11 @@ msgstr[1] "%s (%d neprebrano od vseh)" msgstr[2] "%s (%d neprebrani od vseh)" msgstr[3] "%s (%d neprebrana od vseh)" -#: ../src/empathy-chat-window.c:954 +#: ../src/empathy-chat-window.c:942 msgid "SMS:" msgstr "SMS:" -#: ../src/empathy-chat-window.c:962 +#: ../src/empathy-chat-window.c:950 #, c-format msgid "Sending %d message" msgid_plural "Sending %d messages" @@ -3497,7 +3653,7 @@ msgstr[1] "PoÅ¡iljanje %d sporoÄila" msgstr[2] "PoÅ¡iljanje %d sporoÄil" msgstr[3] "PoÅ¡iljanje %d sporoÄil" -#: ../src/empathy-chat-window.c:982 +#: ../src/empathy-chat-window.c:970 msgid "Typing a message." msgstr "Pisanje sporoÄila." @@ -3521,8 +3677,7 @@ msgstr "_Priljubljena klepetalnica" msgid "Notify for All Messages" msgstr "Obvesti o vseh novih sporoÄilih" -#: ../src/empathy-chat-window.ui.h:6 -#: ../src/empathy-status-icon.ui.h:1 +#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1 msgid "_Show Contact List" msgstr "_Pokaži seznam stikov" @@ -3562,169 +3717,181 @@ msgstr "Premakni zavihek _desno" msgid "_Detach Tab" msgstr "_Odpni zavihek" -#: ../src/empathy-debugger.c:69 +#: ../src/empathy-debugger.c:77 msgid "Show a particular service" msgstr "Pokaži posebno storitev" -#: ../src/empathy-debugger.c:74 +#: ../src/empathy-debugger.c:82 msgid "- Empathy Debugger" msgstr "- razhroÅ¡Äevalnik Empathy" -#: ../src/empathy-debugger.c:113 +#: ../src/empathy-debugger.c:142 msgid "Empathy Debugger" msgstr "Empathy razhroÅ¡Äevalnik" -#: ../src/empathy-debug-window.c:1599 +#: ../src/empathy-debug-window.c:1588 msgid "Save" msgstr "Shrani" -#: ../src/empathy-debug-window.c:1659 +#: ../src/empathy-debug-window.c:1648 msgid "Pastebin link" msgstr "Povezava odložiÅ¡Äa Pastebin" -#: ../src/empathy-debug-window.c:1668 +#: ../src/empathy-debug-window.c:1657 msgid "Pastebin response" msgstr "Odziv odložiÅ¡Äa Pastebin" -#: ../src/empathy-debug-window.c:1675 +#: ../src/empathy-debug-window.c:1664 msgid "Data too large for a single paste. Please save logs to file." -msgstr "PreveÄ je podatkov za enkratno lepljenje. Beleženje dnevnika je priporoÄljivo shraniti v datoteko." +msgstr "" +"PreveÄ je podatkov za enkratno lepljenje. Beleženje dnevnika je " +"priporoÄljivo shraniti v datoteko." -#: ../src/empathy-debug-window.c:1857 +#: ../src/empathy-debug-window.c:1846 msgid "Debug Window" msgstr "RazhroÅ¡Äevalno okno" -#: ../src/empathy-debug-window.c:1917 +#: ../src/empathy-debug-window.c:1906 msgid "Send to pastebin" msgstr "PoÅ¡lji na odložiÅ¡Äe Pastebin" -#: ../src/empathy-debug-window.c:1961 +#: ../src/empathy-debug-window.c:1950 msgid "Pause" msgstr "Premor" -#: ../src/empathy-debug-window.c:1973 +#: ../src/empathy-debug-window.c:1962 msgid "Level " msgstr "Raven" -#: ../src/empathy-debug-window.c:1992 +#: ../src/empathy-debug-window.c:1981 msgid "Debug" msgstr "RazhroÅ¡Äevanje" -#: ../src/empathy-debug-window.c:1997 +#: ../src/empathy-debug-window.c:1986 msgid "Info" msgstr "Podrobnosti" -#: ../src/empathy-debug-window.c:2002 -#: ../src/empathy-debug-window.c:2077 +#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066 msgid "Message" msgstr "SporoÄilo" -#: ../src/empathy-debug-window.c:2007 +#: ../src/empathy-debug-window.c:1996 msgid "Warning" msgstr "Opozorilo" -#: ../src/empathy-debug-window.c:2012 +#: ../src/empathy-debug-window.c:2001 msgid "Critical" msgstr "KritiÄno" -#: ../src/empathy-debug-window.c:2017 +#: ../src/empathy-debug-window.c:2006 msgid "Error" msgstr "Napaka" -#: ../src/empathy-debug-window.c:2030 +#: ../src/empathy-debug-window.c:2019 msgid "" -"Even if they don't display passwords, logs can contain sensitive information such as your list of contacts or the messages you recently sent or received.\n" -"If you don't want to see such information available in a public bug report, you can choose to limit the visibility of your bug to Empathy developers when reporting it by displaying the advanced fields in the <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>." +"Even if they don't display passwords, logs can contain sensitive information " +"such as your list of contacts or the messages you recently sent or " +"received.\n" +"If you don't want to see such information available in a public bug report, " +"you can choose to limit the visibility of your bug to Empathy developers " +"when reporting it by displaying the advanced fields in the <a href=\"https://" +"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>." msgstr "" -"ÄŒeprav dnevniki ne vkljuÄujejo gesel, lahko vsebujejo obÄutljive podatke, kot so seznam stikov ter prejeta in poslana sporoÄila elektronske poÅ¡te.\n" -"V kolikor teh podrobnosti ne želite videti v javnem poroÄilu o hroÅ¡Äu, je vidnost teh mogoÄe omejiti le za razvijalce programa Empathy. To storite preko izbir na spletiÅ¡Äu za <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">objavo poroÄila</a>." - -#: ../src/empathy-debug-window.c:2062 +"ÄŒeprav dnevniki ne vkljuÄujejo gesel, lahko vsebujejo obÄutljive podatke, " +"kot so seznam stikov ter prejeta in poslana sporoÄila elektronske poÅ¡te.\n" +"V kolikor teh podrobnosti ne želite videti v javnem poroÄilu o hroÅ¡Äu, je " +"vidnost teh mogoÄe omejiti le za razvijalce programa Empathy. To storite " +"preko izbir na spletiÅ¡Äu za <a href=\"https://bugzilla.gnome.org/enter_bug." +"cgi?product=empathy\">objavo poroÄila</a>." + +#: ../src/empathy-debug-window.c:2051 msgid "Time" msgstr "ÄŒas" -#: ../src/empathy-debug-window.c:2065 +#: ../src/empathy-debug-window.c:2054 msgid "Domain" msgstr "Domena" -#: ../src/empathy-debug-window.c:2068 +#: ../src/empathy-debug-window.c:2057 msgid "Category" msgstr "Kategorija" -#: ../src/empathy-debug-window.c:2071 +#: ../src/empathy-debug-window.c:2060 msgid "Level" msgstr "Raven" -#: ../src/empathy-debug-window.c:2100 -msgid "The selected connection manager does not support the remote debugging extension." -msgstr "Izbrani upravljalnik povezav ne podpira razÅ¡iritve za oddaljeno razhroÅ¡Äevanje." +#: ../src/empathy-debug-window.c:2089 +msgid "" +"The selected connection manager does not support the remote debugging " +"extension." +msgstr "" +"Izbrani upravljalnik povezav ne podpira razÅ¡iritve za oddaljeno " +"razhroÅ¡Äevanje." -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:500 msgid "Incoming video call" msgstr "Dohodni video klic" -#: ../src/empathy-event-manager.c:512 +#: ../src/empathy-event-manager.c:504 #, 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:513 +#: ../src/empathy-event-manager.c:505 #, 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:541 +#: ../src/empathy-event-manager.c:533 msgid "_Reject" msgstr "_Zavrni" -#: ../src/empathy-event-manager.c:549 -#: ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549 msgid "_Answer" msgstr "_Odgovori" -#: ../src/empathy-event-manager.c:557 +#: ../src/empathy-event-manager.c:549 msgid "_Answer with video" msgstr "_Odgovori z videom" -#: ../src/empathy-event-manager.c:712 +#: ../src/empathy-event-manager.c:704 msgid "Room invitation" msgstr "Vabilo v klepetalnico" -#: ../src/empathy-event-manager.c:714 +#: ../src/empathy-event-manager.c:706 #, c-format msgid "Invitation to join %s" msgstr "Povabilo v %s" -#: ../src/empathy-event-manager.c:721 +#: ../src/empathy-event-manager.c:713 #, 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:734 +#: ../src/empathy-event-manager.c:726 msgid "_Join" msgstr "_Pridruži se" -#: ../src/empathy-event-manager.c:760 +#: ../src/empathy-event-manager.c:752 #, c-format msgid "%s invited you to join %s" msgstr "%s vas je povabil v %s" -#: ../src/empathy-event-manager.c:766 +#: ../src/empathy-event-manager.c:758 #, c-format msgid "You have been invited to join %s" msgstr "Povabljeni ste v %s" -#: ../src/empathy-event-manager.c:945 +#: ../src/empathy-event-manager.c:937 #, c-format msgid "Incoming file transfer from %s" msgstr "PrihajajoÄ prenos datoteke od %s" -#: ../src/empathy-event-manager.c:973 -#: ../src/empathy-roster-window.c:227 +#: ../src/empathy-event-manager.c:965 ../src/empathy-roster-window.c:212 msgid "Password required" msgstr "Zahtevano geslo" -#: ../src/empathy-event-manager.c:1110 +#: ../src/empathy-event-manager.c:1102 #, c-format msgid "" "\n" @@ -3734,108 +3901,105 @@ msgstr "" "SporoÄilo: %s" #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:99 +#: ../src/empathy-ft-manager.c:93 #, 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 +#: ../src/empathy-ft-manager.c:96 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:178 +#: ../src/empathy-ft-manager.c:172 msgctxt "file transfer percent" msgid "Unknown" msgstr "Neznano" -#: ../src/empathy-ft-manager.c:273 +#: ../src/empathy-ft-manager.c:267 #, c-format msgid "%s of %s at %s/s" msgstr "%s od %s pri %s/s" -#: ../src/empathy-ft-manager.c:274 +#: ../src/empathy-ft-manager.c:268 #, c-format msgid "%s of %s" msgstr "%s od %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:305 +#: ../src/empathy-ft-manager.c:299 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Prejemanje\"%s\" od %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:308 +#: ../src/empathy-ft-manager.c:302 #, c-format msgid "Sending \"%s\" to %s" msgstr "PoÅ¡iljanje \"%s\" za %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:338 +#: ../src/empathy-ft-manager.c:332 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Napaka med prejemanjem \"%s\" od %s" -#: ../src/empathy-ft-manager.c:341 +#: ../src/empathy-ft-manager.c:335 msgid "Error receiving a file" msgstr "Napaka med prejemanjem datoteke" -#: ../src/empathy-ft-manager.c:346 +#: ../src/empathy-ft-manager.c:340 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Napaka med poÅ¡iljanjem \"%s\" k %s" -#: ../src/empathy-ft-manager.c:349 +#: ../src/empathy-ft-manager.c:343 msgid "Error sending a file" msgstr "Napaka med poÅ¡iljanjem datoteke" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:488 +#: ../src/empathy-ft-manager.c:482 #, c-format msgid "\"%s\" received from %s" msgstr "\"%s\" prejeto od %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:493 +#: ../src/empathy-ft-manager.c:487 #, c-format msgid "\"%s\" sent to %s" msgstr "\"%s\" poslano %s" -#: ../src/empathy-ft-manager.c:496 +#: ../src/empathy-ft-manager.c:490 msgid "File transfer completed" msgstr "Prenos datoteke je konÄan" -#: ../src/empathy-ft-manager.c:615 -#: ../src/empathy-ft-manager.c:779 +#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773 msgid "Waiting for the other participant's response" msgstr "ÄŒakanje na odziv drugega udeleženca" -#: ../src/empathy-ft-manager.c:641 -#: ../src/empathy-ft-manager.c:679 +#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Preverjanje celovitosti \"%s\"" -#: ../src/empathy-ft-manager.c:644 -#: ../src/empathy-ft-manager.c:682 +#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676 #, c-format msgid "Hashing \"%s\"" msgstr "Ustvarjanje razprÅ¡ila \"%s\"" -#: ../src/empathy-ft-manager.c:1025 +#: ../src/empathy-ft-manager.c:1019 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1037 +#: ../src/empathy-ft-manager.c:1031 msgid "File" msgstr "Datoteka" -#: ../src/empathy-ft-manager.c:1059 +#: ../src/empathy-ft-manager.c:1053 msgid "Remaining" msgstr "Preostalo" @@ -3847,57 +4011,61 @@ msgstr "Prenosi datotek" msgid "Remove completed, canceled and failed file transfers from the list" msgstr "S seznama odstrani konÄane, preklicane in spodletele prenose datotek" -#: ../src/empathy-import-dialog.c:76 +#: ../src/empathy-import-dialog.c:70 msgid "_Import" msgstr "_Uvozi" -#: ../src/empathy-import-dialog.c:88 -msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin." -msgstr "Ni mogoÄe najti raÄuna za uvoz. Program trenutno podpira le uvoz raÄunov programa Pidgin." +#: ../src/empathy-import-dialog.c:82 +msgid "" +"No accounts to import could be found. Empathy currently only supports " +"importing accounts from Pidgin." +msgstr "" +"Ni mogoÄe najti raÄuna za uvoz. Program trenutno podpira le uvoz raÄunov " +"programa Pidgin." -#: ../src/empathy-import-dialog.c:209 +#: ../src/empathy-import-dialog.c:203 msgid "Import Accounts" msgstr "Uvozi raÄune" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:302 +#: ../src/empathy-import-widget.c:296 msgid "Import" msgstr "Uvozi" -#: ../src/empathy-import-widget.c:311 +#: ../src/empathy-import-widget.c:305 msgid "Protocol" msgstr "Protokol" -#: ../src/empathy-import-widget.c:335 +#: ../src/empathy-import-widget.c:329 msgid "Source" msgstr "Vir" -#: ../src/empathy-invite-participant-dialog.c:201 -#: ../src/empathy-invite-participant-dialog.c:229 +#: ../src/empathy-invite-participant-dialog.c:196 +#: ../src/empathy-invite-participant-dialog.c:224 msgid "Invite Participant" msgstr "Povabi udeležence" -#: ../src/empathy-invite-participant-dialog.c:202 +#: ../src/empathy-invite-participant-dialog.c:197 msgid "Choose a contact to invite into the conversation:" msgstr "Izbor stika za povabilo v pogovor:" -#: ../src/empathy-invite-participant-dialog.c:225 +#: ../src/empathy-invite-participant-dialog.c:220 msgid "Invite" msgstr "Povabi" -#: ../src/empathy-new-chatroom-dialog.c:194 +#: ../src/empathy-new-chatroom-dialog.c:184 msgid "Chat Room" msgstr "Klepetelnica" -#: ../src/empathy-new-chatroom-dialog.c:209 +#: ../src/empathy-new-chatroom-dialog.c:199 msgid "Members" msgstr "ÄŒlani" -#: ../src/empathy-new-chatroom-dialog.c:410 +#: ../src/empathy-new-chatroom-dialog.c:400 msgid "Failed to list rooms" msgstr "Izpis seznama klepetalnic je spodletel" -#: ../src/empathy-new-chatroom-dialog.c:439 +#: ../src/empathy-new-chatroom-dialog.c:429 #, c-format msgid "" "%s\n" @@ -3910,35 +4078,46 @@ msgstr "" "Zahtevano geslo: %s\n" "ÄŒlani: %s" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "Yes" msgstr "Da" -#: ../src/empathy-new-chatroom-dialog.c:441 -#: ../src/empathy-new-chatroom-dialog.c:442 +#: ../src/empathy-new-chatroom-dialog.c:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "No" msgstr "Ne" -#: ../src/empathy-new-chatroom-dialog.c:784 +#: ../src/empathy-new-chatroom-dialog.c:774 msgid "Join Room" msgstr "Pridruži se klepetalnici" #: ../src/empathy-new-chatroom-dialog.ui.h:1 -msgid "Enter the room name to join here or click on one or more rooms in the list." -msgstr "Vnesite ime klepetalnice, ki se ji želite pridružiti, ali pa kliknite na eno ali veÄ klepetalnic s seznama." +msgid "" +"Enter the room name to join here or click on one or more rooms in the list." +msgstr "" +"Vnesite ime klepetalnice, ki se ji želite pridružiti, ali pa kliknite na eno " +"ali veÄ klepetalnic s seznama." #: ../src/empathy-new-chatroom-dialog.ui.h:2 msgid "_Room:" msgstr "_Klepetalnica:" #: ../src/empathy-new-chatroom-dialog.ui.h:3 -msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server" -msgstr "Vnesite gostujoÄi strežnik klepetalnice ali pa pustite polje prazno, Äe se klepetalnica nahaja na strežniku raÄuna" +msgid "" +"Enter the server which hosts the room, or leave it empty if the room is on " +"the current account's server" +msgstr "" +"Vnesite gostujoÄi strežnik klepetalnice ali pa pustite polje prazno, Äe se " +"klepetalnica nahaja na strežniku raÄuna" #: ../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 "Vnesite gostujoÄi strežnik klepetalnice ali pa pustite polje prazno, Äe se klepetalnica nahaja na strežniku raÄuna" +msgid "" +"Enter the server which hosts the room, or leave it empty if the room is on " +"the current account's server" +msgstr "" +"Vnesite gostujoÄi strežnik klepetalnice ali pa pustite polje prazno, Äe se " +"klepetalnica nahaja na strežniku raÄuna" #: ../src/empathy-new-chatroom-dialog.ui.h:5 msgid "_Server:" @@ -3952,104 +4131,104 @@ msgstr "Seznama klepetalnic ni bilo mogoÄe naložiti" msgid "Room List" msgstr "Seznam klepetalnic" -#: ../src/empathy-notifications-approver.c:188 +#: ../src/empathy-notifications-approver.c:182 msgid "Respond" msgstr "Odgovori" -#: ../src/empathy-notifications-approver.c:207 +#: ../src/empathy-notifications-approver.c:201 msgid "Answer with video" msgstr "Odgovori z videom" -#: ../src/empathy-notifications-approver.c:215 -#: ../src/empathy-notifications-approver.c:225 +#: ../src/empathy-notifications-approver.c:209 +#: ../src/empathy-notifications-approver.c:219 msgid "Decline" msgstr "Odkloni" -#: ../src/empathy-notifications-approver.c:219 -#: ../src/empathy-notifications-approver.c:230 +#: ../src/empathy-notifications-approver.c:213 +#: ../src/empathy-notifications-approver.c:224 msgid "Accept" msgstr "Sprejmi" #. translators: the 'Provide' button is displayed in a notification #. * bubble when Empathy is asking for an account password; clicking on it #. * brings the password popup. -#: ../src/empathy-notifications-approver.c:240 +#: ../src/empathy-notifications-approver.c:234 msgid "Provide" msgstr "Zagotovi" -#: ../src/empathy-preferences.c:143 +#: ../src/empathy-preferences.c:134 msgid "Message received" msgstr "SporoÄilo je bilo prejeto" -#: ../src/empathy-preferences.c:144 +#: ../src/empathy-preferences.c:135 msgid "Message sent" msgstr "SporoÄilo je bilo poslano" -#: ../src/empathy-preferences.c:145 +#: ../src/empathy-preferences.c:136 msgid "New conversation" msgstr "Nov pogovor" -#: ../src/empathy-preferences.c:146 +#: ../src/empathy-preferences.c:137 msgid "Contact comes online" msgstr "Stik se je povezal" -#: ../src/empathy-preferences.c:147 +#: ../src/empathy-preferences.c:138 msgid "Contact goes offline" msgstr "Stik se je odjavil" -#: ../src/empathy-preferences.c:148 +#: ../src/empathy-preferences.c:139 msgid "Account connected" msgstr "Povezava z raÄunom je vzpostavljena" -#: ../src/empathy-preferences.c:149 +#: ../src/empathy-preferences.c:140 msgid "Account disconnected" msgstr "Povezava z raÄunom je prekinjena" -#: ../src/empathy-preferences.c:386 +#: ../src/empathy-preferences.c:377 msgid "Language" msgstr "Jezik" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:637 +#: ../src/empathy-preferences.c:628 msgid "Juliet" msgstr "Julija" #. translators: Contact name for the chat theme preview -#: ../src/empathy-preferences.c:644 +#: ../src/empathy-preferences.c:635 msgid "Romeo" msgstr "Romeo" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:650 +#: ../src/empathy-preferences.c:641 msgid "O Romeo, Romeo, wherefore art thou Romeo?" msgstr "O, Romeo, Romeo, zakaj li Romeo?!" #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:654 +#: ../src/empathy-preferences.c:645 msgid "Deny thy father and refuse thy name;" msgstr "Odreci se rodu, odvrzi ime," #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:657 +#: ../src/empathy-preferences.c:648 msgid "Or if thou wilt not, be but sworn my love" msgstr "Äe ne, prisezi veÄno mi ljubezen," #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:660 +#: ../src/empathy-preferences.c:651 msgid "And I'll no longer be a Capulet." msgstr "in dlje nisem Kapuletova." #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:663 +#: ../src/empathy-preferences.c:654 msgid "Shall I hear more, or shall I speak at this?" msgstr "Al' bi posluÅ¡al Å¡e, al govoril? " #. translators: Quote from Romeo & Julier, for chat theme preview -#: ../src/empathy-preferences.c:666 +#: ../src/empathy-preferences.c:657 msgid "Juliet has disconnected" msgstr "Julija je prekinila povezavo." -#: ../src/empathy-preferences.c:1032 +#: ../src/empathy-preferences.c:1023 msgid "Preferences" msgstr "Možnosti" @@ -4061,8 +4240,7 @@ msgstr "Pokaži skupine" msgid "Show account balances" msgstr "Pokaži stanje raÄuna" -#: ../src/empathy-preferences.ui.h:4 -#: ../src/empathy-roster-window.c:2241 +#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2226 msgid "Contact List" msgstr "Seznam stikov" @@ -4151,16 +4329,30 @@ msgid "Use _echo cancellation to improve call quality" msgstr "Uporabi _podporo odpravljanja odmevov za izboljÅ¡anje kakovosti klica." #: ../src/empathy-preferences.ui.h:27 -msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call." -msgstr "Odpravljanje odmevov omogoÄi ÄistejÅ¡i zvok glasu med klicanjem, vendar pa se lahko na nekaterih sistemih pojavijo težave. V primeru da med pogovorom zasliÅ¡ite nenavadne zvoke ali Å¡ume, onemogoÄite odpravljanje odmevov in ponovno vzpostavite klic." +msgid "" +"Echo cancellation helps to make your voice sound clearer to the other " +"person, but may cause problems on some computers. If you or the other person " +"hear strange noises or glitches during calls, try turning echo cancellation " +"off and restarting the call." +msgstr "" +"Odpravljanje odmevov omogoÄi ÄistejÅ¡i zvok glasu med klicanjem, vendar pa se " +"lahko na nekaterih sistemih pojavijo težave. V primeru da med pogovorom " +"zasliÅ¡ite nenavadne zvoke ali Å¡ume, onemogoÄite odpravljanje odmevov in " +"ponovno vzpostavite klic." #: ../src/empathy-preferences.ui.h:30 msgid "_Publish location to my contacts" msgstr "O_bjavi mesto mojim stikom" #: ../src/empathy-preferences.ui.h:31 -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 "ZmanjÅ¡ana natanÄnost mesta pomeni, da ne bo objavljenih podatkov natanÄnejÅ¡ih od mesta in države. Koordinate GPS bodo natanÄne na eno decimalno mesto." +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 "" +"ZmanjÅ¡ana natanÄnost mesta pomeni, da ne bo objavljenih podatkov " +"natanÄnejÅ¡ih od mesta in države. Koordinate GPS bodo natanÄne na eno " +"decimalno mesto." #. 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:33 @@ -4188,7 +4380,9 @@ msgid "Location sources:" msgstr "Mesta virov:" #: ../src/empathy-preferences.ui.h:40 -msgid "The list of languages reflects only the languages for which you have a dictionary installed." +msgid "" +"The list of languages reflects only the languages for which you have a " +"dictionary installed." msgstr "Na seznamu jezikov so le tisti, za katere imate nameÅ¡Äene slovarje." #: ../src/empathy-preferences.ui.h:41 @@ -4211,84 +4405,86 @@ msgstr "RazliÄica:" msgid "Themes" msgstr "Teme" -#: ../src/empathy-roster-window.c:244 +#: ../src/empathy-roster-window.c:229 msgid "Provide Password" msgstr "Vpis gesla" -#: ../src/empathy-roster-window.c:250 +#: ../src/empathy-roster-window.c:235 msgid "Disconnect" msgstr "Prekini povezavo" -#: ../src/empathy-roster-window.c:493 -msgid "You need to setup an account to see contacts here." -msgstr "Za prikaz stikov morate nastaviti raÄun." +#: ../src/empathy-roster-window.c:478 +msgid "You need to set up an account to see contacts here." +msgstr "Za prikaz stikov je treba nastaviti raÄun." -#: ../src/empathy-roster-window.c:569 +#: ../src/empathy-roster-window.c:554 #, c-format msgid "Sorry, %s accounts can’t be used until your %s software is updated." -msgstr "RaÄunov %s ni mogoÄe uporabljati, dokler ni posodobljena programska oprema %s." +msgstr "" +"RaÄunov %s ni mogoÄe uporabljati, dokler ni posodobljena programska oprema " +"%s." -#: ../src/empathy-roster-window.c:670 +#: ../src/empathy-roster-window.c:655 msgid "Windows Live" msgstr "Windows Live" -#: ../src/empathy-roster-window.c:674 +#: ../src/empathy-roster-window.c:659 msgid "Facebook" msgstr "Facebook" #. translators: %s is an account name like 'Facebook' or 'Google Talk' -#: ../src/empathy-roster-window.c:689 +#: ../src/empathy-roster-window.c:674 #, c-format msgid "%s account requires authorisation" msgstr "RaÄun %s zahteva overitev" -#: ../src/empathy-roster-window.c:700 +#: ../src/empathy-roster-window.c:685 msgid "Online Accounts" msgstr "Spletni raÄuni" -#: ../src/empathy-roster-window.c:747 +#: ../src/empathy-roster-window.c:732 msgid "Update software..." msgstr "Posodobitev programske opreme ..." -#: ../src/empathy-roster-window.c:753 +#: ../src/empathy-roster-window.c:738 msgid "Reconnect" msgstr "Ponovno se poveži" -#: ../src/empathy-roster-window.c:757 +#: ../src/empathy-roster-window.c:742 msgid "Edit Account" msgstr "Uredi raÄun" -#: ../src/empathy-roster-window.c:762 +#: ../src/empathy-roster-window.c:747 msgid "Close" msgstr "Zapri" -#: ../src/empathy-roster-window.c:904 +#: ../src/empathy-roster-window.c:889 msgid "Top up account" msgstr "PoviÅ¡aj znesek na raÄunu" -#: ../src/empathy-roster-window.c:1590 +#: ../src/empathy-roster-window.c:1575 msgid "You need to enable one of your accounts to see contacts here." msgstr "OmogoÄiti je treba enega izmed raÄunov za prikaz stikov." #. translators: argument is an account name -#: ../src/empathy-roster-window.c:1598 +#: ../src/empathy-roster-window.c:1583 #, c-format msgid "You need to enable %s to see contacts here." msgstr "OmogoÄiti je treba raÄun %s za prikaz stikov." -#: ../src/empathy-roster-window.c:1676 +#: ../src/empathy-roster-window.c:1661 msgid "Change your presence to see contacts here" msgstr "Spremenite nastavitve za prikaz stikov." -#: ../src/empathy-roster-window.c:1685 +#: ../src/empathy-roster-window.c:1670 msgid "No match found" msgstr "Ni najdenih zadetkov." -#: ../src/empathy-roster-window.c:1692 +#: ../src/empathy-roster-window.c:1677 msgid "You haven't added any contact yet" msgstr "Ni Å¡e dodanih stikov" -#: ../src/empathy-roster-window.c:1695 +#: ../src/empathy-roster-window.c:1680 msgid "No online contacts" msgstr "Ni prijavljenih stikov" @@ -4385,12 +4581,12 @@ msgstr "Nov k_lic ..." msgid "Status" msgstr "Stanje" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126 msgid "Done" msgstr "KonÄano" -#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208 +#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214 msgid "Please enter your account details" msgstr "Vnesite podrobnosti raÄuna" @@ -4505,8 +4701,8 @@ msgstr "Podpora razliÄnim raÄunom IM" #~ msgid "Details" #~ msgstr "Podrobnosti" -#~ msgctxt "codec" +#~ msgctxt "codec" #~ msgid "Unknown" #~ msgstr "Neznano" @@ -4620,15 +4816,15 @@ msgstr "Podpora razliÄnim raÄunom IM" #~ msgid "Contacts selected in the list on the left will be linked together." #~ msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj." -#~ msgctxt "Link individual (contextual menu)" +#~ msgctxt "Link individual (contextual menu)" #~ msgid "_Link Contacts…" #~ msgstr "_Poveži stike ..." #~ msgid "Link Contacts" #~ msgstr "Poveži stike" -#~ msgctxt "Unlink individual (button)" +#~ msgctxt "Unlink individual (button)" #~ msgid "_Unlink…" #~ msgstr "_Odstrani povezavo ..." @@ -4648,8 +4844,8 @@ msgstr "Podpora razliÄnim raÄunom IM" #~ msgstr "" #~ "Ali ste prepriÄani, da želite odstraniti povezane stike? S tem se bodo " #~ "stiki razdelil na posamezne stike." -#~ msgctxt "Unlink individual (button)" +#~ msgctxt "Unlink individual (button)" #~ msgid "_Unlink" #~ msgstr "_Odstrani povezavo" @@ -4773,8 +4969,8 @@ msgstr "Podpora razliÄnim raÄunom IM" #~ msgid "Personal Information" #~ msgstr "Osebni podatki" -#~ msgctxt "Edit contact (contextual menu)" +#~ msgctxt "Edit contact (contextual menu)" #~ msgid "_Edit" #~ msgstr "_Uredi" @@ -4829,20 +5025,20 @@ msgstr "Podpora razliÄnim raÄunom IM" #~ msgid "The selected contact is offline." #~ msgstr "Izbrani stik ni povezan v omrežje." -#~ msgctxt "encoding video codec" +#~ msgctxt "encoding video codec" #~ msgid "Unknown" #~ msgstr "Neznano" -#~ msgctxt "encoding audio codec" +#~ msgctxt "encoding audio codec" #~ msgid "Unknown" #~ msgstr "Neznano" -#~ msgctxt "decoding video codec" +#~ msgctxt "decoding video codec" #~ msgid "Unknown" #~ msgstr "Neznano" -#~ msgctxt "decoding audio codec" +#~ msgctxt "decoding audio codec" #~ msgid "Unknown" #~ msgstr "Neznano" @@ -4917,8 +5113,8 @@ msgstr "Podpora razliÄnim raÄunom IM" #~ msgid "Use _Yahoo! Japan" #~ msgstr "Uporabi _Yahoo! Japan" -#~ msgctxt "Link individual (contextual menu)" +#~ msgctxt "Link individual (contextual menu)" #~ msgid "_Link…" #~ msgstr "_Poveži ..." diff --git a/release.py b/release.py index 1ef6da9b8..160650ed1 100755 --- a/release.py +++ b/release.py @@ -9,7 +9,7 @@ import time from string import Template from optparse import OptionParser -last_tag_pattern = 'EMPATHY_3_8*' +last_tag_pattern = 'EMPATHY_3_9*' upload_server = 'master.gnome.org' template = '''\ $name $version is now available for download from: diff --git a/src/Makefile.am b/src/Makefile.am index b52e9ad8f..db30af3f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,11 @@ include $(top_srcdir)/tools/flymake.mk CPPFLAGS_COMMON = \ $(EMPATHY_CFLAGS) \ $(ERROR_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy-gtk \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/extensions \ + -I$(top_builddir)/libempathy-gtk \ + -I$(top_builddir)/libempathy \ -DG_LOG_DOMAIN=\"empathy\" \ -DBIN_DIR=\"$(bindir)\" \ $(DISABLE_DEPRECATED) \ @@ -203,14 +207,10 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) -empathy-chat-resources.c: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \ - --sourcedir=$(srcdir) \ - --generate-source \ - $< - -empathy-chat-resources.h: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \ - --sourcedir=$(srcdir) \ - --generate-header \ - $< +chat_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-chat.gresource.xml) + +empathy-chat-resources.c: empathy-chat.gresource.xml $(chat_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< + +empathy-chat-resources.h: empathy-chat.gresource.xml $(chat_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $< diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c index 2480d7569..bd6b2f866 100644 --- a/src/empathy-about-dialog.c +++ b/src/empathy-about-dialog.c @@ -23,11 +23,10 @@ */ #include "config.h" +#include "empathy-about-dialog.h" #include <glib/gi18n.h> -#include "empathy-about-dialog.h" - #define WEB_SITE "http://live.gnome.org/Empathy" static const char *authors[] = { diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c index 537b43e3d..772e6868e 100644 --- a/src/empathy-accounts-common.c +++ b/src/empathy-accounts-common.c @@ -25,14 +25,12 @@ */ #include "config.h" - -#include <libempathy-gtk/empathy-ui-utils.h> - #include "empathy-accounts-common.h" + #include "empathy-accounts-dialog.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" gboolean empathy_accounts_has_non_salut_accounts (TpAccountManager *manager) diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h index 39d094d22..1cb24d7dd 100644 --- a/src/empathy-accounts-common.h +++ b/src/empathy-accounts-common.h @@ -22,6 +22,10 @@ #ifndef __EMPATHY_ACCOUNTS_COMMON_H__ #define __EMPATHY_ACCOUNTS_COMMON_H__ +#include <telepathy-glib/telepathy-glib.h> + +G_BEGIN_DECLS + gboolean empathy_accounts_has_non_salut_accounts (TpAccountManager *manager); gboolean empathy_accounts_has_accounts (TpAccountManager *manager); @@ -30,4 +34,6 @@ void empathy_accounts_show_accounts_ui (TpAccountManager *manager, TpAccount *account, GApplication *app); +G_END_DECLS + #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */ diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index abb4e0ca8..e2e63dc4a 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -25,25 +25,23 @@ */ #include "config.h" +#include "empathy-accounts-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-pkg-kit.h> - -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-account-widget-sip.h> -#include <libempathy-gtk/empathy-user-info.h> -#include <libempathy-gtk/empathy-local-xmpp-assistant-widget.h> -#include <libempathy-gtk/empathy-new-account-dialog.h> - #include "empathy-accounts-common.h" -#include "empathy-accounts-dialog.h" +#include "empathy-account-widget-sip.h" #include "empathy-import-dialog.h" #include "empathy-import-utils.h" +#include "empathy-local-xmpp-assistant-widget.h" +#include "empathy-new-account-dialog.h" +#include "empathy-pkg-kit.h" +#include "empathy-ui-utils.h" +#include "empathy-user-info.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /* Flashing delay for icons (milliseconds). */ #define FLASH_TIMEOUT 500 diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h index d436fed04..070cd02e9 100644 --- a/src/empathy-accounts-dialog.h +++ b/src/empathy-accounts-dialog.h @@ -25,7 +25,6 @@ #define __EMPATHY_ACCOUNTS_DIALOG_H__ #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 90d7947e9..88923681b 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -25,6 +25,7 @@ */ #include "config.h" +#include "empathy-accounts.h" #include <glib/gi18n.h> @@ -32,13 +33,12 @@ #include <cheese-gtk.h> #endif -#include <libempathy/empathy-utils.h> -#include <libempathy-gtk/empathy-ui-utils.h> - #include "empathy-accounts-common.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts" @@ -136,12 +136,12 @@ out: g_application_release (app); } -static int -app_command_line_cb (GApplication *app, - GApplicationCommandLine *cmdline) +static void +app_activate (GApplication *app) { TpAccountManager *account_manager; + empathy_gtk_init (); account_manager = tp_account_manager_dup (); /* Hold the application while preparing the AM */ @@ -151,8 +151,6 @@ app_command_line_cb (GApplication *app, account_manager_ready_for_accounts_cb, app); g_object_unref (account_manager); - - return 0; } static gboolean @@ -163,7 +161,7 @@ local_cmdline (GApplication *app, gint i; gchar **argv; gint argc = 0; - gboolean retval = FALSE; + gboolean retval = TRUE; GError *error = NULL; GOptionContext *optcontext; @@ -186,7 +184,7 @@ local_cmdline (GApplication *app, }; optcontext = g_option_context_new (N_("- Empathy Accounts")); - g_option_context_add_group (optcontext, gtk_get_option_group (TRUE)); + g_option_context_add_group (optcontext, gtk_get_option_group (FALSE)); g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE); g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE); @@ -199,9 +197,22 @@ local_cmdline (GApplication *app, g_print ("%s\nRun '%s --help' to see a full list of available command line options.\n", error->message, argv[0]); g_warning ("Error in empathy init: %s", error->message); + g_clear_error (&error); *exit_status = EXIT_FAILURE; - retval = TRUE; + } + else + { + if (g_application_register (app, NULL, &error)) + { + g_application_activate (app); + } + else + { + g_warning("Impossible to register empathy-application: %s", error->message); + g_clear_error (&error); + *exit_status = EXIT_FAILURE; + } } g_option_context_free (optcontext); @@ -225,22 +236,16 @@ main (int argc, char *argv[]) empathy_init (); - gtk_init (&argc, &argv); - empathy_gtk_init (); - g_set_application_name (_("Empathy Accounts")); /* Make empathy and empathy-accounts appear as the same app in gnome-shell */ gdk_set_program_class ("Empathy"); gtk_window_set_default_icon_name ("empathy"); - app = gtk_application_new (EMPATHY_ACCOUNTS_DBUS_NAME, - G_APPLICATION_HANDLES_COMMAND_LINE); + app = gtk_application_new (EMPATHY_ACCOUNTS_DBUS_NAME, G_APPLICATION_FLAGS_NONE); app_class = G_OBJECT_GET_CLASS (app); G_APPLICATION_CLASS (app_class)->local_command_line = local_cmdline; - - g_signal_connect (app, "command-line", G_CALLBACK (app_command_line_cb), - NULL); + G_APPLICATION_CLASS (app_class)->activate = app_activate; retval = g_application_run (G_APPLICATION (app), argc, argv); diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c index 0c3693b6f..985a1fa36 100644 --- a/src/empathy-audio-sink.c +++ b/src/empathy-audio-sink.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-audio-sink.h" #ifdef HAVE_GST1 #include <gst/audio/streamvolume.h> @@ -27,10 +28,9 @@ #endif #include "empathy-audio-utils.h" -#include "empathy-audio-sink.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyGstAudioSink, empathy_audio_sink, GST_TYPE_BIN) diff --git a/src/empathy-audio-sink.h b/src/empathy-audio-sink.h index ceb0bbe36..85b576c42 100644 --- a/src/empathy-audio-sink.h +++ b/src/empathy-audio-sink.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_GST_AUDIO_SINK_H__ #define __EMPATHY_GST_AUDIO_SINK_H__ -#include <glib-object.h> #include <gst/gst.h> G_BEGIN_DECLS diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c index fe62a6c4b..bc3aa50cd 100644 --- a/src/empathy-audio-src.c +++ b/src/empathy-audio-src.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-audio-src.h" #ifdef HAVE_GST1 #include <gst/audio/streamvolume.h> @@ -26,14 +27,12 @@ #include <gst/interfaces/streamvolume.h> #endif -#include <libempathy/empathy-utils.h> #include "empathy-audio-utils.h" - -#include "empathy-audio-src.h" #include "empathy-mic-monitor.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyGstAudioSrc, empathy_audio_src, GST_TYPE_BIN) diff --git a/src/empathy-audio-src.h b/src/empathy-audio-src.h index ef87c44c4..2d1a6960d 100644 --- a/src/empathy-audio-src.h +++ b/src/empathy-audio-src.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_GST_AUDIO_SRC_H__ #define __EMPATHY_GST_AUDIO_SRC_H__ -#include <glib-object.h> #include <gst/gst.h> #include <gio/gio.h> diff --git a/src/empathy-audio-utils.c b/src/empathy-audio-utils.c index 323ef8edf..f7a00378f 100644 --- a/src/empathy-audio-utils.c +++ b/src/empathy-audio-utils.c @@ -19,15 +19,14 @@ */ #include "config.h" +#include "empathy-audio-utils.h" #include <pulse/pulseaudio.h> -#include "empathy-audio-utils.h" - -#include <libempathy/empathy-gsettings.h> +#include "empathy-gsettings.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" void empathy_audio_set_stream_properties (GstElement *element, diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c index f1d42b74c..be5b13a0b 100644 --- a/src/empathy-auth-client.c +++ b/src/empathy-auth-client.c @@ -22,21 +22,19 @@ #include "config.h" #include <glib/gi18n.h> +#include <gnutls/gnutls.h> -#define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-auth-factory.h> -#include <libempathy/empathy-server-tls-handler.h> -#include <libempathy/empathy-tls-verifier.h> - -#include <libempathy-gtk/empathy-bad-password-dialog.h> -#include <libempathy-gtk/empathy-password-dialog.h> -#include <libempathy-gtk/empathy-tls-dialog.h> -#include <libempathy-gtk/empathy-ui-utils.h> - +#include "empathy-auth-factory.h" +#include "empathy-bad-password-dialog.h" +#include "empathy-password-dialog.h" #include "empathy-sanity-cleaning.h" +#include "empathy-server-tls-handler.h" +#include "empathy-tls-dialog.h" +#include "empathy-tls-verifier.h" +#include "empathy-ui-utils.h" -#include <gnutls/gnutls.h> +#define DEBUG_FLAG EMPATHY_DEBUG_TLS +#include "empathy-debug.h" #define TIMEOUT 60 diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c index dbd5ecf77..60700ac0f 100644 --- a/src/empathy-call-factory.c +++ b/src/empathy-call-factory.c @@ -19,15 +19,14 @@ */ #include "config.h" - -#include <libempathy/empathy-client-factory.h> -#include <libempathy/empathy-request-util.h> +#include "empathy-client-factory.h" #include "empathy-call-factory.h" #include "empathy-call-handler.h" +#include "empathy-request-util.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT) diff --git a/src/empathy-call-factory.h b/src/empathy-call-factory.h index 174fbf4bd..b913d8e57 100644 --- a/src/empathy-call-factory.h +++ b/src/empathy-call-factory.h @@ -21,7 +21,7 @@ #ifndef __EMPATHY_CALL_FACTORY_H__ #define __EMPATHY_CALL_FACTORY_H__ -#include <glib-object.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c index b1d4f2977..1c4939af1 100644 --- a/src/empathy-call-handler.c +++ b/src/empathy-call-handler.c @@ -19,17 +19,15 @@ */ #include "config.h" +#include "empathy-call-handler.h" #include <telepathy-farstream/telepathy-farstream.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-call-utils.h> - -#include "empathy-call-handler.h" +#include "empathy-call-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyCallHandler, empathy_call_handler, G_TYPE_OBJECT) diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h index 36c6cfdc2..5050d801e 100644 --- a/src/empathy-call-handler.h +++ b/src/empathy-call-handler.h @@ -21,14 +21,10 @@ #ifndef __EMPATHY_CALL_HANDLER_H__ #define __EMPATHY_CALL_HANDLER_H__ -#include <glib-object.h> - -#include <gst/gst.h> #include <farstream/fs-conference.h> - #include <telepathy-glib/telepathy-glib.h> -#include <libempathy/empathy-contact.h> +#include "empathy-contact.h" G_BEGIN_DECLS diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c index bf42b055a..41e9bdfc1 100644 --- a/src/empathy-call-observer.c +++ b/src/empathy-call-observer.c @@ -19,16 +19,15 @@ */ #include "config.h" +#include "empathy-call-observer.h" #include <glib/gi18n-lib.h> -#include <libempathy-gtk/empathy-images.h> -#include <libempathy-gtk/empathy-notify-manager.h> - -#include "empathy-call-observer.h" +#include "empathy-images.h" +#include "empathy-notify-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" struct _EmpathyCallObserverPriv { EmpathyNotifyManager *notify_mgr; diff --git a/src/empathy-call-observer.h b/src/empathy-call-observer.h index 1d5a58b57..3fdb6b797 100644 --- a/src/empathy-call-observer.h +++ b/src/empathy-call-observer.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_CALL_OBSERVER_H__ #define __EMPATHY_CALL_OBSERVER_H__ -#include <glib.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c index ca2914724..e6dca4868 100644 --- a/src/empathy-call-window-fullscreen.c +++ b/src/empathy-call-window-fullscreen.c @@ -22,10 +22,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "empathy-call-window-fullscreen.h" -#include <libempathy/empathy-utils.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-ui-utils.h" +#include "empathy-utils.h" /* The number of seconds for which the "leave fullscreen" popup should be shown */ diff --git a/src/empathy-call-window-fullscreen.h b/src/empathy-call-window-fullscreen.h index 7e9bd63e5..56ddf99b8 100644 --- a/src/empathy-call-window-fullscreen.h +++ b/src/empathy-call-window-fullscreen.h @@ -20,8 +20,6 @@ #ifndef __EMPATHY_CALL_WINDOW_FULLSCREEN_H__ #define __EMPATHY_CALL_WINDOW_FULLSCREEN_H__ -#include <glib-object.h> -#include <gtk/gtk.h> #include "empathy-call-window.h" diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 77722f1a6..eb39855ba 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -19,38 +19,35 @@ */ #include "config.h" +#include "empathy-call-window.h" #include <glib/gi18n.h> - #include <telepathy-farstream/telepathy-farstream.h> - #include <farstream/fs-element-added-notifier.h> #include <farstream/fs-utils.h> -#include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-dialpad-widget.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-sound-manager.h> -#include <libempathy-gtk/empathy-geometry.h> -#include <libempathy-gtk/empathy-images.h> -#include <libempathy-gtk/empathy-call-utils.h> - -#define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> - -#include "empathy-call-window-fullscreen.h" #include "empathy-about-dialog.h" #include "empathy-audio-sink.h" +#include "empathy-call-utils.h" +#include "empathy-call-window-fullscreen.h" +#include "empathy-camera-menu.h" +#include "empathy-camera-monitor.h" +#include "empathy-dialpad-widget.h" +#include "empathy-geometry.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" #include "empathy-mic-menu.h" #include "empathy-preferences.h" +#include "empathy-request-util.h" #include "empathy-rounded-actor.h" #include "empathy-rounded-rectangle.h" #include "empathy-rounded-texture.h" -#include "empathy-camera-menu.h" +#include "empathy-sound-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_VOIP +#include "empathy-debug.h" #define CONTENT_HBOX_SPACING 3 #define CONTENT_HBOX_CHILDREN_PACKING_PADDING 0 @@ -4018,7 +4015,7 @@ empathy_call_window_state_event_cb (GtkWidget *widget, show_controls (window, set_fullscreen); show_borders (window, set_fullscreen); gtk_action_set_stock_id (priv->menu_fullscreen, - (set_fullscreen ? "gtk-leave-fullscreen" : "gtk-fullscreen")); + (set_fullscreen ? "view-restore" : "view-fullscreen")); priv->is_fullscreen = set_fullscreen; } diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h index a5df2dac4..2090b1beb 100644 --- a/src/empathy-call-window.h +++ b/src/empathy-call-window.h @@ -21,11 +21,10 @@ #ifndef __EMPATHY_CALL_WINDOW_H__ #define __EMPATHY_CALL_WINDOW_H__ -#include <glib-object.h> #include <gtk/gtk.h> -#include "empathy-call-handler.h" #include "empathy-audio-src.h" +#include "empathy-call-handler.h" #include "empathy-video-src.h" G_BEGIN_DECLS diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui index f26f33b49..133f4ca4f 100644 --- a/src/empathy-call-window.ui +++ b/src/empathy-call-window.ui @@ -39,7 +39,7 @@ </child> <child> <object class="GtkAction" id="menusettings"> - <property name="stock_id">gtk-preferences</property> + <property name="stock_id">preferences-desktop</property> <property name="name">menusettings</property> <property name="label" translatable="yes">_Settings</property> </object> diff --git a/src/empathy-call.c b/src/empathy-call.c index 9d5ab8a83..8a5549694 100644 --- a/src/empathy-call.c +++ b/src/empathy-call.c @@ -23,7 +23,6 @@ #include "config.h" #include <glib/gi18n.h> - #include <clutter-gtk/clutter-gtk.h> #include <clutter-gst/clutter-gst.h> @@ -31,13 +30,12 @@ #include <X11/Xlib.h> #endif -#include <libempathy-gtk/empathy-ui-utils.h> - -#include "empathy-call-window.h" #include "empathy-call-factory.h" +#include "empathy-call-window.h" +#include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /* Exit after $TIMEOUT seconds if not displaying any call window */ #define TIMEOUT 60 diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c index a6f8d3d12..8dc037bdb 100644 --- a/src/empathy-camera-menu.c +++ b/src/empathy-camera-menu.c @@ -20,14 +20,13 @@ */ #include "config.h" - -#include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-gsettings.h> - #include "empathy-camera-menu.h" +#include "empathy-camera-monitor.h" +#include "empathy-gsettings.h" + #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" struct _EmpathyCameraMenuPrivate { diff --git a/src/empathy-camera-menu.h b/src/empathy-camera-menu.h index 92760f67d..b55726bed 100644 --- a/src/empathy-camera-menu.h +++ b/src/empathy-camera-menu.h @@ -19,7 +19,6 @@ #ifndef __EMPATHY_CAMERA_MENU_H__ #define __EMPATHY_CAMERA_MENU_H__ -#include <glib-object.h> #include "empathy-call-window.h" diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 15a4e7a4f..02ed0d949 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -18,23 +18,18 @@ */ #include "config.h" +#include "empathy-chat-manager.h" #include <telepathy-glib/proxy-subclass.h> -#include <libempathy/empathy-chatroom-manager.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-individual-manager.h> - -#include <libempathy-gtk/empathy-ui-utils.h> - +#include "empathy-chatroom-manager.h" #include "empathy-chat-window.h" +#include "empathy-request-util.h" +#include "empathy-ui-utils.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> - -#include "empathy-chat-manager.h" - -#include <extensions/extensions.h> +#include "empathy-debug.h" enum { CLOSED_CHATS_CHANGED, diff --git a/src/empathy-chat-manager.h b/src/empathy-chat-manager.h index 7dfd53480..b5516c33d 100644 --- a/src/empathy-chat-manager.h +++ b/src/empathy-chat-manager.h @@ -20,9 +20,8 @@ #ifndef __EMPATHY_CHAT_MANAGER_H__ #define __EMPATHY_CHAT_MANAGER_H__ -#include <glib-object.h> -#include <libempathy-gtk/empathy-chat.h> +#include "empathy-chat.h" G_BEGIN_DECLS diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 292c1a9a7..480570d0b 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -26,31 +26,27 @@ */ #include "config.h" +#include "empathy-chat-window.h" -#include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libempathy/empathy-client-factory.h> -#include <libempathy/empathy-chatroom-manager.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-individual-manager.h> - -#include <libempathy-gtk/empathy-images.h> -#include <libempathy-gtk/empathy-geometry.h> -#include <libempathy-gtk/empathy-smiley-manager.h> -#include <libempathy-gtk/empathy-sound-manager.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-notify-manager.h> - -#include "empathy-chat-manager.h" -#include "empathy-chat-window.h" #include "empathy-about-dialog.h" +#include "empathy-chat-manager.h" +#include "empathy-chatroom-manager.h" +#include "empathy-client-factory.h" +#include "empathy-geometry.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" #include "empathy-invite-participant-dialog.h" +#include "empathy-notify-manager.h" +#include "empathy-request-util.h" +#include "empathy-smiley-manager.h" +#include "empathy-sound-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /* Macro to compare guint32 X timestamps, while accounting for wrapping around */ diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h index 2041634aa..ae986cc7f 100644 --- a/src/empathy-chat-window.h +++ b/src/empathy-chat-window.h @@ -27,12 +27,11 @@ #ifndef __EMPATHY_CHAT_WINDOW_H__ #define __EMPATHY_CHAT_WINDOW_H__ -#include <glib-object.h> #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> -#include <libempathy-gtk/empathy-chat.h> +#include "empathy-chat.h" +#include "empathy-individual-manager.h" G_BEGIN_DECLS diff --git a/src/empathy-chat.c b/src/empathy-chat.c index 0e70885d7..1c4c57d25 100644 --- a/src/empathy-chat.c +++ b/src/empathy-chat.c @@ -23,19 +23,17 @@ #include "config.h" #include <glib/gi18n.h> - #include <libnotify/notify.h> -#include <libempathy/empathy-presence-manager.h> - -#include <libempathy-gtk/empathy-theme-manager.h> -#include <libempathy-gtk/empathy-ui-utils.h> - #include "empathy-chat-manager.h" #include "empathy-chat-resources.h" +#include "empathy-presence-manager.h" +#include "empathy-theme-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /* Exit after $TIMEOUT seconds if not displaying any call window */ #define TIMEOUT 60 @@ -68,6 +66,7 @@ activate_cb (GApplication *application) return; activated = TRUE; + empathy_gtk_init (); if (!use_timer) { @@ -100,7 +99,7 @@ main (int argc, gint retval; optcontext = g_option_context_new (N_("- Empathy Chat Client")); - g_option_context_add_group (optcontext, gtk_get_option_group (TRUE)); + g_option_context_add_group (optcontext, gtk_get_option_group (FALSE)); g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE); g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE); @@ -115,7 +114,7 @@ main (int argc, g_option_context_free (optcontext); - empathy_gtk_init (); + empathy_init (); /* Make empathy and empathy-chat appear as the same app in gnome-shell */ gdk_set_program_class ("Empathy"); diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c index a18cccb1f..553c91290 100644 --- a/src/empathy-chatrooms-window.c +++ b/src/empathy-chatrooms-window.c @@ -24,16 +24,14 @@ */ #include "config.h" +#include "empathy-chatrooms-window.h" #include <glib/gi18n.h> -#include <libempathy/empathy-chatroom-manager.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-account-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> - -#include "empathy-chatrooms-window.h" +#include "empathy-account-chooser.h" +#include "empathy-chatroom-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" typedef struct { EmpathyChatroomManager *manager; diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 0a1d7f786..4522c6a02 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -20,18 +20,17 @@ */ #include "config.h" +#include "empathy-debug-window.h" #include <glib/gi18n.h> #include <libsoup/soup.h> -#define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-geometry.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-geometry.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include "empathy-debug-window.h" +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window, GTK_TYPE_WINDOW) diff --git a/src/empathy-debug-window.h b/src/empathy-debug-window.h index 42bb43ef7..c8944bf03 100644 --- a/src/empathy-debug-window.h +++ b/src/empathy-debug-window.h @@ -21,11 +21,10 @@ #ifndef __EMPATHY_DEBUG_WINDOW_H__ #define __EMPATHY_DEBUG_WINDOW_H__ -G_BEGIN_DECLS - -#include <glib-object.h> #include <gtk/gtk.h> +G_BEGIN_DECLS + #define EMPATHY_TYPE_DEBUG_WINDOW (empathy_debug_window_get_type ()) #define EMPATHY_DEBUG_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST \ ((object), EMPATHY_TYPE_DEBUG_WINDOW, EmpathyDebugWindow)) diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c index 00dc98c8d..fb4ef1e4c 100644 --- a/src/empathy-debugger.c +++ b/src/empathy-debugger.c @@ -21,9 +21,8 @@ #include <glib/gi18n.h> -#include <libempathy-gtk/empathy-ui-utils.h> - #include "empathy-debug-window.h" +#include "empathy-ui-utils.h" #define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger" @@ -31,7 +30,7 @@ static GtkWidget *window = NULL; static gchar *service = NULL; static void -activate_cb (GApplication *app) +app_activate (GApplication *app) { if (window == NULL) { @@ -45,20 +44,31 @@ activate_cb (GApplication *app) gtk_window_present (GTK_WINDOW (window)); } - if (service != NULL) + if (!tp_str_empty (service)) empathy_debug_window_show (EMPATHY_DEBUG_WINDOW (window), service); } -static gint -command_line_cb (GApplication *application, - GApplicationCommandLine *command_line, - gpointer user_data) +static void +on_show_service_cb (GAction *action, + GVariant *parameter, + gpointer data) +{ + g_free (service); + service = g_variant_dup_string (parameter, NULL); +} + +static gboolean +local_cmdline (GApplication *app, + gchar ***arguments, + gint *exit_status) { GError *error = NULL; + GSimpleAction *action; gchar **argv; gint argc; - gint retval = 0; + gint i; + gboolean retval = TRUE; GOptionContext *optcontext; GOptionEntry options[] = { @@ -70,10 +80,18 @@ command_line_cb (GApplication *application, }; optcontext = g_option_context_new (N_("- Empathy Debugger")); - g_option_context_add_group (optcontext, gtk_get_option_group (TRUE)); + g_option_context_add_group (optcontext, gtk_get_option_group (FALSE)); g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE); g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE); - argv = g_application_command_line_get_arguments (command_line, &argc); + + action = g_simple_action_new ("show-service", G_VARIANT_TYPE_STRING); + g_signal_connect (action, "activate", G_CALLBACK (on_show_service_cb), app); + g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (action)); + g_object_unref (action); + + argv = *arguments; + for (i = 0; argv[i] != NULL; i++) + argc++; if (!g_option_context_parse (optcontext, &argc, &argv, &error)) { @@ -81,13 +99,27 @@ command_line_cb (GApplication *application, "line options.\n", error->message, argv[0]); - retval = 1; + g_clear_error (&error); + *exit_status = EXIT_FAILURE; + } + else + { + if (g_application_register (app, NULL, &error)) + { + GVariant *parameter = g_variant_new_string (service ? service : ""); + g_action_group_activate_action (G_ACTION_GROUP (app), "show-service", parameter); + + g_application_activate (app); + } + else + { + g_warning("Impossible to register empathy-debugger: %s", error->message); + g_clear_error (&error); + *exit_status = EXIT_FAILURE; + } } g_option_context_free (optcontext); - g_strfreev (argv); - - g_application_activate (application); return retval; } @@ -97,16 +129,15 @@ main (int argc, char **argv) { GtkApplication *app; + GApplicationClass *app_class; gint retval; - gtk_init (&argc, &argv); - empathy_gtk_init (); textdomain (GETTEXT_PACKAGE); - app = gtk_application_new (EMPATHY_DEBUGGER_DBUS_NAME, - G_APPLICATION_HANDLES_COMMAND_LINE); - g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL); - g_signal_connect (app, "command-line", G_CALLBACK (command_line_cb), NULL); + app = gtk_application_new (EMPATHY_DEBUGGER_DBUS_NAME, G_APPLICATION_FLAGS_NONE); + app_class = G_APPLICATION_CLASS (G_OBJECT_GET_CLASS (app)); + app_class->local_command_line = local_cmdline; + app_class->activate = app_activate; g_set_application_name (_("Empathy Debugger")); diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index f652c2164..a0171858a 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -20,26 +20,24 @@ */ #include "config.h" +#include "empathy-event-manager.h" #include <glib/gi18n.h> -#include <libempathy/empathy-presence-manager.h> -#include <libempathy/empathy-connection-aggregator.h> -#include <libempathy/empathy-tp-chat.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-sasl-mechanisms.h> - -#include <libempathy-gtk/empathy-images.h> -#include <libempathy-gtk/empathy-sound-manager.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-call-utils.h> -#include <libempathy-gtk/empathy-subscription-dialog.h> - -#include "empathy-event-manager.h" +#include "empathy-call-utils.h" +#include "empathy-connection-aggregator.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" +#include "empathy-presence-manager.h" +#include "empathy-sasl-mechanisms.h" +#include "empathy-sound-manager.h" +#include "empathy-subscription-dialog.h" +#include "empathy-tp-chat.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager) diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h index 70af9a1c2..f2878c7ca 100644 --- a/src/empathy-event-manager.h +++ b/src/empathy-event-manager.h @@ -22,10 +22,9 @@ #ifndef __EMPATHY_EVENT_MANAGER_H__ #define __EMPATHY_EVENT_MANAGER_H__ -#include <glib.h> #include <glib-object.h> -#include <libempathy/empathy-contact.h> +#include "empathy-contact.h" G_BEGIN_DECLS diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c index f89004f32..18e05dc19 100644 --- a/src/empathy-ft-manager.c +++ b/src/empathy-ft-manager.c @@ -28,17 +28,16 @@ /* The original file transfer manager code was copied from Epiphany */ #include "config.h" +#include "empathy-ft-manager.h" #include <glib/gi18n.h> -#define DEBUG_FLAG EMPATHY_DEBUG_FT -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-geometry.h> +#include "empathy-geometry.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include "empathy-ft-manager.h" +#define DEBUG_FLAG EMPATHY_DEBUG_FT +#include "empathy-debug.h" enum { diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h index 0ff820f06..be41730eb 100644 --- a/src/empathy-ft-manager.h +++ b/src/empathy-ft-manager.h @@ -25,11 +25,9 @@ #ifndef __EMPATHY_FT_MANAGER_H__ #define __EMPATHY_FT_MANAGER_H__ -#include <gtk/gtk.h> #include <glib-object.h> -#include <glib.h> -#include <libempathy/empathy-ft-handler.h> +#include "empathy-ft-handler.h" G_BEGIN_DECLS diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index d4dd70d01..5e6fa8d55 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -21,15 +21,15 @@ */ #include "config.h" +#include "empathy-import-dialog.h" #include <glib/gi18n-lib.h> -#include "empathy-import-dialog.h" #include "empathy-import-widget.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> +#include "empathy-debug.h" enum { PROP_PARENT = 1, diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h index a412037d1..87f1198f1 100644 --- a/src/empathy-import-dialog.h +++ b/src/empathy-import-dialog.h @@ -25,7 +25,7 @@ #ifndef __EMPATHY_IMPORT_DIALOG_H__ #define __EMPATHY_IMPORT_DIALOG_H__ -#include <libempathy/empathy-connection-managers.h> +#include "empathy-connection-managers.h" G_BEGIN_DECLS diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c index 8fd7eaef4..92adb861e 100644 --- a/src/empathy-import-pidgin.c +++ b/src/empathy-import-pidgin.c @@ -20,16 +20,16 @@ * */ #include "config.h" +#include "empathy-import-pidgin.h" #include <glib/gstdio.h> #include <dbus/dbus-protocol.h> #include "empathy-import-utils.h" -#include "empathy-import-pidgin.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> +#include "empathy-debug.h" /* Pidgin to CM map */ typedef struct diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c index 7007dee57..c38233647 100644 --- a/src/empathy-import-utils.c +++ b/src/empathy-import-utils.c @@ -19,11 +19,12 @@ * Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> */ -#include <libempathy/empathy-connection-managers.h> -#include <libempathy/empathy-utils.h> - +#include "config.h" #include "empathy-import-utils.h" + +#include "empathy-connection-managers.h" #include "empathy-import-pidgin.h" +#include "empathy-utils.h" EmpathyImportAccountData * empathy_import_account_data_new (const gchar *source) diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h index 59e1cb4d4..d860c4ee8 100644 --- a/src/empathy-import-utils.h +++ b/src/empathy-import-utils.h @@ -23,7 +23,6 @@ #define __EMPATHY_IMPORT_UTILS_H__ #include <telepathy-glib/telepathy-glib.h> -#include <glib.h> G_BEGIN_DECLS diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c index 77048a4b7..86dc95150 100644 --- a/src/empathy-import-widget.c +++ b/src/empathy-import-widget.c @@ -23,17 +23,15 @@ /* empathy-import-widget.c */ #include "config.h" - -#include "empathy-import-dialog.h" #include "empathy-import-widget.h" -#define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> +#include <glib/gi18n-lib.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include <glib/gi18n-lib.h> +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyImportWidget, empathy_import_widget, G_TYPE_OBJECT) diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h index 14a01d79d..8e9f32f5a 100644 --- a/src/empathy-import-widget.h +++ b/src/empathy-import-widget.h @@ -25,10 +25,9 @@ #ifndef __EMPATHY_IMPORT_WIDGET_H__ #define __EMPATHY_IMPORT_WIDGET_H__ -#include <glib-object.h> - -#include <libempathy/empathy-connection-managers.h> +#include <gtk/gtk.h> +#include "empathy-connection-managers.h" #include "empathy-import-utils.h" G_BEGIN_DECLS diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c index 0b42ab4a7..e562dc564 100644 --- a/src/empathy-invite-participant-dialog.c +++ b/src/empathy-invite-participant-dialog.c @@ -10,14 +10,12 @@ */ #include "config.h" - -#include <glib/gi18n.h> - #include "empathy-invite-participant-dialog.h" -#include <libempathy/empathy-utils.h> +#include <glib/gi18n.h> -#include <libempathy-gtk/empathy-contact-chooser.h> +#include "empathy-contact-chooser.h" +#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyInviteParticipantDialog, empathy_invite_participant_dialog, GTK_TYPE_DIALOG); diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h index 7946fa001..daa3448d2 100644 --- a/src/empathy-invite-participant-dialog.h +++ b/src/empathy-invite-participant-dialog.h @@ -13,10 +13,9 @@ #define __EMPATHY_INVITE_PARTICIPANT_DIALOG_H__ #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> -#include "libempathy/empathy-tp-chat.h" +#include "empathy-tp-chat.h" G_BEGIN_DECLS diff --git a/src/empathy-mic-menu.c b/src/empathy-mic-menu.c index b86aec4be..612ff34be 100644 --- a/src/empathy-mic-menu.c +++ b/src/empathy-mic-menu.c @@ -20,12 +20,12 @@ */ #include "config.h" - #include "empathy-mic-menu.h" + #include "empathy-mic-monitor.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" struct _EmpathyMicMenuPrivate { diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c index c06e786ed..ae2b0c071 100644 --- a/src/empathy-mic-monitor.c +++ b/src/empathy-mic-monitor.c @@ -18,16 +18,14 @@ */ #include "config.h" +#include "empathy-mic-monitor.h" -#include <gtk/gtk.h> #include <pulse/glib-mainloop.h> -#include "empathy-mic-monitor.h" - -#include <libempathy/empathy-utils.h> +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" enum { diff --git a/src/empathy-mic-monitor.h b/src/empathy-mic-monitor.h index 4ad4a28fa..73771681a 100644 --- a/src/empathy-mic-monitor.h +++ b/src/empathy-mic-monitor.h @@ -19,8 +19,7 @@ #ifndef __EMPATHY_MIC_MONITOR_H__ #define __EMPATHY_MIC_MONITOR_H__ -#include <glib-object.h> - +#include <gio/gio.h> #include <pulse/pulseaudio.h> G_BEGIN_DECLS diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index cb8f2a1fb..5edf45a5a 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -22,20 +22,18 @@ */ #include "config.h" +#include "empathy-new-chatroom-dialog.h" #include <glib/gi18n.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-gsettings.h> - -#include <libempathy-gtk/empathy-account-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> - -#include "empathy-new-chatroom-dialog.h" +#include "empathy-account-chooser.h" +#include "empathy-gsettings.h" +#include "empathy-request-util.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyNewChatroomDialog, empathy_new_chatroom_dialog, GTK_TYPE_DIALOG) diff --git a/src/empathy-new-chatroom-dialog.h b/src/empathy-new-chatroom-dialog.h index 02bf3b2a0..31212cb56 100644 --- a/src/empathy-new-chatroom-dialog.h +++ b/src/empathy-new-chatroom-dialog.h @@ -24,7 +24,7 @@ #ifndef __EMPATHY_NEW_CHATROOM_DIALOG_H__ #define __EMPATHY_NEW_CHATROOM_DIALOG_H__ -#include <glib-object.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c index c3c996bd6..fb36f2ac3 100644 --- a/src/empathy-notifications-approver.c +++ b/src/empathy-notifications-approver.c @@ -18,18 +18,16 @@ */ #include "config.h" +#include "empathy-notifications-approver.h" #include <glib/gi18n.h> -#include <libempathy-gtk/empathy-notify-manager.h> -#include <libempathy-gtk/empathy-call-utils.h> - +#include "empathy-call-utils.h" #include "empathy-event-manager.h" +#include "empathy-notify-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> - -#include "empathy-notifications-approver.h" +#include "empathy-debug.h" struct _EmpathyNotificationsApproverPrivate { diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index bfeef61b6..6901aa9c8 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -24,21 +24,19 @@ */ #include "config.h" +#include "empathy-preferences.h" #include <glib/gi18n.h> -#include <libempathy/empathy-client-factory.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-theme-manager.h> -#include <libempathy-gtk/empathy-spell.h> - -#include "empathy-preferences.h" +#include "empathy-client-factory.h" +#include "empathy-gsettings.h" +#include "empathy-spell.h" +#include "empathy-theme-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG); @@ -1026,7 +1024,7 @@ empathy_preferences_init (EmpathyPreferences *preferences) gtk_window_set_role (GTK_WINDOW (preferences), "preferences"); gtk_window_set_position (GTK_WINDOW (preferences), GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_icon_name (GTK_WINDOW (preferences), "gtk-preferences"); + gtk_window_set_icon_name (GTK_WINDOW (preferences), "preferences-desktop"); filename = empathy_file_lookup ("empathy-preferences.ui", "src"); gui = empathy_builder_get_file (filename, diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index 05d2a1fba..93001d8d4 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -22,44 +22,42 @@ */ #include "config.h" +#include "empathy-roster-window.h" #include <sys/stat.h> #include <glib/gi18n.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-chatroom-manager.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-status-presets.h> -#include <libempathy/empathy-presence-manager.h> - -#include <libempathy-gtk/empathy-contact-blocking-dialog.h> -#include <libempathy-gtk/empathy-contact-search-dialog.h> -#include <libempathy-gtk/empathy-geometry.h> -#include <libempathy-gtk/empathy-gtk-enum-types.h> -#include <libempathy-gtk/empathy-individual-dialogs.h> -#include <libempathy-gtk/empathy-roster-model-manager.h> -#include <libempathy-gtk/empathy-roster-view.h> -#include <libempathy-gtk/empathy-new-message-dialog.h> -#include <libempathy-gtk/empathy-new-call-dialog.h> -#include <libempathy-gtk/empathy-log-window.h> -#include <libempathy-gtk/empathy-presence-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> - +#include "empathy-about-dialog.h" #include "empathy-accounts-dialog.h" #include "empathy-call-observer.h" #include "empathy-chat-manager.h" -#include "empathy-roster-window.h" -#include "empathy-preferences.h" -#include "empathy-about-dialog.h" -#include "empathy-new-chatroom-dialog.h" +#include "empathy-chatroom-manager.h" #include "empathy-chatrooms-window.h" +#include "empathy-contact-blocking-dialog.h" +#include "empathy-contact-search-dialog.h" #include "empathy-event-manager.h" #include "empathy-ft-manager.h" +#include "empathy-geometry.h" +#include "empathy-gsettings.h" +#include "empathy-gsettings.h" +#include "empathy-gtk-enum-types.h" +#include "empathy-individual-dialogs.h" +#include "empathy-log-window.h" +#include "empathy-new-call-dialog.h" +#include "empathy-new-chatroom-dialog.h" +#include "empathy-new-message-dialog.h" +#include "empathy-preferences.h" +#include "empathy-presence-chooser.h" +#include "empathy-presence-manager.h" +#include "empathy-request-util.h" +#include "empathy-roster-model-manager.h" +#include "empathy-roster-view.h" +#include "empathy-status-presets.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /* Flashing delay for icons (milliseconds). */ #define FLASH_TIMEOUT 500 @@ -477,7 +475,7 @@ static void display_page_no_account (EmpathyRosterWindow *self) { display_page_message (self, - _("You need to setup an account to see contacts here."), + _("You need to set up an account to see contacts here."), PAGE_MESSAGE_FLAG_ACCOUNTS); } diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c index 038cb4955..89e3144cc 100644 --- a/src/empathy-rounded-actor.c +++ b/src/empathy-rounded-actor.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-rounded-actor.h" G_DEFINE_TYPE(EmpathyRoundedActor, empathy_rounded_actor, GTK_CLUTTER_TYPE_ACTOR) diff --git a/src/empathy-rounded-actor.h b/src/empathy-rounded-actor.h index 49fc03fd3..29a7797a6 100644 --- a/src/empathy-rounded-actor.h +++ b/src/empathy-rounded-actor.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_ROUNDED_ACTOR_H__ #define __EMPATHY_ROUNDED_ACTOR_H__ -#include <glib-object.h> #include <clutter-gtk/clutter-gtk.h> G_BEGIN_DECLS diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c index 67c0e27c0..810fa0df7 100644 --- a/src/empathy-rounded-rectangle.c +++ b/src/empathy-rounded-rectangle.c @@ -19,11 +19,10 @@ */ #include "config.h" +#include "empathy-rounded-rectangle.h" #include <math.h> -#include "empathy-rounded-rectangle.h" - G_DEFINE_TYPE (EmpathyRoundedRectangle, empathy_rounded_rectangle, CLUTTER_TYPE_CAIRO_TEXTURE) diff --git a/src/empathy-rounded-rectangle.h b/src/empathy-rounded-rectangle.h index e4bf72c6e..b9988d53c 100644 --- a/src/empathy-rounded-rectangle.h +++ b/src/empathy-rounded-rectangle.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_ROUNDED_RECTANGLE_H__ #define __EMPATHY_ROUNDED_RECTANGLE_H__ -#include <glib-object.h> #include <clutter/clutter.h> G_BEGIN_DECLS diff --git a/src/empathy-rounded-texture.c b/src/empathy-rounded-texture.c index 7ac7d040d..46c0b2135 100644 --- a/src/empathy-rounded-texture.c +++ b/src/empathy-rounded-texture.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "empathy-rounded-texture.h" G_DEFINE_TYPE (EmpathyRoundedTexture, diff --git a/src/empathy-rounded-texture.h b/src/empathy-rounded-texture.h index ab75757dd..c5d870d03 100644 --- a/src/empathy-rounded-texture.h +++ b/src/empathy-rounded-texture.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_ROUNDED_TEXTURE_H__ #define __EMPATHY_ROUNDED_TEXTURE_H__ -#include <glib-object.h> #include <clutter/clutter.h> G_BEGIN_DECLS diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c index f7ac7d996..827a34eba 100644 --- a/src/empathy-sanity-cleaning.c +++ b/src/empathy-sanity-cleaning.c @@ -22,24 +22,23 @@ */ #include "config.h" - #include "empathy-sanity-cleaning.h" -#include <libempathy/empathy-gsettings.h> - -#include <libempathy-gtk/empathy-theme-manager.h> - #ifdef HAVE_UOA -#include <libempathy/empathy-pkg-kit.h> -#include <libempathy/empathy-uoa-utils.h> - #include <libaccounts-glib/ag-account-service.h> #include <libaccounts-glib/ag-manager.h> #include <libaccounts-glib/ag-service.h> + +#include "empathy-keyring.h" +#include "empathy-pkg-kit.h" +#include "empathy-uoa-utils.h" #endif +#include "empathy-gsettings.h" +#include "empathy-theme-manager.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /* * This number has to be increased each time a new task is added or modified. diff --git a/src/empathy-sanity-cleaning.h b/src/empathy-sanity-cleaning.h index 32000163f..f72993257 100644 --- a/src/empathy-sanity-cleaning.h +++ b/src/empathy-sanity-cleaning.h @@ -24,10 +24,14 @@ #include <gio/gio.h> +G_BEGIN_DECLS + void empathy_sanity_checking_run_async (GAsyncReadyCallback callback, gpointer user_data); gboolean empathy_sanity_checking_run_finish (GAsyncResult *result, GError **error); +G_END_DECLS + #endif diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index 54e49a30e..917fab383 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -20,20 +20,18 @@ */ #include "config.h" - -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-presence-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-new-message-dialog.h> -#include <libempathy-gtk/empathy-new-call-dialog.h> - #include "empathy-status-icon.h" + #include "empathy-event-manager.h" +#include "empathy-gsettings.h" +#include "empathy-new-call-dialog.h" +#include "empathy-new-message-dialog.h" +#include "empathy-presence-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" /* Number of ms to wait when blinking */ #define BLINK_TIMEOUT 500 diff --git a/src/empathy-status-icon.h b/src/empathy-status-icon.h index ca21af833..586e651e2 100644 --- a/src/empathy-status-icon.h +++ b/src/empathy-status-icon.h @@ -22,7 +22,7 @@ #ifndef __EMPATHY_STATUS_ICON_H__ #define __EMPATHY_STATUS_ICON_H__ -#include <glib.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c index 12f8d6b47..9856efed9 100644 --- a/src/empathy-video-src.c +++ b/src/empathy-video-src.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-video-src.h" #ifdef HAVE_GST1 #include <gst/video/colorbalance.h> @@ -27,9 +28,7 @@ #endif #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include <libempathy/empathy-debug.h> - -#include "empathy-video-src.h" +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyGstVideoSrc, empathy_video_src, GST_TYPE_BIN) diff --git a/src/empathy-video-src.h b/src/empathy-video-src.h index e49c79a00..60127ba2d 100644 --- a/src/empathy-video-src.h +++ b/src/empathy-video-src.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_GST_VIDEO_SRC_H__ #define __EMPATHY_GST_VIDEO_SRC_H__ -#include <glib-object.h> #include <gst/gst.h> G_BEGIN_DECLS diff --git a/src/empathy.c b/src/empathy.c index c36f2a2d7..5cfe9f38b 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -23,34 +23,31 @@ #include <glib/gstdio.h> #include <glib/gi18n.h> +#include <libnotify/notify.h> #ifdef HAVE_LIBCHAMPLAIN #include <clutter-gtk/clutter-gtk.h> #endif -#include <libnotify/notify.h> - -#include <libempathy/empathy-client-factory.h> -#include <libempathy/empathy-connection-aggregator.h> -#include <libempathy/empathy-presence-manager.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-chatroom-manager.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-ft-factory.h> -#include <libempathy/empathy-gsettings.h> - -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-location-manager.h> - -#include "empathy-roster-window.h" #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" -#include "empathy-status-icon.h" +#include "empathy-chatroom-manager.h" +#include "empathy-client-factory.h" +#include "empathy-connection-aggregator.h" +#include "empathy-ft-factory.h" #include "empathy-ft-manager.h" +#include "empathy-gsettings.h" +#include "empathy-location-manager.h" #include "empathy-notifications-approver.h" +#include "empathy-presence-manager.h" +#include "empathy-request-util.h" +#include "empathy-roster-window.h" +#include "empathy-status-icon.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" #define EMPATHY_DBUS_NAME "org.gnome.Empathy" @@ -214,11 +211,6 @@ new_ft_handler_cb (EmpathyFTFactory *factory, g_object_unref (handler); } -static gboolean -empathy_app_local_command_line (GApplication *app, - gchar ***arguments, - gint *exit_status); - static void empathy_presence_manager_set_auto_away_cb (GSettings *gsettings, const gchar *key, @@ -285,32 +277,18 @@ out: } } -static int -empathy_app_command_line (GApplication *app, - GApplicationCommandLine *cmdline) +static void +empathy_app_activate (GApplication *app) { EmpathyApp *self = (EmpathyApp *) app; - gchar **args, **argv; - gint argc, exit_status, i; - - args = g_application_command_line_get_arguments (cmdline, &argc); - /* We have to make an extra copy of the array, since g_option_context_parse() - * assumes that it can remove strings from the array without freeing them. */ - argv = g_new (gchar*, argc + 1); - for (i = 0; i <= argc; i++) - argv[i] = args[i]; - - if (empathy_app_local_command_line (app, &argv, &exit_status)) - DEBUG ("failed to parse command line!"); - - g_free (argv); - g_strfreev (args); if (!self->activated) { GError *error = NULL; TpDBusDaemon *dbus; + empathy_gtk_init (); + /* Create the FT factory */ self->ft_factory = empathy_ft_factory_dup_singleton (); g_signal_connect (self->ft_factory, "new-ft-handler", @@ -356,7 +334,8 @@ empathy_app_command_line (GApplication *app, if (self->show_preferences) { empathy_roster_window_show_preferences ( - EMPATHY_ROSTER_WINDOW (self->window), self->preferences_tab); + EMPATHY_ROSTER_WINDOW (self->window), + tp_str_empty (self->preferences_tab) ? NULL : self->preferences_tab); self->show_preferences = FALSE; } @@ -369,8 +348,6 @@ empathy_app_command_line (GApplication *app, /* Display the accounts dialog if needed */ tp_proxy_prepare_async (self->account_manager, NULL, account_manager_ready_cb, self); - - return 0; } static gboolean @@ -395,16 +372,30 @@ show_version_cb (const char *option_name, gpointer data, GError **error); +static void +open_preference_action_cb (GAction *action, + GVariant *parameter, + gpointer data) +{ + EmpathyApp *self = EMPATHY_APP (data); + + self->show_preferences = TRUE; + + g_free (self->preferences_tab); + self->preferences_tab = g_variant_dup_string (parameter, NULL); +} + static gboolean empathy_app_local_command_line (GApplication *app, gchar ***arguments, gint *exit_status) { EmpathyApp *self = (EmpathyApp *) app; + GSimpleAction *action; gint i; gchar **argv; gint argc = 0; - gboolean retval = FALSE; + gboolean retval = TRUE; GError *error = NULL; gboolean no_connect = FALSE, start_hidden = FALSE; @@ -428,13 +419,26 @@ empathy_app_local_command_line (GApplication *app, { NULL } }; + if (!g_application_register (app, NULL, &error)) + { + g_warning("Impossible to register empathy: %s", error->message); + g_clear_error (&error); + *exit_status = EXIT_FAILURE; + return retval; + } + + action = g_simple_action_new ("open-preferences", G_VARIANT_TYPE_STRING); + g_signal_connect (action, "activate", G_CALLBACK (open_preference_action_cb), app); + g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (action)); + g_object_unref (action); + /* We create a group so that GOptionArgFuncs get the user data */ group = g_option_group_new ("empathy", NULL, NULL, app, NULL); g_option_group_set_translation_domain (group, GETTEXT_PACKAGE); g_option_group_add_entries (group, options); optcontext = g_option_context_new (N_("- Empathy IM Client")); - g_option_context_add_group (optcontext, gtk_get_option_group (TRUE)); + g_option_context_add_group (optcontext, gtk_get_option_group (FALSE)); g_option_context_set_main_group (optcontext, group); g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE); @@ -453,17 +457,27 @@ empathy_app_local_command_line (GApplication *app, "line options.\n", error->message, argv[0]); g_warning ("Error in empathy init: %s", error->message); + g_clear_error (&error); *exit_status = EXIT_FAILURE; - retval = TRUE; } + else + { + self->no_connect = no_connect; + self->start_hidden = start_hidden; - g_free (argv); + if (self->show_preferences) + { + GVariant *parameter; + parameter = g_variant_new_string (self->preferences_tab ? self->preferences_tab : ""); + g_action_group_activate_action (G_ACTION_GROUP (app), "open-preferences", parameter); + } - g_option_context_free (optcontext); + g_application_activate (app); + } - self->no_connect = no_connect; - self->start_hidden = start_hidden; + g_free (argv); + g_option_context_free (optcontext); return retval; } @@ -482,8 +496,8 @@ empathy_app_class_init (EmpathyAppClass *klass) gobject_class->dispose = empathy_app_dispose; gobject_class->finalize = empathy_app_finalize; - g_app_class->command_line = empathy_app_command_line; g_app_class->local_command_line = empathy_app_local_command_line; + g_app_class->activate = empathy_app_activate; spec = g_param_spec_boolean ("no-connect", "no connect", "Don't connect on startup", @@ -818,14 +832,11 @@ main (int argc, char *argv[]) g_type_init (); empathy_init (); - gtk_init (&argc, &argv); - empathy_gtk_init (); add_empathy_features (); app = g_object_new (EMPATHY_TYPE_APP, "application-id", EMPATHY_DBUS_NAME, - "flags", G_APPLICATION_HANDLES_COMMAND_LINE, NULL); retval = g_application_run (G_APPLICATION (app), argc, argv); diff --git a/tests/Makefile.am b/tests/Makefile.am index fdd67482a..67fe5d895 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,7 +10,8 @@ EXTRA_DIST = \ AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ -DGCR_API_SUBJECT_TO_CHANGE \ $(EMPATHY_CFLAGS) \ diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c index 7ecb82ac4..7ebf87803 100644 --- a/tests/empathy-chatroom-manager-test.c +++ b/tests/empathy-chatroom-manager-test.c @@ -1,12 +1,4 @@ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <glib/gstdio.h> - -#include <telepathy-glib/telepathy-glib.h> - -#include <libempathy/empathy-chatroom-manager.h> - +#include "empathy-chatroom-manager.h" #include "test-helper.h" #define CHATROOM_SAMPLE "chatrooms-sample.xml" diff --git a/tests/empathy-chatroom-test.c b/tests/empathy-chatroom-test.c index 3826411a5..a64fd2ce0 100644 --- a/tests/empathy-chatroom-test.c +++ b/tests/empathy-chatroom-test.c @@ -3,8 +3,7 @@ #include <string.h> #include "test-helper.h" - -#include <libempathy/empathy-chatroom.h> +#include "empathy-chatroom.h" #if 0 static EmpathyChatroom * diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c index ba01c3782..7fb195f02 100644 --- a/tests/empathy-irc-network-manager-test.c +++ b/tests/empathy-irc-network-manager-test.c @@ -3,10 +3,9 @@ #include <string.h> #include <glib/gstdio.h> -#include "test-irc-helper.h" +#include "empathy-irc-network-manager.h" #include "test-helper.h" - -#include <libempathy/empathy-irc-network-manager.h> +#include "test-irc-helper.h" #define GLOBAL_SAMPLE "default-irc-networks-sample.xml" #define USER_SAMPLE "user-irc-networks-sample.xml" diff --git a/tests/empathy-irc-network-test.c b/tests/empathy-irc-network-test.c index 313ab0651..5ca4fba73 100644 --- a/tests/empathy-irc-network-test.c +++ b/tests/empathy-irc-network-test.c @@ -2,10 +2,9 @@ #include <stdio.h> #include <string.h> -#include "test-irc-helper.h" +#include "empathy-irc-network.h" #include "test-helper.h" - -#include <libempathy/empathy-irc-network.h> +#include "test-irc-helper.h" static void test_empathy_irc_network_new (void) diff --git a/tests/empathy-irc-server-test.c b/tests/empathy-irc-server-test.c index 573967e43..225d57bc8 100644 --- a/tests/empathy-irc-server-test.c +++ b/tests/empathy-irc-server-test.c @@ -2,10 +2,9 @@ #include <stdio.h> #include <string.h> -#include "test-irc-helper.h" +#include "empathy-irc-server.h" #include "test-helper.h" - -#include <libempathy/empathy-irc-server.h> +#include "test-irc-helper.h" static void test_empathy_irc_server_new (void) diff --git a/tests/empathy-live-search-test.c b/tests/empathy-live-search-test.c index 6c53f07ad..10f0346f3 100644 --- a/tests/empathy-live-search-test.c +++ b/tests/empathy-live-search-test.c @@ -4,12 +4,11 @@ #include <stdio.h> #include <string.h> +#include "empathy-live-search.h" #include "test-helper.h" #define DEBUG_FLAG EMPATHY_DEBUG_TESTS -#include <libempathy/empathy-debug.h> - -#include <libempathy-gtk/empathy-live-search.h> +#include "empathy-debug.h" typedef struct { diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c index 4ae6f775a..0cf037444 100644 --- a/tests/empathy-parser-test.c +++ b/tests/empathy-parser-test.c @@ -3,15 +3,13 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <telepathy-glib/telepathy-glib.h> +#include "empathy-string-parser.h" #include "test-helper.h" -#include <telepathy-glib/telepathy-glib.h> - #define DEBUG_FLAG EMPATHY_DEBUG_TESTS -#include <libempathy/empathy-debug.h> - -#include <libempathy-gtk/empathy-string-parser.h> +#include "empathy-debug.h" static void test_replace_match (const gchar *text, diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c index 2004383d6..2155c68b2 100644 --- a/tests/empathy-tls-test.c +++ b/tests/empathy-tls-test.c @@ -1,18 +1,9 @@ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -#include <libempathy/empathy-tls-verifier.h> -#include "test-helper.h" -#include "mock-pkcs11.h" - -#include <gcr/gcr.h> - #include <gnutls/gnutls.h> - -#include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/svc-tls.h> -#include <telepathy-glib/svc-generic.h> + +#include "empathy-tls-verifier.h" +#include "mock-pkcs11.h" +#include "test-helper.h" #define MOCK_TLS_CERTIFICATE_PATH "/mock/certificate" diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 27fdbf7e4..4ca1989ee 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ $(EMPATHY_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c index 0ed9f95e4..613bf7516 100644 --- a/tests/interactive/empathy-logs.c +++ b/tests/interactive/empathy-logs.c @@ -19,15 +19,16 @@ * Authors: Xavier Claessens <xclaesse@gmail.com> */ -#include <config.h> +#include "config.h" + #include <stdlib.h> #include <glib.h> #include <gtk/gtk.h> -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> -#include <libempathy-gtk/empathy-log-window.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-debug.h" +#include "empathy-log-window.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" static void destroy_cb (GtkWidget *dialog, diff --git a/tests/interactive/test-empathy-account-chooser.c b/tests/interactive/test-empathy-account-chooser.c index 7622a6248..159f8fcfa 100644 --- a/tests/interactive/test-empathy-account-chooser.c +++ b/tests/interactive/test-empathy-account-chooser.c @@ -1,9 +1,9 @@ -#include <config.h> +#include "config.h" #include <gtk/gtk.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-account-chooser.h> +#include "empathy-account-chooser.h" +#include "empathy-ui-utils.h" static void filter_func (TpAccount *account, diff --git a/tests/interactive/test-empathy-calendar-button.c b/tests/interactive/test-empathy-calendar-button.c index df91f1f2d..81241090f 100644 --- a/tests/interactive/test-empathy-calendar-button.c +++ b/tests/interactive/test-empathy-calendar-button.c @@ -21,7 +21,7 @@ #include "config.h" -#include <libempathy-gtk/empathy-calendar-button.h> +#include "empathy-calendar-button.h" static void date_changed_cb (EmpathyCalendarButton *button, diff --git a/tests/interactive/test-empathy-contact-blocking-dialog.c b/tests/interactive/test-empathy-contact-blocking-dialog.c index 66353f13d..185f4e954 100644 --- a/tests/interactive/test-empathy-contact-blocking-dialog.c +++ b/tests/interactive/test-empathy-contact-blocking-dialog.c @@ -19,14 +19,13 @@ * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk> */ -#include <config.h> +#include "config.h" #include <gtk/gtk.h> -#include <libempathy/empathy-client-factory.h> - -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-contact-blocking-dialog.h> +#include "empathy-client-factory.h" +#include "empathy-contact-blocking-dialog.h" +#include "empathy-ui-utils.h" static void am_prepare_cb (GObject *source, diff --git a/tests/interactive/test-empathy-dual-roster-view.c b/tests/interactive/test-empathy-dual-roster-view.c index 50903c01f..74bb59f17 100644 --- a/tests/interactive/test-empathy-dual-roster-view.c +++ b/tests/interactive/test-empathy-dual-roster-view.c @@ -1,10 +1,9 @@ -#include <config.h> +#include "config.h" -#include <libempathy-gtk/empathy-roster-model.h> -#include <libempathy-gtk/empathy-roster-model-manager.h> - -#include <libempathy-gtk/empathy-roster-view.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-roster-model.h" +#include "empathy-roster-model-manager.h" +#include "empathy-roster-view.h" +#include "empathy-ui-utils.h" static void individual_activated_cb (EmpathyRosterView *self, diff --git a/tests/interactive/test-empathy-presence-chooser.c b/tests/interactive/test-empathy-presence-chooser.c index 12d35b4c6..208c9a12e 100644 --- a/tests/interactive/test-empathy-presence-chooser.c +++ b/tests/interactive/test-empathy-presence-chooser.c @@ -20,14 +20,13 @@ * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk> */ -#include <config.h> +#include "config.h" #include <gtk/gtk.h> -#include <libempathy/empathy-status-presets.h> - -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-presence-chooser.h> +#include "empathy-presence-chooser.h" +#include "empathy-status-presets.h" +#include "empathy-ui-utils.h" int main (int argc, char **argv) diff --git a/tests/interactive/test-empathy-protocol-chooser.c b/tests/interactive/test-empathy-protocol-chooser.c index 90b1797a3..ca548a85b 100644 --- a/tests/interactive/test-empathy-protocol-chooser.c +++ b/tests/interactive/test-empathy-protocol-chooser.c @@ -1,9 +1,9 @@ -#include <config.h> +#include "config.h" #include <gtk/gtk.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-protocol-chooser.h> +#include "empathy-protocol-chooser.h" +#include "empathy-ui-utils.h" int main (int argc, diff --git a/tests/interactive/test-empathy-roster-model-aggregator.c b/tests/interactive/test-empathy-roster-model-aggregator.c index 49f2012f0..478b4e6cc 100644 --- a/tests/interactive/test-empathy-roster-model-aggregator.c +++ b/tests/interactive/test-empathy-roster-model-aggregator.c @@ -1,10 +1,9 @@ -#include <config.h> +#include "config.h" -#include <libempathy-gtk/empathy-roster-model.h> -#include <libempathy-gtk/empathy-roster-model-aggregator.h> - -#include <libempathy-gtk/empathy-roster-view.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-roster-model-aggregator.h" +#include "empathy-roster-model.h" +#include "empathy-roster-view.h" +#include "empathy-ui-utils.h" static gboolean show_offline = FALSE; static gboolean show_groups = FALSE; diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c index 96137c395..f814d9658 100644 --- a/tests/interactive/test-empathy-roster-view.c +++ b/tests/interactive/test-empathy-roster-view.c @@ -1,10 +1,9 @@ -#include <config.h> +#include "config.h" -#include <libempathy-gtk/empathy-roster-model.h> -#include <libempathy-gtk/empathy-roster-model-manager.h> - -#include <libempathy-gtk/empathy-roster-view.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-roster-model.h" +#include "empathy-roster-model-manager.h" +#include "empathy-roster-view.h" +#include "empathy-ui-utils.h" static gboolean show_offline = FALSE; static gboolean show_groups = FALSE; diff --git a/tests/interactive/test-empathy-status-preset-dialog.c b/tests/interactive/test-empathy-status-preset-dialog.c index e71852509..2494d78b7 100644 --- a/tests/interactive/test-empathy-status-preset-dialog.c +++ b/tests/interactive/test-empathy-status-preset-dialog.c @@ -22,14 +22,13 @@ * Will Thompson <will.thompson@collabora.co.uk> */ -#include <config.h> +#include "config.h" #include <gtk/gtk.h> -#include <libempathy/empathy-status-presets.h> - -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-status-preset-dialog.h> +#include "empathy-status-preset-dialog.h" +#include "empathy-status-presets.h" +#include "empathy-ui-utils.h" int main (int argc, char **argv) diff --git a/tests/mock-pkcs11.c b/tests/mock-pkcs11.c index 4b1219f2c..572221acc 100644 --- a/tests/mock-pkcs11.c +++ b/tests/mock-pkcs11.c @@ -19,13 +19,8 @@ */ #include "config.h" - #include "mock-pkcs11.h" -#include <gcr/gcr.h> - -#include <glib.h> - #include <string.h> /* diff --git a/tests/mock-pkcs11.h b/tests/mock-pkcs11.h index 67d94bef3..aa024fcc9 100644 --- a/tests/mock-pkcs11.h +++ b/tests/mock-pkcs11.h @@ -18,12 +18,8 @@ * 02111-1307, USA. */ -#include <glib.h> - -#include <gcr/gcr.h> - -#include <p11-kit/pkcs11.h> #include <gck/pkcs11x.h> +#include <gcr/gcr.h> #ifndef MOCK_MODULE_H #define MOCK_MODULE_H diff --git a/tests/test-helper.c b/tests/test-helper.c index ca763adb4..efe3e3fd6 100644 --- a/tests/test-helper.c +++ b/tests/test-helper.c @@ -17,15 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdlib.h> -#include <glib.h> -#include <glib-object.h> -#include <gtk/gtk.h> - -#include <libempathy-gtk/empathy-ui-utils.h> - +#include "config.h" #include "test-helper.h" +#include "empathy-ui-utils.h" + void test_init (int argc, char **argv) diff --git a/tests/test-irc-helper.c b/tests/test-irc-helper.c index ade247f39..6fafac804 100644 --- a/tests/test-irc-helper.c +++ b/tests/test-irc-helper.c @@ -1,3 +1,4 @@ +#include "config.h" #include "test-irc-helper.h" void diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h index e375f6fb6..6010bc186 100644 --- a/tests/test-irc-helper.h +++ b/tests/test-irc-helper.h @@ -1,9 +1,6 @@ -#include <stdlib.h> #include <string.h> -#include <libempathy/empathy-irc-server.h> -#include <libempathy/empathy-irc-network.h> -#include <libempathy/empathy-irc-network-manager.h> +#include "empathy-irc-network-manager.h" #ifndef __CHECK_IRC_HELPER_H__ #define __CHECK_IRC_HELPER_H__ diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am index f76c2fa53..1271f6ec3 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am @@ -2,7 +2,8 @@ plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR) INCLUDES = \ -I$(top_builddir) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DLOCALEDIR=\""$(datadir)/locale"\" \ $(UOA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c index f90815924..58074eecf 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c @@ -30,7 +30,7 @@ #include <libaccounts-glib/ag-service.h> #include <libaccounts-glib/ag-account-service.h> -#include <libempathy-gtk/empathy-account-widget.h> +#include "empathy-account-widget.h" G_DEFINE_TYPE (EmpathyAccountsPluginWidget, empathy_accounts_plugin_widget, GTK_TYPE_BOX) diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h index 17963e656..27d114c0e 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h @@ -18,12 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #ifndef __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__ #define __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__ #include <gtk/gtk.h> - #include <libaccounts-glib/ag-account.h> G_BEGIN_DECLS diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c index 939912aad..1f322ec52 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c @@ -22,8 +22,8 @@ #include "empathy-accounts-plugin.h" -#include <libempathy/empathy-client-factory.h> -#include <libempathy/empathy-uoa-utils.h> +#include "empathy-client-factory.h" +#include "empathy-uoa-utils.h" #include "empathy-accounts-plugin-widget.h" diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am index e3351266b..801c2d8a1 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am @@ -3,6 +3,8 @@ plugindir = $(ACCOUNTS_APP_PLUGIN_DIR) INCLUDES = \ -I$(top_builddir) \ -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DLOCALEDIR=\""$(datadir)/locale"\" \ $(UOA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c index 768f0965d..6895a04d5 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c @@ -27,8 +27,8 @@ #include <libaccounts-glib/ag-manager.h> #include <libaccounts-glib/ag-provider.h> -#include <libempathy/empathy-contact.h> -#include <libempathy-gtk/empathy-user-info.h> +#include "empathy-contact.h" +#include "empathy-user-info.h" #include "empathy-app-plugin-widget.h" diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h index b1bfb28cd..aa9d3a204 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h @@ -18,12 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #ifndef __EMPATHY_APP_PLUGIN_WIDGET_H__ #define __EMPATHY_APP_PLUGIN_WIDGET_H__ #include <gtk/gtk.h> - #include <libaccounts-glib/ag-account.h> G_BEGIN_DECLS diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c index c15a13a7a..c22c6d59b 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c @@ -22,7 +22,7 @@ #include "empathy-app-plugin.h" -#include <libempathy/empathy-client-factory.h> +#include "empathy-client-factory.h" #include "empathy-app-plugin-widget.h" diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h index 0167c851e..679639670 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h @@ -22,7 +22,6 @@ #define __EMPATHY_APP_PLUGIN_H__ #include <glib-object.h> - #include <libaccount-plugin/application-plugin.h> G_BEGIN_DECLS diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c index 439bbda65..761e22154 100644 --- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c +++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c @@ -1,13 +1,10 @@ #include "config.h" +#include "empathy-webcredentials-monitor.h" #include <gio/gio.h> - #include <telepathy-glib/telepathy-glib.h> - #include <libaccounts-glib/ag-account.h> -#include "empathy-webcredentials-monitor.h" - G_DEFINE_TYPE (EmpathyWebcredentialsMonitor, empathy_webcredentials_monitor, G_TYPE_OBJECT) #define WEBCRED_BUS_NAME "com.canonical.indicators.webcredentials" diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h index cf373a2d4..1c96f3368 100644 --- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h +++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h @@ -2,7 +2,6 @@ #define __EMPATHY_WEBCREDENTIALS_MONITOR_H__ #include <glib-object.h> - #include <libaccounts-glib/ag-manager.h> G_BEGIN_DECLS diff --git a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c index 8919065ef..0607b9e29 100644 --- a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c +++ b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c @@ -20,12 +20,10 @@ #include "mcp-account-manager-uoa.h" #include <telepathy-glib/telepathy-glib.h> - #include <libaccounts-glib/ag-account.h> #include <libaccounts-glib/ag-account-service.h> #include <libaccounts-glib/ag-manager.h> #include <libaccounts-glib/ag-service.h> - #include <string.h> #include <ctype.h> diff --git a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c index d7a33fd43..3e61dc3ba 100644 --- a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c +++ b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c @@ -22,6 +22,8 @@ * Authors: Xavier Claessens <xavier.claessens@collabora.co.uk> */ +#include "config.h" + #include <mission-control-plugins/mission-control-plugins.h> #include "mcp-account-manager-uoa.h" |
