diff options
309 files changed, 6814 insertions, 6205 deletions
@@ -1,3 +1,23 @@ +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 #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) ============ Bugs fixed: diff --git a/configure.ac b/configure.ac index d4c07d0d0..f88d1558e 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], [1]) 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/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/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..16e0563ca 100644 --- a/help/C/index.page +++ b/help/C/index.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="guide" id="index"> @@ -25,8 +26,8 @@ </info> <title> - <media type="image" mime="image/png" src="figures/empathy-logo.png"> - Empathy Internet Messenger logo + <media type="image" mime="image/png" src="figures/empathy-logo.png" its:translate="no"> + <span its:translate="yes">Empathy Internet Messenger logo</span> </media> Empathy Internet Messenger </title> 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/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/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..6913e6a64 100644 --- a/help/es/es.po +++ b/help/es/es.po @@ -6,54 +6,36 @@ 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-04-30 11:54+0000\n" +"PO-Revision-Date: 2013-05-02 18:09+0200\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" -"Language-Team: Español <gnome-es-list@gnome.org>\n" +"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Gtranslator 2.91.5\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 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) +#: C/index.page:8(info/title) msgctxt "link" msgid "Empathy Internet Messenger" msgstr "MensajerÃa para Internet Empathy" -#: C/index.page:8(info/title) +#: C/index.page:9(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/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) @@ -76,14 +58,14 @@ msgstr "MensajeriÌa para Internet 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) @@ -98,47 +80,46 @@ 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: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: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 Compartir Igual 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" -"\">Logotipo de la mensajerÃa para Internet Empathy</media> MensajerÃa para " -"Internet Empathy" +#: C/index.page:30(media/span) +msgid "Empathy Internet Messenger logo" +msgstr "Logo de mensajerÃa para Internet Empathy" + +#: C/index.page:28(page/title) +msgid "<_:media-1/> Empathy Internet Messenger" +msgstr "<_:media-1/> MensajerÃa para Internet Empathy" -#: C/index.page:35(section/title) +#: C/index.page:36(section/title) msgid "Account Management" msgstr "Gestión de cuentas" -#: C/index.page:39(section/title) +#: C/index.page:40(section/title) msgid "Contact Management" msgstr "Gestión de contactos" -#: C/index.page:43(section/title) +#: C/index.page:44(section/title) msgid "Text Conversations" msgstr "Conversaciones de texto" -#: C/index.page:47(section/title) +#: C/index.page:48(section/title) msgid "Audio and Video Conversations" msgstr "Conversaciones de sonido y vÃdeo" -#: C/index.page:51(section/title) +#: C/index.page:52(section/title) msgid "Advanced Actions" msgstr "Acciones avanzadas" -#: 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 "Problemas comunes" @@ -363,8 +344,8 @@ msgid "" "height=\"16\">Remove</media>." 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>." +"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=" +"\"16\">Quitar</media>." #: C/account-irc.page:115(section/p) msgid "" @@ -730,74 +711,54 @@ 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/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 "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 +767,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 +787,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 +806,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 "" @@ -2157,9 +2123,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 +2350,27 @@ 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 "Hide offline contacts" +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." 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,82 +2378,117 @@ 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:" 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 "Combining contacts" +msgid "Link contacts" +msgstr "Enlazar contactos" + +#: 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:63(item/p) +#: 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 "Click <gui style=\"button\">Link</gui>." +msgid "Press <gui style=\"button\">Link</gui>." msgstr "Pulse <gui style=\"button\">Enlazar</gui>." -#: C/link-contacts.page:82(note/p) +#: 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 "Combining contacts" +msgid "Unlink contacts" +msgstr "Desenlazar contactos" + +#: C/link-contacts.page:93(section/p) +msgid "To unlink a linked contact:" +msgstr "Para desenlazar un contacto enlazado:" + +#: C/link-contacts.page:98(item/p) +#| msgid "Select a status from the list." +msgid "Select the contact from your list." +msgstr "Seleccione el contacto de su lista." + +#: C/link-contacts.page:103(item/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." +"Press <gui style=\"button\">Edit</gui> in the top-right corner of " +"<app>Contacts</app>." 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." +"Pulse <gui style=\"button\">Editar</gui> en la esquina superior derecha de " +"<app>Contactos</app>." -#: C/link-contacts.page:91(section/title) -msgid "Separating contacts" -msgstr "Separar contactos" +#: C/link-contacts.page:108(item/p) +#| msgid "Click <gui style=\"button\">Link</gui>." +msgid "Press <gui style=\"button\">Linked Contacts</gui>." +msgstr "Pulse <gui style=\"button\">Contactos enlazados</gui>." -#: C/link-contacts.page:94(item/p) +#: C/link-contacts.page:113(item/p) +#| msgid "Click <gui style=\"button\">Connect</gui> to enable the new account." 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\">Remove</gui> to unlink an entry from the linked " +"contact." 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\">Quitar</gui> para desenlazar una entrada de un " +"contacto enlazado." -#: 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:118(item/p) +#| msgid "Click <gui style=\"button\">Connect</gui> to enable the new account." +msgid "" +"Press <gui style=\"button\">Close</gui> if you do not want to unlink any " +"more contacts." +msgstr "" +"Pulse <gui style=\"button\">Cerrar</gui> si no quiere desenlazar más " +"contactos." + +#: C/link-contacts.page:123(item/p) +#| msgid "Click <gui style=\"button\">Connect</gui> to enable the new account." +msgid "Finally, press <gui style=\"button\">Done</gui> to finish editing." +msgstr "" +"Finalmente, pulse <gui style=\"button\">Hecho</gui> para terminar la edición." #. 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 @@ -2531,10 +2537,6 @@ msgstr "Qué es la mensajerÃa instantánea y cómo puede usarla." 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 "Visión general de la mensajerÃa instantánea" @@ -2840,8 +2842,8 @@ msgid "" "An error message which says “<gui>Name in use</gui>†appears in the main " "window." msgstr "" -"Aparecen en la ventana principal un mensaje de error que dice «<gui>Nombre en " -"uso</gui>»." +"Aparecen en la ventana principal un mensaje de error que dice «<gui>Nombre " +"en uso</gui>»." #: C/prob-conn-name.page:33(page/title) msgid "I get a message that says “Name in useâ€" @@ -3500,15 +3502,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 +3522,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 +3547,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,6 +3559,86 @@ msgstr "" "Seleccione el contacto con el que quiere tener la conversacioÌn y, del menuÌ, " "seleccione <gui style=\"menuitem\">Llamada de vÃdeo</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" @@ -3854,10 +3940,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 80733da1b..526569a51 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..ed9242b58 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) 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" @@ -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-05-03 12:35+0000\n" +"PO-Revision-Date: 2013-05-03 18:04+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: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 "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,107 +1756,107 @@ 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" @@ -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:1336 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: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: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] "%s segundo" msgstr[1] "%s segundos" -#: ../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] "%s minuto" msgstr[1] "%s minutos" -#: ../libempathy-gtk/empathy-log-window.c:1385 +#: ../libempathy-gtk/empathy-log-window.c:1375 #, 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:1706 msgid "Today" msgstr "Hoy" -#: ../libempathy-gtk/empathy-log-window.c:1720 +#: ../libempathy-gtk/empathy-log-window.c:1710 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:1725 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:1829 +#: ../libempathy-gtk/empathy-log-window.c:3452 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:1928 +#: ../libempathy-gtk/empathy-log-window.c:2387 msgid "Anyone" msgstr "Cualquiera" -#: ../libempathy-gtk/empathy-log-window.c:2710 +#: ../libempathy-gtk/empathy-log-window.c:2700 msgid "Who" msgstr "Quién" -#: ../libempathy-gtk/empathy-log-window.c:2919 +#: ../libempathy-gtk/empathy-log-window.c:2909 msgid "When" msgstr "Cuándo" -#: ../libempathy-gtk/empathy-log-window.c:3037 +#: ../libempathy-gtk/empathy-log-window.c:3027 msgid "Anything" msgstr "Cualquier cosa" -#: ../libempathy-gtk/empathy-log-window.c:3039 +#: ../libempathy-gtk/empathy-log-window.c:3029 msgid "Text chats" msgstr "Chats de texto" -#: ../libempathy-gtk/empathy-log-window.c:3040 +#: ../libempathy-gtk/empathy-log-window.c:3030 #: ../src/empathy-preferences.ui.h:29 msgid "Calls" msgstr "Llamadas" -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3034 msgid "Incoming calls" msgstr "Llamadas entrantes" -#: ../libempathy-gtk/empathy-log-window.c:3045 +#: ../libempathy-gtk/empathy-log-window.c:3035 msgid "Outgoing calls" msgstr "Llamadas salientes" -#: ../libempathy-gtk/empathy-log-window.c:3046 +#: ../libempathy-gtk/empathy-log-window.c:3036 msgid "Missed calls" msgstr "Llamadas perdidas" -#: ../libempathy-gtk/empathy-log-window.c:3066 +#: ../libempathy-gtk/empathy-log-window.c:3056 msgid "What" msgstr "Qué" -#: ../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 "" "¿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:3749 msgid "Clear All" msgstr "Limpiar todo" -#: ../libempathy-gtk/empathy-log-window.c:3766 +#: ../libempathy-gtk/empathy-log-window.c:3756 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" @@ -2490,72 +2490,72 @@ msgstr "¿Qué tipo de cuenta tiene?" msgid "Adding new account" msgstr "Añadiendo 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 +2565,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 +2594,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 +2607,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 +2636,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,7 +2807,7 @@ 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" @@ -2835,197 +2835,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 +3037,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 +3049,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 +3059,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 +3142,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 +3172,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 +3198,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 +3222,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 +3259,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 +3366,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 +3375,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 +3384,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 +3413,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 +3554,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 +3574,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 +3587,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 +3602,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 +3724,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 +3813,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 +3837,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 +3910,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 +4022,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 +4034,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:429 #, c-format msgid "" "%s\n" @@ -4095,17 +4089,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:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "Yes" msgstr "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 "No" msgstr "No" -#: ../src/empathy-new-chatroom-dialog.c:784 +#: ../src/empathy-new-chatroom-dialog.c:774 msgid "Join Room" msgstr "Unirse a sala" @@ -4148,104 +4142,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 +4251,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 +4418,87 @@ 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 setup an account to see contacts here." +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" @@ -1,5 +1,5 @@ # 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 @@ -10,8 +10,8 @@ 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-04-28 12:42+0200\n" +"PO-Revision-Date: 2013-04-28 12:50+0200\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\n" @@ -537,262 +537,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:293 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:213 msgid "Available" msgstr "Disponibile" -#: ../libempathy/empathy-utils.c:228 +#: ../libempathy/empathy-utils.c:215 msgid "Busy" msgstr "Non disponibile" -#: ../libempathy/empathy-utils.c:231 +#: ../libempathy/empathy-utils.c:218 msgid "Away" msgstr "Assente" -#: ../libempathy/empathy-utils.c:233 +#: ../libempathy/empathy-utils.c:220 msgid "Invisible" msgstr "Invisibile" -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:222 msgid "Offline" msgstr "Fuori rete" #. translators: presence type is unknown -#: ../libempathy/empathy-utils.c:238 +#: ../libempathy/empathy-utils.c:225 msgctxt "presence" msgid "Unknown" msgstr "Sconosciuto" -#: ../libempathy/empathy-utils.c:278 +#: ../libempathy/empathy-utils.c:265 msgid "No reason specified" msgstr "Nessun motivo specificato" -#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336 +#: ../libempathy/empathy-utils.c:267 ../libempathy/empathy-utils.c:323 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:269 ../libempathy/empathy-utils.c:303 +#: ../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:271 ../libempathy/empathy-utils.c:305 msgid "Authentication failed" msgstr "Autenticazione non riuscita" -#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320 +#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307 msgid "Encryption error" msgstr "Errore di cifratura" -#: ../libempathy/empathy-utils.c:288 +#: ../libempathy/empathy-utils.c:275 msgid "Name in use" msgstr "Nome in uso" -#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322 +#: ../libempathy/empathy-utils.c:277 ../libempathy/empathy-utils.c:309 msgid "Certificate not provided" msgstr "Certificato non fornito" -#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324 +#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311 msgid "Certificate untrusted" msgstr "Certificato non fidato" -#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326 +#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313 msgid "Certificate expired" msgstr "Certificato scaduto" -#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328 +#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315 msgid "Certificate not activated" msgstr "Certificato non attivato" -#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330 +#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317 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:287 ../libempathy/empathy-utils.c:319 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:289 ../libempathy/empathy-utils.c:321 msgid "Certificate self-signed" msgstr "Certificato auto-firmato" -#: ../libempathy/empathy-utils.c:304 +#: ../libempathy/empathy-utils.c:291 msgid "Certificate error" msgstr "Errore nel certificato" -#: ../libempathy/empathy-utils.c:338 +#: ../libempathy/empathy-utils.c:325 msgid "Encryption is not available" msgstr "La cifratura non è disponibile" -#: ../libempathy/empathy-utils.c:340 +#: ../libempathy/empathy-utils.c:327 msgid "Certificate is invalid" msgstr "Il certificato non è valido" -#: ../libempathy/empathy-utils.c:342 +#: ../libempathy/empathy-utils.c:329 msgid "Connection has been refused" msgstr "La connessione è stata rifiutata" -#: ../libempathy/empathy-utils.c:344 +#: ../libempathy/empathy-utils.c:331 msgid "Connection can't be established" msgstr "La connessione non può essere stabilita" -#: ../libempathy/empathy-utils.c:346 +#: ../libempathy/empathy-utils.c:333 msgid "Connection has been lost" msgstr "La connessione è stata persa" -#: ../libempathy/empathy-utils.c:348 +#: ../libempathy/empathy-utils.c:335 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:337 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:340 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:342 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:344 msgid "Certificate has been revoked" msgstr "Il certificato è stato revocato" -#: ../libempathy/empathy-utils.c:359 +#: ../libempathy/empathy-utils.c:346 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:349 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 +800,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:353 msgid "Your software is too old" msgstr "Il software in uso è troppo datato" -#: ../libempathy/empathy-utils.c:368 +#: ../libempathy/empathy-utils.c:355 msgid "Internal error" msgstr "Errore interno" -#: ../libempathy/empathy-utils.c:497 -#: ../libempathy-gtk/empathy-roster-model.h:30 +#: ../libempathy/empathy-utils.c:484 +#: ../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:489 msgid "Yahoo! Japan" msgstr "Yahoo! Giappone" -#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672 +#: ../libempathy/empathy-utils.c:525 ../src/empathy-roster-window.c:657 msgid "Google Talk" msgstr "Google Talk" -#: ../libempathy/empathy-utils.c:539 +#: ../libempathy/empathy-utils.c:526 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 +907,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 +966,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 +974,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 +1208,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 +1350,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 +1408,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 +1482,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 +1508,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 +1520,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 +1648,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 +1662,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 +1684,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 +1705,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:2947 ../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:770 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 +1793,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,85 +1817,85 @@ 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" @@ -1944,11 +1944,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 +1957,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 +2084,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 +2318,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 +2354,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 +2367,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: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: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" msgstr[0] "%s secondo" msgstr[1] "%s secondi" -#: ../libempathy-gtk/empathy-log-window.c:1382 +#: ../libempathy-gtk/empathy-log-window.c:1367 #, 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:1375 #, 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:1706 msgid "Today" msgstr "Oggi" -#: ../libempathy-gtk/empathy-log-window.c:1725 +#: ../libempathy-gtk/empathy-log-window.c:1710 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:1725 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:1829 +#: ../libempathy-gtk/empathy-log-window.c:3452 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:1928 +#: ../libempathy-gtk/empathy-log-window.c:2387 msgid "Anyone" msgstr "Chiunque" -#: ../libempathy-gtk/empathy-log-window.c:2715 +#: ../libempathy-gtk/empathy-log-window.c:2700 msgid "Who" msgstr "Chi" -#: ../libempathy-gtk/empathy-log-window.c:2924 +#: ../libempathy-gtk/empathy-log-window.c:2909 msgid "When" msgstr "Quando" -#: ../libempathy-gtk/empathy-log-window.c:3042 +#: ../libempathy-gtk/empathy-log-window.c:3027 msgid "Anything" msgstr "Qualsiasi cosa" -#: ../libempathy-gtk/empathy-log-window.c:3044 +#: ../libempathy-gtk/empathy-log-window.c:3029 msgid "Text chats" msgstr "Testo conversazioni" # (ndt) è il titolo del dialogo -#: ../libempathy-gtk/empathy-log-window.c:3045 +#: ../libempathy-gtk/empathy-log-window.c:3030 #: ../src/empathy-preferences.ui.h:29 msgid "Calls" msgstr "Chiamate" -#: ../libempathy-gtk/empathy-log-window.c:3049 +#: ../libempathy-gtk/empathy-log-window.c:3034 msgid "Incoming calls" msgstr "Chiamate in arrivo" -#: ../libempathy-gtk/empathy-log-window.c:3050 +#: ../libempathy-gtk/empathy-log-window.c:3035 msgid "Outgoing calls" msgstr "Chiamate in uscita" -#: ../libempathy-gtk/empathy-log-window.c:3051 +#: ../libempathy-gtk/empathy-log-window.c:3036 msgid "Missed calls" msgstr "Chiamate perse" -#: ../libempathy-gtk/empathy-log-window.c:3071 +#: ../libempathy-gtk/empathy-log-window.c:3056 msgid "What" msgstr "Cosa" -#: ../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 "" "Eliminare veramente tutte le registrazioni delle conversazioni precedenti?" -#: ../libempathy-gtk/empathy-log-window.c:3764 +#: ../libempathy-gtk/empathy-log-window.c:3749 msgid "Clear All" msgstr "Elimina tutto" -#: ../libempathy-gtk/empathy-log-window.c:3771 +#: ../libempathy-gtk/empathy-log-window.c:3756 msgid "Delete from:" msgstr "Elimina da:" @@ -2521,7 +2521,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" @@ -2546,74 +2546,74 @@ msgstr "Che tipo di account è disponibile?" msgid "Adding 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 +2623,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 +2653,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 +2666,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 +2696,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,7 +2872,7 @@ 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" @@ -2900,198 +2900,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 +3103,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 +3115,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 +3125,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 +3150,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 +3213,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 +3244,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 +3271,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 +3296,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 +3334,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:2945 msgid "On hold" msgstr "In attesa" -#: ../src/empathy-call-window.c:2970 +#: ../src/empathy-call-window.c:2949 msgid "Mute" msgstr "Muto" -#: ../src/empathy-call-window.c:2972 +#: ../src/empathy-call-window.c:2951 msgid "Duration" msgstr "Durata" #. Translators: 'status - minutes:seconds' the caller has been connected -#: ../src/empathy-call-window.c:2975 +#: ../src/empathy-call-window.c:2954 #, c-format msgid "%s — %d:%02dm" msgstr "%s — %d.%02dm" -#: ../src/empathy-call-window.c:3071 +#: ../src/empathy-call-window.c:3050 msgid "Technical Details" msgstr "Dettagli tecnici" -#: ../src/empathy-call-window.c:3110 +#: ../src/empathy-call-window.c:3089 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -3443,7 +3443,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:3094 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -3452,7 +3452,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:3100 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -3461,23 +3461,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:3106 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:3110 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:3113 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:3125 #, c-format msgid "" "Something unexpected happened in a Telepathy component. Please <a href=\"%s" @@ -3488,32 +3488,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:3134 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:3137 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:3177 msgid "Can't establish audio stream" msgstr "Impossibile stabilire il flusso audio" -#: ../src/empathy-call-window.c:3208 +#: ../src/empathy-call-window.c:3187 msgid "Can't establish video stream" msgstr "Impossibile stabilire il flusso video" -#: ../src/empathy-call-window.c:3245 +#: ../src/empathy-call-window.c:3224 #, 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:3228 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:3230 msgid "Top Up" msgstr "Ricarica" @@ -3634,20 +3634,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 +3656,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 +3669,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 +3684,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 +3807,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:1588 msgid "Save" msgstr "Salva" -#: ../src/empathy-debug-window.c:1659 +#: ../src/empathy-debug-window.c:1648 msgid "Pastebin link" msgstr "Collegamento Pastebin" -#: ../src/empathy-debug-window.c:1668 +#: ../src/empathy-debug-window.c:1657 msgid "Pastebin response" msgstr "Risposta 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 "Troppi dati per una singola operazione. Salvare i registri su file." -#: ../src/empathy-debug-window.c:1857 +#: ../src/empathy-debug-window.c:1846 msgid "Debug Window" msgstr "Finestra di debug" -#: ../src/empathy-debug-window.c:1917 +#: ../src/empathy-debug-window.c:1906 msgid "Send to pastebin" msgstr "Invia 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 "Livello " -#: ../src/empathy-debug-window.c:1992 +#: ../src/empathy-debug-window.c:1981 msgid "Debug" msgstr "Debug" -#: ../src/empathy-debug-window.c:1997 +#: ../src/empathy-debug-window.c:1986 msgid "Info" msgstr "Informazioni" -#: ../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 "Messaggio" -#: ../src/empathy-debug-window.c:2007 +#: ../src/empathy-debug-window.c:1996 msgid "Warning" msgstr "Avviso" -#: ../src/empathy-debug-window.c:2012 +#: ../src/empathy-debug-window.c:2001 msgid "Critical" msgstr "Critico" -#: ../src/empathy-debug-window.c:2017 +#: ../src/empathy-debug-window.c:2006 msgid "Error" msgstr "Errore" -#: ../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 " @@ -3894,23 +3894,23 @@ msgstr "" "\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">segnalazione</" "a>." -#: ../src/empathy-debug-window.c:2062 +#: ../src/empathy-debug-window.c:2051 msgid "Time" msgstr "Orario" -#: ../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 "Categoria" -#: ../src/empathy-debug-window.c:2071 +#: ../src/empathy-debug-window.c:2060 msgid "Level" msgstr "Livello" -#: ../src/empathy-debug-window.c:2100 +#: ../src/empathy-debug-window.c:2089 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -3918,71 +3918,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 +3992,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 +4106,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 +4119,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:429 #, c-format msgid "" "%s\n" @@ -4178,17 +4178,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:431 +#: ../src/empathy-new-chatroom-dialog.c:432 msgid "Yes" msgstr "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 "No" msgstr "No" -#: ../src/empathy-new-chatroom-dialog.c:784 +#: ../src/empathy-new-chatroom-dialog.c:774 msgid "Join Room" msgstr "Entra nella stanza" @@ -4231,106 +4231,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 +4344,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 +4451,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 +4527,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 +#: ../src/empathy-roster-window.c:478 msgid "You need to setup 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 +4713,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" @@ -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 f0a2db9a2..27f41d37b 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 7d56b6849..6cc60098f 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 5de844bd4..f0b6ec641 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..5af3ff45f 100644 --- a/src/empathy-sanity-cleaning.c +++ b/src/empathy-sanity-cleaning.c @@ -22,24 +22,22 @@ */ #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-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/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" |
